修改测试bug

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

@@ -14,12 +14,12 @@
         </div>
         <el-tabs class="home_body" type="border-card" v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="瞬时波形" name="ssbx"
-                :style="'height:' + bxecharts + ';overflow-y: scroll;padding-bottom:200px;'">
+                :style="'height:' + bxecharts + ';overflow-y: scroll;'">
                 <shushiboxi v-if="isWp && wp && activeName == 'ssbx'" :value="value" :boxoList="boxoList" :wp="wp">
                 </shushiboxi>
             </el-tab-pane>
             <el-tab-pane label="RMS波形" name="rmsbx"
-                :style="'height:' + bxecharts + ';overflow-y: scroll;padding-bottom:200px;'">
+                :style="'height:' + bxecharts + ';overflow-y: scroll;'">
                 <rmsboxi v-if="isWp && wp && activeName == 'rmsbx'" :value="value" :boxoList="boxoList" :wp="wp">
                 </rmsboxi>
             </el-tab-pane>
@@ -104,7 +104,7 @@ const changeView = () => {
         showBoxi.value = true
     }, 0)
 }
-const bxecharts = mainHeight(195).height as any
+const bxecharts = mainHeight(345).height as any
 
 const handleClick = (tab: any, event: any) => {
     // activeName.value = tab.index

src/views/govern/device/control/tabs/event.vue

@@ -8,7 +8,7 @@
             @handleHideCharts="isWaveCharts = false"
             :wp="wp"
         />
-        <el-button v-if="isWaveCharts" type="primary" @click="handleBack" :icon="ArrowLeft">返回</el-button>
+        <!-- <el-button v-if="isWaveCharts" type="primary" @click="handleBack" :icon="ArrowLeft">返回</el-button> -->
     </div>
 </template>
 <script lang="ts" setup>
@@ -33,7 +33,7 @@ const waveFormAnalysisRef = ref()
 const headerRef = ref()
 const tableStore: any = new TableStore({
     url: '/cs-device-boot/csGroup/deviceDataByType',
-    publicHeight: 210,
+    publicHeight: 215,
     method: 'POST',
     column: [
         // { width: '60', type: 'checkbox', fixed: 'left' },
@@ -54,7 +54,7 @@ const tableStore: any = new TableStore({
             title: '持续时间(s)',
             minWidth: 100,
             formatter: (row: any) => {
-                row.cellValue = row.cellValue ? row.cellValue : '/'
+                row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/'
                 return row.cellValue
             }
         },
@@ -91,7 +91,7 @@ const tableStore: any = new TableStore({
                                 row.loading = false
                                 if (res != undefined) {
                                     boxoList.value = row
-                                    // boxoList.value.systemType = 'WX'
+                                    boxoList.value.systemType = 'WX'
                                     wp.value = res.data
                                     view.value = false
                                     view2.value = true

src/views/govern/device/planData/index.vue

@@ -108,14 +108,14 @@
                     <TableHeader :showSearch="false" ref="tableHeaderRef" :key="searchFormIndex"
                         @selectChange="selectChange">
                         <template v-slot:select>
-                            <el-form-item for="-" label="统计指标" label-width="80px">
+                            <el-form-item for="-" label="统计指标">
                                 <el-select collapse-tags collapse-tags-tooltip v-model="searchForm.index"
                                     placeholder="请选择统计指标" multiple :multiple-limit="3">
                                     <el-option v-for="item in indexOptions" :key="item.id" :label="item.name"
                                         :value="item.id"></el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item for="-" label="值类型" label-width="80px">
+                            <el-form-item for="-" label="值类型">
                                 <el-select style="width: 160px !important" v-model="searchForm.dataLevel">
                                     <el-option value="Primary" label="一次值"></el-option>
                                     <el-option value="Secondary" label="二次值"></el-option>
@@ -256,7 +256,7 @@ const nodeClick = async (e: anyObj) => {
 
     //查询测试项信息
     await getTestRecordInfo(id)
-        .then(res => {
+        .then(async (res) => {
             deviceData.value = res.data
             if (res.data.records.length == 1) {
                 activeName.value = res.data.records[0].id
@@ -269,8 +269,13 @@ const nodeClick = async (e: anyObj) => {
                     }
                 })
             }
+            searchForm.value.index = [indexOptions.value[0].id]
+
             schemeTreeRef.value.getPlanData(deviceData.value)
-            init(true)
+            await setTimeout(() => {
+                init(true)
+            }, 500);
+
             loading.value = false
         })
         .catch(e => {
@@ -429,7 +434,7 @@ const init = (flag: boolean) => {
                                     const xname = params[0].value[0];
                                     let str = `${xname}<br>`;
                                     params.forEach((el, index) => {
-                                        str += `${el.marker}${el.seriesName.split('(')[0]}：${el.value[1]}${el.value[2]}<br>`;
+                                        str += `${el.marker}${el.seriesName.split('(')[0]}：${el.value[1] ? (el.value[1] + ' ' + el.value[2]) : '-'}<br>`;
                                     });
                                     return str;
                                 },
@@ -494,7 +499,7 @@ const init = (flag: boolean) => {
 
                                         }
 
-                                        seriesList.push([cc.time, cc.statisticalData?.toFixed(2),cc.unit])
+                                        seriesList.push([cc.time, cc.statisticalData?.toFixed(2), cc.unit])
                                     })