From 490b52b525f3b2795be3375c9dd821f0e60da143 Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Tue, 23 Jun 2026 11:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/cockpit/F47Curve/index.vue     |  2 +-
 src/components/cockpit/ITICurve/index.vue     |  2 +-
 .../admin/components/popup/adminInfo.vue      | 12 ++---
 .../admin/components/popup/password.vue       |  6 +--
 src/styles/vxeTable.css                       |  2 +-
 src/styles/vxeTable.min.css                   |  2 +-
 src/styles/vxeTable.scss                      |  2 +-
 .../govern/alarm/eventStatistics/F47.vue      |  2 +-
 .../govern/alarm/eventStatistics/ITIC.vue     |  2 +-
 src/views/govern/alarm/multiCondition.vue     |  6 +--
 src/views/govern/analyze/APF/APF.vue          |  8 +--
 .../analyze/steadyState/components/chart.vue  |  8 +--
 .../components/monitoring.vue                 | 23 +++++---
 .../supplementaryRecruitment/history.vue      | 14 ++---
 .../govern/device/control/tabs/realtime.vue   |  4 +-
 .../govern/manage/basic/popupDictionary.vue   | 54 +++++++++----------
 .../govern/manage/basic/popupVersion.vue      | 18 +++----
 src/views/govern/manage/factory.vue           | 21 ++++----
 src/views/govern/manage/gplot/popupEdit.vue   |  4 +-
 .../manage/programVersion/comp/upgrade.vue    |  4 +-
 .../mxgraph/graphList/components/popup.vue    | 10 ++--
 src/views/govern/reportForms/form.vue         | 10 ++--
 .../govern/setting/frontManagement/index.vue  | 16 +++---
 .../govern/terminal/deviceLedger/index.vue    | 14 ++---
 .../govern/terminal/deviceMonitor/index.vue   | 14 ++---
 .../dictionary/list/popupDetailEdit.vue       | 12 ++---
 .../setting/dictionary/tree/popupForm.vue     |  8 +--
 .../setting/dictionary/version/index.vue      | 14 ++---
 src/views/system/reportForms/form.vue         |  8 +--
 src/views/user/popupUpdatePwd.vue             |  4 +-
 30 files changed, 159 insertions(+), 147 deletions(-)

diff --git a/src/components/cockpit/F47Curve/index.vue b/src/components/cockpit/F47Curve/index.vue
index d8eee6d..d0268b0 100644
--- a/src/components/cockpit/F47Curve/index.vue
+++ b/src/components/cockpit/F47Curve/index.vue
@@ -456,7 +456,7 @@ const handleTolerableEventClick = async (row: any) => {
                     featureAmplitude: (row.value[1] / 100), //残余电压
                     startTime: row.value[2], //时间
                     lineName: row.value[4], //监测点名称
-                    engineeringName: row.value[5],
+                    engineeringName: row.value[6],
                 }
                 boxoList.value.systemType = 'YPT'
                 wp.value = res.data
diff --git a/src/components/cockpit/ITICurve/index.vue b/src/components/cockpit/ITICurve/index.vue
index fec39cb..ae1c84c 100644
--- a/src/components/cockpit/ITICurve/index.vue
+++ b/src/components/cockpit/ITICurve/index.vue
@@ -388,7 +388,7 @@ const handleTolerableEventClick = async (row: any) => {
                     featureAmplitude: (row.value[1] / 100), //残余电压
                     startTime: row.value[2], //时间
                     lineName: row.value[4], //监测点名称
-                    engineeringName: row.value[5],
+                    engineeringName: row.value[6],
                 }
                 boxoList.value.systemType = 'YPT'
                 wp.value = res.data
diff --git a/src/layouts/admin/components/popup/adminInfo.vue b/src/layouts/admin/components/popup/adminInfo.vue
index c6a1caa..e6dc79a 100644
--- a/src/layouts/admin/components/popup/adminInfo.vue
+++ b/src/layouts/admin/components/popup/adminInfo.vue
@@ -2,22 +2,22 @@
     <el-dialog draggable width="500px" v-model.trim="dialogVisible" :title="title">
   
             <el-form :inline="false" :model="form" label-width="auto" class="form-one">
-                <el-form-item label="用户名称:">
+                <el-form-item label="用户名称">
                     <el-input maxlength="32" show-word-limit  v-model.trim="form.name" :disabled="true"></el-input>
                 </el-form-item>
-                <el-form-item label="登录名称:" class="top">
+                <el-form-item label="登录名称" class="top">
                     <el-input maxlength="32" show-word-limit  v-model.trim="form.loginName" :disabled="true"></el-input>
                 </el-form-item>
-                <!-- <el-form-item label="归属部门名称:" class="top">
+                <!-- <el-form-item label="归属部门名称" class="top">
                     <el-input maxlength="32" show-word-limit  v-model.trim="form.deptName" :disabled="true"></el-input>
                 </el-form-item> -->
-                <el-form-item label="拥有的角色:" class="top">
+                <el-form-item label="拥有的角色" class="top">
                     <el-input maxlength="32" show-word-limit  v-model.trim="form.role" :disabled="true"></el-input>
                 </el-form-item>
-                <el-form-item label="电话号码:" class="top">
+                <el-form-item label="电话号码" class="top">
                     <el-input maxlength="32" show-word-limit  v-model.trim="form.phone" :disabled="true"></el-input>
                 </el-form-item>
-                <el-form-item label="电子邮箱:" class="top">
+                <el-form-item label="电子邮箱" class="top">
                     <el-input maxlength="32" show-word-limit  v-model.trim="form.email" :disabled="true"></el-input>
                 </el-form-item>
             </el-form>
diff --git a/src/layouts/admin/components/popup/password.vue b/src/layouts/admin/components/popup/password.vue
index 8a1c40b..888b6e4 100644
--- a/src/layouts/admin/components/popup/password.vue
+++ b/src/layouts/admin/components/popup/password.vue
@@ -2,13 +2,13 @@
     <el-dialog draggable width="500px" v-model.trim="dialogVisible" :title="title">
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" class="form-one" ref="formRef">
-                <el-form-item label="校验密码:" prop="password">
+                <el-form-item label="校验密码" prop="password">
                     <el-input maxlength="32" show-word-limit  v-model.trim="form.password" type="password" placeholder="请输入校验密码" show-password />
                 </el-form-item>
-                <el-form-item label="新密码:" prop="newPwd">
+                <el-form-item label="新密码" prop="newPwd">
                     <el-input maxlength="32" show-word-limit  v-model.trim="form.newPwd" type="password" placeholder="请输入新密码" show-password />
                 </el-form-item>
-                <el-form-item label="确认密码:" prop="confirmPwd">
+                <el-form-item label="确认密码" prop="confirmPwd">
                     <el-input maxlength="32" show-word-limit 
                         v-model.trim="form.confirmPwd"
                         type="password"
diff --git a/src/styles/vxeTable.css b/src/styles/vxeTable.css
index cec52cd..28e75fe 100644
--- a/src/styles/vxeTable.css
+++ b/src/styles/vxeTable.css
@@ -42,7 +42,7 @@
 
 .vxe-table--render-default .vxe-body--row.row--current,
 .vxe-table--render-default .vxe-body--row.row--current:hover {
-  background-color: var(--el-color-primary-light-8);
+  background-color: var(--el-color-primary-light-9);
 }
 
 .vxe-table--tooltip-wrapper {
diff --git a/src/styles/vxeTable.min.css b/src/styles/vxeTable.min.css
index 25e7f47..f7c541b 100644
--- a/src/styles/vxeTable.min.css
+++ b/src/styles/vxeTable.min.css
@@ -1 +1 @@
-.vxe-header--row{background:var(--vxe-table-header-background-color);color:var(--vxe-table-header-font-color)}.is--checked.vxe-checkbox,.is--checked.vxe-checkbox .vxe-checkbox--icon,.is--checked.vxe-custom--checkbox-option,.is--checked.vxe-custom--checkbox-option .vxe-checkbox--icon,.is--checked.vxe-export--panel-column-option,.is--checked.vxe-export--panel-column-option .vxe-checkbox--icon,.is--checked.vxe-table--filter-option,.is--checked.vxe-table--filter-option .vxe-checkbox--icon,.is--indeterminate.vxe-checkbox,.is--indeterminate.vxe-checkbox .vxe-checkbox--icon,.is--indeterminate.vxe-custom--checkbox-option,.is--indeterminate.vxe-custom--checkbox-option .vxe-checkbox--icon,.is--indeterminate.vxe-export--panel-column-option,.is--indeterminate.vxe-export--panel-column-option .vxe-checkbox--icon,.is--indeterminate.vxe-table--filter-option,.is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon,.vxe-table--render-default .is--checked.vxe-cell--checkbox,.vxe-table--render-default .is--checked.vxe-cell--checkbox .vxe-checkbox--icon,.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox,.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox .vxe-checkbox--icon,.vxe-table--render-default .is--checked.vxe-cell--radio .vxe-radio--icon{color:var(--el-color-primary-light-3)}.vxe-checkbox:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-radio:not(.is--disabled):hover .vxe-radio--icon,.vxe-custom--radio-option:not(.is--disabled):hover .vxe-radio--icon,.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-radio--icon,.vxe-table--filter-option:not(.is--disabled):hover .vxe-radio--icon,.vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon{color:var(--el-color-primary-light-5)}.vxe-table--render-default .vxe-body--row.row--current,.vxe-table--render-default .vxe-body--row.row--current:hover{background-color:var(--el-color-primary-light-8)}.vxe-table--tooltip-wrapper{z-index:10000 !important}.is--disabled{background-color:var(--vxe-input-disabled-color)}.vxe-modal--wrapper{z-index:5000 !important}
+.vxe-header--row{background:var(--vxe-table-header-background-color);color:var(--vxe-table-header-font-color)}.is--checked.vxe-checkbox,.is--checked.vxe-checkbox .vxe-checkbox--icon,.is--checked.vxe-custom--checkbox-option,.is--checked.vxe-custom--checkbox-option .vxe-checkbox--icon,.is--checked.vxe-export--panel-column-option,.is--checked.vxe-export--panel-column-option .vxe-checkbox--icon,.is--checked.vxe-table--filter-option,.is--checked.vxe-table--filter-option .vxe-checkbox--icon,.is--indeterminate.vxe-checkbox,.is--indeterminate.vxe-checkbox .vxe-checkbox--icon,.is--indeterminate.vxe-custom--checkbox-option,.is--indeterminate.vxe-custom--checkbox-option .vxe-checkbox--icon,.is--indeterminate.vxe-export--panel-column-option,.is--indeterminate.vxe-export--panel-column-option .vxe-checkbox--icon,.is--indeterminate.vxe-table--filter-option,.is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon,.vxe-table--render-default .is--checked.vxe-cell--checkbox,.vxe-table--render-default .is--checked.vxe-cell--checkbox .vxe-checkbox--icon,.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox,.vxe-table--render-default .is--indeterminate.vxe-cell--checkbox .vxe-checkbox--icon,.vxe-table--render-default .is--checked.vxe-cell--radio .vxe-radio--icon{color:var(--el-color-primary-light-3)}.vxe-checkbox:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-table--render-default .vxe-cell--checkbox:not(.is--disabled):hover .vxe-checkbox--icon,.vxe-radio:not(.is--disabled):hover .vxe-radio--icon,.vxe-custom--radio-option:not(.is--disabled):hover .vxe-radio--icon,.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-radio--icon,.vxe-table--filter-option:not(.is--disabled):hover .vxe-radio--icon,.vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon{color:var(--el-color-primary-light-5)}.vxe-table--render-default .vxe-body--row.row--current,.vxe-table--render-default .vxe-body--row.row--current:hover{background-color:var(--el-color-primary-light-9)}.vxe-table--tooltip-wrapper{z-index:10000 !important}.is--disabled{background-color:var(--vxe-input-disabled-color)}.vxe-modal--wrapper{z-index:5000 !important}
diff --git a/src/styles/vxeTable.scss b/src/styles/vxeTable.scss
index 2038e84..9dfa221 100644
--- a/src/styles/vxeTable.scss
+++ b/src/styles/vxeTable.scss
@@ -62,7 +62,7 @@
 }
 .vxe-table--render-default .vxe-body--row.row--current,
 .vxe-table--render-default .vxe-body--row.row--current:hover {
-    background-color: var(--el-color-primary-light-8);
+    background-color: var(--el-color-primary-light-9);
 }
 // .vxe-table--render-default .is--disabled.vxe-cell--checkbox .vxe-checkbox--icon{
 //     color: #fff0;
diff --git a/src/views/govern/alarm/eventStatistics/F47.vue b/src/views/govern/alarm/eventStatistics/F47.vue
index 5a78aed..1f4c458 100644
--- a/src/views/govern/alarm/eventStatistics/F47.vue
+++ b/src/views/govern/alarm/eventStatistics/F47.vue
@@ -322,7 +322,7 @@ const handleTolerableEventClick = async (row: any) => {
                     featureAmplitude: row.value[1] / 100,
                     startTime: row.value[2],
                     lineName: row.value[4],
-                    engineeringName: row.value[5],
+                    engineeringName: row.value[6],
                     systemType: 'YPT'
                 }
                 wp.value = res.data
diff --git a/src/views/govern/alarm/eventStatistics/ITIC.vue b/src/views/govern/alarm/eventStatistics/ITIC.vue
index af80e42..13cfabe 100644
--- a/src/views/govern/alarm/eventStatistics/ITIC.vue
+++ b/src/views/govern/alarm/eventStatistics/ITIC.vue
@@ -307,7 +307,7 @@ const handleTolerableEventClick = async (row: any) => {
                     featureAmplitude: row.value[1] / 100,
                     startTime: row.value[2],
                     lineName: row.value[4],
-                    engineeringName: row.value[5],
+                    engineeringName: row.value[6],
                     systemType: 'YPT'
                 }
 
diff --git a/src/views/govern/alarm/multiCondition.vue b/src/views/govern/alarm/multiCondition.vue
index 79f8ced..40ed75d 100644
--- a/src/views/govern/alarm/multiCondition.vue
+++ b/src/views/govern/alarm/multiCondition.vue
@@ -1,6 +1,6 @@
 <template>
     <el-dialog v-model="visible" title="事件筛选" width="500px" append-to-body draggable class="transient-filter-dialog">
-        <el-form label-width="auto" class="filter-form">
+        <el-form label-width="auto" class="filter-form form-one">
             <el-form-item label="暂态幅值(%)">
                 <div class="range-inputs">
                     <el-input-number v-model="params.featureAmplitudeMin" class="range-input-item" :min="0" :max="180"
@@ -30,13 +30,13 @@
             </el-form-item>
             <el-form-item label="触发类型">
                 <el-select v-model="params.target" :clearable="!hasFixedTarget" placeholder="请选择触发类型" multiple
-                    collapse-tags style="width: 317px">
+                    collapse-tags >
                     <el-option v-for="item in eventTypeList" :key="item.value" :label="item.label"
                         :value="item.value" />
                 </el-select>
             </el-form-item>
             <el-form-item label="是否存在波形">
-                <el-select v-model="params.fileFlag" clearable placeholder="请选择是否存在波形" style="width: 317px">
+                <el-select v-model="params.fileFlag" clearable placeholder="请选择是否存在波形" >
                     <el-option v-for="item in fileFlagOptions" :key="item.value" :label="item.label"
                         :value="item.value" />
                 </el-select>
diff --git a/src/views/govern/analyze/APF/APF.vue b/src/views/govern/analyze/APF/APF.vue
index 47782a9..0e8d5be 100644
--- a/src/views/govern/analyze/APF/APF.vue
+++ b/src/views/govern/analyze/APF/APF.vue
@@ -6,24 +6,24 @@
                 <TableHeader :showSearch="false" ref="tableHeaderRef" @selectChange="selectChange"
                  >
                     <template v-slot:select>
-                        <el-form-item label="时间:">
+                        <el-form-item label="时间">
                             <DatePicker ref="datePickerRef"    :timeKeyList="['3', '4', '5']"></DatePicker>
                         </el-form-item>
-                        <el-form-item label="统计指标:">
+                        <el-form-item label="统计指标">
                             <el-select style="width: 200px" v-model.trim="formInline.statisticalId" filterable
                                 @change="frequencyFlag" placeholder="请选择">
                                 <el-option v-for="item in zblist" :key="item.value" :label="item.label"
                                     :value="item.value"></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="谐波次数:" v-show="frequencyShow">
+                        <el-form-item label="谐波次数" v-show="frequencyShow">
                             <el-select v-model.trim="formInline.frequency" filterable placeholder="请选择"
                                 style="width: 100px">
                                 <el-option v-for="item in 49" :key="item + 1" :label="item + 1"
                                     :value="item + 1"></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="值类型:">
+                        <el-form-item label="值类型">
                             <el-select v-model.trim="formInline.valueType" filterable placeholder="请选择">
                                 <el-option v-for="item in typelist" :key="item.value" :label="item.label"
                                     :value="item.value"></el-option>
diff --git a/src/views/govern/analyze/steadyState/components/chart.vue b/src/views/govern/analyze/steadyState/components/chart.vue
index 6dda999..be3b19d 100644
--- a/src/views/govern/analyze/steadyState/components/chart.vue
+++ b/src/views/govern/analyze/steadyState/components/chart.vue
@@ -6,24 +6,24 @@
             <div ref="headerRef">
                 <TableHeader :showSearch="false" ref="tableHeaderRef" @selectChange="selectChange">
                     <template v-slot:select>
-                        <el-form-item label="时间:">
+                        <el-form-item label="时间">
                             <DatePicker ref="datePickerRef"></DatePicker>
                         </el-form-item>
-                        <el-form-item label="统计指标:">
+                        <el-form-item label="统计指标">
                             <el-select style="width: 200px" v-model.trim="formInline.statisticalId" filterable
                                 @change="frequencyFlag" placeholder="请选择">
                                 <el-option v-for="item in zblist" :key="item.value" :label="item.label"
                                     :value="item.value"></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="谐波次数:" v-show="frequencyShow">
+                        <el-form-item label="谐波次数" v-show="frequencyShow">
                             <el-select v-model.trim="formInline.frequency" filterable placeholder="请选择"
                                 style="width: 100px">
                                 <el-option v-for="item in 49" :key="item + 1" :label="item + 1"
                                     :value="item + 1"></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="值类型:">
+                        <el-form-item label="值类型">
                             <el-select v-model.trim="formInline.valueType" filterable placeholder="请选择">
                                 <el-option v-for="item in typelist" :key="item.value" :label="item.label"
                                     :value="item.value"></el-option>
diff --git a/src/views/govern/cloudDeviceEntry/components/monitoring.vue b/src/views/govern/cloudDeviceEntry/components/monitoring.vue
index 57275da..08ea16a 100644
--- a/src/views/govern/cloudDeviceEntry/components/monitoring.vue
+++ b/src/views/govern/cloudDeviceEntry/components/monitoring.vue
@@ -206,7 +206,7 @@
                         formData.deviceInfoList.length > 0
                     ">
                         <el-tabs v-model="busBarIndex" type="border-card" :addable="false"
-                            :closable="pageStatus != 1  && connectionMethod != 'MQTT'" @edit="handleBusBarTabsEdit"
+                            :closable="pageStatus != 1 && connectionMethod != 'MQTT'" @edit="handleBusBarTabsEdit"
                             @tab-click="tabChange('busBarIndex', $event)">
                             <el-tab-pane v-for="(busItem, bIndex) in formData.deviceInfoList" :key="bIndex"
                                 :label="busItem.name ? busItem.name : '新建设备' + bIndex" :name="bIndex + ''">
@@ -233,7 +233,7 @@
                                                 ((nodeLevel == 2 || (nodeLevel == 1 && pageStatus == 2)) &&
                                                     pageStatus == 2)
                                             )
-                                                " @change="busItem.devModel = ''">
+                                                " @change="busItem.devModel = ''; devTypeChange($event)">
 
                                             <el-option v-for="item in formDevTypeOptions" :key="item.id"
                                                 :label="item.name" :value="item.id"></el-option>
@@ -404,8 +404,9 @@
                         formData.lineInfoList.length > 0
                     ">
                         <!-- connectionMethod != 'MQTT' -->
-                        <el-tabs type="border-card" v-model="lineIndex" :addable="false" :closable="pageStatus != 1 && connectionMethod != 'MQTT'"
-                            @edit="handleLineTabsEdit" @tab-click="tabChange('lineIndex', $event)">
+                        <el-tabs type="border-card" v-model="lineIndex" :addable="false"
+                            :closable="pageStatus != 1 && connectionMethod != 'MQTT'" @edit="handleLineTabsEdit"
+                            @tab-click="tabChange('lineIndex', $event)">
                             <el-tab-pane v-for="(lineItem, lIndex) in formData.lineInfoList" :key="lIndex"
                                 :label="lineItem.name ? lineItem.name : '新建监测点' + lIndex" :name="lIndex + ''">
                                 <div class="flex mt10">
@@ -646,7 +647,8 @@
                                                 :label="option.name" :value="option.id"></el-option>
                                         </el-select>
                                     </el-form-item>
-                                    <el-form-item class="form-item" label="监测位置">
+                                    <el-form-item class="form-item" label="监测位置"
+                                        v-if="!(connectionMethod == 'MQTT' && formDevTypeOptions.find(item => item.id == positionKey)?.name == '监测设备')">
                                         <el-select clearable filterable v-model="lineItem.position"
                                             placeholder="请选择监测位置" :disabled="!(connectionMethod != 'MQTT' &&
                                                 (nodeLevel == 4 && pageStatus == 3) ||
@@ -919,7 +921,7 @@ const project = ref([
 ])
 const wiringTypeArr = ref([
     { name: '星型接线', value: 0 },
-    { name: '三角型接线', value: 1 },
+    { name: '角型接线', value: 1 },
     { name: 'V型接线', value: 2 }
 ])
 /**监测点序号 */
@@ -1037,6 +1039,7 @@ const arrdess: any = ref((rule: any, value: any, callback: any) => {
     }
 })
 const connectionMethod = ref('')
+const positionKey = ref('')
 
 // 省市选择相关数据
 const provinceOptions = computed(() => areaTree)
@@ -1322,6 +1325,9 @@ const queryNodeContent = () => {
         if (nodeLevel.value >= 2) {
             formData.value.deviceInfoList = res.data.deviceInfoList || []
             connectionMethod.value = formData.value.deviceInfoList[0].devAccessMethod || 'CLD'
+
+            positionKey.value = formData.value.deviceInfoList[0].devType
+
         }
         if (nodeLevel.value >= 3) {
             formData.value.lineInfoList = res.data.lineInfoList || []
@@ -1914,6 +1920,10 @@ const next = async () => {
         }
     })
 }
+const devTypeChange = (e: any) => {
+
+    positionKey.value = e
+}
 
 // 撤销
 const black = () => {
@@ -2766,6 +2776,7 @@ const tabChange = (type: string, e: any) => {
     } else if (type == 'busBarIndex') {
         lineIndex.value = '0'
         connectionMethod.value = formData.value.deviceInfoList[e.index].devAccessMethod
+        positionKey.value = formData.value.deviceInfoList[e.index].devType
     }
 }
 // 电压等级变化
diff --git a/src/views/govern/device/control/supplementaryRecruitment/history.vue b/src/views/govern/device/control/supplementaryRecruitment/history.vue
index 50b24d4..1d20d3d 100644
--- a/src/views/govern/device/control/supplementaryRecruitment/history.vue
+++ b/src/views/govern/device/control/supplementaryRecruitment/history.vue
@@ -34,7 +34,7 @@
             </template>
             <template v-slot:operation>
                 <el-button type="primary" @click="downLoadFile" class="ml10" icon="el-icon-Download">
-                    模版下载
+                    下载模版
                 </el-button>
                 <el-upload style="display: inline-block" action="" accept=".xlsx" class="upload-demo"
                     :show-file-list="false" :auto-upload="false" :on-change="bulkImport">
@@ -48,34 +48,34 @@
         <el-dialog :title="dialogTitle" v-model.trim="dialogFormVisible" :close-on-click-modal="false"
             :before-close="resetForm" draggable width="500px">
             <el-form :model="form" label-width="120px" :rules="rules" ref="ruleFormRef">
-                <el-form-item label="设备名称:" prop="name">
+                <el-form-item label="设备名称" prop="name">
                     <el-input maxlength="32" show-word-limit    v-model.trim="form.name" autocomplete="off" clearable
                         placeholder="请输入（项目名称+设备名称）"></el-input>
                 </el-form-item>
-                <el-form-item label="网络设备ID:" prop="ndid" class="top">
+                <el-form-item label="网络设备ID" prop="ndid" class="top">
                     <el-input maxlength="32" show-word-limit    v-model.trim="form.ndid" autocomplete="off"
                         placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="设备类型:" prop="devType" class="top">
+                <el-form-item label="设备类型" prop="devType" class="top">
                     <el-select v-model.trim="form.devType" placeholder="请选择" @change="formDevTypeChange" clearable>
                         <el-option v-for="item in devTypeOptions" :key="item.value" :label="item.label"
                             :value="item.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="设备型号:" prop="devModel" class="top">
+                <el-form-item label="设备型号" prop="devModel" class="top">
                     <el-select v-model.trim="form.devModel" filterable placeholder="请选择" clearable>
                         <el-option v-for="item in formDevModelOptionsFilter" :key="item.value" :label="item.label"
                             :value="item.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="通讯协议:" prop="devAccessMethod" class="top">
+                <el-form-item label="通讯协议" prop="devAccessMethod" class="top">
                     <el-select v-model.trim="form.devAccessMethod" placeholder="请选择" clearable>
                         <el-option label="MQTT" value="MQTT"></el-option>
                         <el-option label="CLD" value="cloud"></el-option>
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="合同号:" prop="cntractNo" class="top">
+                <el-form-item label="合同号" prop="cntractNo" class="top">
                     <el-input maxlength="32" show-word-limit    v-model.trim="form.cntractNo" autocomplete="off"
                         placeholder="请输入"></el-input>
                 </el-form-item>
diff --git a/src/views/govern/device/control/tabs/realtime.vue b/src/views/govern/device/control/tabs/realtime.vue
index e05d93e..b1279b5 100644
--- a/src/views/govern/device/control/tabs/realtime.vue
+++ b/src/views/govern/device/control/tabs/realtime.vue
@@ -139,13 +139,13 @@
                     <vxe-column align="center" field="sC" title="C相"></vxe-column>
                     <vxe-column align="center" field="sTot" title="总"></vxe-column>
                 </vxe-colgroup>
-                <vxe-colgroup align="center" title="视在功率因数">
+                <vxe-colgroup align="center" title="视在功率因数(P/S)">
                     <vxe-column align="center" field="pfA" title="A相"></vxe-column>
                     <vxe-column align="center" field="pfB" title="B相"></vxe-column>
                     <vxe-column align="center" field="pfC" title="C相"></vxe-column>
                     <vxe-column align="center" field="pfTot" title="总"></vxe-column>
                 </vxe-colgroup>
-                <vxe-colgroup align="center" title="位移功率因数">
+                <vxe-colgroup align="center" title="位移功率因数(P/S1)">
                     <vxe-column align="center" field="dpfA" title="A相"></vxe-column>
                     <vxe-column align="center" field="dpfB" title="B相"></vxe-column>
                     <vxe-column align="center" field="dpfC" title="C相"></vxe-column>
diff --git a/src/views/govern/manage/basic/popupDictionary.vue b/src/views/govern/manage/basic/popupDictionary.vue
index 688375f..64e8067 100644
--- a/src/views/govern/manage/basic/popupDictionary.vue
+++ b/src/views/govern/manage/basic/popupDictionary.vue
@@ -5,7 +5,7 @@
                 <el-divider content-position="center">基础数据</el-divider>
             </div>
             <el-form :model="form" label-width="130px" ref="formRef" class="form-two" :rules="rules">
-                <el-form-item label="数据分类:" prop="dataType">
+                <el-form-item label="数据分类" prop="dataType">
                     <el-select v-model.trim="form.dataType" filterable clearable placeholder="请选择数据分类">
                         <el-option
                             v-for="item in DataTypeSelect"
@@ -15,7 +15,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="数据名称:" prop="name">
+                <el-form-item label="数据名称" prop="name">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -24,7 +24,7 @@
                         placeholder="请输入数据名称"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="别名:" prop="otherName">
+                <el-form-item label="别名" prop="otherName">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -33,7 +33,7 @@
                         placeholder="请输入别名"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="展示名称:" prop="showName">
+                <el-form-item label="展示名称" prop="showName">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -42,7 +42,7 @@
                         placeholder="请输入展示名称"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="相别:" prop="phase">
+                <el-form-item label="相别" prop="phase">
                     <el-select v-model.trim="form.phase" filterable clearable placeholder="请选择相别">
                         <el-option
                             v-for="item in phaseSelect"
@@ -52,7 +52,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="单位:">
+                <el-form-item label="单位">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -61,7 +61,7 @@
                         placeholder="请输入单位"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="基础数据类型:">
+                <el-form-item label="基础数据类型">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -70,10 +70,10 @@
                         placeholder="请输入基础数据类型"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="开始结束次数:">
+                <el-form-item label="开始结束次数">
                     <el-slider v-model.trim="form.harm" range  :max="50" style="width: 90%" />
                 </el-form-item>
-                <el-form-item label="统计方法:">
+                <el-form-item label="统计方法">
                     <el-select
                         v-model.trim="form.statMethod"
                         multiple
@@ -91,7 +91,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="数据存储:" prop="classId">
+                <el-form-item label="数据存储" prop="classId">
                     <el-select v-model.trim="form.classId" filterable clearable placeholder="请选择数据存储">
                         <el-option
                             v-for="item in DataSelect"
@@ -101,7 +101,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="报表数据来源:">
+                <el-form-item label="报表数据来源">
                     <el-select v-model.trim="form.resourcesId" filterable clearable placeholder="请选择报表数据来源">
                         <el-option
                             v-for="item in ResourcesIdSelect"
@@ -111,7 +111,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="序号:" prop="sort">
+                <el-form-item label="序号" prop="sort">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -121,7 +121,7 @@
                         placeholder="请输入序号"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="限值名称:" prop="limitName">
+                <el-form-item label="限值名称" prop="limitName">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -131,7 +131,7 @@
                         placeholder="请输入限值名称"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="限值表名:" prop="limitTable">
+                <el-form-item label="限值表名" prop="limitTable">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -141,7 +141,7 @@
                         placeholder="请输入限值表名"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="超标判断方式:" prop="formula">
+                <el-form-item label="超标判断方式" prop="formula">
                     <el-select v-model.trim="form.formula" filterable clearable placeholder="请选择超标判断方式">
                         <el-option
                             v-for="item in FormulaSelect"
@@ -156,7 +156,7 @@
                 <el-divider content-position="center">拓展数据</el-divider>
             </div>
             <el-form class="form-two" :model="form" label-width="130px" ref="formRef2">
-                <el-form-item label="告警码(缺省值):">
+                <el-form-item label="告警码(缺省值)">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -165,7 +165,7 @@
                         placeholder="请输入告警码(缺省值)"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="事件类别:">
+                <el-form-item label="事件类别">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -175,7 +175,7 @@
                     ></el-input>
                 </el-form-item>
 
-                <el-form-item label="设置最大值:">
+                <el-form-item label="设置最大值">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -185,7 +185,7 @@
                         placeholder="请输入设置最大值"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="设置最小值:">
+                <el-form-item label="设置最小值">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -195,7 +195,7 @@
                         placeholder="请输入设置最小值"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="枚举序列:">
+                <el-form-item label="枚举序列">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -204,7 +204,7 @@
                         placeholder="请输入枚举序列"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="字符串长度上限:">
+                <el-form-item label="字符串长度上限">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -214,7 +214,7 @@
                         placeholder="请输入字符串长度上限"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="上送规则:">
+                <el-form-item label="上送规则">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -223,23 +223,23 @@
                         placeholder="请输入上送规则"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="是否可远程控制:">
+                <el-form-item label="是否可远程控制">
                     <el-radio v-model.trim="form.ctlSts" :label="1">是</el-radio>
                     <el-radio v-model.trim="form.ctlSts" :label="0">否</el-radio>
                 </el-form-item>
-                <el-form-item label="是否需遥控校验:">
+                <el-form-item label="是否需遥控校验">
                     <el-radio v-model.trim="form.curSts" :label="1">是</el-radio>
                     <el-radio v-model.trim="form.curSts" :label="0">否</el-radio>
                 </el-form-item>
-                <el-form-item label="是否存储:">
+                <el-form-item label="是否存储">
                     <el-radio v-model.trim="form.storeFlag" :label="1">是</el-radio>
                     <el-radio v-model.trim="form.storeFlag" :label="0">否</el-radio>
                 </el-form-item>
-                <el-form-item label="是否加密:">
+                <el-form-item label="是否加密">
                     <el-radio v-model.trim="form.storeFlag" :label="1">是</el-radio>
                     <el-radio v-model.trim="form.storeFlag" :label="0">否</el-radio>
                 </el-form-item>
-                <el-form-item label="数据是否上送:">
+                <el-form-item label="数据是否上送">
                     <el-radio v-model.trim="form.tranFlag" :label="1">是</el-radio>
                     <el-radio v-model.trim="form.tranFlag" :label="0">否</el-radio>
                 </el-form-item>
diff --git a/src/views/govern/manage/basic/popupVersion.vue b/src/views/govern/manage/basic/popupVersion.vue
index 8df9f18..79cfb7e 100644
--- a/src/views/govern/manage/basic/popupVersion.vue
+++ b/src/views/govern/manage/basic/popupVersion.vue
@@ -2,14 +2,14 @@
     <el-dialog draggable class="cn-operate-dialog" width="800px" v-model.trim="dialogVisible" :title="title"
         @close="emit('closePopup')">
         <el-form class="form-two" :model="form" label-width="100px" ref="formRef" :rules="rules">
-            <el-form-item label="设备类型:" prop="type">
+            <el-form-item label="设备类型" prop="type">
 
                 <el-select v-model.trim="form.type" placeholder="请选择设备类型" @change="formDevTypeChange" clearable>
                     <el-option v-for="item in devTypeOptions" :key="item.value" :label="item.label"
                         :value="item.value"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="设备型号:" prop="devType">
+            <el-form-item label="设备型号" prop="devType">
                 <!-- <el-select v-model.trim="form.devType" placeholder="请选择" filterable @change="devTypeChange">
                     <el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
@@ -20,34 +20,34 @@
                         :value="item.value"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="版本号:" prop="versionNo">
+            <el-form-item label="版本号" prop="versionNo">
                 <el-input maxlength="32" show-word-limit    v-model.trim="form.versionNo" autocomplete="off"
                     placeholder="请输入版本号"></el-input>
             </el-form-item>
-            <el-form-item label="版本类型:" prop="versionType">
+            <el-form-item label="版本类型" prop="versionType">
                 <el-input maxlength="32" show-word-limit    v-model.trim="form.versionType" autocomplete="off"
                     placeholder="填写特殊类型(不填默认通用类型)"></el-input>
             </el-form-item>
-            <el-form-item label="协议版本:" prop="versionAgreement">
+            <el-form-item label="协议版本" prop="versionAgreement">
                 <el-input maxlength="32" show-word-limit    v-model.trim="form.versionAgreement" autocomplete="off"
                     placeholder="请输入协议版本"></el-input>
             </el-form-item>
-            <el-form-item label="版本日期:" prop="versionDate">
+            <el-form-item label="版本日期" prop="versionDate">
                 <el-date-picker v-model.trim="form.versionDate" type="date" value-format="YYYY-MM-DD"
                     placeholder="选择日期时间" style="width: 100%"></el-date-picker>
             </el-form-item>
 
-            <el-form-item label="CRC校验:" prop="crc">
+            <el-form-item label="CRC校验" prop="crc">
                 <el-input maxlength="32" show-word-limit    v-model.trim="form.crc" autocomplete="off"
                     placeholder="请输入CRC校验"></el-input>
             </el-form-item>
         </el-form>
         <el-form :model="form" label-width="100px" class="mt10 form-one">
-            <el-form-item label="描述:" prop="description">
+            <el-form-item label="描述" prop="description">
                 <el-input  show-word-limit  maxlength="300" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" 
                     v-model.trim="form.description" autocomplete="off" placeholder="请输入描述"></el-input>
             </el-form-item>
-            <el-form-item label="升级文件:" prop="file">
+            <el-form-item label="升级文件" prop="file">
                 <el-upload :limit="1" accept=".bin" :auto-upload="false" :on-change="fileChange" :on-exceed="fileExceed"
                     :on-remove="fileRemove" :file-list="fileList">
                     <el-button type="primary">点击上传</el-button>
diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue
index 9c8c3c2..a40fbad 100644
--- a/src/views/govern/manage/factory.vue
+++ b/src/views/govern/manage/factory.vue
@@ -74,18 +74,19 @@
                 </el-form-item> -->
             </template>
             <template v-slot:operation>
+                <el-button type="primary" class="ml10" @click="add" icon="el-icon-Plus">新增</el-button>
+                <el-button type="primary" class="ml10" icon="el-icon-Download" @click="downLoadQrCode"
+                    :disabled="!showQrCode">
+                    下载二维码
+                </el-button>
                 <el-button type="primary" @click="downLoadFile1" class="ml10" icon="el-icon-Download">
-                    模版下载
+                    下载模版
                 </el-button>
                 <el-upload style="display: inline-block" action="" accept=".xlsx" class="upload-demo"
                     :show-file-list="false" :auto-upload="false" :on-change="bulkImport">
-                    <el-button type="primary" class="ml10" icon="el-icon-Tickets">批量导入</el-button>
+                    <el-button type="primary" class="ml10" icon="el-icon-Upload">导入</el-button>
                 </el-upload>
-                <el-button type="primary" class="ml10" @click="add" icon="el-icon-Plus">新增设备</el-button>
-                <el-button type="primary" class="ml10" icon="el-icon-Download" @click="downLoadQrCode"
-                    :disabled="!showQrCode">
-                    批量下载二维码
-                </el-button>
+              
             </template>
         </TableHeader>
         <Table ref="tableRef" :checkbox-config="checkboxConfig" :key="tableKey" @sort-change="handleSortChange"></Table>
@@ -397,7 +398,7 @@ const tableStore = new TableStore({
                                         nDid: row.ndid
                                     })
                                         .then(res => {
-                                            ElMessage.success(res.message)
+                                            ElMessage.success('接入成功!')
                                             row.loading1 = false
                                             tableStore.index()
                                         })
@@ -411,7 +412,7 @@ const tableStore = new TableStore({
                                     })
                                         .then(res => {
                                             row.loading1 = false
-                                            ElMessage.success(res.message)
+                                            ElMessage.success('接入成功!')
                                             tableStore.index()
                                         })
                                         .catch(e => {
@@ -424,7 +425,7 @@ const tableStore = new TableStore({
                                 })
                                     .then(res => {
                                         row.loading1 = false
-                                        ElMessage.success(res.message)
+                                        ElMessage.success('接入成功!')
                                         tableStore.index()
                                     })
                                     .catch(e => {
diff --git a/src/views/govern/manage/gplot/popupEdit.vue b/src/views/govern/manage/gplot/popupEdit.vue
index 0c4a05a..5e28303 100644
--- a/src/views/govern/manage/gplot/popupEdit.vue
+++ b/src/views/govern/manage/gplot/popupEdit.vue
@@ -1,7 +1,7 @@
 <template>
     <el-dialog draggable class="cn-operate-dialog" v-model.trim="dialogVisible" title="编辑拓扑图信息" width="800px">
         <el-form :label-width="140">
-            <el-form-item label="拓扑图:" style="height: auto !important" class="form-one">
+            <el-form-item label="拓扑图" style="height: auto !important" class="form-one">
                 <div class="gplot-content">
                     <VueDraggableResizable class-name-draggable="gplot-content-item"
                         class-name-active="gplot-content-item-active" :active="editorIndex == index" :resizable="false"
@@ -18,7 +18,7 @@
                     <div>注意监测点不要移出圈</div>
                 </div>
             </el-form-item>
-            <el-form-item label="监测点位置:" v-if="editorIndex > -1">
+            <el-form-item label="监测点位置" v-if="editorIndex > -1">
                 <div style="display: flex">
                     <el-select v-model.trim="pointList[editorIndex].position" placeholder="请选择" style="flex: 1"
                         @change="positionChange">
diff --git a/src/views/govern/manage/programVersion/comp/upgrade.vue b/src/views/govern/manage/programVersion/comp/upgrade.vue
index 450897a..d854345 100644
--- a/src/views/govern/manage/programVersion/comp/upgrade.vue
+++ b/src/views/govern/manage/programVersion/comp/upgrade.vue
@@ -1,7 +1,7 @@
 <template>
     <el-dialog draggable width="500px" v-model.trim="dialogVisible" :title="title">
         <el-form :model="form" class="form-one" label-width="auto" ref="formRef" :rules="rules">
-            <el-form-item label="版本:" prop="edDataId">
+            <el-form-item label="版本" prop="edDataId">
                 <el-select v-model.trim="form.edDataId" placeholder="请选择版本" @change="selectChange">
                     <el-option v-for="item in devList" :disabled="version == item.versionNo"
                         :label="`${item.devTypeName}_${item.versionNo}_${item.versionAgreement}_${item.versionDate}`"
@@ -9,7 +9,7 @@
                 </el-select>
             </el-form-item>
 
-            <el-form-item label="描述:">
+            <el-form-item label="描述">
                 <el-input maxlength="300" show-word-limit  v-model.trim="versionDesc" disabled type="textarea" :rows="3"></el-input>
             </el-form-item>
         </el-form>
diff --git a/src/views/govern/mxgraph/graphList/components/popup.vue b/src/views/govern/mxgraph/graphList/components/popup.vue
index 37277f1..7d57263 100644
--- a/src/views/govern/mxgraph/graphList/components/popup.vue
+++ b/src/views/govern/mxgraph/graphList/components/popup.vue
@@ -8,7 +8,7 @@
         :close-on-click-modal="false"
     >
         <el-form ref="formRef" :rules="rules" :model="form" label-width="90px" class="form-one">
-            <el-form-item label="项目名称:" prop="name">
+            <el-form-item label="项目名称" prop="name">
                 <el-input maxlength="32" show-word-limit 
                     
                     
@@ -16,7 +16,7 @@
                     placeholder="请输入项目名称"
                 ></el-input>
             </el-form-item>
-            <el-form-item label="是否全局:" class="top" v-if="hasAdmin">
+            <el-form-item label="是否全局" class="top" v-if="hasAdmin">
                 <el-switch
                     v-model="form.scope"
                     inline-prompt
@@ -27,7 +27,7 @@
                     inactive-text="否  "
                 />
             </el-form-item>
-            <el-form-item label="工程项目:" class="top" prop="projectIds" v-if="!hasAdmin || form.scope == 0">
+            <el-form-item label="工程项目" class="top" prop="projectIds" v-if="!hasAdmin || form.scope == 0">
                 <el-tree-select
                     v-model.trim="form.projectIds"
                     default-expand-all
@@ -40,11 +40,11 @@
                     style="width: 100%"
                 />
             </el-form-item>
-            <el-form-item label="项目排序:" prop="orderBy">
+            <el-form-item label="项目排序" prop="orderBy">
                 <el-input-number v-model.number="form.orderBy" style="width: 100%" />
             </el-form-item>
 
-            <el-form-item label="备注:" class="top">
+            <el-form-item label="备注" class="top">
                 <el-input show-word-limit 
                     maxlength="300"
                     
diff --git a/src/views/govern/reportForms/form.vue b/src/views/govern/reportForms/form.vue
index ff3515f..e8f9e64 100644
--- a/src/views/govern/reportForms/form.vue
+++ b/src/views/govern/reportForms/form.vue
@@ -1,7 +1,7 @@
 <template>
     <el-dialog draggable :title="title" v-model.trim="formVisible" width="500px" :before-close="closeDialog">
         <el-form :model="formdata" label-width="100px" :rules="rules" ref="ruleForm" class="form-one">
-            <el-form-item label="模板名称:" prop="name">
+            <el-form-item label="模板名称" prop="name">
                 <el-input maxlength="32" show-word-limit 
                     
                     
@@ -10,12 +10,12 @@
                     style="width: 100%"
                 ></el-input>
             </el-form-item>
-            <!-- <el-form-item label="部门:" prop="deptId">
+            <!-- <el-form-item label="部门" prop="deptId">
                 <Area v-model.trim="formdata.deptId" style="width: 100%" collapse-tags
                     :props="{ multiple: true, label: 'name', value: 'id', emitPath: false }" />
             </el-form-item> -->
 
-            <el-form-item label="模板类型:" prop="reportType">
+            <el-form-item label="模板类型" prop="reportType">
                 <el-select style="width: 100%" v-model.trim="formdata.reportType" placeholder="请选择模板类型">
                     <el-option
                         v-for="item in classificationData"
@@ -25,7 +25,7 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="报表类型:" prop="reportForm">
+            <el-form-item label="报表类型" prop="reportForm">
                 <el-select style="width: 100%" v-model.trim="formdata.reportForm" placeholder="请选择报表类型">
                     <el-option
                         v-for="item in reportFormList"
@@ -35,7 +35,7 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="接线方式:" prop="wiringMethod">
+            <el-form-item label="接线方式" prop="wiringMethod">
                 <el-select style="width: 100%" v-model.trim="formdata.wiringMethod" placeholder="请选择接线方式">
                     <el-option
                         v-for="item in volConTypeList"
diff --git a/src/views/govern/setting/frontManagement/index.vue b/src/views/govern/setting/frontManagement/index.vue
index 4fc99c9..98ee558 100644
--- a/src/views/govern/setting/frontManagement/index.vue
+++ b/src/views/govern/setting/frontManagement/index.vue
@@ -71,25 +71,25 @@
 
         <el-dialog draggable :title="dialogTitle" v-model="dialogFormVisible" :close-on-click-modal="false"
             width="500px" :before-close="resetForm">
-            <el-form :model="formData" label-width="120px" :rules="rules" ref="ruleFormRef" class="form-one">
-                <el-form-item label="前置机名称:" prop="name">
+            <el-form :model="formData" label-width="auto" :rules="rules" ref="ruleFormRef" class="form-one">
+                <el-form-item label="前置机名称" prop="name">
                     <el-input maxlength="32" show-word-limit v-model="formData.name" placeholder="请输入前置机名称"
                         @input="handleInput"></el-input>
                 </el-form-item>
-                <el-form-item label="IP:" prop="ip" class="top">
+                <el-form-item label="IP" prop="ip" class="top">
                     <el-input maxlength="32" show-word-limit v-model="formData.ip" placeholder="请输入Ip"></el-input>
                 </el-form-item>
-                <el-form-item label="等级:" prop="nodeGrade" class="top">
+                <el-form-item label="等级" prop="nodeGrade" class="top">
                     <el-select v-model="formData.nodeGrade" placeholder="请选择等级" style="width: 100%">
                         <el-option v-for="item in fontdveoption" :key="item.id" :label="item.name"
                             :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="最大终端数:" prop="nodeDevNum" class="top">
+                <el-form-item label="最大终端数" prop="nodeDevNum" class="top">
                     <el-input show-word-limit v-model="formData.nodeDevNum"
                         onkeyup="value = value.replace(/[^0-9]/g,'')" maxlength="5" placeholder="请输入最大终端数"></el-input>
                 </el-form-item>
-                <el-form-item label="最大进程数:" prop="maxProcessNum" class="top">
+                <el-form-item label="最大进程数" prop="maxProcessNum" class="top">
                     <el-input show-word-limit v-model="formData.maxProcessNum"
                         onkeyup="value = value.replace(/[^0-9]/g,'')" maxlength="5"
                         placeholder="请根据监测点规模填写合适进程数（1个进程最大可承载200个监测点）"></el-input>
@@ -102,11 +102,11 @@
                         ></el-option>
                     </el-select> -->
                 </el-form-item>
-                <el-form-item label="排序:" prop="sort" class="top">
+                <el-form-item label="排序" prop="sort" class="top">
                     <!-- <el-input maxlength="32" show-word-limit v-model="formData.sort" placeholder="请输入排序"></el-input> -->
                     <el-input-number style="width: 100%" :min="0" v-model.number="formData.sort" placeholder="请输入排序" />
                 </el-form-item>
-                <el-form-item label="描述:" prop="remark" class="top">
+                <el-form-item label="描述" prop="remark" class="top">
                     <el-input maxlength="300" show-word-limit v-model="formData.remark"
                         :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" placeholder="请输入描述"></el-input>
                 </el-form-item>
diff --git a/src/views/govern/terminal/deviceLedger/index.vue b/src/views/govern/terminal/deviceLedger/index.vue
index aba61d7..3b79289 100644
--- a/src/views/govern/terminal/deviceLedger/index.vue
+++ b/src/views/govern/terminal/deviceLedger/index.vue
@@ -32,7 +32,7 @@
             </template>
             <template v-slot:operation>
                 <el-button type="primary" @click="downLoadFile" class="ml10" icon="el-icon-Download">
-                    模版下载
+                    下载模版
                 </el-button>
                 <el-upload style="display: inline-block" action="" accept=".xlsx" class="upload-demo"
                     :show-file-list="false" :auto-upload="false" :on-change="bulkImport">
@@ -46,34 +46,34 @@
         <el-dialog :title="dialogTitle" v-model.trim="dialogFormVisible" :close-on-click-modal="false"
             :before-close="resetForm" draggable width="40%">
             <el-form :model="form" label-width="120px" :rules="rules" ref="ruleFormRef">
-                <el-form-item label="设备名称:" prop="name">
+                <el-form-item label="设备名称" prop="name">
                     <el-input maxlength="32" show-word-limit    v-model.trim="form.name" autocomplete="off" clearable
                         placeholder="请输入（项目名称+设备名称）"></el-input>
                 </el-form-item>
-                <el-form-item label="网络设备ID:" prop="ndid" class="top">
+                <el-form-item label="网络设备ID" prop="ndid" class="top">
                     <el-input maxlength="32" show-word-limit    v-model.trim="form.ndid" autocomplete="off"
                         placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="设备类型:" prop="devType" class="top">
+                <el-form-item label="设备类型" prop="devType" class="top">
                     <el-select v-model.trim="form.devType" placeholder="请选择" @change="formDevTypeChange" clearable>
                         <el-option v-for="item in devTypeOptions" :key="item.value" :label="item.label"
                             :value="item.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="设备型号:" prop="devModel" class="top">
+                <el-form-item label="设备型号" prop="devModel" class="top">
                     <el-select v-model.trim="form.devModel" filterable placeholder="请选择" clearable>
                         <el-option v-for="item in formDevModelOptionsFilter" :key="item.value" :label="item.label"
                             :value="item.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="通讯协议:" prop="devAccessMethod" class="top">
+                <el-form-item label="通讯协议" prop="devAccessMethod" class="top">
                     <el-select v-model.trim="form.devAccessMethod" placeholder="请选择" clearable>
                         <el-option label="MQTT" value="MQTT"></el-option>
                         <el-option label="CLD" value="cloud"></el-option>
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="合同号:" prop="cntractNo" class="top">
+                <el-form-item label="合同号" prop="cntractNo" class="top">
                     <el-input maxlength="32" show-word-limit    v-model.trim="form.cntractNo" autocomplete="off"
                         placeholder="请输入"></el-input>
                 </el-form-item>
diff --git a/src/views/govern/terminal/deviceMonitor/index.vue b/src/views/govern/terminal/deviceMonitor/index.vue
index 895dd78..9d7f932 100644
--- a/src/views/govern/terminal/deviceMonitor/index.vue
+++ b/src/views/govern/terminal/deviceMonitor/index.vue
@@ -33,7 +33,7 @@
             </template>
             <template v-slot:operation>
                 <el-button type="primary" @click="downLoadFile" class="ml10" icon="el-icon-Download">
-                    模版下载
+                    下载模版
                 </el-button>
                 <el-upload style="display: inline-block" action="" accept=".xlsx" class="upload-demo"
                     :show-file-list="false" :auto-upload="false" :on-change="bulkImport">
@@ -47,34 +47,34 @@
         <el-dialog :title="dialogTitle" v-model.trim="dialogFormVisible" :close-on-click-modal="false"
             :before-close="resetForm" draggable width="40%">
             <el-form :model="form" label-width="120px" :rules="rules" ref="ruleFormRef">
-                <el-form-item label="设备名称:" prop="name">
+                <el-form-item label="设备名称" prop="name">
                     <el-input maxlength="32" show-word-limit    v-model.trim="form.name" autocomplete="off" clearable
                         placeholder="请输入（项目名称+设备名称）"></el-input>
                 </el-form-item>
-                <el-form-item label="网络设备ID:" prop="ndid" class="top">
+                <el-form-item label="网络设备ID" prop="ndid" class="top">
                     <el-input maxlength="32" show-word-limit    v-model.trim="form.ndid" autocomplete="off"
                         placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label="设备类型:" prop="devType" class="top">
+                <el-form-item label="设备类型" prop="devType" class="top">
                     <el-select v-model.trim="form.devType" placeholder="请选择" @change="formDevTypeChange" clearable>
                         <el-option v-for="item in devTypeOptions" :key="item.value" :label="item.label"
                             :value="item.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="设备型号:" prop="devModel" class="top">
+                <el-form-item label="设备型号" prop="devModel" class="top">
                     <el-select v-model.trim="form.devModel" filterable placeholder="请选择" clearable>
                         <el-option v-for="item in formDevModelOptionsFilter" :key="item.value" :label="item.label"
                             :value="item.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="通讯协议:" prop="devAccessMethod" class="top">
+                <el-form-item label="通讯协议" prop="devAccessMethod" class="top">
                     <el-select v-model.trim="form.devAccessMethod" placeholder="请选择" clearable>
                         <el-option label="MQTT" value="MQTT"></el-option>
                         <el-option label="CLD" value="cloud"></el-option>
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="合同号:" prop="cntractNo" class="top">
+                <el-form-item label="合同号" prop="cntractNo" class="top">
                     <el-input maxlength="32" show-word-limit    v-model.trim="form.cntractNo" autocomplete="off"
                         placeholder="请输入"></el-input>
                 </el-form-item>
diff --git a/src/views/setting/dictionary/list/popupDetailEdit.vue b/src/views/setting/dictionary/list/popupDetailEdit.vue
index 8913dfb..33a8787 100644
--- a/src/views/setting/dictionary/list/popupDetailEdit.vue
+++ b/src/views/setting/dictionary/list/popupDetailEdit.vue
@@ -2,7 +2,7 @@
     <el-dialog width="500px" v-model.trim="dialogVisible" :title="title">
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="auto" class="form-one" :rules="rules" ref="formRef">
-                <el-form-item label="名称:" class="top" prop="name">
+                <el-form-item label="名称" class="top" prop="name">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -10,7 +10,7 @@
                         placeholder="请输入名称"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="计算值:" class="top">
+                <el-form-item label="计算值" class="top">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -18,7 +18,7 @@
                         placeholder="请输入计算值"
                     ></el-input>
                 </el-form-item>
-                <el-form-item class="top" label="对应算法:" prop="algoDescribe" v-if="form.openDescribe == 1">
+                <el-form-item class="top" label="对应算法" prop="algoDescribe" v-if="form.openDescribe == 1">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -26,7 +26,7 @@
                         placeholder="请输入数字"
                     ></el-input>
                 </el-form-item>
-                <el-form-item class="top" label="编码:" prop="code">
+                <el-form-item class="top" label="编码" prop="code">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -34,10 +34,10 @@
                         placeholder="请输入编码"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="排序:" prop="sort" class="top">
+                <el-form-item label="排序" prop="sort" class="top">
                     <el-input-number v-model.trim="form.sort" :min="0" />
                 </el-form-item>
-                <el-form-item v-if="form.openLevel === 1" label="事件等级:">
+                <el-form-item v-if="form.openLevel === 1" label="事件等级">
                     <el-select v-model.trim="form.level" placeholder="选择开启等级">
                         <el-option
                             v-for="item in EventOpenLevel"
diff --git a/src/views/setting/dictionary/tree/popupForm.vue b/src/views/setting/dictionary/tree/popupForm.vue
index 8d18011..b6c3c3b 100644
--- a/src/views/setting/dictionary/tree/popupForm.vue
+++ b/src/views/setting/dictionary/tree/popupForm.vue
@@ -2,7 +2,7 @@
     <el-dialog class="cn-operate-dialog" width="500px" v-model.trim="dialogVisible" :title="title">
         <el-scrollbar>
             <el-form :inline="false" :model="form" ref="formRef" label-width="auto" :rules="rules">
-                <el-form-item label="字典名称:" prop="name">
+                <el-form-item label="字典名称" prop="name">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -11,7 +11,7 @@
                     ></el-input>
                 </el-form-item>
 
-                <el-form-item label="编码:" prop="code" class="top">
+                <el-form-item label="编码" prop="code" class="top">
                     <el-input maxlength="32" show-word-limit 
                         
                         
@@ -19,7 +19,7 @@
                         placeholder="请输入字典编码"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="排序:" prop="sort" class="top">
+                <el-form-item label="排序" prop="sort" class="top">
                     <el-input-number style="width: 100%" :min="0" v-model.number="form.sort" placeholder="请输入排序" />
                     <!-- <el-input maxlength="32" show-word-limit 
                         
@@ -28,7 +28,7 @@
                         placeholder="请输入排序"
                     ></el-input> -->
                 </el-form-item>
-                <el-form-item label="描述:" class="top">
+                <el-form-item label="描述" class="top">
                     <el-input maxlength="300" show-word-limit 
                         
                         :autosize="{ minRows: 2, maxRows: 4 }"
diff --git a/src/views/setting/dictionary/version/index.vue b/src/views/setting/dictionary/version/index.vue
index 2629a23..54f4e53 100644
--- a/src/views/setting/dictionary/version/index.vue
+++ b/src/views/setting/dictionary/version/index.vue
@@ -21,30 +21,30 @@
         </Table>
         <el-dialog width="500px" v-model.trim="dialogVisible" title="新增版本">
             <el-form :inline="false" :model="form" ref="formRef" label-width="auto" class="form-one" :rules="rules">
-                <el-form-item label="版本号:" prop="appVersion">
+                <el-form-item label="版本号" prop="appVersion">
                     <el-input maxlength="32" show-word-limit v-model.trim="form.appVersion" placeholder="请输入版本号" />
                 </el-form-item>
-                <el-form-item label="整改内容:">
+                <el-form-item label="整改内容">
                     <el-input show-word-limit maxlength="300" type="textarea" v-model.trim="form.content"
                         placeholder="请输入整改内容" />
                 </el-form-item>
-                <el-form-item label="发布类型:">
+                <el-form-item label="发布类型">
                     <el-select v-model.trim="form.sev" placeholder="请选择发布类型">
                         <el-option label="优化" :value="0" />
                         <el-option label="bug调整" :value="1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="版本类型:">
+                <el-form-item label="版本类型">
                     <el-select v-model.trim="form.versionType" placeholder="请选择版本类型">
                         <el-option label="web" value="WEB" />
                         <el-option label="app" value="APP" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="Android路径:" prop="androidPath" v-if="form.versionType == 'APP'">
+                <el-form-item label="Android路径" prop="androidPath" v-if="form.versionType == 'APP'">
                     <el-input  v-model.trim="form.androidPath"
                         placeholder="请输入Android路径" />
                 </el-form-item>
-                <el-form-item label="IOS路径:" prop="iosPath" v-if="form.versionType == 'APP'">
+                <el-form-item label="IOS路径" prop="iosPath" v-if="form.versionType == 'APP'">
                     <el-input  v-model.trim="form.iosPath" placeholder="请输入IOS路径" />
                 </el-form-item>
             </el-form>
@@ -108,7 +108,7 @@ const tableStore = new TableStore({
         { title: '整改内容', field: 'content' }
     ],
     beforeSearchFun: () => {
-        // console.log("🚀 ~ tableStore.table.params:", tableStore.table)
+        // console.log("🚀 ~ tableStore.table.params", tableStore.table)
         // if (tableStore.table.params.versionType == 'APP') {
         // }
     }
diff --git a/src/views/system/reportForms/form.vue b/src/views/system/reportForms/form.vue
index 88ded97..3c839a6 100644
--- a/src/views/system/reportForms/form.vue
+++ b/src/views/system/reportForms/form.vue
@@ -1,22 +1,22 @@
 <template>
     <el-dialog draggable :title="title" v-model.trim="formVisible" width="30%" :before-close="closeDialog">
         <el-form :model="formdata" label-width="100px" :rules="rules" ref="ruleForm">
-            <el-form-item label="模板名称:" prop="name">
+            <el-form-item label="模板名称" prop="name">
                 <el-input maxlength="32" show-word-limit    placeholder="模板名称" v-model.trim="formdata.name"
                     style="width: 100%"></el-input>
             </el-form-item>
-            <el-form-item label="部门:" prop="deptId">
+            <el-form-item label="部门" prop="deptId">
                 <Area v-model.trim="formdata.deptId" style="width: 100%" collapse-tags
                     :props="{ multiple: true, label: 'name', value: 'id', emitPath: false }" />
             </el-form-item>
 
-            <el-form-item label="模板类型:" prop="reportType">
+            <el-form-item label="模板类型" prop="reportType">
                 <el-select style="width: 100%" v-model.trim="formdata.reportType" placeholder="请选择模板类型">
                     <el-option v-for="item in classificationData" :key="item.id" :label="item.label"
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="报表类型:" prop="reportForm">
+            <el-form-item label="报表类型" prop="reportForm">
                 <el-select style="width: 100%" v-model.trim="formdata.reportForm" placeholder="请选择报表类型">
                     <el-option v-for="item in reportFormList" :key="item.value" :label="item.label"
                         :value="item.value"></el-option>
diff --git a/src/views/user/popupUpdatePwd.vue b/src/views/user/popupUpdatePwd.vue
index 054601f..a5e51c4 100644
--- a/src/views/user/popupUpdatePwd.vue
+++ b/src/views/user/popupUpdatePwd.vue
@@ -2,10 +2,10 @@
     <el-dialog class="cn-operate-dialog" width="500px" v-model.trim="dialogVisible" :title="title">
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
-                <el-form-item label="新密码:" prop="newPwd" style="margin-top: 20px">
+                <el-form-item label="新密码" prop="newPwd" style="margin-top: 20px">
                     <el-input maxlength="32" show-word-limit  v-model.trim="form.newPwd" type="password" placeholder="请输入新密码" show-password />
                 </el-form-item>
-                <el-form-item label="确认密码:" prop="confirmPwd" style="margin-top: 20px">
+                <el-form-item label="确认密码" prop="confirmPwd" style="margin-top: 20px">
                     <el-input maxlength="32" show-word-limit  v-model.trim="form.confirmPwd" type="password" placeholder="请输入确认密码" show-password />
                 </el-form-item>
             </el-form>