全局替换终端

src/api/access-boot/analyzeModel.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 新增设备模版
+// 新增终端模版
 export const addDevModel = (file:any) => {
     let form = new FormData()
     form.append('file', file)

src/api/advance-boot/bearingCapacity.ts

@@ -155,7 +155,7 @@ export function remove(data) {
         params: data
     })
 }
-// 承载能力评估用户设备查询
+// 承载能力评估用户终端查询
 export function queyDeviceList(data) {
     return createAxios({
         url: '/advance-boot/carrycapacitydev/queyDeviceList',
@@ -163,7 +163,7 @@ export function queyDeviceList(data) {
         data
     })
 }
-// 新增设备
+// 新增终端
 export function addDev(data) {
     return createAxios({
         url: '/advance-boot/carrycapacitydev/add',
@@ -171,7 +171,7 @@ export function addDev(data) {
         data
     })
 }
-// 修改设备
+// 修改终端
 export function updateDev(data) {
     return createAxios({
         url: '/advance-boot/carrycapacitydev/update',
@@ -179,7 +179,7 @@ export function updateDev(data) {
         data
     })
 }
-// 删除设备
+// 删除终端
 export function removeDev(data) {
     return createAxios({
         url: '/advance-boot/carrycapacitydev/remove',

src/api/advance-boot/sgGroven/sgMachine.ts

@@ -3,7 +3,7 @@ import createAxios from '@/utils/request'
 import {ADVANCE_BOOT} from '@/utils/constantRequest'
 
 /**
- * 新增设备
+ * 新增终端
  */
 export const listMachine = (productLineId: any) => {
     const data = {productLineId}
@@ -16,7 +16,7 @@ export const listMachine = (productLineId: any) => {
 
 
 /**
- * 根据生产线id查询所有设备
+ * 根据生产线id查询所有终端
  */
 export const querySgMachineByProductLineId = (data: any) => {
     return createAxios({
@@ -28,7 +28,7 @@ export const querySgMachineByProductLineId = (data: any) => {
 
 
 /**
- * 新增设备
+ * 新增终端
  */
 export const addSgMachine = (data: any) => {
     return createAxios({
@@ -40,7 +40,7 @@ export const addSgMachine = (data: any) => {
 
 
 /**
- * 更新设备
+ * 更新终端
  */
 export const updateSgMachine = (data: any) => {
     return createAxios({
@@ -52,7 +52,7 @@ export const updateSgMachine = (data: any) => {
 
 
 /**
- * 删除设备
+ * 删除终端
  */
 export const deleteSgMachine = (data: any) => {
     let ids = [data]

src/api/advance-boot/sgGroven/sgSensitiveUnit.ts

@@ -4,7 +4,7 @@ import {ADVANCE_BOOT} from '@/utils/constantRequest'
 
 
 /**
- * 新增设备
+ * 新增终端
  */
 export const addSgSensitiveUnit = (data: any) => {
     return createAxios({
@@ -15,7 +15,7 @@ export const addSgSensitiveUnit = (data: any) => {
 }
 
 /**
- * 根据设备id查询所有元器件
+ * 根据终端id查询所有元器件
  */
 export const queryUnitByMachineId = (data: any) => {
     return createAxios({
@@ -26,7 +26,7 @@ export const queryUnitByMachineId = (data: any) => {
 
 
 /**
- * 更新设备
+ * 更新终端
  */
 export const updateSgSensitiveUnit = (data: any) => {
     return createAxios({
@@ -38,7 +38,7 @@ export const updateSgSensitiveUnit = (data: any) => {
 
 
 /**
- * 删除设备
+ * 删除终端
  */
 export const deleteSgSensitiveUnit = (data: any) => {
     let ids = [data]

src/api/common.ts

@@ -30,7 +30,7 @@ export function areaSelect() {
     })
 }
 
-// 设备列表
+// 终端列表
 export function getDeviceTree() {
     return createAxios({
         url: '/cs-device-boot/csLedger/deviceTree',

src/api/device-boot/Business.ts

@@ -56,7 +56,7 @@ export function queryTerminal(data: any) {
     })
 }
 
-//删除设备
+//删除终端
 export function delTerminal(data: any) {
     return createAxios({
         url: `/device-boot/device/delTerminal`,

src/api/device-boot/device.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 获取区域中断设备
+// 获取区域中断终端
 export function getAreaOffDev(data) {
     return request({
         url: "/device-boot/device/getAreaOffDev",

src/api/device-boot/terminalTree.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 获取区域中断设备
+// 获取区域中断终端
 export function getTerminalTreeForFive(data:any) {
     return request({
         url: '/device-boot/terminalTree/getTerminalTreeForFive',

src/api/supervision-boot/device/quitRunningDev.ts

@@ -6,7 +6,7 @@ const MAPPING_PATH = SUPERVISION_BOOT + '/quitRunningDevice'
 
 
 /**
- * 新增设备退运
+ * 新增终端退运
  */
 export const addRunningDevice = (data: any) => {
     return createAxios({
@@ -18,7 +18,7 @@ export const addRunningDevice = (data: any) => {
 
 
 /**
- * 更新设备退运
+ * 更新终端退运
  */
 export const quitRunningDeviceUpdate = (data: any) => {
     return createAxios({
@@ -29,7 +29,7 @@ export const quitRunningDeviceUpdate = (data: any) => {
 }
 
 /**
- * 取消设备退运
+ * 取消终端退运
  */
 export const cancelQuitRunningDevice = (data: any) => {
     return createAxios({
@@ -42,7 +42,7 @@ export const cancelQuitRunningDevice = (data: any) => {
 
 
 /**
- * 根据id获取设备的详细数据
+ * 根据id获取终端的详细数据
  */
 export const getRunningDeviceById = (id: any) => {
     return createAxios({

src/api/supervision-boot/terminal/index.ts

@@ -38,7 +38,7 @@ export const cancelTerminalFormData = (data: any) => {
 }
 
 /**
- * 获取关联设备列表
+ * 获取关联终端列表
  */
 export const getDeviceList = () => {
     return createAxios({

src/assets/panorama/devicesDemo.js

@@ -14,7 +14,7 @@ export const devicesDemo = {
         orgId: 'ff80808149f52e24014a039871840007',
         provinceId: 'ff80808149f52e24014a039871840007',
     },
-    // 设备查询过滤
+    // 终端查询过滤
     device: {
         // 电网资源查询
         ids: [
@@ -44,9 +44,9 @@ export const devicesDemo = {
         countries: ['ff808081542d934101542e24b2c30001'], // 区县ID
         maintCrews: ['ff8080814db36458014db89148050006'], // 维护班组ID,
         lineIds: ['10DKX-395601'], // 配电线路ID
-        hideYPDevices: true, // 是否隐藏营销设备
+        hideYPDevices: true, // 是否隐藏营销终端
 
-        // 设备显示过滤表单默认值
+        // 终端显示过滤表单默认值
         devIdFilter: '10230,10234',
         voltageLevel: '500000,220000',
         runStatus: 1, //运行状态
@@ -56,7 +56,7 @@ export const devicesDemo = {
         propertyDefault: 'vlevel_code',
         ownershipCode: 1, //电网资产
 
-        // 设备属性高亮表单默认值
+        // 终端属性高亮表单默认值
         highlightManner: 'id',
         propertyRender: '10230,10234,100255259',
         highlightColor: '#0060ff',
@@ -72,12 +72,12 @@ export const devicesDemo = {
 
         lnglat: '119.04805,32.03709', // 经纬度
 
-        // 设备名称查询
+        // 终端名称查询
         keyword: '220',
         NameQueryOrgId: '',
         distribution: 1,
 
-        // 设备 ID 查询
+        // 终端 ID 查询
         idQueryManner: 'bothends',
 
         // 线路和运行杆塔查询
@@ -102,8 +102,8 @@ export const devicesDemo = {
         supplyRadiusTransId: '650008239306401', // 供电半径 - 台区
         powerSource: '650008239306401', // 电源
         electricStatus: '650008239306401', // 带电状态
-        shortPathStart: '651220001069800', // 最短路径 - 起始设备ID
+        shortPathStart: '651220001069800', // 最短路径 - 起始终端ID
-        shortPathEnd: '651220001337700', // 最短路径 - 终止设备ID
+        shortPathEnd: '651220001337700', // 最短路径 - 终止终端ID
 
         devId: '14000124192657',
         devType: '0111',
@@ -113,7 +113,7 @@ export const devicesDemo = {
             441, 442, 443, 444, 505, 506, 510, 511, 512, 521, 546, 556, 558, 567, 569, 571
         ]
     },
-    // 查询面板的设备类型选项
+    // 查询面板的终端类型选项
     devicesTypeDemo: [
         { code: '296', name: '发电厂' },
         { code: '110', name: '变电站' },

src/components/form/datePicker/index.vue

@@ -26,6 +26,15 @@
 import { DArrowLeft, VideoPause, DArrowRight } from '@element-plus/icons-vue'
 import { ref, onMounted, nextTick, watch } from 'vue'
 
+interface Props {
+    nextFlag?: boolean
+
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    nextFlag:false
+})
+
 const interval = ref(3)
 const timeFlag = ref(1)
 const count = ref(0)
@@ -112,7 +121,7 @@ const timeChange = (e: number) => {
 
 // 当前
 const nowTime = () => {
-    console.log(interval.value,"000000000");
+    console.log(interval.value, '000000000')
     timeChange(interval.value)
 }
 // 上一个
@@ -194,8 +203,9 @@ const next = () => {
     if (interval.value == 3) {
         if (month == 12) {
             year = year + 1
+
             // 年份进位后，大于当前的年份，是不科学的
-            if (presentY < year) {
+            if (presentY < year && !props.nextFlag) {
                 startTime = presentY + '-12-01'
                 if (presentD < 10) {
                     endTime = presentY + '-12' + '-0' + presentD
@@ -224,7 +234,7 @@ const next = () => {
             // 年份等于当前年份
             if (presentY == year) {
                 // 月份超过当前月份，是不科学的
-                if (month >= presentM) {
+                if (month >= presentM && !props.nextFlag) {
                     if (presentM < 10) {
                         startTime = year + '-0' + presentM + '-01'
                         if (presentD < 10) {
@@ -269,14 +279,14 @@ const next = () => {
         if (month == 10) {
             year = year + 1
             // 年份进位后大于当前年份是不科学的
-            if (year > presentY) {
+            if (year > presentY && !props.nextFlag) {
                 startTime = presentY + '-10-01'
                 if (presentD < 10) {
                     endTime = year + '-' + presentM + '-0' + presentD
                 } else {
                     endTime = year + '-' + presentM + '-' + presentD
                 }
-            } else if (year == presentY) {
+            } else if (year == presentY ) {
                 startTime = year + '-01-01'
                 // 当前月份大约3月份
                 if (presentM > 3) {
@@ -296,7 +306,7 @@ const next = () => {
         } else {
             month = month + 3
             // 季度进位后，超过当前月份是不科学的
-            if (year == presentY) {
+            if (year == presentY && !props.nextFlag) {
                 if (month >= presentM) {
                     // 当季度进位后大于当前月，以当前月的时间显示季度
                     if (presentM > 0 && presentM < 4) {
@@ -372,7 +382,7 @@ const next = () => {
     } else {
         year = year + 1
         // 年份进位后大于当前年份，是不科学的
-        if (year >= presentY) {
+        if (year >= presentY && !props.nextFlag) {
             startTime = presentY + '-01-01'
             if (presentM < 10) {
                 if (presentD < 10) {

src/components/table/header/index.vue

@@ -10,7 +10,7 @@
                 :inline="true"
             >
                 <el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 600px">
-                    <DatePicker ref="datePickerRef"></DatePicker>
+                    <DatePicker ref="datePickerRef" :nextFlag="nextFlag"></DatePicker>
                 </el-form-item>
 
                 <el-form-item label="区域" v-if="area">
@@ -61,12 +61,14 @@ interface Props {
     datePicker?: boolean
     area?: boolean
     showSearch?: boolean
+    nextFlag?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
     datePicker: false,
     area: false,
-    showSearch: true
+    showSearch: true,
+    nextFlag: false
 })
 // 动态计算table高度
 const resizeObserver = new ResizeObserver(entries => {

src/router/static.ts

@@ -53,7 +53,7 @@ export const adminBaseRoute = {
                 {
                     path: 'machine',
                     component: () => import('@/views/pqs/voltageSags/sagGovern/businessUser/machine/index.vue'),
-                    name: '设备查看页面',
+                    name: '终端查看页面',
                     meta: {
                         title: pageTitle('router.eventView')
                     }

src/stores/config.ts

@@ -9,7 +9,7 @@ export const useConfig = defineStore(
         const layout: Layout = reactive({
             /* 全局 */
             showDrawer: false,
-            // 是否收缩布局(小屏设备)
+            // 是否收缩布局(小屏终端)
             shrink: false,
             // 后台布局方式，可选值<Default|Classic|Streamline|Double>
             layoutMode: 'Classic',
@@ -126,7 +126,7 @@ export const useConfig = defineStore(
     //     const layout: Layout = reactive({
     //         /* 全局 */
     //         showDrawer: false,
-    //         // 是否收缩布局(小屏设备)
+    //         // 是否收缩布局(小屏终端)
     //         shrink: false,
     //         // 后台布局方式，可选值<Default|Classic|Streamline|Double>
     //         layoutMode: 'Classic',

src/styles/element.scss

@@ -110,7 +110,7 @@
 
 /* dialog滚动条-e */
 
-/* 小屏设备 el-radio-group 样式优化-s */
+/* 小屏终端 el-radio-group 样式优化-s */
 .ba-input-item-radio {
     margin-bottom: 10px;
 
@@ -121,7 +121,7 @@
     }
 }
 
-/* 小屏设备 el-radio-group 样式调整-e */
+/* 小屏终端 el-radio-group 样式调整-e */
 
 .el-tabs--card > .el-tabs__header .el-tabs__item.is-active {
     background: var(--el-color-primary);

src/views/pqs/bearingCapacity/evaluationList/components/charge.vue

@@ -71,12 +71,12 @@
                                     />
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="供电设备容量(MVA)" prop="deviceCapacity">
+                            <el-form-item label="供电终端容量(MVA)" prop="deviceCapacity">
                                 <el-input-number
                                     v-model="form.deviceCapacity"
                                     style="width: 100%"
                                     :min="0.000001"
-                                    placeholder="请填入供电设备容量"
+                                    placeholder="请填入供电终端容量"
                                 />
                             </el-form-item>
                             <el-form-item label="最小短路容量(MVA)" prop="shortCapacity">
@@ -120,9 +120,9 @@
                             v-loading="loading"
                             :data="equipmentList"
                         >
-                            <vxe-column field="devName" title="设备名称"></vxe-column>
+                            <vxe-column field="devName" title="终端名称"></vxe-column>
                             <vxe-column field="devScale" title="电压等级" :formatter="formatter"></vxe-column>
-                            <vxe-column field="protocolCapacity" title="设备容量(MVA)"></vxe-column>
+                            <vxe-column field="protocolCapacity" title="终端容量(MVA)"></vxe-column>
                         </vxe-table>
                     </div>
                 </el-card>
@@ -268,7 +268,7 @@ const rules = {
     connectionMode: [{ required: true, message: '请选择连接方式', trigger: 'change' }],
     k: [{ required: true, message: '请选择功率因数', trigger: 'change' }],
     scale: [{ required: true, message: '请选择电压等级', trigger: 'change' }],
-    shortCapacity: [{ required: true, message: '请填入供电设备容量', trigger: 'blur' }],
+    shortCapacity: [{ required: true, message: '请填入供电终端容量', trigger: 'blur' }],
     deviceCapacity: [{ required: true, message: '请填入最小短路容量', trigger: 'blur' }]
 }
 const pieCharts = ref({})
@@ -288,7 +288,7 @@ const addUse = () => {
     // tableData.value = tableData.value.filter((arr: any) => !res.has(arr.userId) && res.set(arr.userId, 1))
     dialogVisible.value = false
 }
-// 查看设备
+// 查看终端
 const equipment = (row: any) => {}
 // 承载能力评估
 const assess = () => {
@@ -400,7 +400,7 @@ const formatter = (row: any) => {
         return row.cellValue
     }
 }
-// 查询设备
+// 查询终端
 const selChange = (e: any) => {
     loading.value = true
     queyDeviceList({

src/views/pqs/bearingCapacity/userManagement/equipment.vue

@@ -1,15 +1,15 @@
 <template>
-    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" title="设备">
+    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" title="终端">
         <el-button icon="el-icon-Plus" type="primary" @click="add" class="mb10">新增</el-button>
         <vxe-table v-bind="defaultAttribute" v-loading="loading" height="auto" ref="xTable" :data="userData">
-            <vxe-column field="devName" title="设备名称"></vxe-column>
+            <vxe-column field="devName" title="终端名称"></vxe-column>
             <vxe-column field="devScale" title="电压等级" :formatter="formatter"></vxe-column>
-            <vxe-column field="protocolCapacity" title="设备容量(MVA)"></vxe-column>
+            <vxe-column field="protocolCapacity" title="终端容量(MVA)"></vxe-column>
             <vxe-column title="操作" width="120px">
                 <template #default="{ row }">
                     <el-button type="primary" size="small" link @click="revise(row)">修改</el-button>
 
-                    <el-popconfirm @confirm="deleteD(row)" title="确认删除设备?">
+                    <el-popconfirm @confirm="deleteD(row)" title="确认删除终端?">
                         <template #reference>
                             <el-button type="danger" size="small" link>删除</el-button>
                         </template>
@@ -20,20 +20,20 @@
     </el-dialog>
     <el-dialog draggable v-model="addShow" width="400px" :title="title" :before-close="handleClose">
         <el-form :model="form" ref="formRef" :rules="rules" label-width="auto">
-            <el-form-item label="设备名称" prop="devName">
+            <el-form-item label="终端名称" prop="devName">
-                <el-input v-model="form.devName" placeholder="请输入设备名称" />
+                <el-input v-model="form.devName" placeholder="请输入终端名称" />
             </el-form-item>
             <el-form-item label="电压等级" prop="devScale">
                 <el-select v-model="form.devScale" clearable placeholder="请选择电压等级">
                     <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="设备容量(MVA)" prop="protocolCapacity">
+            <el-form-item label="终端容量(MVA)" prop="protocolCapacity">
                 <el-input-number
                     v-model="form.protocolCapacity"
                     style="width: 100%"
                     :min="0"
-                    placeholder="请选择设备容量"
+                    placeholder="请选择终端容量"
                 />
             </el-form-item>
         </el-form>
@@ -68,9 +68,9 @@ const form: any = ref({
     userId: ''
 })
 const rules = {
-    devName: [{ required: true, message: '请输入设备名称', trigger: 'blur' }],
+    devName: [{ required: true, message: '请输入终端名称', trigger: 'blur' }],
-    devScale: [{ required: true, message: '请输入设备名称', trigger: 'change' }],
+    devScale: [{ required: true, message: '请输入终端名称', trigger: 'change' }],
-    protocolCapacity: [{ required: true, message: '请输入设备名称', trigger: 'blur' }]
+    protocolCapacity: [{ required: true, message: '请输入终端名称', trigger: 'blur' }]
 }
 const open = (row: any) => {
     dialogVisible.value = true
@@ -86,7 +86,7 @@ const open = (row: any) => {
 // 新增
 const add = () => {
     addShow.value = true
-    title.value = '新增设备'
+    title.value = '新增终端'
 }
 
 // 过滤数据
@@ -100,7 +100,7 @@ const formatter = (row: any) => {
 // 修改
 const revise = (row: any) => {
     form.value = JSON.parse(JSON.stringify(row))
-    title.value = '修改设备'
+    title.value = '修改终端'
     addShow.value = true
 }
 // 关闭弹框
@@ -114,11 +114,11 @@ const handleClose = () => {
     }
     formRef.value.resetFields()
 }
-// 新增设备
+// 新增终端
 const submitForm = async () => {
     await formRef.value.validate(valid => {
         if (valid) {
-            if (title.value == '新增设备') {
+            if (title.value == '新增终端') {
                 form.value.userId = rowList.value.userId
                 addDev(form.value).then(res => {
                     ElMessage.success('新增成功!')
@@ -135,10 +135,10 @@ const submitForm = async () => {
         }
     })
 }
-// 删除设备
+// 删除终端
 const deleteD = row => {
     removeDev({ devIds: row.devId }).then(res => {
-        ElMessage.success('删除设备成功!')
+        ElMessage.success('删除终端成功!')
         open(rowList.value)
     })
 }

src/views/pqs/bearingCapacity/userManagement/index.vue

@@ -64,7 +64,7 @@
                 </template>
             </el-dialog>
         </div>
-        <!-- 设备 -->
+        <!-- 终端 -->
         <equipment ref="equipmentRef" />
     </div>
 </template>
@@ -174,7 +174,7 @@ const tableStore: any = new TableStore({
             buttons: [
                 {
                     name: 'edit',
-                    title: '设备 ',
+                    title: '终端 ',
                     type: 'primary',
                     icon: 'el-icon-Plus',
                     render: 'basicButton',

src/views/pqs/business/terminal/FrontManagement/index.vue

@@ -43,12 +43,12 @@
                         ></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
                         v-model="formData.nodeDevNum"
                         onkeyup="value = value.replace(/[^0-9]/g,'')"
                         maxlength="5"
-                        placeholder="请输入最大装置数"
+                        placeholder="请输入最大终端数"
                     ></el-input>
                 </el-form-item>
                 <el-form-item label="排序:" prop="sort" class="top">
@@ -105,7 +105,7 @@ const rules = reactive({
     name: [{ required: true, message: '名称不可为空', trigger: 'blur' }],
     ip: [{ required: true, message: 'ip不可为空', trigger: 'blur' }],
     nodeGrade: [{ required: true, message: '等级不可为空', trigger: 'blur' }],
-    nodeDevNum: [{ required: true, message: '最大装置数不可为空', trigger: 'blur' }],
+    nodeDevNum: [{ required: true, message: '最大终端数不可为空', trigger: 'blur' }],
     sort: [{ required: true, message: '排序不可为空', trigger: 'blur' }],
     remark: [{ required: true, message: '描述不可为空', trigger: 'blur' }]
 })

src/views/pqs/business/terminal/ProgramManagement/index.vue

@@ -127,7 +127,7 @@
         >
             <div :style="{ height: dialogHeight.height }">
                 <vxe-table height="auto" auto-resize :data="logtableData" v-bind="defaultAttribute">
-                    <vxe-column field="devTypeName" align="center" title="装置序号"></vxe-column>
+                    <vxe-column field="devTypeName" align="center" title="终端序号"></vxe-column>
                     <vxe-column field="versionId" align="center" title="版本序号"></vxe-column>
                     <vxe-column field="flag" align="center" title="版本状态" width="100">
                         <template #default="{ row }">

src/views/pqs/business/terminal/deviceter/index.vue

@@ -303,7 +303,7 @@
                         </el-form-item>
                     </div>
 
-                    <!--终端设备-->
+                    <!--终端终端-->
                     <div
                         id="id500"
                         class="form-device"
@@ -615,13 +615,13 @@
                                     </el-form-item>
                                     <el-form-item
                                         class="form-item"
-                                        label="设备型号:"
+                                        label="终端型号:"
                                         :prop="'deviceParam.' + index + '.devType'"
-                                        :rules="[{ required: true, message: '请选择设备型号', trigger: 'change' }]"
+                                        :rules="[{ required: true, message: '请选择终端型号', trigger: 'change' }]"
                                     >
                                         <el-select
                                             v-model="item.devType"
-                                            placeholder="请选择设备型号"
+                                            placeholder="请选择终端型号"
                                             :disabled="
                                                 nodeLevel > 500 && (pageStatus == 3 || pageStatus == 2)
                                                     ? pageStatus == 3 || pageStatus == 2
@@ -964,7 +964,7 @@
                                     </el-form-item>
                                     <el-form-item
                                         class="form-item"
-                                        label="设备容量(MVA):"
+                                        label="终端容量(MVA):"
                                         :prop="
                                             'deviceParam.' +
                                             [deviceIndex] +
@@ -974,12 +974,12 @@
                                             lIndex +
                                             '.devCapacity'
                                         "
-                                        :rules="{ required: false, message: '请输入设备容量', trigger: 'blur' }"
+                                        :rules="{ required: false, message: '请输入终端容量', trigger: 'blur' }"
                                     >
                                         <el-input
                                             v-model="lineItem.devCapacity"
                                             :disabled="pageStatus == 1"
-                                            placeholder="请输入设备容量(MVA)"
+                                            placeholder="请输入终端容量(MVA)"
                                         ></el-input>
                                     </el-form-item>
                                     <el-form-item
@@ -1570,7 +1570,7 @@ const monitorPointDetail: any = ref({
     ct2: '',
     /**所属部门 */
     deptIndex: '',
-    /**设备容量 */
+    /**终端容量 */
     devCapacity: '',
     /**短路容量 */
     shortCapacity: '',
@@ -1644,7 +1644,7 @@ const AddProjectBO: any = ref({
     gdIndex: 0,
     /**变电站Id*/
     subIndex: 0,
-    /**设备Id */
+    /**终端Id */
     devIndex: 0,
     /**母线ID */
     subvIndex: 0,
@@ -1656,15 +1656,15 @@ const AddProjectBO: any = ref({
     gdInformationParam: null,
     /**变电站 */
     subStationParam: null,
-    /**终端设备   母线  母线下面subVoltage是监测点*/
+    /**终端终端   母线  母线下面subVoltage是监测点*/
     deviceParam: null
 })
 const deviceBODetail: any = ref({
     /**名称 */
     name: '',
-    /**设备id*/
+    /**终端id*/
     devIndex: '',
-    /**设备型号 */
+    /**终端型号 */
     devType: '',
     /**ip */
     ip: '255.255.255.255',
@@ -2137,7 +2137,7 @@ const updateSubStation = () => {
     }
 }
 /**
- * 修改变设备/母线/监测点
+ * 修改变终端/母线/监测点
  */
 const updateDevice = () => {
     /**生成数据 */
@@ -2224,7 +2224,7 @@ const queryNodeContent = () => {
             /**假数据 */
             var arr = []
             var arr1 = []
-            //取设备
+            //取终端
             for (var i = 0; i < data.deviceVO.length; i++) {}
         }
         /**对接口再放开 */
@@ -2295,7 +2295,7 @@ const tabChange = (type: string) => {
     }
 }
 /**
- * 新增/删除设备
+ * 新增/删除终端
  */
 const handleDeviceTabsEdit = (targetName: any, action: any) => {
     // console.log(targetName);

src/views/pqs/harmonicMonitoring/harmonicGovern/index.vue

@@ -320,7 +320,7 @@ const rules = {
 
     quick: {
         governMachinePower: [
-            { required: true, message: '设备容量不能为空', trigger: 'blur' },
+            { required: true, message: '终端容量不能为空', trigger: 'blur' },
             { pattern: numberRegex, message: '请输入有效的数值', trigger: 'blur' }
         ],
         price: [

src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue

@@ -91,7 +91,7 @@ const tableStore = new TableStore({
             }
         },
         { title: '短路容量(MVA)', field: 'shortCapacity' },
-        { title: '设备容量(MVA)', field: 'deviceCapacity' },
+        { title: '终端容量(MVA)', field: 'deviceCapacity' },
         { title: '协议容量(MVA)', field: 'dealCapacity' },
         { title: '谐波情况', field: 'harmDes' },
         { title: '电能质量情况', field: 'powerDes' }

src/views/pqs/qualityInspeection/panorama/components/cityMapL.vue

@@ -1,77 +1,339 @@
 <template>
     <div :class="show ? 'show' : 'noshow'">
         <div class="boxLeft" :style="height">
-            <!-- 在线监测规模 -->
+            <!-- 监测规模 -->
-            <div :style="boxHeight">
+            <div class="mb10" :style="`height:250px);`">
                 <div class="title">
-                    <span>在线监测规模</span>
+                    <span>监测规模</span>
+                </div>
+                <div style="display: flex" class="mt2">
+                    <img src="@/assets/img/FGX.png" />
+                </div>
+                <div style="display: flex">
+                    <div v-for="(item, i) in list" class="cardBox" :style="i == 1 ? 'flex:1.3' : ''">
+                        <div class="card">
+                            <span style="cursor: pointer" @click="GridDiagram(i)">{{ item.title }}：</span>
+                            <span
+                                :style="`color: ${item.color[0]}; cursor:pointer`"
+                                @click="LookMap(item.list[4].numOneList, item.list[4].numTwoList, 0)"
+                            >
+                                {{ item.list[4].numOne }}
+                            </span>
+                        </div>
+                    </div>
+                </div>
+                <!-- 监测规模 列表 -->
+                <div>
+                    <div class="vcl mt5">
+                        <p
+                            v-for="(item, i) in vList"
+                            :style="i == 0 ? 'width: 60px' : i == 5 ? 'width: 32px' : 'flex:1'"
+                        >
+                            {{ item }}
+                        </p>
                     </div>
 
-                <div style="display: flex" class="mt2">
+                    <div v-for="(item, i) in list" class="vcl">
-                    <img src="@/assets/img/FGX.png" />
+                        <p style="width: 60px">
+                            {{ item.title }}
+                            <!-- <span style="position: absolute; font-size: 10px; top: -10px; right: -5px; color: #575757">
+                                详情
+                            </span> -->
+                        </p>
+                        <p class="numOne" @click="LookMap(item.list[0].numOneList, item.list[0].numTwoList, 0)">
+                            {{ item.list[0].numOne }}
+                        </p>
+                        <p class="numOne" @click="LookMap(item.list[1].numOneList, item.list[1].numTwoList, 0)">
+                            {{ item.list[1].numOne }}
+                        </p>
+                        <p class="numOne" @click="LookMap(item.list[2].numOneList, item.list[2].numTwoList, 0)">
+                            {{ item.list[2].numOne }}
+                        </p>
+                        <p class="numOne" @click="LookMap(item.list[3].numOneList, item.list[3].numTwoList, 0)">
+                            {{ item.list[3].numOne }}
+                        </p>
+                        <!-- <p
+                            style="font-size: 12px; width: 32px; cursor: pointer; color: var(--el-color-primary)"
+                            @click.stop="open(i)"
+                        >
+                            详情
+                        </p> -->
                     </div>
-                <MyEChart :style="tabHeight" :options="onlineCharts" />
                 </div>
-            <!-- 监测终端状态 -->
+            </div>
-            <div :style="boxHeight">
+            <!-- 监测点指标统计 -->
+            <div :style="`height:calc(${boxHeight.height} + 50px)`">
                 <div class="title">
-                    <span>监测终端状态</span>
+                    <span>监测点指标统计</span>
                 </div>
                 <div style="display: flex" class="mt2">
                     <img src="@/assets/img/FGX.png" />
                 </div>
-                <div class="TJTop">
+                <div :style="`height:calc(${boxHeight.height} + 20px);overflow-y: auto;`">
+                    <div v-for="item in countList">
+                        <div class="title mt5" style="font-weight: 500">
                             <img src="@/assets/img/TJ.png" />
-                    终端在线率：
+                            {{ item.title }}
-                    <span>{{ onlineRate }}%</span>
                         </div>
-                <MyEChart :style="`height: calc(${tabHeight.height} - 27px)`" :options="terminalCharts" />
+                        <div
+                            class="card-Box"
+                            :style="`height:calc((${boxHeight.height} - 50px )/ 3);`"
+                            v-for="val in item.children"
+                        >
+                            <div>
+                                <span class="line"></span>
+                                <span class="vol">{{ val.title }}</span>
                             </div>
-            <!-- 监测点 -->
+                            <div class="num">
-            <div :style="boxHeight">
+                                <div @click="LookMap(val.numList, [], 0)">
+                                    投运:
+                                    <span>{{ val.num }}</span>
+                                </div>
+                                <div @click="LookMap(val.onLineNumList, [], 0)">
+                                    在线:
+                                    <span style="color: #2dcd28">{{ val.onLineNum }}</span>
+                                </div>
+                                <div>
+                                    数据完整性:
+                                    <span style="color: #2b7fd3; cursor: text">{{ val.integrityRate }}%</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- 监测点指标统计 -->
+            <div :style="`height:calc(${boxHeight.height} - 55px)`">
                 <div class="title">
-                    <span>监测点数据完整率</span>
+                    <span>监测运行统计</span>
                 </div>
-
                 <div style="display: flex" class="mt2">
                     <img src="@/assets/img/FGX.png" />
                 </div>
-                <MyEChart :style="tabHeight" :options="dotCharts" />
+
+                <div :style="`height:calc(${boxHeight.height} - 100px);overflow-y: auto;`" class="BoxA mt10">
+                    <div class="card-Box" v-for="item in linList">
+                        <div>
+                            <span class="line"></span>
+                            <span class="vol">{{ item.title[0] }}</span>
+                        </div>
+                        <div class="num">
+                            <div>
+                                {{ item.title[1] }}:
+                                <span style="color: #2dcd28" @click="LookMap(item.lineListOne, [], 0)">
+                                    {{ item.lineNumOne || 0 }}
+                                </span>
+                            </div>
+                            <div>
+                                {{ item.title[2] }}:
+                                <span style="color: #cc0000" @click="LookMap([], item.lineListTwo, 1)">
+                                    {{ item.lineNumTwo || 0 }}
+                                </span>
                             </div>
                         </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
         <img
             class="imgL"
             :style="show ? 'transform: rotate(0deg);' : 'transform: rotate(180deg);'"
             @click="show = !show"
             src="@/assets/img/QH.png"
         />
+
+        <!-- 变电站详情 -->
+        <stand ref="standRef" />
+        <!-- 终端 -->
+        <terminal ref="terminalRef" />
+        <!-- 检测点 -->
+        <point ref="pointRef" />
     </div>
 </template>
 
 <script setup lang="ts">
 import { onMounted, reactive, ref, provide } from 'vue'
-
-import MyEChart from '@/components/echarts/MyEchart.vue'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
-
+import { ArrowRight, View } from '@element-plus/icons-vue'
-import { getGridDiagramAreaData, getGridDiagramCityDev, getGridDiagramLineData } from '@/api/device-boot/panorama'
+import stand from './details/stand.vue'
-import { useConfig } from '@/stores/config'
+import terminal from './details/terminal.vue'
-const config = useConfig()
+import point from './details/point.vue'
+import {
+    getSubLineGiveAnAlarm,
+    getGridDiagramMonitor,
+    getGridDiagramDev,
+    getGridDiagramStatistics,
+    getGridDiagramRunData
+} from '@/api/device-boot/panorama'
+const emit = defineEmits(['LookMap', 'GridDiagram'])
 const dictData = useDictData()
-const height = mainHeight(30)
-const boxHeight = mainHeight(40, 3)
-const tabHeight: any = mainHeight(150, 3)
-const onlineRate = ref(0)
 const show = ref(false)
+const standRef = ref()
+const terminalRef = ref()
+const pointRef = ref()
+const list: any = ref([
+    {
+        title: '变电站',
+        color: ['#000', '#bd3124'],
+
+        list: [
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            }
+        ]
+    },
+    {
+        title: '监测终端',
+        color: ['#000', '#2dcd28'],
+        list: [
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            }
+        ]
+    },
+    {
+        title: '监测点',
+
+        color: ['#000', '#2dcd28', '#bd3124'],
+        list: [
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            }
+        ]
+    }
+])
+const countList: any = ref([
+    {
+        title: '冀北',
+        children: [
+            {
+                title: '电网侧监测点',
+                num: 0,
+                onLineNum: 0,
+                integrityRate: 0
+            },
+            { title: '非电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }
+        ]
+    },
+    {
+        title: '上送国网',
+        children: [{ title: '电网侧监测点', num: 0, onLineNum: 0, integrityRate: 0 }]
+    }
+])
+const linList: any = ref([
+    {
+        title: ['运行状态', '合格', '告警']
+    },
+    {
+        title: ['通讯状态', '在线', '离线']
+    },
+
+    {
+        title: ['数据完整性', '≥90%', '<90%']
+    },
+    {
+        title: ['电能质量指标', '未超标', '超标']
+    }
+])
+const vList = ['', '500kV', '220kV', '110kV', '35kV', ]
 const formRow: any = ref({})
-const terminalCharts: any = ref({})
+const height = mainHeight(30)
+const boxHeight = mainHeight(290, 2)
 
-const dotCharts = ref()
+// 详情
-
+const open = (e: any) => {
-const onlineCharts = ref()
+    if (e == 0) {
-
+        standRef.value.open(formRow.value)
-const info = (row: any) => {
+    } else if (e == 1) {
+        terminalRef.value.open(formRow.value)
+    } else if (e == 2) {
+        pointRef.value.open(formRow.value)
+    }
+}
+const info = async (row: any) => {
     let form = {
         ...row,
         id: row.orgNo,
@@ -82,181 +344,66 @@ const info = (row: any) => {
         isUpToGrid: row.isUpToGrid,
         monitorFlag: row.isUpToGrid == 0 ? null : row.isUpToGrid
     }
-    let loadType = dictData.getBasicData('Statistical_Type').find(item => item.code == 'Load_Type')
+    countList.value[0].title = row.areaName
-
     formRow.value = form
+
     // 变电站
-    getGridDiagramAreaData(form).then(res => {
+    getSubLineGiveAnAlarm(form).then(res => {
-        onlineCharts.value = {
+        let data = row.isUpToGrid == 1 ? res.data.gwInfo : res.data.info
-            tooltip: {},
+        list.value[0].list = data[0].data
-            yAxis: {
-                type: 'value',
-                name: '个'
-            },
-
-            xAxis: {
-                type: 'category',
-                data: ['变电站', '监测终端', '监测点'],
-                axisLabel: {
-                    color: '#000',
-                    fontSize: 12
-                }
-            },
-            grid: {
-                top: '30px',
-                left: '10px',
-                right: '20px'
-            },
-
-            options: {
-                dataZoom: null,
-                series: [
-                    {
-                        name: '个数',
-                        type: 'bar',
-                        data: [
-                            res.data[0].subNum,
-                            res.data[0].deviceNum,
-                            res.data[0].lineNum
-                        ],
-                        label: {
-                            show: true,
-                            position: 'top',
-                            fontSize: 10
-                        }
-                    }
-                ]
-            }
-        }
     })
     // 终端
-    getGridDiagramCityDev({ ...form, deviceInfoParam: form, pageNum: 1, pageSize: 1000 }).then(res => {
+    getGridDiagramDev(form).then(res => {
-        onlineRate.value = res.data[1]
+        let data = row.isUpToGrid == 1 ? res.data.gwInfo : res.data.info
-        let data = [
+        list.value[1].list = data[0].data
-            {
+    })
-                name: '运行',
+    // 监测点
-                value: res.data[0] - 0
+    await getGridDiagramMonitor(form).then(res => {
-            },
+        let data = row.isUpToGrid == 1 ? res.data.gwInfo : res.data.info
-            {
-                name: '检修',
-                value: res.data[2] - 0
-            },
-            {
-                name: '退役',
-                value: res.data[4] - 0
-            }
-        ]
 
-        terminalCharts.value = {
+        list.value[2].list = data[0].data.map((item: any) => {
-            title: {
+            return {
-                text: data[0].value + data[1].value + data[2].value,
+                numOne: item.num,
-                left: '26%',
+                numTwo: item.onLineNum,
-                top: '40%',
+                numOneList: item.numList,
-                textStyle: {
+                numTwoList: item.onLineNumList
-                    fontWeight: 600,
-                    fontSize: 16
-                },
-                subtext: '总数',
-                subtextStyle: {
-                    fontWeight: 550,
-                    fontSize: 14
-                }
-            },
-
-            tooltip: {
-                trigger: 'item'
-            },
-            legend: {
-                orient: 'vertical',
-                top: 'center',
-                right: '10%',
-                formatter: function (e: any) {
-                    return e + '   ' + data.filter(item => item.name == e)[0].value + '台'
-                }
-            },
-            xAxis: {
-                show: false
-            },
-            yAxis: {
-                show: false
-            },
-            color: [config.layout.elementUiPrimary[0], '#FFBF00', '#FF9100'],
-            options: {
-                dataZoom: null,
-                series: [
-                    {
-                        type: 'pie',
-                        center: ['30%', '50%'],
-                        radius: ['40%', '60%'],
-                        label: {
-                            show: false,
-                            position: 'outside',
-                            textStyle: {
-                                //数值样式
-                            }
-                        },
-
-                        data: data
-                    }
-                ]
-            }
             }
         })
 
-    // 监测点
+        list.value[2].list.push({
-    getGridDiagramLineData({ ...form, statisticalType: loadType }).then(res => {
+            numOne: 0,
-        dotCharts.value = {
+            numOneList: []
-            title: {
+        })
-                text: ''
+    })
-            },
+    // 监测点指标统计
-            // str.replace(/\(\d+\)/, "\n$&");
+    getGridDiagramStatistics(form).then(res => {
-            xAxis: {
+        countList.value[0].children[0] = { title: '电网侧监测点', ...res.data.data[0] }
-                data: res.data.map((item: any) => {
+        countList.value[0].children[1] = { title: '非电网侧监测点', ...res.data.data[1] }
-                    let title = item.orgName.replace(/\(\d+\)/g, '')
+        countList.value[1].children[0] = { title: '电网侧监测点', ...res.data.gwData[0] }
-                    // return title.length > 5
+    })
-                    return title.length > 6
+    // 监测运行统计
-                        ? title.length > 11
+    getGridDiagramRunData(form).then(res => {
-                            ? title.slice(0, 5) + '\n ' + title.slice(5, 10) + '\n ' + title.slice(10)
+        res.data[0].title = ['运行状态', '合格', '告警']
-                            : title.slice(0, 5) + '\n ' + title.slice(5)
+        res.data[1].title = ['通讯状态', '在线', '离线']
-                        : title
+        res.data[2].title = ['数据完整性', '≥90%', '<90%']
-                }),
+        res.data[3].title = ['电能质量指标', '未超标', '超标']
-                axisLabel: {
-                    color: '#000',
-                    fontSize: 12,
-                    interval: 0
-                }
-            },
-            yAxis: {
-                name: '%',
-                min: 0,
-                max: 100
-            },
-            grid: {
-                top: '30px',
-                left: '0px',
-                right: '20px',
-                bottom: 0
-            },
-            options: {
-                dataZoom: null,
-                series: [
-                    {
-                        name: '数据完整率',
-                        type: 'bar',
 
-                        data: res.data.map((item: any) => item.integrityRate),
+        linList.value = res.data
-                        label: {
-                            show: true,
-                            position: 'top',
-                            fontSize: 10
-                        }
-                    }
-                ]
-            }
-        }
     })
 }
-
+// 点击
+const LookMap = (coutList: object, alarmList: object, key?: any) => {
+    // console.log('🚀 ~ LookMap ~ row:', row)
+    let form = {
+        coutList: coutList,
+        alarmList: alarmList
+    }
+    emit('LookMap', form, key)
+}
+const GridDiagram = (k: any) => {
+    emit('GridDiagram', k, 3)
+}
+onMounted(() => {})
 defineExpose({ info, show })
 </script>
 
@@ -264,22 +411,80 @@ defineExpose({ info, show })
 .boxLeft {
     background-color: #fff;
     width: 100%;
-    padding: 10px 10px 10px 10px;
+    // padding: 10px 10px 10px 10px;
     border-radius: 5px;
     font-size: 13px;
     overflow: hidden;
 }
 
+.cardBox {
+    display: flex;
+    flex-wrap: wrap;
+    flex: 1;
+
+    .card {
+        justify-content: center;
+        margin-top: 15px;
+        margin-right: 2%;
+        display: flex;
+        flex: 1;
+        align-items: center;
+        font-size: 16px;
+        span:nth-child(2) {
+            font-weight: 550;
+        }
+    }
+}
+.vcl {
+    display: flex;
+    border-bottom: 2px solid #fff;
+    background-color: #edededc0;
+    border-radius: 5px;
+    font-size: 14px;
+    p {
+        text-align: center;
+        margin: 6px;
+        line-height: 30px;
+    }
+    .numOne {
+        flex: 1;
+        font-weight: 550;
+        cursor: pointer;
+    }
+    &:nth-child(1) {
+        background-color: #fff;
+    }
+    &:nth-child(2) {
+        .numOne {
+            color: #00bff5;
+        }
+    }
+    &:nth-child(3) {
+        .numOne {
+            color: #008000;
+        }
+    }
+    &:nth-child(4) {
+        .numOne {
+            color: #0000ff;
+        }
+    }
+}
+
 .title {
     // height: ;
-    display: flex;
+    // display: flex;
-    justify-content: space-between;
+    // justify-content: space-between;
     font-size: 15px;
     line-height: 23px;
     padding-left: 5px;
     width: 100%;
     font-weight: 550;
-
+    display: flex;
+    align-items: center;
+    span:nth-child(1) {
+        cursor: pointer;
+    }
     .info {
         font-weight: normal;
         display: flex;
@@ -287,6 +492,60 @@ defineExpose({ info, show })
         cursor: pointer;
         color: #757575;
     }
+    img {
+        height: 1.2rem;
+        width: 1.2rem;
+        margin-right: 5px;
+    }
+}
+
+.card-Box {
+    // display: grid;
+    // grid-template-rows: 1fr 1fr;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-evenly;
+    // align-items: center;
+    margin: 0 5px 5px;
+    padding: 10px;
+    background-color: #edededc0;
+    border-radius: 10px;
+    min-height: 60px;
+    max-height: 120px;
+    .line {
+        display: inline-block;
+        width: 0.5rem;
+        height: 0.5rem;
+        border-radius: 0.25rem;
+        background: var(--el-color-primary);
+        margin-right: 5px;
+        margin-bottom: 2px;
+    }
+    .num {
+        margin-left: 10px;
+        display: grid;
+        text-align: center;
+        grid-template-columns: 1fr 1fr 1.5fr;
+        font-size: 14px;
+
+        span {
+            cursor: pointer;
+            font-size: 16px;
+            font-weight: 550;
+        }
+    }
+}
+.BoxA {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    grid-template-rows: 1fr 1fr;
+    // grid-template-rows: 80px;
+    .num {
+        margin-left: 10px;
+        display: grid;
+        text-align: center;
+        grid-template-columns: 1fr 1fr;
+    }
 }
 
 .imgL {
@@ -302,7 +561,7 @@ defineExpose({ info, show })
 
 .show {
     width: 0px;
-    transition: all 0.1s ease;
+    transition: all 0.3s ease;
     .boxLeft {
         padding: 0;
     }
@@ -320,18 +579,6 @@ defineExpose({ info, show })
 :deep(.el-table thead) {
     color: #000;
 }
-.TJTop {
-    margin-top: 10px;
-    display: flex;
-    img {
-        height: 1.2rem;
-        width: 1.2rem;
-        margin-right: 5px;
-    }
-    span {
-        color: #2dcd28;
-    }
-}
 :deep(.el-dialog__body) {
     max-height: none !important;
 }

src/views/pqs/qualityInspeection/panorama/components/cityMapL1.vue

@@ -0,0 +1,338 @@
+<template>
+    <div :class="show ? 'show' : 'noshow'">
+        <div class="boxLeft" :style="height">
+            <!-- 在线监测规模 -->
+            <div :style="boxHeight">
+                <div class="title">
+                    <span>在线监测规模</span>
+                </div>
+
+                <div style="display: flex" class="mt2">
+                    <img src="@/assets/img/FGX.png" />
+                </div>
+                <MyEChart :style="tabHeight" :options="onlineCharts" />
+            </div>
+            <!-- 监测终端状态 -->
+            <div :style="boxHeight">
+                <div class="title">
+                    <span>监测终端状态</span>
+                </div>
+                <div style="display: flex" class="mt2">
+                    <img src="@/assets/img/FGX.png" />
+                </div>
+                <div class="TJTop">
+                    <img src="@/assets/img/TJ.png" />
+                    终端在线率：
+                    <span>{{ onlineRate }}%</span>
+                </div>
+                <MyEChart :style="`height: calc(${tabHeight.height} - 27px)`" :options="terminalCharts" />
+            </div>
+            <!-- 监测点 -->
+            <div :style="boxHeight">
+                <div class="title">
+                    <span>监测点数据完整率</span>
+                </div>
+
+                <div style="display: flex" class="mt2">
+                    <img src="@/assets/img/FGX.png" />
+                </div>
+                <MyEChart :style="tabHeight" :options="dotCharts" />
+            </div>
+        </div>
+        <img
+            class="imgL"
+            :style="show ? 'transform: rotate(0deg);' : 'transform: rotate(180deg);'"
+            @click="show = !show"
+            src="@/assets/img/QH.png"
+        />
+    </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, reactive, ref, provide } from 'vue'
+
+import MyEChart from '@/components/echarts/MyEchart.vue'
+import { useDictData } from '@/stores/dictData'
+import { mainHeight } from '@/utils/layout'
+
+import { getGridDiagramAreaData, getGridDiagramCityDev, getGridDiagramLineData } from '@/api/device-boot/panorama'
+import { useConfig } from '@/stores/config'
+const config = useConfig()
+const dictData = useDictData()
+const height = mainHeight(30)
+const boxHeight = mainHeight(40, 3)
+const tabHeight: any = mainHeight(150, 3)
+const onlineRate = ref(0)
+const show = ref(false)
+const formRow: any = ref({})
+const terminalCharts: any = ref({})
+
+const dotCharts = ref()
+
+const onlineCharts = ref()
+
+const info = (row: any) => {
+    let form = {
+        ...row,
+        id: row.orgNo,
+        deptIndex: row.orgNo,
+        orgId: row.orgNo,
+        ids: [],
+        statisticalType: dictData.getBasicData('Statistical_Type', ['Report_Type'])[0],
+        isUpToGrid: row.isUpToGrid,
+        monitorFlag: row.isUpToGrid == 0 ? null : row.isUpToGrid
+    }
+    let loadType = dictData.getBasicData('Statistical_Type').find(item => item.code == 'Load_Type')
+
+    formRow.value = form
+    // 变电站
+    getGridDiagramAreaData(form).then(res => {
+        onlineCharts.value = {
+            tooltip: {},
+            yAxis: {
+                type: 'value',
+                name: '个'
+            },
+
+            xAxis: {
+                type: 'category',
+                data: ['变电站', '监测终端', '监测点'],
+                axisLabel: {
+                    color: '#000',
+                    fontSize: 12
+                }
+            },
+            grid: {
+                top: '30px',
+                left: '10px',
+                right: '20px'
+            },
+
+            options: {
+                dataZoom: null,
+                series: [
+                    {
+                        name: '个数',
+                        type: 'bar',
+                        data: [
+                            res.data[0].subNum,
+                            res.data[0].deviceNum,
+                            res.data[0].lineNum
+                        ],
+                        label: {
+                            show: true,
+                            position: 'top',
+                            fontSize: 10
+                        }
+                    }
+                ]
+            }
+        }
+    })
+    // 终端
+    getGridDiagramCityDev({ ...form, deviceInfoParam: form, pageNum: 1, pageSize: 1000 }).then(res => {
+        onlineRate.value = res.data[1]
+        let data = [
+            {
+                name: '运行',
+                value: res.data[0] - 0
+            },
+            {
+                name: '检修',
+                value: res.data[2] - 0
+            },
+            {
+                name: '退役',
+                value: res.data[4] - 0
+            }
+        ]
+
+        terminalCharts.value = {
+            title: {
+                text: data[0].value + data[1].value + data[2].value,
+                left: '26%',
+                top: '40%',
+                textStyle: {
+                    fontWeight: 600,
+                    fontSize: 16
+                },
+                subtext: '总数',
+                subtextStyle: {
+                    fontWeight: 550,
+                    fontSize: 14
+                }
+            },
+
+            tooltip: {
+                trigger: 'item'
+            },
+            legend: {
+                orient: 'vertical',
+                top: 'center',
+                right: '10%',
+                formatter: function (e: any) {
+                    return e + '   ' + data.filter(item => item.name == e)[0].value + '台'
+                }
+            },
+            xAxis: {
+                show: false
+            },
+            yAxis: {
+                show: false
+            },
+            color: [config.layout.elementUiPrimary[0], '#FFBF00', '#FF9100'],
+            options: {
+                dataZoom: null,
+                series: [
+                    {
+                        type: 'pie',
+                        center: ['30%', '50%'],
+                        radius: ['40%', '60%'],
+                        label: {
+                            show: false,
+                            position: 'outside',
+                            textStyle: {
+                                //数值样式
+                            }
+                        },
+
+                        data: data
+                    }
+                ]
+            }
+        }
+    })
+
+    // 监测点
+    getGridDiagramLineData({ ...form, statisticalType: loadType }).then(res => {
+        dotCharts.value = {
+            title: {
+                text: ''
+            },
+            // str.replace(/\(\d+\)/, "\n$&");
+            xAxis: {
+                data: res.data.map((item: any) => {
+                    let title = item.orgName.replace(/\(\d+\)/g, '')
+                    // return title.length > 5
+                    return title.length > 6
+                        ? title.length > 11
+                            ? title.slice(0, 5) + '\n ' + title.slice(5, 10) + '\n ' + title.slice(10)
+                            : title.slice(0, 5) + '\n ' + title.slice(5)
+                        : title
+                }),
+                axisLabel: {
+                    color: '#000',
+                    fontSize: 12,
+                    interval: 0
+                }
+            },
+            yAxis: {
+                name: '%',
+                min: 0,
+                max: 100
+            },
+            grid: {
+                top: '30px',
+                left: '0px',
+                right: '20px',
+                bottom: 0
+            },
+            options: {
+                dataZoom: null,
+                series: [
+                    {
+                        name: '数据完整率',
+                        type: 'bar',
+
+                        data: res.data.map((item: any) => item.integrityRate),
+                        label: {
+                            show: true,
+                            position: 'top',
+                            fontSize: 10
+                        }
+                    }
+                ]
+            }
+        }
+    })
+}
+
+defineExpose({ info, show })
+</script>
+
+<style lang="scss" scoped>
+.boxLeft {
+    background-color: #fff;
+    width: 100%;
+    padding: 10px 10px 10px 10px;
+    border-radius: 5px;
+    font-size: 13px;
+    overflow: hidden;
+}
+
+.title {
+    // height: ;
+    display: flex;
+    justify-content: space-between;
+    font-size: 15px;
+    line-height: 23px;
+    padding-left: 5px;
+    width: 100%;
+    font-weight: 550;
+
+    .info {
+        font-weight: normal;
+        display: flex;
+        font-size: 12px;
+        cursor: pointer;
+        color: #757575;
+    }
+}
+
+.imgL {
+    position: absolute;
+    padding: 10px;
+    top: calc(50% - 80px);
+    right: -23px;
+
+    transform: rotate(180deg);
+    height: 200px;
+    cursor: pointer;
+}
+
+.show {
+    width: 0px;
+    transition: all 0.1s ease;
+    .boxLeft {
+        padding: 0;
+    }
+}
+.noshow {
+    width: 25%;
+    transition: all 0.3s ease;
+    .boxLeft {
+        padding: 10px 10px 10px 10px;
+    }
+}
+:deep(.el-card) {
+    --el-card-padding: 10px !important;
+}
+:deep(.el-table thead) {
+    color: #000;
+}
+.TJTop {
+    margin-top: 10px;
+    display: flex;
+    img {
+        height: 1.2rem;
+        width: 1.2rem;
+        margin-right: 5px;
+    }
+    span {
+        color: #2dcd28;
+    }
+}
+:deep(.el-dialog__body) {
+    max-height: none !important;
+}
+</style>

src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue

@@ -418,18 +418,18 @@ const info = (row: any) => {
         ]
         statisticsCharts.value = {
             title: {
-                text: data[0].value + data[1].value + data[2].value,
+                text:'总数：'+ (data[0].value + data[1].value + data[2].value),
-                left: '26%',
+                left: '23%',
-                top: '40%',
+                top: '45%',
                 textStyle: {
-                    fontWeight: 600,
+                    // fontWeight: 600,
-                    fontSize: 16
+                    fontSize: 12
                 },
-                subtext: '总数',
+                // subtext: '总数',
-                subtextStyle: {
+                // subtextStyle: {
-                    fontWeight: 550,
+                //     fontWeight: 550,
-                    fontSize: 14
+                //     fontSize: 14
-                }
+                // }
             },
 
             tooltip: {

src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue

@@ -131,12 +131,12 @@
                 <el-option label="年" value="1" />
                 <el-option label="月" value="3" />
             </el-select> -->
-            <div style="position: absolute; width: 100px; top: 0px; right: 10px; z-index: 1">
+            <div style="position: absolute; width: 100px; top: 0px; right: 0px; z-index: 1">
-                <el-radio-group v-model="city" size="small" >
+                <el-radio-group v-model="city" size="small" @change="analysis">
-                    <el-radio-button label="1">省</el-radio-button>
+                    <el-radio-button label="0">省</el-radio-button>
-                    <el-radio-button label="2">地市</el-radio-button>
+                    <el-radio-button label="1">市</el-radio-button>
                 </el-radio-group>
-                <el-radio-group v-model="time" size="small" @change="analysis">
+                <el-radio-group v-model="type" size="small" @change="analysis">
                     <el-radio-button label="1">年</el-radio-button>
                     <el-radio-button label="3">月</el-radio-button>
                 </el-radio-group>
@@ -153,8 +153,8 @@ import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { getAssessDetail, getAssessTrend } from '@/api/device-boot/panorama'
 const dialogVisible: any = ref(false)
 const rowList: any = ref({})
-const time = ref('1')
+const type = ref('1')
-const city = ref('1')
+const city = ref('0')
 const loading = ref(false)
 const tableData: any = ref([])
 
@@ -164,13 +164,13 @@ const open = async (row: any) => {
         tableData.value = res.data
     })
     rowList.value = row
-    analysis(1)
+    analysis()
     dialogVisible.value = true
 }
-const analysis = (e: any) => {
+const analysis = () => {
     loading.value = true
     let time = rowList.value.searchBeginTime.slice(0, 4) + `-01-01`
-    getAssessTrend({ ...rowList.value, searchBeginTime: time, type: e }).then(res => {
+    getAssessTrend({ ...rowList.value, searchBeginTime: time, type: type.value, areaType: city.value }).then(res => {
         picEChart.value = {
             title: {
                 text: '各地市综合评估趋势对比'
@@ -230,7 +230,7 @@ const analysis = (e: any) => {
 
             grid: {
                 bottom: '10px',
-                top: '60px',
+                top: '60px'
             },
 
             yAxis: {

src/views/pqs/qualityInspeection/panorama/components/line/info.vue

@@ -456,18 +456,18 @@ const open = async (id: string) => {
         ]
         incidentCharts.value = {
             title: {
-                text: ' ' + (data[0].value + data[1].value + data[2].value),
+                text: '总数：' + (data[0].value + data[1].value + data[2].value),
-                left: '41%',
+                left: '40%',
-                top: '40%',
+                top: '45%',
                 textStyle: {
-                    fontWeight: 600,
+                    // fontWeight: 600,
-                    fontSize: 16
+                    fontSize: 12
                 },
-                subtext: '总数',
+                // subtext: '总数',
-                subtextStyle: {
+                // subtextStyle: {
-                    fontWeight: 550,
+                //     fontWeight: 550,
-                    fontSize: 14
+                //     fontSize: 14
-                }
+                // }
             },
 
             tooltip: {

src/views/pqs/qualityInspeection/panorama/components/map.vue

@@ -8,7 +8,7 @@
             v-model.trim="inputQuery"
             style="height: 46px; width: 334px"
             @keyup.enter="DeviceQ"
-            placeholder="请输入设备名称"
+            placeholder="请输入终端名称"
         >
             <template #prefix>
                 <div class="Icon"></div>
@@ -127,7 +127,7 @@ const LngLat = [
 ]
 import { getAssessOverview } from '@/api/device-boot/panorama'
 
-narimap.Require(['PSRMap', 'Thematic', 'Components.Query', 'Components.RegionSelector'], () => {
+narimap.Require(['PSRMap', 'Thematic', 'Components.Query','Components.MapSelector', 'Components.RegionSelector'], () => {
     if (narimap.Config.examples.notlogin) {
         initMap(narimap.Config.styles.sjRaster)
     } else {
@@ -147,9 +147,6 @@ narimap.Require(['PSRMap', 'Thematic', 'Components.Query', 'Components.RegionSel
                 console.log('错误', err)
             })
     }
-    setTimeout(() => {
-        console.log('🚀 ~ .then ~ narimap.Config.style:', narimap.Config)
-    }, 0)
 })
 function initMap(styleurl: any) {
     map.value = new narimap.Map({
@@ -163,6 +160,7 @@ function initMap(styleurl: any) {
         localIdeographFontFamily: 'Microsoft YoHei'
     })
     map.value.on('load', () => {
+        createMapSelectorComponent()
         DeviceQuery.value = new narimap.ResourceQuery.DeviceQuery()
         addLayer()
 
@@ -984,6 +982,24 @@ const flyTo = (row: any, zoom?: number) => {
     })
 }
 
+// 添加地图选择
+const createMapSelectorComponent = () => {
+    const mapSelector = new narimap.Components.MapSelector();
+
+    mapSelector.init(
+        map.value,
+        // ['sjBase', 'sjDark'],
+        // [
+        //     {
+        //         styleKey: 'sjRaster',
+        //         styleName: '影像图',
+        //         styleUrl: narimap.Config.styles.sjRaster,
+        //         // styleIcon: WebGIS.Config.apiRoot + 'libs/webgis/images/map/map_sjRasterStyle.png'
+        //     }
+        // ]
+    )
+}
+
 defineExpose({ locatePositions, addMarkers, grids, DeviceQ, radiusPop, flyTo })
 const height = mainHeight(20)
 </script>

src/views/pqs/qualityInspeection/panorama/components/mapL.vue

@@ -13,12 +13,12 @@
                     <div v-for="(item, i) in list" class="cardBox" :style="i == 1 ? 'flex:1.3' : ''">
                         <div class="card">
                             <span style="cursor: pointer" @click="GridDiagram(i)">{{ item.title }}：</span>
-                            <span
+                            <!-- <span
                                 :style="`color: ${item.color[0]}; cursor:pointer`"
                                 @click="LookMap(item.list[4].numOneList, item.list[4].numTwoList, 0)"
                             >
                                 {{ item.list[4].numOne }}
-                            </span>
+                            </span> -->
                         </div>
                     </div>
                 </div>
@@ -142,6 +142,12 @@
             @click="show = !show"
             src="@/assets/img/QH.png"
         />
+        <div class="legeng">
+            <div v-for="item in legengList">
+                <span :style="`background-color: ${item.color};`"></span>
+                <span>{{ item.title }}</span>
+            </div>
+        </div>
 
         <!-- 变电站详情 -->
         <stand ref="standRef" />
@@ -318,6 +324,28 @@ const linList: any = ref([
         title: ['电能质量指标', '未超标', '超标']
     }
 ])
+const legengList = [
+    {
+        color: '#00b07d',
+        title: '优质'
+    },
+    {
+        color: '#3399ff',
+        title: '良好'
+    },
+    {
+        color: '#ffcc33',
+        title: '合格'
+    },
+    {
+        color: '#db0887',
+        title: '较差'
+    },
+    {
+        color: '#ff0000',
+        title: '极差'
+    }
+]
 const vList = ['', '500kV', '220kV', '110kV', '35kV', '']
 const formRow: any = ref({})
 const height = mainHeight(30)
@@ -344,6 +372,7 @@ const info = async (row: any) => {
         isUpToGrid: row.isUpToGrid,
         monitorFlag: row.isUpToGrid == 0 ? null : row.isUpToGrid
     }
+    countList.value[0].title = row.areaName
     formRow.value = form
 
     // 变电站
@@ -453,6 +482,21 @@ defineExpose({ info, show })
     &:nth-child(1) {
         background-color: #fff;
     }
+    &:nth-child(2) {
+        .numOne {
+            color: #00bff5;
+        }
+    }
+    &:nth-child(3) {
+        .numOne {
+            color: #008000;
+        }
+    }
+    &:nth-child(4) {
+        .numOne {
+            color: #0000ff;
+        }
+    }
 }
 
 .title {
@@ -566,4 +610,30 @@ defineExpose({ info, show })
 :deep(.el-dialog__body) {
     max-height: none !important;
 }
+.legeng {
+    position: absolute;
+    padding: 5px;
+    bottom: 0;
+    right: -75px;
+    width: 70px;
+    font-size: 12px;
+    height: 120px;
+    background: #fff;
+    border-radius: 5px;
+    display: grid;
+    line-height: 22px;
+    grid-template-rows: auto;
+    div {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        span:nth-child(1) {
+            display: inline-block;
+            height: 10px;
+            border-radius: 2px;
+            width: 15px;
+            margin-right: 5px;
+        }
+    }
+}
 </style>

src/views/pqs/qualityInspeection/panorama/components/mapR.vue

@@ -5,7 +5,7 @@
             <div style="height: 110px">
                 <div class="title">
                     <span>
-                        综合评估
+                        稳态综合评估
                         <el-popover placement="right" :width="150" trigger="hover">
                             <template #reference>
                                 <WarningFilled class="WarningFilled" />
@@ -229,12 +229,12 @@
             @click="show = !show"
             src="@/assets/img/QH.png"
         />
-        <div class="legeng">
+        <!-- <div class="legeng">
             <div v-for="item in legengList">
                 <span :style="`background-color: ${item.color};`"></span>
                 <span>{{ item.title }}</span>
             </div>
-        </div>
+        </div> -->
         <!-- 评估 -->
         <Evaluate ref="evaluateRef" />
         <!-- 稳态 -->

src/views/pqs/qualityInspeection/panorama/components/style/map.scss

@@ -97,6 +97,9 @@
 :deep(.sgmap-canvas) {
     width: 100% !important;
 }
+:deep(.sgmap-ctrl-bottom-right) {
+    z-index: 0 !important;
+}
 :deep(.my-popup) {
     max-width: 400px !important;
     .popup-box {
@@ -184,7 +187,7 @@
         display: flex;
         justify-content: space-around;
         text-align: center;
-        div{
+        div {
             cursor: pointer;
         }
     }

src/views/pqs/qualityInspeection/panorama/index.vue

@@ -36,7 +36,7 @@
             <!-- 市级 -->
             <!-- <div v-show="control == 4"> -->
             <div v-show="control == 2">
-                <cityMapL ref="cityMapLRef" class="mapL" />
+                <cityMapL ref="cityMapLRef" class="mapL" @LookMap="LookMap" @GridDiagram="GridDiagram" />
                 <cityMapR ref="cityMapRRef" class="mapR" />
             </div>
         </div>
@@ -88,14 +88,17 @@ const control = ref(1)
 const form: any = ref({
     name: '',
     orgNo: dictData.state.area[0].id,
+    areaName: dictData.state.area[0]?.name,
     isUpToGrid: 0
 })
 
 const height = mainHeight(10)
 // 获取区域名称
 const changeValue = (e: any) => {
-    //mapRef.value.locatePositions(e)
+    console.log('🚀 ~ changeValue ~ e:', e.data)
+    // mapRef.value.locatePositions(e)
     form.value.orgNo = e.data.id //list.filter((item: any) => item.code == e.orgId)[0]?.id || dictData.state.area[0].id
+    form.value.areaName = e.data.name
     options.value[0].name = e.data.areaName
 
     control.value = e.data.level
@@ -118,12 +121,56 @@ const infoShow = (e: boolean) => {
 }
 // 地图控制图层
 const LookMap = (row: any, key?: any) => {
-    //mapRef.value.addMarkers({ ...row, type: 1 }, key)
+    // mapRef.value.addMarkers({ ...row, type: 1 }, key)
 }
+const LngLat = [
+    {
+        name: '唐山',
+        LngLat: [118.335849137, 39.7513593355],
+        zoom: 8
+    },
+    {
+        name: '张家口',
+        LngLat: [115.032504679, 40.8951549951],
+        zoom: 7
+    },
+    {
+        name: '秦皇岛',
+        LngLat: [119.185113833, 40.1179119754],
+        zoom: 8.3
+    },
+    {
+        name: '承德',
+        LngLat: [117.548498365, 41.3775890632],
+        zoom: 7.3
+    },
+    {
+        name: '廊坊',
+        LngLat: [116.628004129, 39.0589378611],
+        zoom: 8
+    },
+    {
+        name: '超高压',
+        LngLat: [116.84428600000001, 40.57707185292256],
+        zoom: 6.709267680647425
+    },
+    {
+        name: '风光储',
+        LngLat: [116.84428600000001, 40.57707185292256],
+        zoom: 6.709267680647425
+    }
+]
 //区域统计展示切换
-const GridDiagram = (k?: number) => {
+const GridDiagram = (k?: number, num?: number) => {
-    //mapRef.value.radiusPop(k)
+    // mapRef.value.radiusPop(k)
-    //mapRef.value.flyTo({ coordinate: [116.84428600000001, 40.57707185292256] }, 6.709267680647425)
+    if (num == 3) {
+        // form.value.areaName
+        let value = LngLat.filter(item => item.name == form.value.areaName)[0]
+
+        // if (value) mapRef.value.flyTo({ coordinate: value.LngLat }, value.zoom)
+    } else {
+        // mapRef.value.flyTo({ coordinate: [116.84428600000001, 40.57707185292256] }, 6.709267680647425)
+    }
 }
 const info = () => {
     form.value.startTime = datePickerRef.value.timeValue[0]
@@ -133,7 +180,7 @@ const info = () => {
 
     form.value.type = datePickerRef.value.interval
 
-    //mapRef.value.grids(form.value)
+    // mapRef.value.grids(form.value)
     if (control.value == 1) {
         mapLRef.value.info(form.value)
         mapRRef.value.info(form.value)
@@ -147,6 +194,7 @@ const reset = () => {
     form.value = {
         name: '',
         orgNo: dictData.state.area[0].id,
+        areaName: dictData.state.area[0]?.name,
         isUpToGrid: 0
     }
     changeValue({ data: dictData.state.area[0] })
@@ -220,5 +268,4 @@ onMounted(() => {
     background-color: var(--el-button-hover-bg-color);
     outline: 0;
 }
-
 </style>

src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue

@@ -159,11 +159,11 @@
     <el-dialog draggable title="运维异常问题新增" v-model="operationAdd" width="1200px" :before-close="handleClose">
         <el-divider content-position="left">第二步 选择普测计划及问题类型</el-divider>
         <el-form :model="operationAdddata" ref="operationAddRef" :inline="true" :rules="rules">
-            <el-form-item label="异常设备名称:" prop="abnormalDevName">
+            <el-form-item label="异常终端名称:" prop="abnormalDevName">
                 <el-input
                     v-model="operationAdddata.abnormalDevName"
                     clearable
-                    placeholder="请填写异常设备名称"
+                    placeholder="请填写异常终端名称"
                 ></el-input>
             </el-form-item>
 
@@ -176,12 +176,12 @@
                 ></el-date-picker>
             </el-form-item>
             <br />
-            <el-form-item label="设备异常描述:" style="margin-top: 10px" prop="eventDescription">
+            <el-form-item label="终端异常描述:" style="margin-top: 10px" prop="eventDescription">
                 <el-input
                     type="textarea"
                     style="width: 400px"
                     :autosize="{ minRows: 2, maxRows: 4 }"
-                    placeholder="请填写设备异常描述"
+                    placeholder="请填写终端异常描述"
                     v-model="operationAdddata.eventDescription"
                 ></el-input>
             </el-form-item>
@@ -360,7 +360,7 @@ const rules = {
     abnormalDevTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
     transientIndicators: [{ required: true, message: '请选择暂态指标', trigger: 'change' }],
     steadyState: [{ required: true, message: '请选择稳态指标', trigger: 'change' }],
-    eventDescription: [{ required: true, message: '请输入设备异常描述', trigger: 'blur' }],
+    eventDescription: [{ required: true, message: '请输入终端异常描述', trigger: 'blur' }],
     abnormalDevName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }]
 }
 

src/views/pqs/supervise/electricalEnergy/components/detail.vue

@@ -127,16 +127,16 @@
                     </el-form-item>
                 </el-form>
 
-                <!-- 设备异常 -->
+                <!-- 终端异常 -->
-                <el-form :inline="true" label-width="auto" disabled v-if="problemSources == '设备异常'">
+                <el-form :inline="true" label-width="auto" disabled v-if="problemSources == '终端异常'">
-                    <el-form-item label="异常设备名称:">
+                    <el-form-item label="异常终端名称:">
                         <el-input v-model="addData.abnormalDevName" placeholder="请填写"></el-input>
                     </el-form-item>
                     <el-form-item label="发现异常时间:">
                         <el-input v-model="addData.abnormalDevTime" placeholder="请填写"></el-input>
                     </el-form-item>
                     <br />
-                    <el-form-item label="设备异常描述:">
+                    <el-form-item label="终端异常描述:">
                         <el-input
                             type="textarea"
                             style="width: 400px"
@@ -195,7 +195,7 @@ const open = async (row: any) => {
     dialogVisible.value = true
     let res: any = {}
     problemSources.value = row.problemSources
-    if (row.problemSources == '设备异常') {
+    if (row.problemSources == '终端异常') {
         res = await getAbnormalDetail(row.powerQualityProblemNo)
     } else if (row.problemSources == '在线监测告警') {
         res = await getExcessiveDetail(row.powerQualityProblemNo)

src/views/pqs/supervise/electricalEnergy/components/filling.vue

@@ -185,7 +185,7 @@ const problemData = dictData.getBasicData('Problem_Sources')
 const open = async (row: any) => {
     addData.value = row
     let res: any = {}
-    if (row.problemSources == '设备异常') {
+    if (row.problemSources == '终端异常') {
         res = await getAbnormalDetail(row.powerQualityProblemNo)
     } else if (row.problemSources == '在线监测告警') {
         res = await getExcessiveDetail(row.powerQualityProblemNo)

src/views/pqs/supervise/electricalEnergy/components/process1.vue

@@ -17,10 +17,10 @@
                 </el-checkbox>
             </el-checkbox-group>
         </el-form-item>
-        <el-row v-if="prop.addData.problemSources == '用户投诉' || prop.addData.problemSources == '设备异常'">
+        <el-row v-if="prop.addData.problemSources == '用户投诉' || prop.addData.problemSources == '终端异常'">
             <el-divider></el-divider>
 
-            <el-form-item label="电网侧受影响设备:" prop="powerGridAffectDev">
+            <el-form-item label="电网侧受影响终端:" prop="powerGridAffectDev">
                 <el-checkbox-group :disabled="prop.disabled" v-model="causeAnalysisData.powerGridAffectDev">
                     <el-checkbox v-for="(item, ind) in powerGridAffectDevList" :key="ind" :label="item.code">
                         {{ item.name }}
@@ -29,7 +29,7 @@
             </el-form-item>
             <el-divider></el-divider>
 
-            <el-form-item label="用户侧受影响设备:" prop="userAffectDev">
+            <el-form-item label="用户侧受影响终端:" prop="userAffectDev">
                 <el-checkbox-group :disabled="prop.disabled" v-model="causeAnalysisData.userAffectDev">
                     <el-checkbox v-for="(item, ind) in userAffectDevList" :key="ind" :label="item.code">
                         {{ item.name }}
@@ -117,17 +117,17 @@ const rules = {
     reportProcessContentYyfx: [{ required: true, message: '请选择电网侧原因', trigger: 'change' }],
     userReportProcessContentYyfx: [{ required: true, message: '请选择用户侧原因', trigger: 'change' }],
     eventDescriptionYyfx: [{ required: true, message: '请填写事件描述', trigger: 'blur' }],
-    powerGridAffectDev: [{ required: true, message: '请选择电网侧受影响设备', trigger: 'change' }],
+    powerGridAffectDev: [{ required: true, message: '请选择电网侧受影响终端', trigger: 'change' }],
-    userAffectDev: [{ required: true, message: '请选择用户侧受影响设备', trigger: 'change' }],
+    userAffectDev: [{ required: true, message: '请选择用户侧受影响终端', trigger: 'change' }],
     fileList: [{ required: true, message: '请上传文件', trigger: 'change' }]
 }
 // 电网侧原因
 const CauseList = dictData.getBasicData('Grid-side_Reasons')
 // 用户侧原因
 const userCauseList = dictData.getBasicData('User_Reasons')
-// 电网侧受影响设备
+// 电网侧受影响终端
 const powerGridAffectDevList = dictData.getBasicData('Grid_Unit')
-// 用户侧受影响设备
+// 用户侧受影响终端
 const userAffectDevList = dictData.getBasicData('Customer_Unit')
 const OnlineList = dictData.getBasicData('Problem_Sources')
 

src/views/pqs/supervise/electricalEnergy/components1/complaints.vue

@@ -135,7 +135,7 @@ const tableStore = new TableStore({
         //     {
         //         userName: '东润开阳堡光伏电站用户',
         //         userId: '8115771123274',
-        //         complaintContent: '装置频繁重启',
+        //         complaintContent: '终端频繁重启',
         //         complaintTime: '2024-05-16'
         //     }
         // ]

src/views/pqs/supervise/electricalEnergy/components1/form/testQuestionsForm.vue

@@ -106,7 +106,7 @@ const rules = {
     abnormalDevTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
     transientIndicators: [{ required: true, message: '请选择暂态指标', trigger: 'change' }],
     steadyState: [{ required: true, message: '请选择稳态指标', trigger: 'change' }],
-    eventDescription: [{ required: true, message: '请输入设备异常描述', trigger: 'blur' }],
+    eventDescription: [{ required: true, message: '请输入终端异常描述', trigger: 'blur' }],
     abnormalDevName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }]
 }
 const submit = () => {

src/views/pqs/supervise/harmonicSurvey/components/planManage.vue

@@ -1,8 +1,8 @@
 <template>
   <TableHeader area datePicker ref='TableHeaderRef'>
     <template #select>
-      <el-form-item label='审核状态'>
+      <el-form-item label='流程状态'>
-        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择审核状态'>
+        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
           <el-option
               v-for='item in statusSelect'
               :key='item.id'
@@ -97,7 +97,7 @@ const tableStore = new TableStore({
     { field: 'planEndTime', minWidth: 130,title: '计划结束时间' },
     {
       field: 'status',
-      title: '审核状态',
+      title: '流程状态',
       render: 'tag',
       minWidth: 80,
       custom: {

src/views/pqs/supervise/harmonicSurvey/components/testManage.vue

@@ -1,8 +1,8 @@
 <template>
   <TableHeader area datePicker ref='TableHeaderRef'>
     <template v-slot:select>
-      <el-form-item label='审核状态'>
+      <el-form-item label='流程状态'>
-        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择审核状态'>
+        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
           <el-option
               v-for='item in statusSelect'
               :key='item.id'
@@ -96,7 +96,7 @@ const tableStore = new TableStore({
     { field: 'completeTime', title: '实际完成时间', minWidth: 140 },
     {
       field: 'status',
-      title: '审核状态',
+      title: '流程状态',
       render: 'tag',
       minWidth: 140,
       custom: {
@@ -107,7 +107,7 @@ const tableStore = new TableStore({
         4: 'warning'
       },
       replaceValue: {
-        6: '待测试',
+        6: '新增',
         1: '审批中',
         2: '审批通过',
         3: '审批不通过',

src/views/pqs/supervise/harmonicSurvey/detail.vue

@@ -14,7 +14,7 @@
             <el-descriptions-item label="计划结束时间">
                 {{ detailData?.planEndTime }}
             </el-descriptions-item>
-            <el-descriptions-item label="审核状态">
+            <el-descriptions-item label="流程状态">
                 <el-tag :type="getDeviceStatusType(detailData?.status)">
                     {{ getDeviceStatus(detailData?.status) }}
                 </el-tag>

src/views/pqs/supervise/harmonicSurvey/plan/detail.vue

@@ -24,7 +24,7 @@
       <el-descriptions-item label='计划结束时间'>
         {{ detailData?.planEndTime }}
       </el-descriptions-item>
-      <el-descriptions-item label='审核状态'>
+      <el-descriptions-item label='流程状态'>
         <el-tag :type='getDeviceStatusType(detailData?.status)'>
           {{ getDeviceStatus(detailData?.status) }}
         </el-tag>

src/views/pqs/supervise/harmonicSurvey/test/detail.vue

@@ -55,7 +55,7 @@
         <span @click="openFile(detailData.testReportName )">预览</span>
       </el-descriptions-item>
 
-      <el-descriptions-item label='审核状态'>
+      <el-descriptions-item label='流程状态'>
         <el-tag :type='getDeviceStatusType(detailData?.status)'>
           {{ getDeviceStatus(detailData?.status) }}
         </el-tag>

src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue

@@ -28,8 +28,8 @@
                     />
                 </el-select>
             </el-form-item>
-            <el-form-item label="所属地市：" prop="city">
+            <el-form-item label="所在地市：" prop="city">
-                <el-select v-model="form.city" clearable placeholder="请选择所属地市" :disabled="openType == 'detail'">
+                <el-select v-model="form.city" clearable placeholder="请选择所在地市" :disabled="openType == 'detail'">
                     <el-option
                         v-for="item in areaOptionList"
                         :key="item.id"
@@ -200,7 +200,7 @@ const dialogFormVisible = ref(false)
 
 const form: any = ref({})
 const ruleFormRef: any = ref(null)
-//字典获取所属地市
+//字典获取所在地市
 const areaOptionList = dictData.getBasicData('jibei_area')
 //字典电压等级
 const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
@@ -266,7 +266,7 @@ const resetForm = () => {
         orgId: '', //填报部门
         goToNetReport: [], //报告
         userType: 0, //用户性质
-        city: areaOptionList[0].name, //所属地市
+        city: areaOptionList[0].name, //所在地市
         responsibleDepartment: '', //归口管理部门
         projectName: '', //用户名称
         userStatus: userStateList[0].value, //用户状态

src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue

@@ -16,7 +16,7 @@
             </template>
         </details_item>
         <details_item>
-            <template #label>所属地市</template>
+            <template #label>所在地市</template>
             <template #content>
                 {{ detailData.city }}
             </template>
@@ -66,7 +66,7 @@
             </template>
         </details_item>
         <details_item v-if="detailData.userType == 0 || detailData.userType == 1">
-            <template #label>非线性设备类型</template>
+            <template #label>非线性终端类型</template>
             <template #content>
                 {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
             </template>
@@ -156,7 +156,7 @@
                 detailData.userType == '5'
             "
         >
-            <template #label>PCC供电设备容量</template>
+            <template #label>PCC供电终端容量</template>
             <template #content>
                 {{ proviteData.pccEquipmentCapacity }}
             </template>
@@ -227,7 +227,7 @@
             </template>
         </details_item>
         <details_item v-if="detailData.userType == 6">
-            <template #label>敏感装置名称</template>
+            <template #label>敏感终端名称</template>
             <template #content>
                 {{ proviteData.deviceName }}
             </template>
@@ -324,7 +324,7 @@
             </template>
         </details_item>
         <details_item v-if="detailData.userType == 6">
-            <template #label>主要敏感设备清单</template>
+            <template #label>主要敏感终端清单</template>
             <template #content>
                 <el-icon>
                     <Link />
@@ -497,7 +497,7 @@ const proviteData = ref()
 const getProviteData = async () => {
     if (detailData.value.userType == '0' || detailData.value.userType == '1') {
         proviteData.value = detailData.value.userReportProjectPO
-        //查询非线性设备类型
+        //查询非线性终端类型
         await getDictTreeById(proviteData.value.nonlinearDeviceType).then(res => {
             proviteData.value.nonlinearDeviceType = res.data?.name
         })
@@ -541,7 +541,7 @@ const getProviteData = async () => {
         await getFileNamePath(proviteData.value.substationMainWiringDiagram, 'substationMainWiringDiagram')
     }
 
-    //主要敏感设备清单
+    //主要敏感终端清单
     if (proviteData.value.sensitiveDevices) {
         await getFileNamePath(proviteData.value.sensitiveDevices, 'sensitiveDevices')
     }
@@ -607,7 +607,7 @@ const getFileNamePath = async (val: any, pathName: any) => {
                     url: res.data.url
                 }
             }
-            //主要敏感设备清单
+            //主要敏感终端清单
             else if (pathName == 'sensitiveDevices' && proviteData.value.sensitiveDevices) {
                 proviteData.value.sensitiveDevices = {
                     name: res.data.fileName,

src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue

@@ -5,8 +5,8 @@
                 <el-form-item label="用户名称">
                     <el-input v-model="tableStore.table.params.projectName" placeholder="请输入用户名称"></el-input>
                 </el-form-item>
-                <el-form-item label="所属地市">
+                <el-form-item label="所在地市">
-                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所属地市">
+                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
                         <el-option
                             v-for="item in areaOptionList"
                             :key="item.id"
@@ -74,7 +74,7 @@ const tableStore = new TableStore({
     method: 'POST',
     column: [
         { title: '序号', type: 'seq', width: 80 },
-        { field: 'city', title: '所属地市', minWidth: 80 },
+        { field: 'city', title: '所在地市', minWidth: 80 },
         { field: 'projectName', title: '用户名称', minWidth: 170 },
         {
             field: 'userType',

src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue

@@ -5,8 +5,8 @@
                 <el-form-item label='用户名称'>
                     <el-input v-model='tableStore.table.params.projectName' clearable></el-input>
                 </el-form-item>
-                <el-form-item label='所属地市'>
+                <el-form-item label='所在地市'>
-                    <el-select v-model='tableStore.table.params.city' clearable placeholder='请选择所属地市'>
+                    <el-select v-model='tableStore.table.params.city' clearable placeholder='请选择所在地市'>
                         <el-option
                             v-for='item in areaOptionList'
                             :key='item.id'
@@ -76,7 +76,7 @@ const tableStore = new TableStore({
                 return getUserTypeName(userType)
             }
         },
-        { field: 'city', title: '所属地市', minWidth: 80 },
+        { field: 'city', title: '所在地市', minWidth: 80 },
         { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
         {
             field: 'userStatus',
@@ -99,7 +99,7 @@ const tableStore = new TableStore({
         { field: 'substation', title: '变电站', minWidth: 100 },
         {
             field: 'status',
-            title: '审核状态',
+            title: '流程状态',
             minWidth: 100,
             render: 'tag',
             custom: {

src/views/pqs/supervise/interfere/components/undocumented/addForm.vue

@@ -45,7 +45,12 @@
                 />
             </el-form-item>
             <el-form-item for="-" label="用户性质：" prop="userType">
-                <el-select :disabled="resendId!=''" v-model="form.userType" placeholder="请选择用户性质" @change="changeUserType()">
+                <el-select
+                    :disabled="resendId != ''"
+                    v-model="form.userType"
+                    placeholder="请选择用户性质"
+                    @change="changeUserType()"
+                >
                     <el-option
                         v-for="(item, index) in userTypeList"
                         :label="item.label"
@@ -54,8 +59,8 @@
                     />
                 </el-select>
             </el-form-item>
-            <el-form-item for="-" label="所属地市：" prop="city">
+            <el-form-item for="-" label="所在地市：" prop="city">
-                <el-select v-model="form.city" clearable placeholder="请选择所属地市">
+                <el-select v-model="form.city" clearable placeholder="请选择所在地市">
                     <el-option
                         v-for="item in areaOptionList"
                         :key="item.id"
@@ -104,7 +109,7 @@
             <el-form-item
                 for="-"
                 v-if="form.userType == '0' || form.userType == '1'"
-                label="非线性设备类型："
+                label="非线性终端类型："
                 prop="nonlinearDeviceType"
             >
                 <el-tree-select
@@ -208,7 +213,7 @@
             <el-form-item
                 for="-"
                 v-if="form.userType == '2' || form.userType == '3' || form.userType == '4' || form.userType == '5'"
-                label="PCC供电设备容量："
+                label="PCC供电终端容量："
                 prop="pccEquipmentCapacity"
             >
                 <el-input
@@ -216,7 +221,7 @@
                     oninput="value=value.replace(/[^\-?\d.]/g,'')
 .replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
 .replace('-','$#$').replace(/\-/g,'').replace('$#$','-')"
-                    placeholder="请输入PCC供电设备容量"
+                    placeholder="请输入PCC供电终端容量"
                 >
                     <template #append>MVA</template>
                 </el-input>
@@ -243,8 +248,8 @@
                     <el-option v-for="(item, index) in industryList" :label="item.name" :value="item.id" :key="index" />
                 </el-select>
             </el-form-item>
-            <el-form-item for="-" v-if="form.userType == '6'" label="敏感装置名称：" prop="deviceName">
+            <el-form-item for="-" v-if="form.userType == '6'" label="敏感终端名称：" prop="deviceName">
-                <el-input v-model="form.deviceName" autocomplete="off" placeholder="请输入敏感装置名称" />
+                <el-input v-model="form.deviceName" autocomplete="off" placeholder="请输入敏感终端名称" />
             </el-form-item>
             <el-form-item for="-" v-if="form.userType == '6'" label="供电电源数量：" prop="powerSupplyCount">
                 <el-input-number
@@ -430,7 +435,7 @@
             <el-form-item
                 class="uploadFile"
                 for="-"
-                label="主要敏感设备清单："
+                label="主要敏感终端清单："
                 v-if="form.userType == '6'"
                 prop="sensitiveDevices"
             >
@@ -518,7 +523,7 @@ import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { queryByAllCode } from '@/api/system-boot/dictTree'
 import { uploadFile } from '@/api/system-boot/file'
-import { submitFormData, getById ,updateFormData} from '@/api/supervision-boot/interfere/index'
+import { submitFormData, getById, updateFormData } from '@/api/supervision-boot/interfere/index'
 defineProps({
     openType: {
         type: String,
@@ -532,8 +537,11 @@ const dialogFormVisible = ref(false)
 const acceptType = ''
 const form: any = ref({})
 const ruleFormRef: any = ref(null)
-//字典获取所属地市
+//字典获取所在地市
-const areaOptionList = dictData.getBasicData('jibei_area')
+const areaOptionList = dictData
+    .getBasicData('jibei_area')
+    .filter(item => !(item.name == '超高压' || item.name == '风光储'))
+
 //字典获取敏感电能质量指标
 const energyQualityIndexList = dictData.getBasicData('Indicator_Type')
 //字典获取行业类型
@@ -596,7 +604,7 @@ const userStateList = reactive([
     }
 ])
 const title = ref('')
-//获取非线性设备类型树形下拉
+//获取非线性终端类型树形下拉
 const defaultProps = {
     children: 'children',
     label: 'name',
@@ -612,7 +620,7 @@ const resetForm = () => {
         orgId: '', //填报部门  1
         expectedProductionDate: '', //工程预期投产日期 1
         userType: 0, //用户性质 1
-        city: areaOptionList[0].name, //所属地市 1
+        city: areaOptionList[0].name, //所在地市 1
         responsibleDepartment: '', //归口管理部门 1
         userStatus: userStateList[0].value, //用户状态 1
         projectName: '', //用户名称 1
@@ -636,16 +644,16 @@ const resetForm = () => {
         userAgreementCapacity: '', //用户用电协议容量（MVA） 1
         needGovernance: 0, //是否需要治理 1
         agreementCapacity: '', //用户协议容量  1
-        nonlinearDeviceType: '', //非线性设备类型 1
+        nonlinearDeviceType: '', //非线性终端类型 1
         nonlinearLoadType: '', //非线性负荷类型 1
-        pccEquipmentCapacity: '', // PCC供电设备容量（MVA） 1
+        pccEquipmentCapacity: '', // PCC供电终端容量（MVA） 1
         baseShortCircuitCapacity: '', //基准短路容量（MVA）1
         industry: industryList[0].id, //行业 1
-        deviceName: '', //敏感装置名称  1
+        deviceName: '', //敏感终端名称  1
         powerSupplyCount: 0, //供电电源数量 1
         energyQualityIndex: energyQualityIndexList[0].id, //敏感电能质量指标 1
         antiInterferenceTest: 0, //是否开展抗扰度测试 1
-        sensitiveDevices: [], //主要敏感设备清单 1
+        sensitiveDevices: [], //主要敏感终端清单 1
         antiInterferenceReport: [] //抗扰度测试报告 1
     }
     form.value.reporter = adminInfo.$state.name
@@ -691,7 +699,7 @@ const handleCheckChange = data => {
     }
 }
 const subForm: any = ref({
-    city: '', //所属地市
+    city: '', //所在地市
     evaluationConclusion: '', //预测评估结论
     evaluationDept: '', //预测评估单位
     expectedProductionDate: '', //工程预期投产日期
@@ -759,7 +767,7 @@ const subForm: any = ref({
         predictionEvaluationReport: [], //预测评估报告告地址
         predictionEvaluationReviewOpinions: [], //预测评估评审意见报告地址
         preliminaryDesignDescription: [], //项目初步设计说明书告地址
-        sensitiveDevices: [], //主要敏感设备清单
+        sensitiveDevices: [], //主要敏感终端清单
         state: 0,
         substationMainWiringDiagram: [] //用户接入变电站主接线示意图地址
     }
@@ -772,7 +780,7 @@ const rules = ref({
     orgId: [{ required: true, message: '请选择填报部门', trigger: 'change' }],
     expectedProductionDate: [{ required: true, message: '请选择工程预期投产日期', trigger: 'change' }],
     userType: [{ required: true, message: '清选择用户性质', trigger: 'change' }],
-    city: [{ required: true, message: '请选择所属地市', trigger: 'change' }],
+    city: [{ required: true, message: '请选择所在地市', trigger: 'change' }],
     responsibleDepartment: [{ required: true, message: '请输入归口管理部门', trigger: 'blur' }],
     userStatus: [{ required: true, message: '请选择用户状态', trigger: 'change' }],
     projectName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
@@ -781,13 +789,13 @@ const rules = ref({
     evaluationDept: [{ required: true, message: '请选择预测评估单位', trigger: 'change' }],
     evaluationConclusion: [{ required: true, message: '请输入预测评估结论', trigger: 'blur' }],
     agreementCapacity: [{ required: true, message: '请选择用户协议容量', trigger: 'blur' }],
-    nonlinearDeviceType: [{ required: true, message: '请选择非线性设备类型', trigger: 'change' }],
+    nonlinearDeviceType: [{ required: true, message: '请选择非线性终端类型', trigger: 'change' }],
     needGovernance: [{ required: true, message: '请选择是否需要治理', trigger: 'change' }],
     backgroundTestPerformed: [{ required: true, message: '请选择是否开展背景测试', trigger: 'change' }],
     state: [{ required: true, message: '请选择数据状态', trigger: 'change' }],
     pccPoint: [{ required: true, message: '请输入PCC点', trigger: 'blur' }],
     industry: [{ required: true, message: '请选择行业', trigger: 'change' }],
-    deviceName: [{ required: true, message: '请输入敏感装置名称', trigger: 'blur' }],
+    deviceName: [{ required: true, message: '请输入敏感终端名称', trigger: 'blur' }],
     powerSupplyCount: [{ required: true, message: '请输入供电电源数量', trigger: 'blur' }],
     energyQualityIndex: [{ required: true, message: '请输入敏感电能质量指标', trigger: 'blur' }],
     evaluationType: [{ required: true, message: '请选择评估类型', trigger: 'change' }],
@@ -795,11 +803,11 @@ const rules = ref({
     evaluationChekDept: [{ required: true, message: '请输入预测评估审单位', trigger: 'blur' }],
     baseShortCircuitCapacity: [{ required: true, message: '请输入基准短路容量', trigger: 'blur' }],
     minShortCircuitCapacity: [{ required: true, message: '请输入系统最小短路容量', trigger: 'blur' }],
-    pccEquipmentCapacity: [{ required: true, message: '请输入PCC供电设备容量', trigger: 'blur' }],
+    pccEquipmentCapacity: [{ required: true, message: '请输入PCC供电终端容量', trigger: 'blur' }],
     userAgreementCapacity: [{ required: true, message: '请输入用户用电协议容量', trigger: 'blur' }],
     nonlinearLoadType: [{ required: true, message: '请输入非线性负荷类型', trigger: 'blur' }],
     substationMainWiringDiagram: [{ required: true, message: '请上传用户接入变电站主接线示意图', trigger: 'change' }],
-    sensitiveDevices: [{ required: true, message: '请上传主要敏感设备清单', trigger: 'change' }],
+    sensitiveDevices: [{ required: true, message: '请上传主要敏感终端清单', trigger: 'change' }],
     antiInterferenceReport: [{ required: true, message: '请上传抗扰度测试报告', trigger: 'change' }],
     powerQualityReport: [{ required: true, message: '请上传背景电能质量测试报告', trigger: 'change' }],
     feasibilityReport: [{ required: false, message: '请上传可研报告', trigger: 'blur' }],
@@ -896,7 +904,7 @@ watch(
                 predictionEvaluationReport: [], //预测评估报告告地址
                 predictionEvaluationReviewOpinions: [], //预测评估评审意见报告地址
                 preliminaryDesignDescription: [], //项目初步设计说明书告地址
-                sensitiveDevices: [], //主要敏感设备清单
+                sensitiveDevices: [], //主要敏感终端清单
                 state: 0,
                 substationMainWiringDiagram: [] //用户接入变电站主接线示意图地址
             }
@@ -915,12 +923,12 @@ watch(
         deep: true
     }
 )
-const resendId=ref('')
+const resendId = ref('')
 const open = async (row: any) => {
     title.value = row.title
     dialogFormVisible.value = true
     if (row.row) {
-        resendId.value=row.row.id
+        resendId.value = row.row.id
         await getById({ id: row.row.id }).then(res => {
             // form.value.userType = res.data.userType
             if (res.data.userReportProjectPO != null) {
@@ -938,8 +946,8 @@ const open = async (row: any) => {
             }
             form.value.orgId = adminInfo.$state.deptName
         })
-    }else{
+    } else {
-        resendId.value=''
+        resendId.value = ''
     }
 }
 // 处理上传文件回显
@@ -1017,7 +1025,7 @@ const predictionEvaluationReviewOpinions = ref('')
 const additionalAttachments = ref('')
 //用户接入变电站主接线示意图
 const substationMainWiringDiagram = ref('')
-//主要敏感设备清单：
+//主要敏感终端清单：
 const sensitiveDevices = ref('')
 //抗扰度测试报告：
 const antiInterferenceReport = ref('')
@@ -1050,7 +1058,7 @@ const choose = (e: any) => {
         else if (uploadName.value == 'substationMainWiringDiagram') {
             substationMainWiringDiagram.value = res.data.name
         }
-        //主要敏感设备清单：
+        //主要敏感终端清单：
         else if (uploadName.value == 'sensitiveDevices') {
             sensitiveDevices.value = res.data.name
         }
@@ -1200,7 +1208,7 @@ const confirmForm = () => {
                 }
                 if (!sensitiveDevices.value) {
                     return ElMessage({
-                        message: '请上传主要敏感设备清单',
+                        message: '请上传主要敏感终端清单',
                         type: 'warning'
                     })
                 }
@@ -1226,7 +1234,7 @@ const confirmForm = () => {
                         predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址
                         additionalAttachments: additionalAttachments.value, //其他附件告地址
                         substationMainWiringDiagram: substationMainWiringDiagram.value, //用户接入变电站主接线示意图地址
-                        sensitiveDevices: sensitiveDevices.value, //主要敏感设备清单
+                        sensitiveDevices: sensitiveDevices.value, //主要敏感终端清单
                         antiInterferenceReport: antiInterferenceReport.value, //抗扰度测试报告
                         powerQualityReport: powerQualityReport.value //背景电能质量测试报告
                     }
@@ -1246,7 +1254,7 @@ const confirmForm = () => {
                 })
             } else {
                 console.log(confirmFormData)
-                confirmFormData.id=resendId.value
+                confirmFormData.id = resendId.value
                 updateFormData(confirmFormData).then(res => {
                     if (res.code == 'A0000') {
                         ElMessage({

src/views/pqs/supervise/interfere/components/undocumented/detail.vue

@@ -20,7 +20,7 @@
                     })?.label
                 }}
             </el-descriptions-item>
-            <el-descriptions-item label="所属地市">
+            <el-descriptions-item label="所在地市">
                 {{ detailData.city }}
             </el-descriptions-item>
             <el-descriptions-item label="归口管理部门">
@@ -46,7 +46,7 @@
                     })?.name
                 }}
             </el-descriptions-item>
-            <el-descriptions-item label="非线性设备类型" v-if="detailData.userType == 0 || detailData.userType == 1">
+            <el-descriptions-item label="非线性终端类型" v-if="detailData.userType == 0 || detailData.userType == 1">
                 {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
             </el-descriptions-item>
             <el-descriptions-item label="预测评估单位">
@@ -112,7 +112,7 @@
                 {{ proviteData.agreementCapacity }}
             </el-descriptions-item>
             <el-descriptions-item
-                label="PCC供电设备容量（MVA）"
+                label="PCC供电终端容量（MVA）"
                 v-if="
                     detailData.userType == '2' ||
                     detailData.userType == '3' ||
@@ -175,7 +175,7 @@
                     })?.name
                 }}
             </el-descriptions-item>
-            <el-descriptions-item label="敏感装置名称" v-if="detailData.userType == 6">
+            <el-descriptions-item label="敏感终端名称" v-if="detailData.userType == 6">
                 {{ proviteData.deviceName }}
             </el-descriptions-item>
             <!--            <el-descriptions-item label="供电电源数量" v-if="detailData.userType == 6">-->
@@ -274,7 +274,7 @@
                 </a>
                 <span @click="openFile(proviteData.substationMainWiringDiagram?.name )">预览</span>
             </el-descriptions-item>
-            <el-descriptions-item label="主要敏感设备清单" v-if="detailData.userType == 6">
+            <el-descriptions-item label="主要敏感终端清单" v-if="detailData.userType == 6">
                 <el-icon>
                     <Link />
                 </el-icon>
@@ -391,7 +391,7 @@ const userStateList = reactive([
     }
 ])
 const dictData = useDictData()
-//字典获取所属地市
+//字典获取所在地市
 const areaOptionList = dictData.getBasicData('jibei_area')
 //字典获取敏感电能质量指标
 const energyQualityIndexList = dictData.getBasicData('Indicator_Type')
@@ -428,7 +428,7 @@ const predictionEvaluationReportRef = ref(null)
 const predictionEvaluationReviewOpinionsRef = ref(null)
 //用户接入变电站主接线示意图
 const substationMainWiringDiagramRef = ref(null)
-//主要敏感设备清单
+//主要敏感终端清单
 const sensitiveDevicesRef = ref(null)
 //抗扰度测试报告
 const antiInterferenceReportRef = ref(null)
@@ -460,7 +460,7 @@ const preview = (val: any, url: any) => {
         if (val == 'substationMainWiringDiagram') {
             substationMainWiringDiagramRef?.value.open(url)
         }
-        //主要敏感设备清单
+        //主要敏感终端清单
         if (val == 'sensitiveDevices') {
             sensitiveDevicesRef?.value.open(url)
         }
@@ -482,7 +482,7 @@ const preview = (val: any, url: any) => {
 const getProviteData = async () => {
     if (detailData.value.userType == '0' || detailData.value.userType == '1') {
         proviteData.value = detailData.value.userReportProjectPO
-        //查询非线性设备类型
+        //查询非线性终端类型
         await getDictTreeById(proviteData.value.nonlinearDeviceType).then(res => {
             proviteData.value.nonlinearDeviceType = res.data?.name
         })
@@ -525,7 +525,7 @@ const getProviteData = async () => {
         await getFileNamePath(proviteData.value.substationMainWiringDiagram, 'substationMainWiringDiagram')
     }
 
-    //主要敏感设备清单
+    //主要敏感终端清单
     if (proviteData.value.sensitiveDevices) {
         await getFileNamePath(proviteData.value.sensitiveDevices, 'sensitiveDevices')
     }
@@ -587,7 +587,7 @@ const getFileNamePath = async (val: any, pathName: any) => {
                     url: res.data.url
                 }
             }
-            //主要敏感设备清单
+            //主要敏感终端清单
             else if (pathName == 'sensitiveDevices' && proviteData.value.sensitiveDevices) {
                 proviteData.value.sensitiveDevices = {
                     name: res.data.fileName,

src/views/pqs/supervise/interfere/components/undocumented/index.vue

@@ -4,8 +4,8 @@
             <el-form-item label="用户名称">
                 <el-input v-model="tableStore.table.params.projectName" placeholder="请输入用户名称"></el-input>
             </el-form-item>
-            <el-form-item label="所属地市">
+            <el-form-item label="所在地市">
-                <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所属地市">
+                <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
                     <el-option
                         v-for="item in areaOptionList"
                         :key="item.id"
@@ -15,8 +15,8 @@
                 </el-select>
             </el-form-item>
 
-            <el-form-item label="审核状态">
+            <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                     <el-option
                         v-for="item in statusSelect"
                         :key="item.id"
@@ -76,7 +76,7 @@ const tableStore = new TableStore({
     column: [
         { title: '序号', type: 'seq', width: 80 },
         // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
-        { field: 'city', title: '所属地市', minWidth: 80 },
+        { field: 'city', title: '所在地市', minWidth: 80 },
         {
             field: 'substation',
             title: '变电站',
@@ -116,7 +116,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'status',
-            title: '审核状态',
+            title: '流程状态',
             minWidth: 100,
             render: 'tag',
             custom: {

src/views/pqs/supervise/plan/components/detail.vue

@@ -277,7 +277,7 @@ const getFileNamePath = async (val: any, pathName: any) => {
                     url: res.data.url
                 }
             }
-            //主要敏感设备清单
+            //主要敏感终端清单
             else if (pathName == 'otherAttachments' && detailData.value.otherAttachments) {
                 detailData.value.otherAttachments = {
                     name: res.data.fileName,

src/views/pqs/supervise/plan/components/effectProblem/index.vue

@@ -16,8 +16,8 @@
             <el-form-item label="用户名称">
                 <el-input v-model="tableStore.table.params.searchValue" clearable></el-input>
             </el-form-item>
-            <el-form-item label="所属地市">
+            <el-form-item label="所在地市">
-                <el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择所属地市">
+                <el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择所在地市">
                     <el-option
                         v-for="item in areaOptionList"
                         :key="item.id"

src/views/pqs/supervise/plan/index.vue

@@ -3,8 +3,8 @@
     <div class="default-main">
         <TableHeader area datePicker ref="TableHeaderRef">
              <template #select>
-                 <el-form-item label="审核状态">
+                 <el-form-item label="流程状态">
-                     <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
+                     <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                          <el-option
                              v-for="item in statusSelect"
                              :key="item.id"
@@ -82,7 +82,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'city',
-            title: '所属地市',
+            title: '所在地市',
             minWidth: 170,
             formatter: (row: any) => {
                 return row.cellValue ? row.cellValue : '/'
@@ -112,7 +112,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'status',
-            title: '审核状态',
+            title: '流程状态',
             minWidth: 100,
             render: 'tag',
             custom: {

src/views/pqs/supervise/retire/components/equipment.vue

@@ -4,7 +4,7 @@
             <Area ref="areaRef" v-model="addData.orgNo" />
         </el-form-item>
 
-        <el-form-item label="设备编号:" prop="assetNumber">
+        <el-form-item label="终端编号:" prop="assetNumber">
             <el-input v-model="addData.assetNumber" clearable placeholder="请输入关键字"></el-input>
         </el-form-item>
 
@@ -46,7 +46,7 @@ const dictData = useDictData()
 const interferenceType = dictData.getBasicData('Interference_Source')
 const emit = defineEmits(['onSubmit'])
 const rules = reactive({
-    assetNumber: [{ required: true, message: '请输入设备编号', trigger: 'blur' }],
+    assetNumber: [{ required: true, message: '请输入终端编号', trigger: 'blur' }],
     devNumber: [{ required: true, message: '请输入资产编号', trigger: 'blur' }],
 
     checker: [{ required: true, message: '请选择审核人', trigger: 'change' }],
@@ -69,7 +69,7 @@ const formRef = ref()
 const config = () => {
     formRef.value.validate(async (valid: any) => {
         if (valid) {
-            if (title.value == '新增设备退役申请单') {
+            if (title.value == '新增终端退役申请单') {
                 let form = new FormData()
                 form.append('file', addData.value.fileList[0].raw)
                 await uploadFile(form).then((res: any) => {
@@ -86,7 +86,7 @@ const config = () => {
                     ElMessage.success('新增成功!')
                     cancel()
                 })
-            } else if (title.value == '编辑设备退役申请单') {
+            } else if (title.value == '编辑终端退役申请单') {
                 if (addData.value.fileList[0].raw != undefined) {
                     let form = new FormData()
                     form.append('file', addData.value.fileList[0].raw)

src/views/pqs/supervise/retire/detail.vue

@@ -10,7 +10,7 @@
                 {{ detailData.subName }}
             </el-descriptions-item>
             <template v-if='detailData.deviceType == 1'>
-                <el-descriptions-item label='终端装置' :span='2'>
+                <el-descriptions-item label='终端终端' :span='2'>
                     {{ detailData.deviceName }}
                 </el-descriptions-item>
             </template>

src/views/pqs/supervise/retire/deviceQuitPopup.vue

@@ -157,7 +157,7 @@ const submit = () => {
 }
 
 /**
- * 设备类型切换
+ * 终端类型切换
  */
 
 const changeType = (event: any) => {
@@ -168,7 +168,7 @@ const changeType = (event: any) => {
 
 const changeDevStatus = async (event: any) => {
   await getDeviceDetailData(event).then(res => {
-    //给当前设备赋值初始运行状态
+    //给当前终端赋值初始运行状态
     form.value.devOriginalStatus = res.data.runFlag
   })
 }

src/views/pqs/supervise/retire/monitor.vue

@@ -3,8 +3,8 @@
   <div >
     <TableHeader date-picker>
       <template #select>
-          <el-form-item label="审核状态">
+          <el-form-item label="流程状态">
-              <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
+              <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                   <el-option
                       v-for="item in statusSelect"
                       :key="item.id"
@@ -85,7 +85,7 @@ const tableStore = new TableStore({
       }
     },
     {
-      field: 'status', title: '审核状态', minWidth: 100,
+      field: 'status', title: '流程状态', minWidth: 100,
       render: 'tag',
       custom: {
         1: 'primary',
@@ -169,7 +169,7 @@ tableStore.table.params.searchValue = ''
 tableStore.table.params.status = ''
 provide('tableStore', tableStore)
 
-//新增退运设备信息
+//新增退运终端信息
 const add = () => {
   deviceQuitPopup.value.open('监测点退运')
 }

src/views/pqs/supervise/retire/monitorQuitPopup.vue

@@ -2,9 +2,9 @@
     <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title" width="450px" top="20vh">
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
-                <!-- <el-form-item label="设备类型" prop="deviceType">
+                <!-- <el-form-item label="终端类型" prop="deviceType">
             <el-radio-group v-model="form.deviceType"  :disabled="title == '监测点退运'" @change="changeType">
-                <el-radio border label="1">监测装置</el-radio>
+                <el-radio border label="1">监测终端</el-radio>
                 <el-radio border label="2">监测点</el-radio>
             </el-radio-group>
         </el-form-item> -->
@@ -73,7 +73,7 @@ const form = ref({
 
 //form表单校验规则
 const rules = {
-    deviceId: [{ required: true, message: '设备不能为空', trigger: 'change' }],
+    deviceId: [{ required: true, message: '终端不能为空', trigger: 'change' }],
     propertyNo: [{ required: true, message: '请输入退役原因', trigger: 'blur' }]
 }
 const resetForm = () => {
@@ -136,7 +136,7 @@ const submit = () => {
 }
 
 /**
- * 设备类型切换
+ * 终端类型切换
  */
 
 const changeType = (event: any) => {
@@ -146,7 +146,7 @@ const changeType = (event: any) => {
 }
 const changeDevStatus = async (event: any) => {
     await getLineDetailData(event).then(res => {
-        //给当前设备赋值初始运行状态
+        //给当前终端赋值初始运行状态
         switch (res.data.runFlag) {
             case '投运':
                 form.value.devOriginalStatus = '0'

src/views/pqs/supervise/retire/terminal.vue

@@ -3,8 +3,8 @@
     <div >
         <TableHeader date-picker>
             <template v-slot:select>
-                <el-form-item label="审核状态">
+                <el-form-item label="流程状态">
-                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
+                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                         <el-option
                             v-for="item in statusSelect"
                             :key="item.id"
@@ -107,7 +107,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'status',
-            title: '审核状态',
+            title: '流程状态',
             minWidth: 100,
             render: 'tag',
             custom: {
@@ -192,7 +192,7 @@ tableStore.table.params.status = ''
 tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 
-//新增退运设备信息
+//新增退运终端信息
 const add = () => {
     deviceQuitPopup.value.open('新增终端状态变更')
 }

src/views/pqs/supervise/technology/components/alarm.vue

@@ -1,8 +1,8 @@
 <template>
     <TableHeader datePicker ref="TableHeaderRef">
         <template #select>
-            <el-form-item label="审核状态">
+            <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                     <el-option
                         v-for="item in statusSelect"
                         :key="item.id"
@@ -80,7 +80,7 @@ const tableStore = new TableStore({
         { field: 'issueDetail', title: '告警内容', minWidth: '150' },
         {
             field: 'status',
-            title: '审核状态',
+            title: '流程状态',
             minWidth: '150',
             render: 'tag',
             custom: {
@@ -95,7 +95,7 @@ const tableStore = new TableStore({
                 2: '审批通过',
                 3: '审批不通过',
                 4: '已取消',
-                5: '待反馈'
+                5: '新增'
             }
         },
         { field: 'createTime', title: '创建时间', minWidth: '150' },

src/views/pqs/supervise/technology/components/earlyWarn.vue

@@ -59,7 +59,7 @@ const tableStore = new TableStore({
         },
         { field: 'leafletName', title: '单据名称', minWidth: '150' },
         {
-            field: 'status', title: '审核状态', minWidth: '150',
+            field: 'status', title: '流程状态', minWidth: '150',
             render: 'tag',
             custom: {
                 1: 'primary',
@@ -73,7 +73,7 @@ const tableStore = new TableStore({
                 2: '审批通过',
                 3: '审批不通过',
                 4: '已取消',
-                5: '待反馈'
+                5: '新增'
             }
         },
         { field: 'createTime', title: '创建时间', minWidth: '150' },

src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue

@@ -66,7 +66,7 @@ const tableStore = new TableStore({
         },
         { field: 'devType', title: '终端型号', minWidth: 100 },
 
-        { field: 'ip', title: '装置网络参数', minWidth: 100 },
+        { field: 'ip', title: '终端网络参数', minWidth: 100 },
         { field: 'port', title: '端口号', minWidth: 40 },
         {
             field: 'runFlag',

src/views/pqs/supervise/terminal/components/interferenceUserTable.vue

@@ -5,8 +5,8 @@
                 <el-form-item label="用户名称">
                     <el-input style="width:200px;"  placeholder="请输入用户名称" v-model="tableStore.table.params.projectName" clearable></el-input>
                 </el-form-item>
-                <el-form-item label="所属地市">
+                <el-form-item label="所在地市">
-                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所属地市">
+                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
                         <el-option
                             v-for="item in areaOptionList"
                             :key="item.id"
@@ -57,7 +57,7 @@ const tableStore = new TableStore({
                 return getUserTypeName(userType)
             }
         },
-        { field: 'city', title: '所属地市', minWidth: 80 },
+        { field: 'city', title: '所在地市', minWidth: 80 },
         { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
         {
             field: 'userStatus',

src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue

@@ -13,7 +13,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="信息查询">
-                    <el-input  style="width:240px;" placeholder="电站名称，装置编号，监测点名称" v-model="tableStore.table.params.searchValue" clearable></el-input>
+                    <el-input  style="width:240px;" placeholder="电站名称，终端编号，监测点名称" v-model="tableStore.table.params.searchValue" clearable></el-input>
                 </el-form-item>
 
             </template>
@@ -72,7 +72,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'devCapacity',
-            title: '供电设备容量(MVA )',
+            title: '供电终端容量(MVA )',
             minWidth: 150
         },
         {

src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue

@@ -5,8 +5,8 @@
                 <el-form-item label="用户名称">
                     <el-input style="width:200px;" placeholder="请输入用户名称" v-model="tableStore.table.params.projectName" clearable></el-input>
                 </el-form-item>
-                <el-form-item label="所属地市">
+                <el-form-item label="所在地市">
-                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所属地市">
+                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
                         <el-option
                             v-for="item in areaOptionList"
                             :key="item.id"
@@ -57,7 +57,7 @@ const tableStore = new TableStore({
             }
         },
         { field: 'projectName', title: '用户名称', minWidth: 170 },
-        { field: 'city', title: '所属地市', minWidth: 80 },
+        { field: 'city', title: '所在地市', minWidth: 80 },
         // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
         {
             field: 'userStatus',

src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue

@@ -2,8 +2,8 @@
 <template>
     <TableHeader area datePicker ref="TableHeaderRef">
          <template #select>
-             <el-form-item label="审核状态">
+             <el-form-item label="流程状态">
-                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
+                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                      <el-option
                          v-for="item in statusSelect"
                          :key="item.id"
@@ -82,7 +82,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'status',
-            title: '审核状态',
+            title: '流程状态',
             minWidth: 100,
             render: 'tag',
             custom: {

src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue

@@ -68,13 +68,13 @@
                     placeholder="请选择工程投产日期"
                 />
             </el-form-item>
-            <el-form-item v-if="false" for="-" label="所属地市：" prop="city">
+            <el-form-item v-if="false" for="-" label="所在地市：" prop="city">
                 <el-select
                     v-model="form.city"
                     clearable
                     style="width: 100%"
                     :disabled="true"
-                    placeholder="请选择所属地市"
+                    placeholder="请选择所在地市"
                 >
                     <el-option
                         v-for="item in areaOptionList"
@@ -111,13 +111,13 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item for="-" label="关联设备：" prop="monitoringTerminalCode">
+            <el-form-item for="-" label="关联终端：" prop="monitoringTerminalCode">
                 <el-select
                     v-model="form.monitoringTerminalCode"
                     clearable
                     style="width: 100%"
                     filterable
-                    placeholder="请选择关联设备"
+                    placeholder="请选择关联终端"
                     @change="changeDevice"
                 >
                     <el-option
@@ -219,14 +219,14 @@
                     <template #append>MVA</template>
                 </el-input>
             </el-form-item>
-            <el-form-item for="-" label="设备容量：" prop="devCapacity">
+            <el-form-item for="-" label="终端容量：" prop="devCapacity">
                 <el-input
                     v-model="form.devCapacity"
                     autocomplete="off"
                     oninput="value=value.replace(/[^\-?\d.]/g,'')
 .replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
 .replace('-','$#$').replace(/\-/g,'').replace('$#$','-')"
-                    placeholder="请输入设备容量"
+                    placeholder="请输入终端容量"
                 >
                     <template #append>MVA</template>
                 </el-input>
@@ -379,7 +379,7 @@ const title = ref('')
 const ruleFormRef: any = ref(null)
 // acceptType .doc,.docx,.xlsx,.xls,.pdf
 const acceptType = ''
-//字典获取所属地市
+//字典获取所在地市
 const areaOptionList = dictData.getBasicData('jibei_area')
 //字典获取监测点电压等级
 const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
@@ -521,13 +521,13 @@ const userNameList = ref([])
 const projectList = ref([])
 
 const monitoringTerminalList = ref([])
-//获取关联设备
+//获取关联终端
 const findAllMonitoringTerminalList = () => {
     getDeviceList().then(res => {
         monitoringTerminalList.value = res.data
     })
 }
-//查询关联设备下拉框
+//查询关联终端下拉框
 const changeDevice = () => {
     const obj = monitoringTerminalList.value.find(item => {
         return form.value.monitoringTerminalCode == item.id
@@ -549,9 +549,9 @@ const resetForm = () => {
         orgId: '', //填报部门id
         orgName: '', //填报部门名称
         expectedProductionDate: '', //工程投产日期
-        city: areaOptionList[0].name, //所属地市
+        city: areaOptionList[0].name, //所在地市
         userStatus: userStateList[1].id, //用户状态
-        monitoringTerminalCode: monitoringTerminalList.value[0]?.id, //关联设备
+        monitoringTerminalCode: monitoringTerminalList.value[0]?.id, //关联终端
         monitoringTerminalName: monitoringTerminalList.value[0]?.monitoringTerminalName,
         userName: projectList.value[0]?.id, //用户名称关联干扰源
         userId: '', //工程id
@@ -564,7 +564,7 @@ const resetForm = () => {
         pt2: 1, //	PT变比2
         shortCapacity: '10', //	短路容量
         dealCapacity: '10', //协议容量
-        devCapacity: '10', //设备容量
+        devCapacity: '10', //终端容量
         standardCapacity: '10', //基准容量
         isGridConnectionPoint: 0, //是否并网点
         isStatistical: 0, //	是否参与统计
@@ -695,7 +695,7 @@ const changeUserName = () => {
                 ...form.value,
                 shortCapacity: obj.userReportSubstationPO?.minShortCircuitCapacity, //	短路容量
                 dealCapacity: obj.userReportSubstationPO?.userAgreementCapacity, //协议容量
-                devCapacity: obj.userReportSubstationPO?.pccEquipmentCapacity, //设备容量
+                devCapacity: obj.userReportSubstationPO?.pccEquipmentCapacity, //终端容量
                 standardCapacity: obj.userReportSubstationPO?.baseShortCircuitCapacity //基准容量
             }
         })
@@ -735,7 +735,7 @@ const rules = ref({
     city: [
         {
             required: true,
-            message: '请选择所属地市',
+            message: '请选择所在地市',
             trigger: 'change'
         }
     ],
@@ -756,7 +756,7 @@ const rules = ref({
     monitoringTerminalCode: [
         {
             required: true,
-            message: '请选择关联设备',
+            message: '请选择关联终端',
             trigger: 'change'
         }
     ],
@@ -799,7 +799,7 @@ const rules = ref({
     devCapacity: [
         {
             required: true,
-            message: '请输入设备容量',
+            message: '请输入终端容量',
             trigger: 'blur'
         }
     ],

src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue

@@ -20,7 +20,7 @@
         <el-descriptions-item label="工程投产日期">
             {{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}
         </el-descriptions-item>
-        <el-descriptions-item label="所属地市">
+        <el-descriptions-item label="所在地市">
             {{ detailData.city }}
         </el-descriptions-item>
         <el-descriptions-item label="用户状态">
@@ -33,7 +33,7 @@
         <el-descriptions-item label="关联干扰源">
             {{ detailData.userName }}
         </el-descriptions-item>
-        <el-descriptions-item label="关联设备">
+        <el-descriptions-item label="关联终端">
             {{ detailData.monitoringTerminalName }}
         </el-descriptions-item>
         <el-descriptions-item label="监测点名称">
@@ -55,7 +55,7 @@
         <el-descriptions-item label="协议容量">
             {{ detailData.dealCapacity }}
         </el-descriptions-item>
-        <el-descriptions-item label="设备容量">
+        <el-descriptions-item label="终端容量">
             {{ detailData.devCapacity }}
         </el-descriptions-item>
         <el-descriptions-item label="基准容量">

src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue

@@ -2,8 +2,8 @@
 <template>
     <TableHeader area datePicker ref="TableHeaderRef">
          <template #select>
-             <el-form-item label="审核状态">
+             <el-form-item label="流程状态">
-                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
+                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                      <el-option
                          v-for="item in statusSelect"
                          :key="item.id"
@@ -65,7 +65,7 @@ const tableStore = new TableStore({
             }
         },
         { field: 'connectedBus', title: '关联母线', minWidth: 170 },
-        { field: 'monitoringTerminalName', title: '所属装置', minWidth: 170 },
+        { field: 'monitoringTerminalName', title: '所属终端', minWidth: 170 },
         { field: 'lineName', title: '监测点名称', minWidth: 150 },
         { field: 'reportDate', title: '填报日期', minWidth: 150 },
         {
@@ -78,7 +78,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'status',
-            title: '审核状态',
+            title: '流程状态',
             minWidth: 100,
             render: 'tag',
             custom: {

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue

@@ -53,8 +53,8 @@
                     placeholder="请选择工程投产日期"
                 />
             </el-form-item>
-            <el-form-item for="-" label="所属地市：" prop="city">
+            <el-form-item for="-" label="所在地市：" prop="city">
-                <el-select v-model="form.city" clearable style="width: 100%" placeholder="请选择所属地市">
+                <el-select v-model="form.city" clearable style="width: 100%" placeholder="请选择所在地市">
                     <el-option
                         v-for="item in areaOptionList"
                         :key="item.id"
@@ -270,7 +270,7 @@
             </el-form-item>
             <el-form-item
                 for="-"
-                label="监测装置安装位置："
+                label="监测终端安装位置："
                 prop="monitoringDeviceInstallationPosition"
                 class="label_over_warp"
             >
@@ -279,7 +279,7 @@
                     v-model="form.monitoringDeviceInstallationPosition"
                     clearable
                     style="width: 100%"
-                    placeholder="请选择监测装置安装位置"
+                    placeholder="请选择监测终端安装位置"
                 >
                     <el-option
                         v-for="item in monitoringDeviceInstallationPositionList"
@@ -396,8 +396,8 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item for="-" label="厂家设备编号：" prop="manufacturerDeviceNumber">
+            <el-form-item for="-" label="厂家终端编号：" prop="manufacturerDeviceNumber">
-                <el-input v-model="form.manufacturerDeviceNumber" autocomplete="off" placeholder="请输入厂家设备编号" />
+                <el-input v-model="form.manufacturerDeviceNumber" autocomplete="off" placeholder="请输入厂家终端编号" />
             </el-form-item>
 
             <!-- <el-form-item for="-" label="经度：" prop="longitude">
@@ -621,7 +621,7 @@ const ruleFormRef: any = ref(null)
 const title = ref('')
 // acceptType .xls,.xlsx
 const acceptType = ''
-//字典获取所属地市
+//字典获取所在地市
 const areaOptionList = dictData.getBasicData('jibei_area')
 //字典获取电压互感器类型
 const voltageTransformerTypeList = dictData.getBasicData('Voltage_Transformer')
@@ -673,11 +673,11 @@ const userStateList = reactive([
 const terminalModelList = [
     {
         id: '0',
-        name: '虚拟设备'
+        name: '虚拟终端'
     },
     {
         id: '1',
-        name: '实际设备'
+        name: '实际终端'
     },
     {
         id: '2',
@@ -698,7 +698,7 @@ const communicationStatusList = [
         name: '正常'
     }
 ]
-//定义监测装置安装位置下拉框数据
+//定义监测终端安装位置下拉框数据
 const monitoringDeviceInstallationPositionList = [
     {
         id: '0',
@@ -814,7 +814,7 @@ const resetForm: any = async () => {
         reportDate: new Date(), //填报日期
         orgId: '', //填报部门
         expectedProductionDate: '', //工程投产日期
-        city: areaOptionList[0].id, //所属地市
+        city: areaOptionList[0].id, //所在地市
         userStatus: userStateList[1].id, //用户状态
         userName: '', //用户名称
         userId: '',
@@ -840,8 +840,8 @@ const resetForm: any = async () => {
         // latitude: '0', //纬度
         // longitude: '0', //经度
         manufacturer: manufacturerList[0].id, //厂家
-        manufacturerDeviceNumber: '', //	厂家设备编号
+        manufacturerDeviceNumber: '', //	厂家终端编号
-        monitoringDeviceInstallationPosition: monitoringDeviceInstallationPositionList[0].id, //监测装置安装位置
+        monitoringDeviceInstallationPosition: monitoringDeviceInstallationPositionList[0].id, //监测终端安装位置
         monitoringTerminalCode: '', //监测终端编码
         monitoringTerminalName: '', //监测终端名称
         neutralPointWiringMethod: neutralPointWiringMethodList[0].id, //	中性点接线方式
@@ -873,7 +873,7 @@ const devReportForm: any = ref({
     reportDate: new Date(), //填报日期
     orgId: '', //填报部门
     expectedProductionDate: '', //工程投产日期
-    city: areaOptionList[0].name, //所属地市
+    city: areaOptionList[0].name, //所在地市
     userStatus: userStateList[1].id, //用户状态
     userName: '', //用户名称
     userId: '',
@@ -903,8 +903,8 @@ const devReportForm: any = ref({
         // latitude: '0', //纬度
         // longitude: '0', //经度
         manufacturer: manufacturerList[0].id, //厂家
-        manufacturerDeviceNumber: '', //	厂家设备编号
+        manufacturerDeviceNumber: '', //	厂家终端编号
-        monitoringDeviceInstallationPosition: monitoringDeviceInstallationPositionList[0].id, //监测装置安装位置
+        monitoringDeviceInstallationPosition: monitoringDeviceInstallationPositionList[0].id, //监测终端安装位置
         monitoringTerminalCode: '', //监测终端编码
         monitoringTerminalName: '', //监测终端名称
         neutralPointWiringMethod: neutralPointWiringMethodList[0].id, //	中性点接线方式
@@ -958,7 +958,7 @@ const rules = ref({
     city: [
         {
             required: true,
-            message: '请选择所属地市',
+            message: '请选择所在地市',
             trigger: 'change'
         }
     ],
@@ -1057,7 +1057,7 @@ const rules = ref({
     manufacturerDeviceNumber: [
         {
             required: true,
-            message: '请输入厂家设备编号',
+            message: '请输入厂家终端编号',
             trigger: 'blur'
         }
     ],
@@ -1183,7 +1183,7 @@ const rules = ref({
     monitoringDeviceInstallationPosition: [
         {
             required: true,
-            message: '请选择监测装置安装位置',
+            message: '请选择监测终端安装位置',
             trigger: 'change'
         }
     ],

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue

@@ -12,7 +12,7 @@
         <el-descriptions-item label="工程投产日期">
             {{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}
         </el-descriptions-item>
-        <!-- <el-descriptions-item label="所属地市">
+        <!-- <el-descriptions-item label="所在地市">
                 {{ detailData.city }}
             </el-descriptions-item> -->
         <el-descriptions-item label="用户状态">
@@ -70,7 +70,7 @@
                 })?.name
             }}
         </el-descriptions-item>
-        <el-descriptions-item label="厂家设备编号">
+        <el-descriptions-item label="厂家终端编号">
             {{ detailData.supervisionTempDeviceReport?.manufacturerDeviceNumber }}
         </el-descriptions-item>
         <el-descriptions-item label="终端IP">
@@ -159,7 +159,7 @@
                     : '-'
             }}
         </el-descriptions-item>
-        <el-descriptions-item label="监测装置安装位置">
+        <el-descriptions-item label="监测终端安装位置">
             {{
                 monitoringDeviceInstallationPositionList.find(item => {
                     return item.id == detailData.supervisionTempDeviceReport?.monitoringDeviceInstallationPosition
@@ -284,9 +284,9 @@ const userStateList = reactive([
     }
 ])
 const dictData = useDictData()
-//字典获取所属地市
+//字典获取所在地市
 const areaOptionList = dictData.getBasicData('jibei_area')
-//定义监测装置安装位置下拉框数据
+//定义监测终端安装位置下拉框数据
 const monitoringDeviceInstallationPositionList = [
     {
         id: '0',
@@ -312,15 +312,15 @@ const summonFlagList = [
 const terminalModelList = [
     {
         id: '0',
-        name: '虚拟设备'
+        name: '虚拟终端'
     },
     {
         id: '1',
-        name: '虚拟设备'
+        name: '虚拟终端'
     },
     {
         id: '2',
-        name: '虚拟设备'
+        name: '虚拟终端'
     }
 ]
 //定义通讯状态下拉框数据

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue

@@ -1,9 +1,9 @@
 <!---终端入网检测-->
 <template>
-    <TableHeader area datePicker ref="TableHeaderRef">
+    <TableHeader area datePicker nextFlag  ref="TableHeaderRef">
         <template #select>
-            <el-form-item label="审核状态">
+            <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                     <el-option
                         v-for="item in statusSelect"
                         :key="item.id"
@@ -72,8 +72,8 @@ const tableStore = new TableStore({
                 return row.cellValue
             }
         },
-        { field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
+        { field: 'monitoringTerminalName', title: '终端名称', minWidth: 170 },
-        { field: 'monitoringTerminalCode', title: '设备编号', minWidth: 170 },
+        { field: 'monitoringTerminalCode', title: '终端编号', minWidth: 170 },
         { field: 'reportDate', title: '填报日期', minWidth: 170 },
         {
             field: 'createBy',
@@ -85,7 +85,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'status',
-            title: '审核状态',
+            title: '流程状态',
             minWidth: 100,
             render: 'tag',
             custom: {

src/views/pqs/supervise/testRun/index.vue

@@ -3,8 +3,8 @@
     <div class="default-main">
         <TableHeader area datePicker ref='TableHeaderRef'>
             <template #select>
-                <el-form-item label="审核状态">
+                <el-form-item label="流程状态">
-                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
+                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                         <el-option
                             v-for="item in statusSelect"
                             :key="item.id"
@@ -105,7 +105,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'status',
-            title: '审核状态',
+            title: '流程状态',
             minWidth: 100,
             render: 'tag',
             custom: {

src/views/pqs/voltageSags/operationsManagement/point/index.vue

@@ -82,7 +82,7 @@ const tableStore = new TableStore({
         { field: 'loadType', title: '干扰源类型', width: 120 },
         { field: 'objName', title: '监测对象名称', width: 180 },
         { field: 'shortCapacity', title: '最小短路容量(MVA)', width: 190 },
-        { field: 'devCapacity', title: '供电设备容量(MVA )', width: 190 },
+        { field: 'devCapacity', title: '供电终端容量(MVA )', width: 190 },
         { field: 'dealCapacity', title: '用户协议容量(MVA)', width: 190 },
         { field: 'comFlag', title: '通讯状态 ', width: 120 },
         { field: 'id', title: '监测点序号', width: 120 },

src/views/pqs/voltageSags/overview/right.vue

@@ -9,8 +9,8 @@
                     <vxe-column type="seq" title="序号" width="60px"></vxe-column>
                     <vxe-column field="updateTime" title="中断时间"></vxe-column>
                     <vxe-column field="subName" title="变电站"></vxe-column>
-                    <vxe-column field="devName" title="装置名称"></vxe-column>
+                    <vxe-column field="devName" title="终端名称"></vxe-column>
-                    <vxe-column field="devType" title="装置型号"></vxe-column>
+                    <vxe-column field="devType" title="终端型号"></vxe-column>
                     <vxe-column field="ip" title="网络参数"></vxe-column>
                 </vxe-table>
             </div>

src/views/pqs/voltageSags/report/weekly/components/overviewTabEch.vue

@@ -84,7 +84,7 @@ const init = () => {
         })
         options1.value = {
             title: {
-                text: '设备运行情况',
+                text: '终端运行情况',
                 subtext: '区域统计'
             },
 
@@ -123,7 +123,7 @@ const init = () => {
         }
         options2.value = {
             title: {
-                text: '设备运行情况',
+                text: '终端运行情况',
                 subtext: '电压等级统计'
             },
 

src/views/pqs/voltageSags/sagGovern/businessUser/event/toleranceCurve.vue

@@ -12,8 +12,8 @@
                         />
                     </el-select>
                 </el-form-item>
-                <el-form-item label='设备'>
+                <el-form-item label='终端'>
-                    <el-select v-model='form.machineId' placeholder='暂无设备'>
+                    <el-select v-model='form.machineId' placeholder='暂无终端'>
                         <el-option
                             v-for='item in machineOptions'
                             :key='item.id'
@@ -134,13 +134,13 @@ const search = async (id: string, beginTime: string, endTime: string) => {
     searchBeginTime.value = beginTime
     searchEndTime.value = endTime
     userId.value = id
-    //根据用户id获取到生产线下拉框、再根据生产线下拉框获取生产线下的设备下拉，再根据设备获取下拉的敏感元器件的下拉
+    //根据用户id获取到生产线下拉框、再根据生产线下拉框获取生产线下的终端下拉，再根据终端获取下拉的敏感元器件的下拉
     await querySgProductLineByUserId(id).then((res: any) => {
         productLineOptions.value = res.data
         form.productLineId = productLineOptions.value[0].id
     })
 
-    //根据生产线获取设备数据
+    //根据生产线获取终端数据
     await querySgMachineByProductLineId(form.productLineId).then((res: any) => {
         machineOptions.value = res.data
         if (machineOptions.value.length > 0) {
@@ -148,7 +148,7 @@ const search = async (id: string, beginTime: string, endTime: string) => {
         }
     })
 
-    //根据设备获取元器件数据
+    //根据终端获取元器件数据
     await queryUnitByMachineId(form.machineId).then((res: any) => {
         unitOptions.value = res.data
         if (unitOptions.value.length > 0) {

src/views/pqs/voltageSags/sagGovern/businessUser/index.vue

@@ -117,7 +117,7 @@ const tableStore = new TableStore({
                 },
                 {
                     name: 'productSetting',
-                    title: '设备管理',
+                    title: '终端管理',
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',

src/views/pqs/voltageSags/sagGovern/businessUser/machine/index.vue

@@ -1,4 +1,4 @@
-<!--设备管理界面-->
+<!--终端管理界面-->
 <template>
   <div class='default-main'>
     <TableHeader>
@@ -22,9 +22,9 @@
     </TableHeader>
     <!--表格-->
     <Table ref='tableRef'></Table>
-    <!--设备弹出框-->
+    <!--终端弹出框-->
     <machine-popup ref='machinePopup' />
-    <!--设备详细弹出框，管理元器件-->
+    <!--终端详细弹出框，管理元器件-->
     <machine-detail ref='machineDetail' />
   </div>
 </template>
@@ -60,9 +60,9 @@ const tableStore = new TableStore({
   method: 'POST',
   column: [
     { title: '序号', type: 'seq', width: 80 },
-    { title: '设备名称', minWidth: '160', field: 'name' },
+    { title: '终端名称', minWidth: '160', field: 'name' },
-    { title: '设备型号', minWidth: '140', field: 'type' },
+    { title: '终端型号', minWidth: '140', field: 'type' },
-    { title: '设备损失(万元)', width: '140', field: 'machineLoss' },
+    { title: '终端损失(万元)', width: '140', field: 'machineLoss' },
     { title: '原料损失(万元)', width: '140', field: 'materialLoss' },
     { title: '产线功率(kW)', width: '140', field: 'machinePower' },
     {
@@ -89,7 +89,7 @@ const tableStore = new TableStore({
           icon: 'el-icon-EditPen',
           render: 'basicButton',
           click: row => {
-            machinePopup.value.open('修改设备', row)
+            machinePopup.value.open('修改终端', row)
           }
         },
         {
@@ -126,7 +126,7 @@ const tableStore = new TableStore({
 
 
 const getTableData = async () => {
-  //根据用户查询下面所有的生产线，默认根据第一个生产线获取下面所有设备
+  //根据用户查询下面所有的生产线，默认根据第一个生产线获取下面所有终端
   await querySgProductLineByUserId(query.id).then(res => {
     productLineList.value = res.data
     // //如果没有传就用第一个
@@ -158,7 +158,7 @@ const add = () => {
     let data = {
       productLineId: tableStore.table.params.productLineId
     }
-    machinePopup.value.open('新增设备', data)
+    machinePopup.value.open('新增终端', data)
   } else {
     ElMessage.error('请新增一条生产线')
   }

src/views/pqs/voltageSags/sagGovern/businessUser/machine/machinePopup.vue

@@ -1,4 +1,4 @@
-<!--设备的新增编辑弹出框-->
+<!--终端的新增编辑弹出框-->
 <template>
     <el-dialog
         draggable
@@ -10,14 +10,14 @@
     >
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
-                <el-form-item label="设备名" prop="name">
+                <el-form-item label="终端名" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入设备名" clearable />
+                    <el-input v-model="form.name" placeholder="请输入终端名" clearable />
                 </el-form-item>
                 <el-form-item label="型号">
                     <el-input v-model="form.type" placeholder="请输入型号" clearable />
                 </el-form-item>
-                <el-form-item label="设备损失" prop="machineLoss">
+                <el-form-item label="终端损失" prop="machineLoss">
-                    <el-input v-model="form.machineLoss" placeholder="请输入设备损失" clearable>
+                    <el-input v-model="form.machineLoss" placeholder="请输入终端损失" clearable>
                         <template #append>万元</template>
                     </el-input>
                 </el-form-item>
@@ -66,9 +66,9 @@ const form = reactive({
 
 //form表单校验规则
 const rules = {
-    name: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
+    name: [{ required: true, message: '终端名不能为空', trigger: 'blur' }],
     machineLoss: [
-        { required: true, message: '设备损失不能为空', trigger: 'blur' },
+        { required: true, message: '终端损失不能为空', trigger: 'blur' },
         { pattern: regex, message: '请输入有效的数值', trigger: 'blur' }
     ],
     materialLoss: [

src/views/pqs/voltageSags/sagGovern/businessUser/productLine/index.vue

@@ -46,12 +46,12 @@ const tableStore = new TableStore({
     { title: '进线名称', minWidth: '130', field: 'incomingLineName' },
     { title: '产线名称', minWidth: '130', field: 'name' },
     { title: '产能损失(万元)', width: '120', field: 'capacityLoss' },
-    { title: '设备损失(万元)', width: '120', field: 'machineLoss' },
+    { title: '终端损失(万元)', width: '120', field: 'machineLoss' },
     { title: '原料损失(万元)', width: '120', field: 'materialLoss' },
     { title: '产线功率(kW)', width: '120', field: 'machinePower' },
     {
       title: '计算模式',
-      titlePrefix: { message: '模式一：单次中断不计算设备、原料损失 \n 模式二：单次中断计算设备、原料损失', icon: 'vxe-icon-question-circle-fill' },
+      titlePrefix: { message: '模式一：单次中断不计算终端、原料损失 \n 模式二：单次中断计算终端、原料损失', icon: 'vxe-icon-question-circle-fill' },
       render: 'tag',
       width: '120',
       field: 'calcMode',
@@ -69,7 +69,7 @@ const tableStore = new TableStore({
       buttons: [
         {
           name: 'productSetting',
-          title: '设备管理',
+          title: '终端管理',
           type: 'primary',
           icon: 'el-icon-EditPen',
           render: 'basicButton',

src/views/pqs/voltageSags/sagGovern/businessUser/productLine/productPopup.vue

@@ -28,7 +28,7 @@
                         <el-tooltip
                             class="box-item"
                             effect="light"
-                            content="单次中断不计算设备、原料损失"
+                            content="单次中断不计算终端、原料损失"
                             placement="bottom-start"
                         >
                             <el-radio border label="0">模式一</el-radio>
@@ -36,7 +36,7 @@
                         <el-tooltip
                             class="box-item"
                             effect="light"
-                            content="单次中断计算设备、原料损失"
+                            content="单次中断计算终端、原料损失"
                             placement="bottom-start"
                         >
                             <el-radio border label="1">模式二</el-radio>

src/views/pqs/voltageSags/sagGovern/businessUser/sensitiveUnit/machineDetail.vue

@@ -1,19 +1,19 @@
-<!--设备详情页面，包含设备基础信息、元器件列表信息-->
+<!--终端详情页面，包含终端基础信息、元器件列表信息-->
 <template>
     <el-dialog draggable class="cn-operate-dialog" v-model="machineDetailVisible" :title="title" style="width: 900px">
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" ref="formRef">
-                <el-form-item label="设备名称">
+                <el-form-item label="终端名称">
                     <el-input v-model="form.name" readonly />
                 </el-form-item>
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="设备型号">
+                        <el-form-item label="终端型号">
                             <el-input v-model="form.type" readonly />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="设备损失">
+                        <el-form-item label="终端损失">
                             <el-input v-model="form.machineLoss" readonly>
                                 <template #append>万元</template>
                             </el-input>
@@ -65,7 +65,7 @@ const unitTable = ref()
 const machineDetailVisible = ref(false)
 const title = ref('')
 
-//回显设备基础信息
+//回显终端基础信息
 const open = (text: string, data?: any) => {
     title.value = text
     machineDetailVisible.value = true

src/views/pqs/voltageSags/sagGovern/businessUser/sensitiveUnit/unitPopup.vue

@@ -139,7 +139,7 @@ const checkAmp = (rule: any, value: any, callback: any) => {
 
 //form表单校验规则
 const rules = {
-    name: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
+    name: [{ required: true, message: '终端名不能为空', trigger: 'blur' }],
     sensitivity: [{ required: true, message: '灵敏度不能为空', trigger: 'change' }],
     standardFlag: [{ required: true, message: '耐受能力不能为空', trigger: 'change' }],
     vtcTimeUpper: [

src/views/pqs/voltageSags/sagGovern/scheme/index.vue

@@ -51,8 +51,8 @@ const userListData: any = ref([])
 // }
 
 window.showPower = function(id: string) {
-    //根据生产线查询该生产线下的所有设备数据
+    //根据生产线查询该生产线下的所有终端数据
-    machineDetailTable.value.open('设备容量信息', id)
+    machineDetailTable.value.open('终端容量信息', id)
 }
 
 

src/views/pqs/voltageSags/sagGovern/scheme/machineDetailPopup.vue

@@ -1,4 +1,4 @@
-<!--设备的新增编辑弹出框-->
+<!--终端的新增编辑弹出框-->
 <template>
     <el-dialog class='cn-operate-dialog' v-model='machineVisible' :title='title' style='width: 415px;height: 400px'
                top='30vh'>
@@ -7,8 +7,8 @@
                       :cell-style="{ textAlign: 'center' }"
                       :height='250'
                       :header-cell-style="{ 'text-align': 'center' }">
-                <el-table-column prop='name' label='设备名称' width='180' />
+                <el-table-column prop='name' label='终端名称' width='180' />
-                <el-table-column prop='machinePower' label='设备容量（kW）' width='180' />
+                <el-table-column prop='machinePower' label='终端容量（kW）' width='180' />
             </el-table>
         </el-scrollbar>
         <template #footer>

src/views/pqs/voltageSags/sagGovern/scheme/schemeCalc/calcParam.vue

@@ -200,7 +200,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span='7' :offset='1'>
-                    <el-form-item label='设备容量' prop='quick.governMachinePower'>
+                    <el-form-item label='终端容量' prop='quick.governMachinePower'>
                         <el-input
                             v-model='form.quick.governMachinePower'
                             clearable
@@ -369,7 +369,7 @@ const rules = {
 
     quick: {
         governMachinePower: [
-            { required: true, message: '设备容量不能为空', trigger: 'blur' },
+            { required: true, message: '终端容量不能为空', trigger: 'blur' },
             { pattern: numberRegex, message: '请输入有效的数值', trigger: 'blur' }
         ],
         price: [

src/views/pqs/voltageSags/sagGovern/scheme/schemeCalc/schemeResult.vue

@@ -569,7 +569,7 @@
                         </el-descriptions-item>
                         <el-descriptions-item :width='300'>
                             <template #label>
-                                设备容量
+                                终端容量
                             </template>
                             <el-col :span='23'>
                                 {{ data.quick.governMachinePower }} kVA
@@ -800,7 +800,7 @@ const activeName = ref()
 const upsResult = ref('')
 const avcResult = ref('')
 const quickResult = ref('')
-const schemeName = ref('安装UPS治理设备')
+const schemeName = ref('安装UPS治理终端')
 const bestData = ref({
     'type': 0,
     'eventCount': 0,
@@ -850,15 +850,15 @@ emitter.on('send-scheme-result', (resultData: any) => {
     const avcData = data.value.avcData
     const quickData = data.value.quickData
     if (bestId.value == upsData.id) {
-        schemeName.value = '安装UPS治理设备'
+        schemeName.value = '安装UPS治理终端'
         bestData.value = upsData
         activeName.value = '1'
     } else if (bestId.value == avcData.id) {
-        schemeName.value = '安装AVC治理设备'
+        schemeName.value = '安装AVC治理终端'
         bestData.value = avcData
         activeName.value = '2'
     } else if (bestId.value == quickData.id) {
-        schemeName.value = '安装快切开关设备'
+        schemeName.value = '安装快切开关终端'
         bestData.value = quickData
         activeName.value = '3'
     }