暂态事件-波形解析接口调试

src/views/govern/device/control/tabs/components/waveFormAnalysis.vue

@@ -5,8 +5,8 @@
             <el-form-item label="值类型选择">
                 <el-select @change="changeView" v-model="value" placeholder="请选择值类型">
                     <el-option
-                        v-for="item in options"
-                        :key="item.value"
+                        v-for="(item, index) in options"
+                        :key="index"
                         :label="item.label"
                         :value="item.value"
                     ></el-option>
@@ -17,18 +17,26 @@
             <el-tab-pane
                 label="瞬时波形"
                 name="ssbx"
-                class="boxbx pt10 pb10"
-                :style="'height:' + bxecharts + ';overflow-y: scroll;'"
+                :style="'height:' + bxecharts + ';overflow-y: scroll;padding-bottom:200px;'"
             >
-                <shushiboxi v-if="wp" :value="value" :boxoList="boxoList" :wp="wp"></shushiboxi>
+                <shushiboxi
+                    v-if="isWp && wp && activeName == 'ssbx'"
+                    :value="value"
+                    :boxoList="boxoList"
+                    :wp="wp"
+                ></shushiboxi>
             </el-tab-pane>
             <el-tab-pane
                 label="RMS波形"
-                class="boxbx pt10 pb10"
                 name="rmsbx"
-                :style="'height:' + bxecharts + ';overflow-y: scroll;'"
+                :style="'height:' + bxecharts + ';overflow-y: scroll;padding-bottom:200px;'"
             >
-                <rmsboxi v-if="wp" :value="value" :boxoList="boxoList" :wp="wp"></rmsboxi>
+                <rmsboxi
+                    v-if="isWp && wp && activeName == 'rmsbx'"
+                    :value="value"
+                    :boxoList="boxoList"
+                    :wp="wp"
+                ></rmsboxi>
             </el-tab-pane>
             <!-- <el-tab-pane label="瞬时波形" name="0">
                 <template #label>
@@ -109,9 +117,8 @@ const view = ref(true)
 const view2 = ref(false)
 const showBoxi = ref(true)
 const activeName = ref('ssbx')
-const boxoList = ref({})
 const wp = ref({})
-const value = ref(1)
+const value = ref(2)
 const options = ref([
     {
         value: 1,
@@ -122,29 +129,34 @@ const options = ref([
         label: '二次值'
     }
 ])
-watch(
-    () => props.wp,
-    (val, oldVal) => {
-        if (val) {
-            console.log(val, '+++++++++++++++wp')
-            wp.value == val
-        }
-    },
-    {
-        immediate: true,
-        deep: true
-    }
-)
-const getWpData = (val: any) => {
+// watch(
+//     () => props.wp,
+//     (val, oldVal) => {
+//         if (val) {
+//             console.log(val,"+++++++++++++++wp");
+//             wp.value == val
+//         }
+//     },
+//     {
+//         immediate: true,
+//         deep: true
+//     }
+// )
+const isWp = ref(false)
+const boxoList: any = ref([])
+const getWpData = (val: any, list: any) => {
     wp.value = val
+    isWp.value = true
+    boxoList.value = list
+    console.log(wp.value, val, 'ggggghhhh')
 }
 const changeView = () => {
-    // showBoxi.value = false
-    // setTimeout(() => {
-    //     showBoxi.value = true
-    // }, 0)
+    showBoxi.value = false
+    setTimeout(() => {
+        showBoxi.value = true
+    }, 0)
 }
-const bxecharts = mainHeight(155).height as any
+const bxecharts = mainHeight(195).height as any
 //加载echarts
 const init = () => {
     return
@@ -524,7 +536,7 @@ const init = () => {
 }
 
 const handleClick = (tab: any, event: any) => {
-    activeName.value = tab.index
+    // activeName.value = tab.index
     if (tab.name == 'ssbx') {
         activeName.value = 'ssbx'
     } else if (tab.name == 'rmsbx') {
@@ -561,11 +573,17 @@ defineExpose({ getWpData })
     position: relative;
     .waveFormAnalysis_header {
         position: absolute;
-        top: -30px;
+        top: -25px;
         left: 0;
+        width: 80%;
+        height: 40px;
+        .el-select {
+            width: 200px !important;
+        }
     }
     .waveFormAnalysis_body {
-        margin-top: 15px;
+        margin-top: 20px;
+        flex: 1;
     }
 }
 </style>