diff --git a/src/views/govern/device/control/tabs/trend.vue b/src/views/govern/device/control/tabs/trend.vue
index a7305e9..dff32df 100644
--- a/src/views/govern/device/control/tabs/trend.vue
+++ b/src/views/govern/device/control/tabs/trend.vue
@@ -8,21 +8,10 @@
                         <DatePicker ref="datePickerRef"></DatePicker>
                     </el-form-item>
                     <el-form-item label="统计指标" label-width="80px">
-                        <el-select
-                            multiple
-                            :multiple-limit="3"
-                            collapse-tags
-                            collapse-tags-tooltip
-                            v-model="searchForm.index"
-                            placeholder="请选择统计指标"
-                            @change="onIndexChange($event)"
-                        >
-                            <el-option
-                                v-for="item in indexOptions"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
+                        <el-select multiple :multiple-limit="3" collapse-tags collapse-tags-tooltip
+                            v-model="searchForm.index" placeholder="请选择统计指标" @change="onIndexChange($event)">
+                            <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 label="值类型">
@@ -32,19 +21,11 @@
                         </el-select>
                     </el-form-item>
 
-                    <el-form-item
-                        class="history_count"
-                        v-for="(item, index) in countData"
-                        :key="index"
+                    <el-form-item class="history_count" v-for="(item, index) in countData" :key="index"
                         :label="item.name.includes('次数') ? item.name : item.name + '谐波次数'"
-                        v-show="item.countOptions.length != 0"
-                    >
-                        <el-select
-                            v-model="item.count"
-                            @change="onCountChange($event, index)"
-                            placeholder="请选择谐波次数"
-                            style="width: 100px"
-                        >
+                        v-show="item.countOptions.length != 0">
+                        <el-select v-model="item.count" @change="onCountChange($event, index)" placeholder="请选择谐波次数"
+                            style="width: 100px">
                             <el-option v-for="vv in item.countOptions" :key="vv" :label="vv" :value="vv"></el-option>
                         </el-select>
                     </el-form-item>
@@ -220,7 +201,14 @@ const init = async () => {
                         let unitList: any = []
 
                         let groupedData = chartsList.reduce((acc: any, item: any) => {
-                            let key = item.anotherName
+
+                            let key = ''
+                            if (item.phase == null) {
+                                key = item.unit
+                            } else {
+                                key = item.anotherName
+                            }
+
                             if (!acc[key]) {
                                 acc[key] = []
                             }
@@ -228,6 +216,7 @@ const init = async () => {
                             return acc
                         }, {})
                         let result = Object.values(groupedData)
+                        // console.log("🚀 ~ .then ~ result:", result)
                         if (chartsList.length > 0) {
                             unitList = result.map((item: any) => {
                                 return item[0].unit
@@ -238,14 +227,17 @@ const init = async () => {
                             legend: {
                                 itemWidth: 20,
                                 itemHeight: 10,
-                                itemGap: 15,
+                                itemGap: 10,
                                 type: 'scroll', // 开启滚动分页
                                 // orient: 'vertical', // 垂直排列
-                                top: 25,
-                                bottom: 30,
+                                top: 10,
+
                                 width: 400,
-                                right: 150,
-                                height: 100
+                                height: 50
+                            },
+                            grid: {
+                                top: '80px',
+
                             },
                             tooltip: {
                                 axisPointer: {
@@ -319,13 +311,21 @@ const init = async () => {
                                 series: []
                             }
                         }
+                        // console.log("🚀 ~ unitList.forEach ~ unitList:", unitList)
+
                         if (chartsList.length > 0) {
                             echartsData.value.yAxis = []
+
+
                             unitList.forEach((item: any, index: any) => {
+                                if (index > 2) {
+                                    echartsData.value.grid.right = (index - 1) * 80
+                                }
                                 let right = {
                                     position: 'right',
                                     offset: (index - 1) * 80
                                 }
+                                console.log("🚀 ~ unitList.forEach ~ right.index:", index)
                                 echartsData.value.yAxis.push({
                                     name: item,
                                     yAxisIndex: index,
@@ -337,13 +337,22 @@ const init = async () => {
                                     ...(index > 0 ? right : null)
                                 })
                             })
+                            // console.log("🚀 ~ result.forEach ~ result:", result)
 
                             result.forEach((item: any, index: any) => {
                                 let yMethodList: any = []
 
                                 let ABCList = Object.values(
                                     item.reduce((acc, item) => {
-                                        let key = item.phase
+
+                                        let key = ''
+                                        if (item.phase == null) {
+                                            key = item.anotherName
+                                        } else {
+
+                                            key = item.phase
+                                        }
+
                                         if (!acc[key]) {
                                             acc[key] = []
                                         }
@@ -351,6 +360,8 @@ const init = async () => {
                                         return acc
                                     }, {})
                                 )
+                                // console.log("🚀 ~ ABCList.forEach ~ ABCList:", ABCList)
+
                                 ABCList.forEach((kk: any) => {
                                     let seriesList: any = []
                                     kk.forEach((cc: any) => {
@@ -360,11 +371,12 @@ const init = async () => {
 
                                         seriesList.push([cc.time, cc.statisticalData?.toFixed(2), cc.unit])
                                     })
+                                    // console.log(kk);
 
                                     echartsData.value.options.series.push({
                                         name: kk[0].phase
-                                            ? kk[0].phase + '相' + item[0].anotherName
-                                            : item[0].anotherName,
+                                            ? kk[0].phase + '相' + kk[0].anotherName
+                                            : kk[0].anotherName,
                                         type: 'line',
                                         smooth: true,
                                         symbol: 'none',
@@ -376,6 +388,7 @@ const init = async () => {
                                 echartsData.value.yAxis[index].min = min
                                 echartsData.value.yAxis[index].max = max
                             })
+                            console.log("🚀 ~ result.forEach ~ echartsData.value:", echartsData.value)
                         }
                         loading.value = false
                     }
@@ -665,6 +678,7 @@ defineExpose({ getTrendRequest })
     // flex: 1;
     margin-top: 10px;
 }
+
 .history_count {
     .el-select {
         min-width: 100px;
diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue
index 11981dc..9a6b32d 100644
--- a/src/views/govern/device/planData/index.vue
+++ b/src/views/govern/device/planData/index.vue
@@ -21,12 +21,8 @@
                             <p>测试项信息</p>
                         </div> -->
                         <el-tabs v-model="activeName" type="border-card" @click.self="handleClickTabs">
-                            <el-tab-pane
-                                v-for="(item, index) in deviceData?.records"
-                                :label="item.itemName"
-                                :name="item.id"
-                                :key="index"
-                            >
+                            <el-tab-pane v-for="(item, index) in deviceData?.records" :label="item.itemName"
+                                :name="item.id" :key="index">
                                 <template #label>
                                     <span class="custom-tabs-label">
                                         <el-icon>
@@ -110,22 +106,11 @@
                         <TableHeader :showSearch="false" ref="tableHeaderRef" @selectChange="selectChange">
                             <template v-slot:select :key="num">
                                 <el-form-item for="-" label="统计指标">
-                                    <el-select
-                                        style="min-width: 200px"
-                                        collapse-tags
-                                        collapse-tags-tooltip
-                                        v-model="searchForm.index"
-                                        placeholder="请选择统计指标"
-                                        @change="onIndexChange($event)"
-                                        multiple
-                                        :multiple-limit="3"
-                                    >
-                                        <el-option
-                                            v-for="item in indexOptions"
-                                            :key="item.id"
-                                            :label="item.name"
-                                            :value="item.id"
-                                        ></el-option>
+                                    <el-select style="min-width: 200px" collapse-tags collapse-tags-tooltip
+                                        v-model="searchForm.index" placeholder="请选择统计指标" @change="onIndexChange($event)"
+                                        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="值类型">
@@ -134,42 +119,20 @@
                                         <el-option value="Secondary" label="二次值"></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item
-                                    for="-"
-                                    v-for="(item, index) in countData"
-                                    :key="index"
+                                <el-form-item for="-" v-for="(item, index) in countData" :key="index"
                                     :label="item.name.includes('次数') ? item.name : item.name + '谐波次数'"
-                                    label-width="180px"
-                                    v-show="item.countOptions.length != 0"
-                                >
+                                    label-width="180px" v-show="item.countOptions.length != 0">
                                     <!-- multiple -->
-                                    <el-select
-                                        v-model="item.count"
-                                        collapse-tags
-                                        collapse-tags-tooltip
-                                        placeholder="请选择谐波次数"
-                                        style="width: 120px"
-                                    >
-                                        <el-option
-                                            v-for="vv in item.countOptions"
-                                            :key="vv"
-                                            :label="vv"
-                                            :value="vv"
-                                        ></el-option>
+                                    <el-select v-model="item.count" collapse-tags collapse-tags-tooltip
+                                        placeholder="请选择谐波次数" style="width: 120px">
+                                        <el-option v-for="vv in item.countOptions" :key="vv" :label="vv"
+                                            :value="vv"></el-option>
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item for="-" label="统计类型" label-width="80px">
-                                    <el-select
-                                        style="width: 120px"
-                                        v-model="searchForm.type"
-                                        placeholder="请选择值类型"
-                                    >
-                                        <el-option
-                                            v-for="item in typeOptions"
-                                            :key="item.id"
-                                            :label="item.name"
-                                            :value="item.id"
-                                        ></el-option>
+                                    <el-select style="width: 120px" v-model="searchForm.type" placeholder="请选择值类型">
+                                        <el-option v-for="item in typeOptions" :key="item.id" :label="item.name"
+                                            :value="item.id"></el-option>
                                     </el-select>
                                 </el-form-item>
                             </template>
@@ -184,13 +147,8 @@
                     <div class="history_title">
                         <p>{{ chartTitle }}</p>
                     </div>
-                    <div
-                        class="history_chart"
-                        v-loading="loading"
-                        :style="EcharHeight"
-                        :key="EcharHeight.height"
-                        ref="chartRef"
-                    >
+                    <div class="history_chart" v-loading="loading" :style="EcharHeight" :key="EcharHeight.height"
+                        ref="chartRef">
                         <MyEchart ref="historyChart" v-if="echartsData" :isExport="true" :options="echartsData" />
                     </div>
                 </div>
@@ -463,7 +421,12 @@ const init = (flag: boolean) => {
                         let unitList: any = []
 
                         let groupedData = chartsList.reduce((acc: any, item: any) => {
-                            let key = item.anotherName
+                            let key = ''
+                            if (item.phase == null) {
+                                key = item.unit
+                            } else {
+                                key = item.anotherName
+                            }
                             if (!acc[key]) {
                                 acc[key] = []
                             }
@@ -471,6 +434,7 @@ const init = (flag: boolean) => {
                             return acc
                         }, {})
                         let result = Object.values(groupedData)
+
                         if (chartsList.length > 0) {
                             unitList = result.map((item: any) => {
                                 return item[0].unit
@@ -485,10 +449,14 @@ const init = (flag: boolean) => {
                                 type: 'scroll', // 开启滚动分页
                                 // orient: 'vertical', // 垂直排列
                                 top: 10,
-                                bottom: 30,
+
                                 width: 400,
                                 height: 50
                             },
+                            grid: {
+                                top: '80px',
+
+                            },
                             tooltip: {
                                 axisPointer: {
                                     type: 'cross',
@@ -509,9 +477,8 @@ const init = (flag: boolean) => {
                                     const xname = params[0].value[0]
                                     let str = `${xname}<br>`
                                     params.forEach((el: any, index: any) => {
-                                        str += `${el.marker}${el.seriesName.split('(')[0]}：${
-                                            el.value[1] ? 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
                                 }
@@ -536,6 +503,9 @@ const init = (flag: boolean) => {
                         if (chartsList.length > 0) {
                             echartsData.value.yAxis = []
                             unitList.forEach((item: any, index: any) => {
+                                if (index > 2) {
+                                    echartsData.value.grid.right = (index - 1) * 80
+                                }
                                 let right = {
                                     position: 'right',
                                     offset: (index - 1) * 80
@@ -557,7 +527,13 @@ const init = (flag: boolean) => {
 
                                 let ABCList = Object.values(
                                     item.reduce((acc, item) => {
-                                        let key = item.phase
+                                        let key = ''
+                                        if (item.phase == null) {
+                                            key = item.anotherName
+                                        } else {
+
+                                            key = item.phase
+                                        }
                                         if (!acc[key]) {
                                             acc[key] = []
                                         }
@@ -576,8 +552,8 @@ const init = (flag: boolean) => {
                                     })
                                     echartsData.value.options.series.push({
                                         name: kk[0].phase
-                                            ? kk[0].phase + '相' + item[0].anotherName
-                                            : item[0].anotherName,
+                                            ? kk[0].phase + '相' + kk[0].anotherName
+                                            : kk[0].anotherName,
                                         type: 'line',
                                         smooth: true,
                                         symbol: 'none',
diff --git a/src/views/govern/manage/engineering.vue b/src/views/govern/manage/engineering.vue
index c9de4c5..5051097 100644
--- a/src/views/govern/manage/engineering.vue
+++ b/src/views/govern/manage/engineering.vue
@@ -61,7 +61,7 @@ onMounted(() => {
     // }, 500)
 })
 const deletes = (row: any) => {
-    ElMessageBox.prompt('二次校验密码确认', '', {
+    ElMessageBox.prompt('二次校验密码确认', '·', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
           customClass: 'customInput',