From 1a6bf39a0746398c12df9788be90d177aef646bd Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 11 九月 2023 16:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/PM20230220027_Web
---
src/views/plotting/plottingInquire.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/views/plotting/plottingInquire.vue b/src/views/plotting/plottingInquire.vue
index ad1d9ad..29c3f85 100644
--- a/src/views/plotting/plottingInquire.vue
+++ b/src/views/plotting/plottingInquire.vue
@@ -24,7 +24,10 @@
>
<!-- <el-tab-pane label="鍥惧眰灞炴��" name="first">User</el-tab-pane> -->
<el-tab-pane label="鏌ヨ缁撴灉" name="second">
- <div class="inquireContent_input">
+ <div class="chart_box" v-if="chartIsshow">
+ <Bar-graph :width="'100%'" :height="'260px'"></Bar-graph>
+ </div>
+ <div class="inquireContent_input" v-if="!chartIsshow">
<div class="inquireContent_input_left">
<div class="label">鑼冨洿妗�</div>
<el-input
@@ -52,7 +55,7 @@
</el-select>
</div>
</div>
- <div class="inquireContent_msg">
+ <div class="inquireContent_msg" v-if="!chartIsshow">
<div class="inquireContent_msg_k">
<span>鎻愬彇鐨勮竟鐣屾</span>
<span>{{ ScopeBox.pixel }}</span>
@@ -65,7 +68,7 @@
>
</div>
</div>
- <div class="inquireContent_table">
+ <div class="inquireContent_table" v-if="!chartIsshow">
<div class="table">
<div class="table_head">
<div class="table_head_td">搴忓彿</div>
@@ -111,6 +114,8 @@
watch,
} from "vue";
import { useStore } from "vuex"; // 寮曞叆useStore 鏂规硶
+//echarts
+import BarGraph from "@/components/BarGraph.vue";
const store = useStore(); // 璇ユ柟娉曠敤浜庤繑鍥瀞tore 瀹炰緥
const emits = defineEmits(["setCloseplotting"]);
let isShow = ref(false);
@@ -198,11 +203,15 @@
// const setCloseplotting = () => {
// emits("setCloseplotting", false);
// };
+let chartIsshow = ref(false);
watch(
() => store.state.plottingInquireData,
(nVal, oVal) => {
isShow.value = nVal.isshow;
inquireData.value = nVal.entitiesData;
+ if (nVal.entitiesData.icon == "x.png") {
+ chartIsshow.value = true;
+ }
},
{ deep: true }
);
--
Gitblit v1.9.3