修改关键字

README.md

@@ -1,78 +1,78 @@
-#### 介绍
+#### 介绍
-
+
-```
+```
-Vue 3 + TypeScript + Vite这个模板可以帮助您开始使用Vue 3和TypeScript在Vite中进行开发。该模板使用了Vue 3的<script setup>单文件组件，请查看script setup文档了解更多信息。
+Vue 3 + TypeScript + Vite这个模板可以帮助您开始使用Vue 3和TypeScript在Vite中进行开发。该模板使用了Vue 3的<script setup>单文件组件，请查看script setup文档了解更多信息。
-```
+```
-
+
-#### 安装依赖&运行项目
+#### 安装依赖&运行项目
-
+
-> node version:^18.17.0 || >=20.5.0"
+> node version:^18.17.0 || >=20.5.0"
-
+
-```shell
+```shell
-#项目使用pnpm包管理器
+#项目使用pnpm包管理器
-npm i pnpm -g
+npm i pnpm -g
-
+
-#安装依赖
+#安装依赖
-pnpm i
+pnpm i
-
+
-#运行项目
+#运行项目
-npm run dev
+npm run dev
-
+
-#冀北现场启动命令 区分是否加载现场电网一张图内网api
+#jb现场启动命令 区分是否加载现场电网一张图内网api
-npm run dev:jibei
+npm run dev:jibei
-
+
-#去除后台所有模块名 如除/xxxx-boot
+#去除后台所有模块名 如除/xxxx-boot
-npm run dev:removeMode
+npm run dev:removeMode
-
+
-
+
-
+
-#因海南和冀北技术监督不同 通过修改文件的方式来区分
+#因海南和jb技术监督不同 通过修改文件的方式来区分
-#海南打包   需要吧pqs目录下supervise_hn 文件夹改成supervise 原文件改成supervise_jb
+#海南打包   需要吧pqs目录下supervise_hn 文件夹改成supervise 原文件改成supervise_jb
-#冀北打包   需要吧pqs目录下supervise_jb 文件夹改成supervise  原文件改成supervise_hn
+#jb打包   需要吧pqs目录下supervise_jb 文件夹改成supervise  原文件改成supervise_hn
-```
+```
-
+
-#### 页面编写-示例
+#### 页面编写-示例
-
+
-```
+```
-基础页面写法请查看`src/template`下的readme.md
+基础页面写法请查看`src/template`下的readme.md
-```
+```
-
+
-#### 开发规范
+#### 开发规范
-
+
-> 初衷：养成合理的习惯，精力留在技术调研、业务开发中。
+> 初衷：养成合理的习惯，精力留在技术调研、业务开发中。
->
+>
-> 常见点如下描述，更多的规范待前端开发人员有时间后，慢慢丰富。
+> 常见点如下描述，更多的规范待前端开发人员有时间后，慢慢丰富。
-
+
--   命名风格：所有的包（文件夹）、文件名以小驼峰的风格命名，比如 xxxAaa，禁止 XxxAaa 或者 xxx-aaa。
+-   命名风格：所有的包（文件夹）、文件名以小驼峰的风格命名，比如 xxxAaa，禁止 XxxAaa 或者 xxx-aaa。
--   命名语义：禁止中文命名或拼音，英文命名借用下工具，稍微准确一点，不要与实际业务相差太远。
+-   命名语义：禁止中文命名或拼音，英文命名借用下工具，稍微准确一点，不要与实际业务相差太远。
--   功能组件创建风格：以**功能名称**命名文件夹，每个功能下以**index.vue**作为该功能的组件入口。正确示例参考：/src/views/auth/menu/index.vue。
+-   功能组件创建风格：以**功能名称**命名文件夹，每个功能下以**index.vue**作为该功能的组件入口。正确示例参考：/src/views/auth/menu/index.vue。
-
+
-![组件层级图](./src/assets/readme/moduleLevel.png)
+![组件层级图](./src/assets/readme/moduleLevel.png)
-
+
--   todo...：待后续补充。
+-   todo...：待后续补充。
-
+
-#### 开发助手
+#### 开发助手
-
+
-##### 1、表格系列
+##### 1、表格系列
-
+
--   页面表格以及表格页面按钮的弹出等功能参考：/views/pqs/voltageSags/sagGovern/index.vue
+-   页面表格以及表格页面按钮的弹出等功能参考：/views/pqs/voltageSags/sagGovern/index.vue
--   表格中需要替换数据：
+-   表格中需要替换数据：
-
+
-```js
+```js
-// 通过formatter函数返回实际需要返回的值
+// 通过formatter函数返回实际需要返回的值
-    {
+    {
-        title: '数据来源', field: 'dataSource', minWidth: '130',
+        title: '数据来源', field: 'dataSource', minWidth: '130',
-        formatter: (row: any) => {
+        formatter: (row: any) => {
-            return row.dataSource == 0 ? '离线导入' : '监测点同步'
+            return row.dataSource == 0 ? '离线导入' : '监测点同步'
-        }
+        }
-    }****
+    }****
-```
+```
-
+
-##### 2、样式系列
+##### 2、样式系列
-
+
--   获取当前主体的高度：import { mainHeight } from '@/utils/layout'
+-   获取当前主体的高度：import { mainHeight } from '@/utils/layout'
--   弹框内输入框长度设置 1 行 1 个 class="form-one" 1 行 2 个 class="form-two"
+-   弹框内输入框长度设置 1 行 1 个 class="form-one" 1 行 2 个 class="form-two"
-
+
-#### 依赖变更记录
+#### 依赖变更记录
-
+
--   2024-04-25 新增 vform3，by 洪圣文，用于页面表单设计保存为 json，命令：pnpm i vform3-builds
+-   2024-04-25 新增 vform3，by 洪圣文，用于页面表单设计保存为 json，命令：pnpm i vform3-builds

index.html

@@ -15,7 +15,7 @@
     <script src="/static/luckysheet/plugin.js"></script>
     <script src="/static/luckysheet/luckysheet.umd.js"></script>
 
-    <!-- 冀北地图 -->
+    <!-- jb地图 -->
     <!--引入样式文件-->
     <script src="%VITE_NARIMAP%"></script>
     <!-- <script src="%VITE_NRGISCOMMON%"></script> -->

src/components/cockpit/integrity/index.vue

@@ -183,7 +183,7 @@ const tableStore: any = new TableStore({
             if (tableStore.table.params.statisticalType.name == '终端厂家') {
                 return k.citTotalNum != 0
             } else {
-                return k.citName != '上送国网' && k.citName != '非上送国网'
+                return  !k.citName.includes('上送')
             }
         })
     }

src/components/cockpit/onlineRate/index.vue

@@ -181,7 +181,7 @@ const tableStore: any = new TableStore({
             if (tableStore.table.params.statisticalType.name == '终端厂家') {
                 return k.citTotalNum != 0
             } else {
-                return k.citName != '上送国网' && k.citName != '非上送国网'
+                return  !k.citName.includes('上送')
             }
         })
         

src/components/cockpit/terminalEvaluation/index.vue

@@ -233,7 +233,7 @@ const tableStore: any = new TableStore({
             if (tableStore.table.params.statisticalType.name == '终端厂家') {
                 return k.count != 0
             } else {
-                return k.name != '上送国网' && k.name != '非上送国网'
+                return !k.citName.includes('上送')
             }
         })
     }

src/components/table/header/index.vue

@@ -1,29 +1,20 @@
 <template>
     <div ref="tableHeader" class="cn-table-header">
         <div class="table-header ba-scroll-style">
-            <el-form
+            <el-form style="flex: 1; height: 32px; display: flex; flex-wrap: wrap" ref="headerForm" @submit.prevent=""
-                style="flex: 1; height: 32px; display: flex; flex-wrap: wrap"
+                @keyup.enter="onComSearch" label-position="left" :inline="true">
-                ref="headerForm"
-                @submit.prevent=""
-                @keyup.enter="onComSearch"
-                label-position="left"
-                :inline="true"
-            >
                 <el-form-item v-if="datePicker" style="grid-column: span 2; max-width: 630px">
                     <template #label>
                         <el-checkbox v-if="showTimeAll" v-model="timeAll" label="统计时间" />
                         <span v-else>{{ dateLabel }}</span>
                     </template>
-                    <DatePicker
+                    <DatePicker ref="datePickerRef" v-if="timeAll" :nextFlag="nextFlag"
-                        ref="datePickerRef"
+                        :theCurrentTime="theCurrentTime"></DatePicker>
-                        v-if="timeAll"
-                        :nextFlag="nextFlag"
-                        :theCurrentTime="theCurrentTime"
-                    ></DatePicker>
                 </el-form-item>
 
                 <el-form-item label="区域" v-if="area">
-                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex" @change-value="onAreaChange" />
+                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex" @change-value="onAreaChange"
+                        style="width: 200px;" />
                 </el-form-item>
                 <slot name="select"></slot>
             </el-form>
@@ -32,43 +23,24 @@
                     <Icon size="14" name="el-icon-ArrowUp" style="color: #fff" v-if="showSelect" />
                     <Icon size="14" name="el-icon-ArrowDown" style="color: #fff" v-else />
                 </el-button>
-                <el-button
+                <el-button @click="onComSearch" v-if="showSearch" :loading="tableStore.table.loading" type="primary"
-                    @click="onComSearch"
+                    :icon="Search">
-                    v-if="showSearch"
-                    :loading="tableStore.table.loading"
-                    type="primary"
-                    :icon="Search"
-                >
                     查询
                 </el-button>
-                <el-button
+                <el-button @click="onResetForm" v-if="showSearch && showReset" :loading="tableStore.table.loading"
-                    @click="onResetForm"
+                    :icon="RefreshLeft">
-                    v-if="showSearch && showReset"
-                    :loading="tableStore.table.loading"
-                    :icon="RefreshLeft"
-                >
                     重置
                 </el-button>
-                <el-button
+                <el-button @click="onExport" v-if="showExport" :loading="tableStore.table.exportLoading" type="primary"
-                    @click="onExport"
+                    icon="el-icon-Download">
-                    v-if="showExport"
-                    :loading="tableStore.table.exportLoading"
-                    type="primary"
-                    icon="el-icon-Download"
-                >
                     导出
                 </el-button>
             </template>
             <slot name="operation"></slot>
         </div>
-        <el-form
+        <el-form :style="showSelect && showUnfoldButton ? headerFormSecondStyleOpen : headerFormSecondStyleClose"
-            :style="showSelect && showUnfoldButton ? headerFormSecondStyleOpen : headerFormSecondStyleClose"
+            ref="headerFormSecond" @submit.prevent="" @keyup.enter="onComSearch" label-position="left"
-            ref="headerFormSecond"
+            :inline="true"></el-form>
-            @submit.prevent=""
-            @keyup.enter="onComSearch"
-            label-position="left"
-            :inline="true"
-        ></el-form>
     </div>
 </template>
 
@@ -297,6 +269,7 @@ defineExpose({
     padding: 13px 15px;
     font-size: 14px;
     overflow: hidden;
+
     .table-header-operate-text {
         margin-left: 6px;
     }
@@ -324,7 +297,7 @@ defineExpose({
     margin-left: 12px;
 }
 
-.mlr-12 + .el-button {
+.mlr-12+.el-button {
     margin-left: 12px;
 }
 
@@ -359,7 +332,7 @@ defineExpose({
         border-radius: 0;
     }
 
-    .el-button + .el-button {
+    .el-button+.el-button {
         margin: 0;
     }
 
@@ -370,6 +343,7 @@ defineExpose({
 
 html.dark {
     .table-search-button-group {
+
         button:focus,
         button:active {
             background-color: var(--el-color-info-dark-2);

src/components/tree/pqs/Terminal.vue

@@ -28,66 +28,66 @@ const info = (id: any) => {
     expanded.value = [id]
     getTerminalTree().then(res => {
         // let arr: any[] = []
-        if (VITE_FLAG) {
+        // if (VITE_FLAG) {
-            res.data.forEach((item: any) => {
+        //     res.data.forEach((item: any) => {
-                item.icon = 'el-icon-Menu'
+        //         item.icon = 'el-icon-Menu'
-                item.plevel = item.level
+        //         item.plevel = item.level
-                item.level = 0
+        //         item.level = 0
-                item.children.forEach((item2: any) => {
+        //         item.children.forEach((item2: any) => {
-                    item2.icon = 'el-icon-HomeFilled'
+        //             item2.icon = 'el-icon-HomeFilled'
 
-                    item2.plevel = item2.level
+        //             item2.plevel = item2.level
-                    item2.level = 100
+        //             item2.level = 100
-                    expanded.value.push(item2.id)
+        //             expanded.value.push(item2.id)
-                    item2.children.forEach((item3: any) => {
+        //             item2.children.forEach((item3: any) => {
-                        item3.icon = 'el-icon-CollectionTag'
+        //                 item3.icon = 'el-icon-CollectionTag'
-                        item3.plevel = item3.level
+        //                 item3.plevel = item3.level
-                        item3.level = 200
+        //                 item3.level = 200
-                        item3.children.forEach((item4: any) => {
+        //                 item3.children.forEach((item4: any) => {
-                            item4.icon = 'el-icon-Flag'
+        //                     item4.icon = 'el-icon-Flag'
-                            item4.plevel = item4.level
+        //                     item4.plevel = item4.level
-                            item4.level = 300
+        //                     item4.level = 300
-                            // arr.push(item4)
+        //                     // arr.push(item4)
-                            item4.children.forEach((item5: any) => {
+        //                     item4.children.forEach((item5: any) => {
-                                item5.icon = 'el-icon-OfficeBuilding'
+        //                         item5.icon = 'el-icon-OfficeBuilding'
-                                item5.plevel = item5.level
+        //                         item5.plevel = item5.level
-                                item5.level = 300
+        //                         item5.level = 300
-                                // item5.id = item4.id
+        //                         // item5.id = item4.id
-                                item5.children.forEach((item6: any) => {
+        //                         item5.children.forEach((item6: any) => {
-                                    item6.icon = 'el-icon-HelpFilled'
+        //                             item6.icon = 'el-icon-HelpFilled'
-                                    item6.plevel = 4
+        //                             item6.plevel = 4
-                                    if (item6.name == '电网侧' && item6.children.length == 0) {
+        //                             if (item6.name == '电网侧' && item6.children.length == 0) {
-                                        item6.level = 400
+        //                                 item6.level = 400
-                                    } else {
+        //                             } else {
-                                        item6.level = 400
+        //                                 item6.level = 400
-                                    }
+        //                             }
-                                    item6.children.forEach((item7: any) => {
+        //                             item6.children.forEach((item7: any) => {
-                                        item7.icon = 'el-icon-Film'
+        //                                 item7.icon = 'el-icon-Film'
-                                        item7.plevel = item7.level
+        //                                 item7.plevel = item7.level
-                                        item7.level = 400
+        //                                 item7.level = 400
-                                        item7.children.forEach((item8: any) => {
+        //                                 item7.children.forEach((item8: any) => {
-                                            item8.icon = 'el-icon-Collection'
+        //                                     item8.icon = 'el-icon-Collection'
-                                            item8.plevel = item8.level
+        //                                     item8.plevel = item8.level
-                                            item8.level = 500
+        //                                     item8.level = 500
-                                            item8.children.forEach((item9: any) => {
+        //                                     item8.children.forEach((item9: any) => {
-                                                item9.icon = 'el-icon-Share'
+        //                                         item9.icon = 'el-icon-Share'
-                                                item9.plevel = item9.level
+        //                                         item9.plevel = item9.level
-                                                item9.level = 600
+        //                                         item9.level = 600
-                                                item9.children.forEach((item10: any) => {
+        //                                         item9.children.forEach((item10: any) => {
-                                                    item10.icon = 'el-icon-Location'
+        //                                             item10.icon = 'el-icon-Location'
-                                                    item10.plevel = item10.level
+        //                                             item10.plevel = item10.level
-                                                    item10.level = 700
+        //                                             item10.level = 700
-                                                })
+        //                                         })
-                                            })
+        //                                     })
-                                        })
+        //                                 })
-                                    })
+        //                             })
-                                })
+        //                         })
-                            })
+        //                     })
-                        })
+        //                 })
-                    })
+        //             })
-                })
+        //         })
-            })
+        //     })
-        } else {
+        // } else {
             res.data.forEach((item: any) => {
                 item.icon = 'el-icon-Menu'
                 item.plevel = item.level
@@ -129,7 +129,7 @@ const info = (id: any) => {
                     })
                 })
             })
-        }
+        // }
 
         tree.value = res.data
 

src/styles/app.scss

@@ -404,6 +404,11 @@ body,
 .el-select__wrapper {
     height: 32px !important;
 }
+.BMap_center,
+.BMap_top,
+.BMap_bottom {
+    background-color: #fff;
+}
 @font-face {
     font-family: 'AlimamaFangYuanTiVF';
     src: url('../assets/font/ali/AlimamaFangYuanTiVF-Thin.woff') format('woff'),

src/utils/constantRequest.ts

@@ -1,14 +1,14 @@
-// 高级算法
+// 高级算法
-export const ADVANCE_BOOT = '/advance-boot'
+export const ADVANCE_BOOT = '/advance-boot'
-
+
-//技术监督
+//技术监督
-export const PROCESS_BOOT = '/process-boot'
+export const PROCESS_BOOT = '/process-boot'
-
+
-//工作流模块
+//工作流模块
-export const BPM_BOOT = '/bpm-boot'
+export const BPM_BOOT = '/bpm-boot'
-
+
-//冀北技术监督
+//网公司技术监督
-export const SUPERVISION_BOOT = '/supervision-boot'
+export const SUPERVISION_BOOT = '/supervision-boot'
-
+
-//终端模块
+//终端模块
 export const DEVICE_BOOT = '/device-boot'

src/utils/mqtt.ts

@@ -27,8 +27,8 @@ class MQTT {
         clean: true,
         connectTimeout: 30 * 1000,
         clientId: `mqttjs_${Math.random().toString(16).substr(2, 8)}`,
-        username: 't_user',
+        username: '',
-        password: 'njcnpqs',
+        password: '',
         reconnectPeriod: 1000, // 默认1秒重试一次
         maxReconnectTimes: 3 // 默认最大重连5次
     }

src/utils/webSocketClient.ts

@@ -1,4 +1,3 @@
-import { Flag } from '@element-plus/icons-vue/dist/types'
 import { ElMessage, EVENT_CODE } from 'element-plus'
 
 // 定义消息类型，用于类型检查
@@ -44,7 +43,9 @@ export default class SocketService {
             console.log('您的浏览器不支持WebSocket')
             return
         }
-        if (url == 'null' || url == null) return
+        
+        console.log("🚀 ~ SocketService ~ connect ~ url:", url)
+       if (url === null || (typeof url === 'string' && url.includes('null'))) return;
 
         setTimeout(() => {
             this.ws = new WebSocket(url)
@@ -55,7 +56,6 @@ export default class SocketService {
             this.ws.onmessage = event => this.handleMessage(event)
         }, 0)
     }
-
     // 处理连接成功事件
     private handleOpen(): void {
         ElMessage.success('webSocket连接服务端成功了')

src/views/pqs/auditManage/auditList/index.vue

@@ -90,7 +90,6 @@ const loading = ref(false)
 const statistics = ref()
 
 const flg = ref(true)
-const showMqtt = ref(false)
 const zoom = ref('') //图表焦点校验
 
 const resultList = ref([

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

@@ -2911,7 +2911,7 @@ const selectChanged = async (value: any) => {
             capacity = 750
             break
         case '35':
-            capacity = 259
+            capacity = 250
             break
         case '10':
             capacity = 100
@@ -2931,9 +2931,9 @@ const selectChanged = async (value: any) => {
         case '750':
             capacity = 7000
             break
-        case '800':
+       // case '800':
-            capacity = 7000
+         //   capacity = 7000
-            break
+         //   break
         case '1000':
             capacity = 9000
             break

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

@@ -2,7 +2,7 @@
     <div class="default-main">
         <TableHeader :showReset="false" showExport>
             <template #select>
-                <el-form-item label="关键字筛选">
+                <el-form-item label="筛选数据">
                     <el-input
                         maxlength="32"
                         show-word-limit

src/views/pqs/database/case/components/drawer.vue

@@ -12,7 +12,7 @@
             </div>
             <el-collapse v-model="activeName" accordion>
                 <!-- <el-collapse-item title="典型电能质量干扰源" name="1"></el-collapse-item> -->
-                <el-collapse-item title="国家电网有限公司企业标准" name="2">
+                <el-collapse-item title="电网有限公司企业标准" name="2">
                     <!-- <el-empty description="暂无数据" class="custom-empty iframe" /> -->
                     <div :style="`overflow: auto;`" class="iframe">
                         <vue-office-docx v-if="urlKey.includes('.doc') || urlKey.includes('.docx')" :src="url" />

src/views/pqs/database/case/index.vue

@@ -3,7 +3,7 @@
         <!-- 案例库 -->
         <TableHeader ref="TableHeaderRef">
             <template #select>
-                <el-form-item label="名称">
+                <el-form-item label="筛选数据">
                     <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入搜索名称" maxlength="32" show-word-limit/>
                 </el-form-item>
 

src/views/pqs/database/stencil/index.vue

@@ -3,7 +3,7 @@
         <!-- 模版 -->
         <TableHeader ref="TableHeaderRef" >
             <template #select>
-                <el-form-item label="名称">
+                <el-form-item label="筛选数据">
                     <el-input v-model="tableStore.table.params.searchValue" clearable
                         placeholder="请输入搜索名称" maxlength="32" show-word-limit/>
                     </el-form-item>

src/views/pqs/harmonicMonitoring/area/SteadyState/index.vue

@@ -3,7 +3,7 @@
         <div class="online_header">
             <TableHeader date-picker area ref="tableHeaderRef">
                 <template #select>
-                    <el-form-item label="统计类型:">
+                    <el-form-item label="统计类型">
                         <el-select
                             v-model="tableStore.table.params.statisticalType"
                             placeholder="请选择统计类型"
@@ -19,7 +19,7 @@
                         </el-select>
                     </el-form-item>
 
-                    <el-form-item label="电压等级:">
+                    <el-form-item label="电压等级">
                         <el-select
                             v-model="tableStore.table.params.scale"
                             multiple
@@ -52,7 +52,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="终端厂家:">
+                    <el-form-item label="终端厂家">
                         <el-select
                             v-model="tableStore.table.params.manufacturer"
                             multiple
@@ -88,7 +88,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="关键字筛选">
+                    <el-form-item label="筛选数据">
                         <el-input
                             v-model.trim="tableStore.table.params.searchValue"
                             clearable

src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue

@@ -6,7 +6,7 @@
                     <el-form-item label="筛选数据">
                         <el-input v-model="tableStore.table.params.searchValue" placeholder="输入关键字筛选" clearable maxlength="32" show-word-limit/>
                     </el-form-item>
-                    <el-form-item label="统计类型:">
+                    <el-form-item label="统计类型">
                         <el-select
                             v-model="tableStore.table.params.statisticalType"
                             value-key="id"
@@ -21,7 +21,7 @@
                         </el-select>
                     </el-form-item>
 
-                    <el-form-item label="电压等级:">
+                    <el-form-item label="电压等级">
                         <el-select
                             v-model="tableStore.table.params.scale"
                             multiple
@@ -38,7 +38,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="终端厂家:">
+                    <el-form-item label="终端厂家">
                         <el-select
                             v-model="tableStore.table.params.manufacturer"
                             multiple
@@ -55,7 +55,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="干扰源类型:">
+                    <el-form-item label="干扰源类型">
                         <el-select
                             v-model="tableStore.table.params.loadType"
                             multiple

src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue

@@ -3,14 +3,14 @@
         <div class="online_header">
             <TableHeader date-picker ref="tableHeaderRef">
                 <template #select>
-                    <el-form-item label="统计类型:">
+                    <el-form-item label="统计类型">
                         <el-select v-model="formData.statisticalType" placeholder="请选择统计类型" value-key="id"
                             style="width: 100%">
                             <el-option v-for="item in classificationData" :key="item.id" :label="item.name"
                                 :value="item"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="区域选择:">
+                    <el-form-item label="区域选择">
                         <!-- <el-select ref="select1" v-model="deptName" placeholder="请选择所属部门区域" style="width: 100%">
                     <el-option :value="formData.deptIndex" style="height: auto"> -->
                         <!-- {{ formData.deptIndex }} -->
@@ -33,28 +33,28 @@
                         <!-- </el-option>
                 </el-select> -->
                     </el-form-item>
-                    <el-form-item label="电压等级:">
+                    <el-form-item label="电压等级">
                         <el-select v-model="formData.scale" multiple collapse-tags clearable placeholder="请选择电压等级"
                             style="width: 100%" value-key="id">
                             <el-option v-for="item in voltageleveloption" :key="item.id" :label="item.name"
                                 :value="item"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="终端厂家:">
+                    <el-form-item label="终端厂家">
                         <el-select v-model="formData.manufacturer" multiple collapse-tags clearable
                             placeholder="请选择终端厂家" style="width: 100%" value-key="id">
                             <el-option v-for="(item, index) in terminaloption" :key="index" :label="item.name"
                                 :value="item"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="干扰源类型:">
+                    <el-form-item label="干扰源类型">
                         <el-select v-model="formData.loadType" multiple collapse-tags clearable placeholder="请选择干扰源类型"
                             style="width: 100%" value-key="id">
                             <el-option v-for="(item, index) in interfereoption" :key="index" :label="item.name"
                                 :value="item"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="关键字筛选:">
+                    <el-form-item label="筛选数据">
                         <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入关键字"></el-input>
                     </el-form-item>
                 </template>

src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue

@@ -3,7 +3,7 @@
         <div class="online_header">
             <TableHeader date-picker area ref="tableHeaderRef">
                 <template #select>
-                    <el-form-item label="统计类型:">
+                    <el-form-item label="统计类型">
                         <el-select
                             v-model="tableStore.table.params.statisticalType"
                             placeholder="请选择统计类型"
@@ -19,7 +19,7 @@
                         </el-select>
                     </el-form-item>
 
-                    <el-form-item label="电压等级:">
+                    <el-form-item label="电压等级">
                         <el-select
                             v-model="tableStore.table.params.scale"
                             multiple
@@ -37,7 +37,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="终端厂家:">
+                    <el-form-item label="终端厂家">
                         <el-select
                             v-model="tableStore.table.params.manufacturer"
                             multiple
@@ -55,7 +55,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="干扰源类型:">
+                    <el-form-item label="干扰源类型">
                         <el-select
                             v-model="tableStore.table.params.loadType"
                             multiple
@@ -83,7 +83,7 @@
                             />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="关键字筛选">
+                    <el-form-item label="筛选数据">
                         <el-input
                             v-model.trim="tableStore.table.params.searchValue"
                             clearable

src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index1.vue

@@ -2,7 +2,7 @@
     <div class="default-main">
         <TableHeader date-picker area showExport>
             <template #select>
-                    <el-form-item label="统计类型:" v-if="false">
+                    <el-form-item label="统计类型" v-if="false">
                         <el-select
                             v-model="tableStore.table.params.statisticalType"
                             placeholder="请选择统计类型"
@@ -18,7 +18,7 @@
                         </el-select>
                     </el-form-item>
 
-                    <el-form-item label="电压等级:" v-if="false">
+                    <el-form-item label="电压等级" v-if="false">
                         <el-select
                             v-model="tableStore.table.params.scale"
                             multiple
@@ -36,7 +36,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="终端厂家:" v-if="false">
+                    <el-form-item label="终端厂家" v-if="false">
                         <el-select
                             v-model="tableStore.table.params.manufacturer"
                             multiple
@@ -55,7 +55,7 @@
                         </el-select>
                     </el-form-item> 
                     
-                    <el-form-item label="干扰源类型:">
+                    <el-form-item label="干扰源类型">
                         <el-select
                             v-model="tableStore.table.params.loadType"
                             multiple

src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue

@@ -3,7 +3,7 @@
         <div class="online_header">
             <TableHeader date-picker ref="tableHeaderRef">
                 <template #select>
-                    <el-form-item label="统计类型:">
+                    <el-form-item label="统计类型">
                         <el-select
                             v-model="formData.statisticalType"
                             placeholder="请选择统计类型"
@@ -18,7 +18,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="区域选择:">
+                    <el-form-item label="区域选择">
                         <!-- <el-select ref="select1" v-model="deptName" placeholder="请选择所属部门区域" style="width: 100%">
                     <el-option :value="formData.deptIndex" style="height: auto"> -->
                         <!-- {{ formData.deptIndex }} -->
@@ -48,7 +48,7 @@
                         <!-- </el-option>
                 </el-select> -->
                     </el-form-item>
-                    <el-form-item label="电压等级:">
+                    <el-form-item label="电压等级">
                         <el-select
                             v-model="formData.scale"
                             multiple
@@ -66,7 +66,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="终端厂家:">
+                    <el-form-item label="终端厂家">
                         <el-select
                             v-model="formData.manufacturer"
                             multiple
@@ -84,7 +84,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="干扰源类型:">
+                    <el-form-item label="干扰源类型">
                         <el-select
                             v-model="formData.loadType"
                             multiple
@@ -102,7 +102,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="关键字筛选:">
+                    <el-form-item label="筛选数据">
                         <el-input
                             v-model="tableStore.table.params.searchValue"
                             clearable

src/views/pqs/harmonicMonitoring/area/qualifiedRate/components/charts.vue

@@ -1,305 +1,305 @@
-<template>
+<template>
-    <div class="charts" style="position: relative; width: 100%">
+    <div class="charts" style="position: relative; width: 100%">
-        <div style="position: absolute; right: 60px; top: 5px; font-weight: bold">
+        <div style="position: absolute; right: 60px; top: 5px; font-weight: bold">
-            <el-tag
+            <el-tag
-                style="
+                style="
-                    background: #A52a2a;
+                    background: #A52a2a;
-                    width: 30px;
+                    width: 30px;
-                    height: 15px;
+                    height: 15px;
-                    border: 1px solid #A52a2a;
+                    border: 1px solid #A52a2a;
-                    float: left;
+                    float: left;
-                    margin-top: 2px;
+                    margin-top: 2px;
-                "
+                "
-            ></el-tag>
+            ></el-tag>
-            <span style="color: #A52a2a; font-weight: 400; float: left">&nbsp&nbsp在线率<60% &nbsp&nbsp</span>
+            <span style="color: #A52a2a; font-weight: 400; float: left">&nbsp&nbsp合格率<60% &nbsp&nbsp</span>
-            <el-tag
+            <el-tag
-                size="small"
+                size="small"
-                style="
+                style="
-                    background: #ffcc33;
+                    background: #ffcc33;
-                    width: 30px;
+                    width: 30px;
-                    height: 15px;
+                    height: 15px;
-                    border: 1px solid #ffcc33;
+                    border: 1px solid #ffcc33;
-                    float: left;
+                    float: left;
-                    margin-top: 2px;
+                    margin-top: 2px;
-                "
+                "
-            ></el-tag>
+            ></el-tag>
-            <span style="color: #ffcc33; font-weight: 400; float: left">&nbsp&nbsp60%≤在线率<90% &nbsp&nbsp</span>
+            <span style="color: #ffcc33; font-weight: 400; float: left">&nbsp&nbsp60%≤合格率<90% &nbsp&nbsp</span>
-            <el-tag
+            <el-tag
-                style="
+                style="
-                    background: #339966;
+                    background: #339966;
-                    width: 30px;
+                    width: 30px;
-                    height: 15px;
+                    height: 15px;
-                    border: 1px solid #339966;
+                    border: 1px solid #339966;
-                    float: left;
+                    float: left;
-                    margin-top: 2px;
+                    margin-top: 2px;
-                "
+                "
-            ></el-tag>
+            ></el-tag>
-            <span style="color: #339966; font-weight: 400; float: left">&nbsp&nbsp在线率≥90%</span>
+            <span style="color: #339966; font-weight: 400; float: left">&nbsp&nbsp合格率≥90%</span>
-        </div>
+        </div>
-        <my-echart
+        <my-echart
-            v-loading="loading"
+            v-loading="loading"
-            class="mt10"
+            class="mt10"
-            :style="`height: calc(${tableStore.table.height} - 135px)`"
+            :style="`height: calc(${tableStore.table.height} - 135px)`"
-            :options="options"
+            :options="options"
-        />
+        />
-    </div>
+    </div>
-</template>
+</template>
-<script setup lang="ts">
+<script setup lang="ts">
-import { ref, onMounted, provide, nextTick } from 'vue'
+import { ref, onMounted, provide, nextTick } from 'vue'
-import TableStore from '@/utils/tableStore'
+import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
+import Table from '@/components/table/index.vue'
-import MyEchart from '@/components/echarts/MyEchart.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
-import TableHeader from '@/components/table/header/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
+import { useDictData } from '@/stores/dictData'
-import * as echarts from 'echarts/core'
+import * as echarts from 'echarts/core'
-const dictData = useDictData()
+const dictData = useDictData()
-const options = ref({})
+const options = ref({})
-
+
-const TableHeaderRef = ref()
+const TableHeaderRef = ref()
-const tableStoreParams: any = ref({})
+const tableStoreParams: any = ref({})
-const loading = ref(false)
+const loading = ref(false)
-const getTableStoreParams = async (val: any) => {
+const getTableStoreParams = async (val: any) => {
-    tableStoreParams.value = val
+    tableStoreParams.value = val
-    loading.value = true
+    loading.value = true
-    setTimeout(() => {
+    setTimeout(() => {
-        tableStore.index()
+        tableStore.index()
-    }, 1500)
+    }, 1500)
-}
+}
-const itemStyle = {
+const itemStyle = {
-    normal: {
+    normal: {
-        // 随机显示
+        // 随机显示
-        //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
+        //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
-
+
-        // 定制显示（按顺序）
+        // 定制显示（按顺序）
-        color: function (params) {
+        color: function (params) {
-            if (params.value >= 90) {
+            if (params.value >= 90) {
-                return new echarts.graphic.LinearGradient(
+                return new echarts.graphic.LinearGradient(
-                    0,
+                    0,
-                    1,
+                    1,
-                    0,
+                    0,
-                    0,
+                    0,
-                    [
+                    [
-                        {
+                        {
-                            offset: 1,
+                            offset: 1,
-                            color: '#339966'
+                            color: '#339966'
-                        }
+                        }
-                    ],
+                    ],
-                    false
+                    false
-                )
+                )
-            } else if (params.value >= 60 && params.value <= 90) {
+            } else if (params.value >= 60 && params.value <= 90) {
-                return new echarts.graphic.LinearGradient(
+                return new echarts.graphic.LinearGradient(
-                    0,
+                    0,
-                    1,
+                    1,
-                    0,
+                    0,
-                    0,
+                    0,
-                    [
+                    [
-                        {
+                        {
-                            offset: 1,
+                            offset: 1,
-                            color: '#FFCC33'
+                            color: '#FFCC33'
-                        }
+                        }
-                    ],
+                    ],
-                    false
+                    false
-                )
+                )
-            } else if (params.value <= 60 && params.value !== 3.14159) {
+            } else if (params.value <= 60 && params.value !== 3.14159) {
-                return new echarts.graphic.LinearGradient(
+                return new echarts.graphic.LinearGradient(
-                    0,
+                    0,
-                    1,
+                    1,
-                    0,
+                    0,
-                    0,
+                    0,
-                    [
+                    [
-                        {
+                        {
-                            offset: 1,
+                            offset: 1,
-                            color: '#A52a2a'
+                            color: '#A52a2a'
-                        }
+                        }
-                    ],
+                    ],
-                    false
+                    false
-                )
+                )
-            } else if (params.value == 3.14159) {
+            } else if (params.value == 3.14159) {
-                return new echarts.graphic.LinearGradient(
+                return new echarts.graphic.LinearGradient(
-                    0,
+                    0,
-                    1,
+                    1,
-                    0,
+                    0,
-                    0,
+                    0,
-                    [
+                    [
-                        {
+                        {
-                            offset: 1,
+                            offset: 1,
-                            color: '#cccccc'
+                            color: '#cccccc'
-                        }
+                        }
-                    ],
+                    ],
-                    false
+                    false
-                )
+                )
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}
-
+
-const tableStore = new TableStore({
+const tableStore = new TableStore({
-    url: '/harmonic-boot/steadyQualify/getSteadyQualifyCensus',
+    url: '/harmonic-boot/steadyQualify/getSteadyQualifyCensus',
-    showPage: false,
+    showPage: false,
-    method: 'POST',
+    method: 'POST',
-    // publicHeight: 10,
+    // publicHeight: 10,
-    column: [],
+    column: [],
-    beforeSearchFun: () => {
+    beforeSearchFun: () => {
-        tableStore.table.params = tableStoreParams.value
+        tableStore.table.params = tableStoreParams.value
-    },
+    },
-    loadCallback: () => {
+    loadCallback: () => {
-        let code = tableStore.table.params.statisticalType.code
+        let code = tableStore.table.params.statisticalType.code
-        let title = '',
+        let title = '',
-            titleX = ''
+            titleX = ''
-        if (code == 'Power_Network') {
+        if (code == 'Power_Network') {
-            title = '区域'
+            title = '区域'
-            titleX = '区域'
+            titleX = '区域'
-        } else if (code == 'Manufacturer') {
+        } else if (code == 'Manufacturer') {
-            title = '终端厂家'
+            title = '终端厂家'
-            titleX = '终端\n厂家'
+            titleX = '终端\n厂家'
-        } else if (code == 'Voltage_Level') {
+        } else if (code == 'Voltage_Level') {
-            title = '电压等级'
+            title = '电压等级'
-            titleX = '电压\n等级'
+            titleX = '电压\n等级'
-        } else if (code == 'Load_Type') {
+        } else if (code == 'Load_Type') {
-            title = '干扰源类型'
+            title = '干扰源类型'
-            titleX = '干扰\n源类型'
+            titleX = '干扰\n源类型'
-        } else if (code == 'Report_Type') {
+        } else if (code == 'Report_Type') {
-            title = '上报类型'
+            title = '上报类型'
-            titleX = '上报\n类型'
+            titleX = '上报\n类型'
-        }
+        }
-        options.value = {
+        options.value = {
-            title: {
+            title: {
-                text: title
+                text: title
-            },
+            },
-            legend: {
+            legend: {
-                show: false
+                show: false
-            },
+            },
-
+
-            tooltip: {
+            tooltip: {
-               
+               
-                formatter: function (params: any) {
+                formatter: function (params: any) {
-                    let tips = `<strong>${params[0]?.name}</strong></br>` // 标题加粗
+                    let tips = `<strong>${params[0]?.name}</strong></br>` // 标题加粗
-                    params.forEach((item: any) => {
+                    params.forEach((item: any) => {
-                        const value = item.value === 3.14159 ? '暂无数据' : item.value // 处理特殊值
+                        const value = item.value === 3.14159 ? '暂无数据' : item.value // 处理特殊值
-                        tips += `<div style=" display: flex;justify-content: space-between;">
+                        tips += `<div style=" display: flex;justify-content: space-between;">
-                           <span>${item.marker}
+                           <span>${item.marker}
-                            ${item.seriesName}:
+                            ${item.seriesName}:
-                           </span>　${value} 
+                           </span>　${value} 
-                            </div>` // 统一格式
+                            </div>` // 统一格式
-                    })
+                    })
-                    return tips
+                    return tips
-                }
+                }
-            },
+            },
-
+
-            xAxis: {
+            xAxis: {
-                name: titleX,
+                name: titleX,
-                data: tableStore.table.data.type
+                data: tableStore.table.data.type
-            },
+            },
-            yAxis: {
+            yAxis: {
-                name: '%',
+                name: '%',
-                max: 100
+                max: 100
-            },
+            },
-            series: [
+            series: [
-                {
+                {
-                    name: '频率偏差',
+                    name: '频率偏差',
-                    type: 'bar',
+                    type: 'bar',
-                    itemStyle: itemStyle,
+                    itemStyle: itemStyle,
-                    data: tableStore.table.data.freqOffset,
+                    data: tableStore.table.data.freqOffset,
-                    markLine: {
+                    markLine: {
-                        silent: false,
+                        silent: false,
-                        symbol: 'circle',
+                        symbol: 'circle',
-                        data: [
+                        data: [
-                            {
+                            {
-                                name: '',
+                                name: '',
-                                yAxis: 100,
+                                yAxis: 100,
-                                lineStyle: {
+                                lineStyle: {
-                                    color: '#339966'
+                                    color: '#339966'
-                                },
+                                },
-                                label: {
+                                label: {
-                                    // position: "middle",
+                                    // position: "middle",
-                                    formatter: '{b}',
+                                    formatter: '{b}',
-                                    textStyle: {
+                                    textStyle: {
-                                        color: '#339966'
+                                        color: '#339966'
-                                    }
+                                    }
-                                }
+                                }
-                            },
+                            },
-                            {
+                            {
-                                name: '',
+                                name: '',
-                                yAxis: 90,
+                                yAxis: 90,
-                                lineStyle: {
+                                lineStyle: {
-                                    color: '#FFCC33'
+                                    color: '#FFCC33'
-                                },
+                                },
-                                label: {
+                                label: {
-                                    // position: "middle",
+                                    // position: "middle",
-                                    formatter: '{b}',
+                                    formatter: '{b}',
-                                    textStyle: {
+                                    textStyle: {
-                                        color: '#FFCC33'
+                                        color: '#FFCC33'
-                                    }
+                                    }
-                                }
+                                }
-                            },
+                            },
-                            {
+                            {
-                                name: '',
+                                name: '',
-                                yAxis: 60,
+                                yAxis: 60,
-                                lineStyle: {
+                                lineStyle: {
-                                    color: '#A52a2a'
+                                    color: '#A52a2a'
-                                },
+                                },
-                                label: {
+                                label: {
-                                    // position: "middle",
+                                    // position: "middle",
-                                    formatter: '{b}',
+                                    formatter: '{b}',
-                                    textStyle: {
+                                    textStyle: {
-                                        color: '#A52a2a'
+                                        color: '#A52a2a'
-                                    }
+                                    }
-                                }
+                                }
-                            }
+                            }
-                        ]
+                        ]
-                    }
+                    }
-                },
+                },
-                {
+                {
-                    name: '闪变',
+                    name: '闪变',
-                    type: 'bar',
+                    type: 'bar',
-                    itemStyle: itemStyle,
+                    itemStyle: itemStyle,
-                    data: tableStore.table.data.flicker
+                    data: tableStore.table.data.flicker
-                },
+                },
-                {
+                {
-                    name: '三相电压不平衡',
+                    name: '三相电压不平衡',
-                    type: 'bar',
+                    type: 'bar',
-                    itemStyle: itemStyle,
+                    itemStyle: itemStyle,
-                    data: tableStore.table.data.voltageUnbalance
+                    data: tableStore.table.data.voltageUnbalance
-                },
+                },
-                {
+                {
-                    name: '谐波电压',
+                    name: '谐波电压',
-                    type: 'bar',
+                    type: 'bar',
-                    itemStyle: itemStyle,
+                    itemStyle: itemStyle,
-                    data: tableStore.table.data.harmonicVoltage
+                    data: tableStore.table.data.harmonicVoltage
-                },
+                },
-                {
+                {
-                    name: '电压偏差',
+                    name: '电压偏差',
-                    type: 'bar',
+                    type: 'bar',
-                    itemStyle: itemStyle,
+                    itemStyle: itemStyle,
-                    data: tableStore.table.data.voltageOffset
+                    data: tableStore.table.data.voltageOffset
-                },
+                },
-                {
+                {
-                    name: '谐波电流',
+                    name: '谐波电流',
-                    type: 'bar',
+                    type: 'bar',
-                    itemStyle: itemStyle,
+                    itemStyle: itemStyle,
-                    data: tableStore.table.data.harmonicCurrent
+                    data: tableStore.table.data.harmonicCurrent
-                },
+                },
-                {
+                {
-                    name: '负序电流',
+                    name: '负序电流',
-                    type: 'bar',
+                    type: 'bar',
-                    itemStyle: itemStyle,
+                    itemStyle: itemStyle,
-                    data: tableStore.table.data.negativeCurrent
+                    data: tableStore.table.data.negativeCurrent
-                },
+                },
-                {
+                {
-                    name: '间谐波电压含有率',
+                    name: '间谐波电压含有率',
-                    type: 'bar',
+                    type: 'bar',
-                    itemStyle: itemStyle,
+                    itemStyle: itemStyle,
-                    data: tableStore.table.data.interHarmonic
+                    data: tableStore.table.data.interHarmonic
-                }
+                }
-            ]
+            ]
-        }
+        }
-        loading.value = false
+        loading.value = false
-    }
+    }
-})
+})
-
+
-provide('tableStore', tableStore)
+provide('tableStore', tableStore)
-
+
-onMounted(() => {})
+onMounted(() => {})
-defineExpose({ getTableStoreParams })
+defineExpose({ getTableStoreParams })
-</script>
+</script>
-<style scoped lang="scss"></style>
+<style scoped lang="scss"></style>

src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue

@@ -3,7 +3,7 @@
         <div class="online_header">
             <TableHeader date-picker area ref="tableHeaderRef">
                 <template #select>
-                    <el-form-item label="统计类型:">
+                    <el-form-item label="统计类型">
                         <el-select
                             v-model="tableStore.table.params.statisticalType"
                             placeholder="请选择统计类型"
@@ -19,7 +19,7 @@
                         </el-select>
                     </el-form-item>
 
-                    <el-form-item label="电压等级:">
+                    <el-form-item label="电压等级">
                         <el-select
                             v-model="tableStore.table.params.scale"
                             multiple
@@ -37,7 +37,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="终端厂家:">
+                    <el-form-item label="终端厂家">
                         <el-select
                             v-model="tableStore.table.params.manufacturer"
                             multiple
@@ -55,7 +55,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="干扰源类型:">
+                    <el-form-item label="干扰源类型">
                         <el-select
                             v-model="tableStore.table.params.loadType"
                             multiple
@@ -83,7 +83,7 @@
                             />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="关键字筛选">
+                    <el-form-item label="筛选数据">
                         <el-input
                             v-model.trim="tableStore.table.params.searchValue"
                             clearable

src/views/pqs/harmonicMonitoring/area/terminalonlinerate/index.vue

@@ -3,7 +3,7 @@
         <div class="online_header">
             <TableHeader date-picker area ref="tableHeaderRef">
                 <template #select>
-                    <el-form-item label="统计类型:">
+                    <el-form-item label="统计类型">
                         <el-select
                             v-model="tableStore.table.params.statisticalType"
                             placeholder="请选择统计类型"
@@ -19,7 +19,7 @@
                         </el-select>
                     </el-form-item>
 
-                    <el-form-item label="终端厂家:">
+                    <el-form-item label="终端厂家">
                         <el-select
                             v-model="tableStore.table.params.manufacturer"
                             multiple
@@ -37,7 +37,7 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="关键字筛选">
+                    <el-form-item label="筛选数据">
                         <el-input
                             v-model.trim="tableStore.table.params.searchValue"
                             clearable

src/views/pqs/harmonicMonitoring/detailed/alarmStatistics/index.vue

@@ -9,21 +9,21 @@
                         </el-option>
                     </el-select>
                 </el-form-item> -->
-                <el-form-item label="电压等级:">
+                <el-form-item label="电压等级">
                     <el-select v-model="tableStore.table.params.scale" filterable multiple collapse-tags clearable
                         placeholder="请选择电压等级" value-key="id">
                         <el-option v-for="item in voltageleveloption" :key="item.id" :label="item.name" :value="item">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="终端厂家:">
+                <el-form-item label="终端厂家">
                     <el-select v-model="tableStore.table.params.manufacturer" filterable multiple collapse-tags
                         clearable placeholder="请选择终端厂家" value-key="id">
                         <el-option v-for="item in terminaloption" :key="item.id" :label="item.name" :value="item">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="干扰源类型:">
+                <el-form-item label="干扰源类型">
                     <el-select v-model="tableStore.table.params.loadType" filterable multiple collapse-tags clearable
                         placeholder="请选择干扰源类型" value-key="id">
                         <el-option v-for="item in interfereoption" :key="item.id" :label="item.name" :value="item">

src/views/pqs/harmonicMonitoring/detailed/division/components/aListOfLoadData.vue

@@ -7,7 +7,7 @@
         </div>
         <TableHeader :showReset="false" ref="TableHeaderRef">
             <template #select>
-                <el-form-item label="关键字">
+                <el-form-item label="筛选数据">
                     <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入关键字" maxlength="32" show-word-limit/>
                 </el-form-item>
             </template>

src/views/pqs/harmonicMonitoring/detailed/division/components/completenessDetails.vue

@@ -2,7 +2,7 @@
     <el-dialog v-model="dialogVisible" draggable title="完整性不足详情" width="1000">
         <TableHeader :showReset="false" ref="TableHeaderRef">
             <template #select>
-                <el-form-item label="关键字">
+                <el-form-item label="筛选数据">
                     <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入关键字" />
                 </el-form-item>
             </template>

src/views/pqs/harmonicMonitoring/detailed/division/index.vue

@@ -3,7 +3,7 @@
         <!-- 模版 -->
         <TableHeader datePicker showExport :showReset="false" ref="TableHeaderRef">
             <template #select>
-                <!-- <el-form-item label="关键字">
+                <!-- <el-form-item label="筛选数据">
                     <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入关键字" />
                 </el-form-item> -->
             </template>

src/views/pqs/harmonicMonitoring/detailed/overLabelDetails/index.vue

@@ -9,26 +9,31 @@
                         </el-option>
                     </el-select>
                 </el-form-item> -->
-                <el-form-item label="电压等级:">
+                <el-form-item label="电压等级">
                     <el-select v-model="tableStore.table.params.scale" filterable multiple collapse-tags clearable
                         placeholder="请选择电压等级" value-key="id">
                         <el-option v-for="item in voltageleveloption" :key="item.id" :label="item.name" :value="item">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="终端厂家:">
+                <el-form-item label="终端厂家">
                     <el-select v-model="tableStore.table.params.manufacturer" filterable multiple collapse-tags
                         clearable placeholder="请选择终端厂家" value-key="id">
                         <el-option v-for="item in terminaloption" :key="item.id" :label="item.name" :value="item">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="干扰源类型:">
+                <el-form-item label="干扰源类型">
                     <el-select v-model="tableStore.table.params.loadType" filterable multiple collapse-tags clearable
                         placeholder="请选择干扰源类型" value-key="id">
                         <el-option v-for="item in interfereoption" :key="item.id" :label="item.name" :value="item">
                         </el-option>
                     </el-select>
+
+                </el-form-item>
+                <el-form-item label="筛选数据">
+                    <el-input v-model="tableStore.table.params.searchValue" clearable style="width: 240px;"
+                        placeholder="请输入变电站、监测点、监测对象" />
                 </el-form-item>
             </template>
 
@@ -108,7 +113,7 @@ const tableStore = new TableStore({
         { field: 'threeUnbalance', title: '三相电压不平衡度', minWidth: "100px", },
         { field: 'negativeOverDay', title: '负序电流', minWidth: "100px", },
         { field: 'flickerOverDay', title: '闪变', minWidth: "100px", },
-        { field: 'monitorNumber', title: '监测点编号', minWidth: "100px", formatter: (row: any) => { return row.cellValue == null ? '/' : row.cellValue }  },
+        { field: 'monitorNumber', title: '监测点编号', minWidth: "100px", formatter: (row: any) => { return row.cellValue == null ? '/' : row.cellValue } },
 
 
 
@@ -126,6 +131,7 @@ tableStore.table.params.monitorFlag = 2
 tableStore.table.params.scale = []
 tableStore.table.params.manufacturer = []
 tableStore.table.params.loadType = []
+tableStore.table.params.searchValue = ''
 const wp = ref({})
 
 provide('tableStore', tableStore)

src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue

@@ -2,7 +2,7 @@
     <div class="default-main">
         <TableHeader datePicker area showExport>
             <template #select>
-                <el-form-item label="统计类型:">
+                <el-form-item label="统计类型">
                     <el-select
                         v-model="tableStore.table.params.statisticalType"
                         placeholder="请选择统计类型"
@@ -16,7 +16,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="电压等级:">
+                <el-form-item label="电压等级">
                     <el-select
                         v-model="tableStore.table.params.scale"
                         filterable
@@ -34,7 +34,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="终端厂家:">
+                <el-form-item label="终端厂家">
                     <el-select
                         v-model="tableStore.table.params.manufacturer"
                         filterable
@@ -52,7 +52,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="干扰源类型:">
+                <el-form-item label="干扰源类型">
                     <el-select
                         v-model="tableStore.table.params.loadType"
                         filterable

src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue

@@ -13,7 +13,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入监测点名称" />
+                    <el-input v-model="tableStore.table.params.searchValue" clearable  style="width: 240px;" placeholder="请输入变电站、监测点、监测对象" />
                 </el-form-item>
             </template>
 
@@ -277,7 +277,7 @@ const tableStore = new TableStore({
             if (tableStore.table.params.statisticalType.name == '终端厂家') {
                 return k.citTotalNum != 0
             } else {
-                return k.citName != '上送国网' && k.citName != '非上送国网'
+                return !k.citName.includes('上送')
             }
         })
         // 合并子集数据 并去重

src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue

@@ -270,7 +270,7 @@ const tableStore = new TableStore({
             if (tableStore.table.params.statisticalType.name == '终端厂家') {
                 return k.citTotalNum != 0
             } else {
-                return k.citName != '上送国网' && k.citName != '非上送国网'
+                return !k.citName.includes('上送')
             }
         })
        // console.log(123, tableStore.table.params.statisticalType.name)

src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue

@@ -41,7 +41,7 @@
                         <el-tab-pane label="监测点运行状态" name="6" lazy v-if="!isReload">
                             <Yunxingzhuangtai v-if="activeName == '6'" />
                         </el-tab-pane>
-                        <el-tab-pane label="实时数据" name="7" lazy v-if="!isReload && !VITE_FLAG && !VITE_FLAG1">
+                        <el-tab-pane label="实时数据" name="7" lazy v-if="!isReload  && !VITE_FLAG1">
                             <Shishishuju v-if="activeName == '7'" />
                         </el-tab-pane>
                         <el-tab-pane label="统计报表" name="8" lazy v-if="!isReload && VITE_FLAG">

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

@@ -9,7 +9,7 @@
                         clearable
                         maxlength="32"
                         show-word-limit
-                        placeholder="筛选数据"
+                        placeholder="请输入关键字"
                     />
                 </el-form-item>
             </template>

src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue

@@ -3,101 +3,47 @@
         <TableHeader area ref="TableHeaderRef" showExport>
             <template #select>
                 <el-form-item label="运行状态">
-                    <el-select
+                    <el-select filterable multiple collapse-tags v-model="tableStore.table.params.runFlag" clearable
-                        filterable
+                        placeholder="请选择运行状态">
-                        multiple
+                        <el-option v-for="item in runFlagList" :key="item.id" :label="item.name"
-                        collapse-tags
+                            :value="item.id"></el-option>
-                        v-model="tableStore.table.params.runFlag" clearable placeholder="请选择运行状态">
-                        <el-option
-                            v-for="item in runFlagList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="数据筛选">
-                    <el-input
-                        style="width: 240px"
-                        placeholder="电站名称，终端编号，监测点名称、电压等级、终端厂家、干扰源类型"
-                        v-model="tableStore.table.params.searchValue"
-                        clearable
-                        maxlength="32"
-                        show-word-limit
-                    ></el-input>
-                </el-form-item>
-                <el-form-item label="通讯状态:">
-                    <el-select
-                        v-model="tableStore.table.params.comFlag"
-                        filterable
-                        multiple
-                        collapse-tags
-                        clearable
-                        placeholder="请选择通讯状态"
-                    >
-                        <el-option
-                            v-for="item in communicationstatus"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="电压等级:">
+                <el-form-item label="通讯状态">
-                    <el-select
+                    <el-select v-model="tableStore.table.params.comFlag" filterable multiple collapse-tags clearable
-                        v-model="tableStore.table.params.scale"
+                        placeholder="请选择通讯状态">
-                        filterable
+                        <el-option v-for="item in communicationstatus" :key="item.value" :label="item.label"
-                        multiple
+                            :value="item.value"></el-option>
-                        collapse-tags
-                        clearable
-                        placeholder="请选择电压等级"
-                        value-key="id"
-                    >
-                        <el-option
-                            v-for="item in voltageleveloption"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="终端厂家:">
+
-                    <el-select
+                <el-form-item label="电压等级">
-                        v-model="tableStore.table.params.manufacturer"
+                    <el-select v-model="tableStore.table.params.scale" filterable multiple collapse-tags clearable
-                        filterable
+                        placeholder="请选择电压等级" value-key="id">
-                        multiple
+                        <el-option v-for="item in voltageleveloption" :key="item.id" :label="item.name"
-                        collapse-tags
+                            :value="item"></el-option>
-                        clearable
-                        placeholder="请选择终端厂家"
-                        value-key="id"
-                    >
-                        <el-option
-                            v-for="item in terminaloption"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="干扰源类型:">
+                <el-form-item label="终端厂家">
-                    <el-select
+                    <el-select v-model="tableStore.table.params.manufacturer" filterable multiple collapse-tags
-                        v-model="tableStore.table.params.loadType"
+                        clearable placeholder="请选择终端厂家" value-key="id">
-                        filterable
+                        <el-option v-for="item in terminaloption" :key="item.id" :label="item.name"
-                        multiple
+                            :value="item"></el-option>
-                        collapse-tags
-                        clearable
-                        placeholder="请选择干扰源类型"
-                        value-key="id"
-                    >
-                        <el-option
-                            v-for="item in interfereoption"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="干扰源类型">
+                    <el-select v-model="tableStore.table.params.loadType" filterable multiple collapse-tags clearable
+                        placeholder="请选择干扰源类型" value-key="id">
+                        <el-option v-for="item in interfereoption" :key="item.id" :label="item.name"
+                            :value="item"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="数据筛选">
+                    <el-input style="width: 240px" placeholder="电站名称，终端编号，监测点名称、电压等级、终端厂家、干扰源类型"
+                        v-model="tableStore.table.params.searchValue" clearable maxlength="32"
+                        show-word-limit></el-input>
+                </el-form-item>
             </template>
 
             <template #operation>

src/views/pqs/harmonicMonitoring/runManage/quantitativeStatistics/index.vue

@@ -3,7 +3,7 @@
 
         <TableHeader area>
             <template #select>
-                <el-form-item label="监测点性质:">
+                <el-form-item label="监测点性质">
                     <el-select v-model="tableStore.table.params.powerFlag" filterable  collapse-tags 
                         placeholder="请选择监测点性质">
                         <el-option v-for="item in terminalstatus" :key="item.value" :label="item.label"
@@ -11,7 +11,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="电压等级:">
+                <el-form-item label="电压等级">
                     <el-select v-model="tableStore.table.params.scale" filterable multiple collapse-tags clearable
                         placeholder="请选择电压等级" value-key="id">
                         <el-option v-for="item in voltageleveloption" :key="item.id" :label="item.name" :value="item">
@@ -19,14 +19,14 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="终端厂家:">
+                <el-form-item label="终端厂家">
                     <el-select v-model="tableStore.table.params.manufacturer" filterable multiple collapse-tags
                         clearable placeholder="请选择终端厂家" value-key="id">
                         <el-option v-for="item in terminaloption" :key="item.id" :label="item.name" :value="item">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="干扰源类型:">
+                <el-form-item label="干扰源类型">
                     <el-select v-model="tableStore.table.params.loadType" filterable multiple collapse-tags clearable
                         placeholder="请选择干扰源类型" value-key="id">
                         <el-option v-for="item in interfereoption" :key="item.id" :label="item.name" :value="item">
@@ -37,7 +37,7 @@
 
 
 
-                <el-form-item label="上报类型:">
+                <el-form-item label="上报类型">
                     <el-select v-model="tableStore.table.params.monitorFlag" 
                         placeholder="请选择上报类型">
                         <el-option v-for="item in communicationstatus" :key="item.value" :label="item.label"

src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue

@@ -10,7 +10,7 @@
 
                 </el-form-item> -->
 
-                <el-form-item label="终端厂家:">
+                <el-form-item label="终端厂家">
                     <el-select
                         v-model="tableStore.table.params.manufacturer"
                         filterable
@@ -36,7 +36,7 @@
                     />
                 </el-form-item>
 
-                <el-form-item label="通讯状态:">
+                <el-form-item label="通讯状态">
                     <el-select
                         v-model="tableStore.table.params.comF"
                         filterable
@@ -53,7 +53,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="终端状态:">
+                <el-form-item label="终端状态">
                     <el-select
                         v-model="tableStore.table.params.runF"
                         filterable
@@ -70,7 +70,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="干扰源类型:">
+                <el-form-item label="干扰源类型">
                     <el-select
                         v-model="tableStore.table.params.loadType"
                         filterable
@@ -88,7 +88,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="电压等级:">
+                <el-form-item label="电压等级">
                     <el-select
                         v-model="tableStore.table.params.scale"
                         filterable

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

@@ -302,7 +302,7 @@ const list: any = ref([
 ])
 const countList: any = ref([
     {
-        title: '冀北',
+        title: '网公司',
         children: [
             {
                 title: '电网侧监测点',

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

@@ -314,7 +314,7 @@ const list: any = ref([
 ])
 const countList: any = ref([
     {
-        title: '冀北',
+        title: '网公司',
         children: [
             {
                 title: '电网侧监测点',

src/views/pqs/runManage/alarmCleaning/components/alarm.vue

@@ -27,7 +27,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="终端厂家:">
+                <el-form-item label="终端厂家">
                     <el-select v-model="tableStore.table.params.manufacturer" clearable placeholder="请选择终端厂家">
                         <el-option
                             v-for="item in terminaloption"

src/views/pqs/runManage/cleaning/components/abnormal.vue

@@ -27,7 +27,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="终端厂家:">
+                <el-form-item label="终端厂家">
                     <el-select v-model="tableStore.table.params.manufacturer" clearable placeholder="请选择终端厂家">
                         <el-option
                             v-for="item in terminaloption"

src/views/pqs/runManage/runEvaluate/index_JB.vue

@@ -273,7 +273,7 @@ const tableStore = new TableStore({
             if (tableStore.table.params.statisticalType.name == '终端厂家') {
                 return k.count != 0
             } else {
-                return k.name != '上送国网' && k.name != '非上送国网'
+                return !k.citName.includes('上送')
             }
         })
         // 合并子集数据 并去重

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

@@ -13,7 +13,13 @@
                 <Area v-model="form.deptId" @change="changeArea" />
             </el-form-item>
             <el-form-item for="-" label="计划名称:" prop="planName">
-                <el-input v-model="form.planName" placeholder="请输入计划名称" clearable maxlength="32" show-word-limit></el-input>
+                <el-input
+                    v-model="form.planName"
+                    placeholder="请输入计划名称"
+                    clearable
+                    maxlength="32"
+                    show-word-limit
+                ></el-input>
             </el-form-item>
             <el-form-item label="监督类型:" prop="supvType">
                 <el-select v-model="form.supvType" placeholder="请选择监督类型" style="width: 100%" @change="++key">
@@ -26,7 +32,13 @@
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="监督对象名称:" prop="supvObjectName">
-                <el-input v-model="form.supvObjectName" placeholder="请输入监督对象名称" clearable maxlength="32" show-word-limit></el-input>
+                <el-input
+                    v-model="form.supvObjectName"
+                    placeholder="请输入监督对象名称"
+                    clearable
+                    maxlength="32"
+                    show-word-limit
+                ></el-input>
             </el-form-item>
             <el-form-item for="-" label="计划开始时间:" prop="planStartTime">
                 <el-date-picker
@@ -336,7 +348,12 @@ const changeArea = () => {
         treeList.value.forEach((item: any) => {
             if (item.id == form.value.deptId) {
                 list.push(item)
-                if (item.id != treeListCgy.value[0].id && item.name != '冀北电力有限公司' && item.name != '超高压') {
+                if (
+                    item.id != treeListCgy.value[0].id &&
+                    !item.name.includes('电力有限公司') &&
+                 
+                    item.name != '超高压'
+                ) {
                     list.push(...treeListCgy.value)
                 }
             } else {

src/views/pqs/voltageSags/Region/transientList/index.vue

@@ -10,81 +10,39 @@
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item label="筛选数据">
-                        <el-input
+                        <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入关键字筛选"
-                            v-model="tableStore.table.params.searchValue"
+                            style="width: 200px" maxlength="32" show-word-limit />
-                            clearable
-                            placeholder="输入关键字筛选"
-                            style="width: 200px"
-                            maxlength="32"
-                            show-word-limit
-                        />
                     </el-form-item>
-                    <el-form-item label="触发类型:">
+                    <el-form-item label="触发类型">
-                        <el-select
+                        <el-select v-model="tableStore.table.params.waveType" placeholder="请选择触发类型" clearable multiple
-                            v-model="tableStore.table.params.waveType"
+                            collapse-tags style="width: 100%">
-                            placeholder="请选择触发类型"
+                            <el-option v-for="item in triggeroptions" :key="item.id" :label="item.name"
-                            clearable
+                                :value="item.id"></el-option>
-                            multiple
-                            collapse-tags
-                            style="width: 100%"
-                        >
-                            <el-option
-                                v-for="item in triggeroptions"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="是否有波形:">
+                    <el-form-item label="是否有波形">
-                        <el-select
+                        <el-select v-model="tableStore.table.params.fileFlag" placeholder="请选择是否存在波形" clearable
-                            v-model="tableStore.table.params.fileFlag"
+                            style="width: 100%">
-                            placeholder="请选择是否存在波形"
+                            <el-option v-for="item in wareaoptions" :key="item.id" :label="item.label"
-                            clearable
+                                :value="item.id"></el-option>
-                            style="width: 100%"
-                        >
-                            <el-option
-                                v-for="item in wareaoptions"
-                                :key="item.id"
-                                :label="item.label"
-                                :value="item.id"
-                            ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="暂态持续时间(s):">
+                    <el-form-item label="暂态持续时间(s)">
-                        <el-input
+                        <el-input v-model="tableStore.table.params.persistMin" placeholder="请输入X秒"
-                            v-model="tableStore.table.params.persistMin"
+                            onkeyup="value=value.replace(/[^\d.]/g,'')" clearable style="width: 94px"></el-input>
-                            placeholder="请输入X秒"
-                            onkeyup="value=value.replace(/[^\d.]/g,'')"
-                            clearable
-                            style="width: 94px"
-                        ></el-input>
                         <el-tag style="margin-left: 5px">&lt; 时间数 &lt;</el-tag>
-                        <el-input
+                        <el-input v-model="tableStore.table.params.persistMax" placeholder="请输入X秒"
-                            v-model="tableStore.table.params.persistMax"
+                            onkeyup="value=value.replace(/[^\d.]/g,'')" clearable
-                            placeholder="请输入X秒"
+                            style="margin-left: 5px; width: 94px"></el-input>
-                            onkeyup="value=value.replace(/[^\d.]/g,'')"
-                            clearable
-                            style="margin-left: 5px; width: 94px"
-                        ></el-input>
                     </el-form-item>
 
-                    <el-form-item label="事件严重度:">
+                    <el-form-item label="事件严重度">
-                        <el-input
+                        <el-input v-model="tableStore.table.params.severityMin" placeholder="请输入正负数"
-                            v-model="tableStore.table.params.severityMin"
+                            onkeyup="value=value.replace(/[^\d\.-]/g,'')" clearable style="width: 94px"></el-input>
-                            placeholder="请输入正负数"
-                            onkeyup="value=value.replace(/[^\d\.-]/g,'')"
-                            clearable
-                            style="width: 94px"
-                        ></el-input>
                         <el-tag style="margin-left: 5px">&lt; 严重度 &lt;</el-tag>
-                        <el-input
+                        <el-input v-model="tableStore.table.params.severityMax" placeholder="请输入正负数"
-                            v-model="tableStore.table.params.severityMax"
+                            onkeyup="value=value.replace(/[^\d\.-]/g,'')" clearable
-                            placeholder="请输入正负数"
+                            style="margin-left: 5px; width: 94px"></el-input>
-                            onkeyup="value=value.replace(/[^\d\.-]/g,'')"
-                            clearable
-                            style="margin-left: 5px; width: 94px"
-                        ></el-input>
                     </el-form-item>
 
                     <!-- <el-form-item label="触发类型:">
@@ -94,53 +52,24 @@
                                 :value="item.id"></el-option>
                         </el-select>
                     </el-form-item> -->
-                    <el-form-item label="暂态原因:">
+                    <el-form-item label="暂态原因">
-                        <el-select
+                        <el-select v-model="tableStore.table.params.eventReason" placeholder="请选择暂态原因" clearable
-                            v-model="tableStore.table.params.eventReason"
+                            multiple collapse-tags style="width: 100%">
-                            placeholder="请选择暂态原因"
+                            <el-option v-for="item in reasonoptions" :key="item.id" :label="item.name"
-                            clearable
+                                :value="item.id"></el-option>
-                            multiple
-                            collapse-tags
-                            style="width: 100%"
-                        >
-                            <el-option
-                                v-for="item in reasonoptions"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="暂态核实原因:">
+                    <el-form-item label="暂态核实原因">
-                        <el-select
+                        <el-select v-model="tableStore.table.params.verifyReason" placeholder="请选择暂态核实原因" clearable
-                            v-model="tableStore.table.params.verifyReason"
+                            multiple collapse-tags collapse-tags-tooltip>
-                            placeholder="请选择暂态核实原因"
+                            <el-option v-for="item in verifyReasonList" :key="item.id" :label="item.name"
-                            clearable
+                                :value="item.id"></el-option>
-                            multiple
-                            collapse-tags
-                            collapse-tags-tooltip
-                        >
-                            <el-option
-                                v-for="item in verifyReasonList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="变电站(监测点):">
+                    <el-form-item label="变电站(监测点)">
-                        <el-cascader
+                        <el-cascader v-model="tableStore.table.params.lineIds" :options="options" :props="defaultProps"
-                            v-model="tableStore.table.params.lineIds"
+                            collapse-tags-tooltip style="width: 257px" filterable clearable collapse-tags
-                            :options="options"
+                            placeholder="请选择变电站(监测点)" :show-all-levels="true" />
-                            :props="defaultProps"
-                            collapse-tags-tooltip
-                            style="width: 257px"
-                            filterable
-                            clearable
-                            collapse-tags
-                            placeholder="请选择变电站(监测点)"
-                            :show-all-levels="true"
-                        />
                     </el-form-item>
                 </template>
                 <template #operation>
@@ -272,10 +201,10 @@ const tableStore = new TableStore({
         },
 
         {
-             title: '操作',fixed: 'right',
+            title: '操作', fixed: 'right',
             width: '150',
             render: 'buttons',
-            
+
             buttons: [
                 {
                     name: 'edit',
@@ -330,7 +259,7 @@ const tableStore = new TableStore({
         }
     ],
 
-    loadCallback: () => {}
+    loadCallback: () => { }
 })
 const options = ref([])
 const defaultProps = {

src/views/pqs/voltageSags/analyse/eventwaveform/index.vue

@@ -2,7 +2,7 @@
     <div class="default-main">
         <TableHeader datePicker ref="TableHeaderRef">
             <template #select>
-                <el-form-item label="关键字">
+                <el-form-item label="筛选数据">
                     <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入事件关联分析描述"  maxlength="32"  show-word-limit/>
                 </el-form-item>
             </template>

src/views/pqs/voltageSags/analyse/impactscope/index.vue

@@ -3,7 +3,7 @@
         <div v-show="view">
             <TableHeader datePicker ref="TableHeaderRef" >
                 <template #select>
-                    <el-form-item label="关键字">
+                    <el-form-item label="筛选数据">
                         <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入事件关联分析描述"
                             maxlength="32" show-word-limit />
                     </el-form-item>

src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue

@@ -68,7 +68,7 @@
                 ></bm-marker>
             </template>
             <!-- 点 -->
-            <BmlMarkerClusterer maxZoom="12">
+            <BmlMarkerClusterer maxZoom="12" :styles="styles">
                 <bm-marker
                     :position="path"
                     v-for="path in areaLineInfo"
@@ -163,6 +163,44 @@ const areaLineInfo = ref<any>([])
 const siteList = ref<any>([])
 const polyline = ref<any>([])
 const lineId = ref('')
+const imageUrl = new URL('@/assets/imgs/m0.png', import.meta.url).href
+const imageUrl1 = new URL('@/assets/imgs/m1.png', import.meta.url).href
+const imageUrl2 = new URL('@/assets/imgs/m3.png', import.meta.url).href
+const imageUrl3 = new URL('@/assets/imgs/m4.png', import.meta.url).href
+const styles = [
+    {
+        url: imageUrl,
+        size: {
+            width: 53,
+            height: 52
+        },
+        opt_textSize: 10
+    },
+    {
+        url: imageUrl1,
+        size: {
+            width: 56,
+            height: 55
+        },
+        opt_textSize: 12
+    },
+    {
+        url: imageUrl2,
+        size: {
+            width: 78,
+            height: 77
+        },
+        opt_textSize: 14
+    },
+    {
+        url: imageUrl3,
+        size: {
+            width: 90,
+            height: 89
+        },
+        opt_textSize: 14
+    },
+]
 const handler = async ({ BMap, map }: any) => {
     let data = props.mapList
     let r = 0.0035

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

@@ -82,7 +82,7 @@
                     ></bm-marker>
                 </template>
                 <!-- 点 -->
-                <BmlMarkerClusterer maxZoom="12">
+                <BmlMarkerClusterer maxZoom="12" :styles="styles">
                     <bm-marker
                         :position="path"
                         v-for="path in areaLineInfo"
@@ -196,13 +196,51 @@ const areaLineInfo = ref<any>([])
 const siteList = ref<any>([])
 const polyline = ref<any>([])
 const lineId = ref('')
+const imageUrl = new URL('@/assets/imgs/m0.png', import.meta.url).href
+const imageUrl1 = new URL('@/assets/imgs/m1.png', import.meta.url).href
+const imageUrl2 = new URL('@/assets/imgs/m3.png', import.meta.url).href
+const imageUrl3 = new URL('@/assets/imgs/m4.png', import.meta.url).href
+const styles = [
+    {
+        url: imageUrl,
+        size: {
+            width: 53,
+            height: 52
+        },
+        opt_textSize: 10
+    },
+    {
+        url: imageUrl1,
+        size: {
+            width: 56,
+            height: 55
+        },
+        opt_textSize: 12
+    },
+    {
+        url: imageUrl2,
+        size: {
+            width: 78,
+            height: 77
+        },
+        opt_textSize: 14
+    },
+    {
+        url: imageUrl3,
+        size: {
+            width: 90,
+            height: 89
+        },
+        opt_textSize: 14
+    },
+]
 const handler = async ({ BMap, map }: any) => {
     params.value.deptIndex = adminInfo.$state.deptId
     params.value.searchBeginTime = datePickerRef.value.timeValue[0]
     params.value.searchEndTime = datePickerRef.value.timeValue[1]
     let { data } = await getAreaLineInfo(params.value)
     let r = 0.0035
-    let list = data.filter((item: any) => item.lng != 0)
+    let list = data//.filter((item: any) => item.lng != 0)
     list.forEach((item: any) => {
         // 变电站图标
         item.icon = {

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

@@ -3,7 +3,7 @@
     <div class='default-main'>
         <TableHeader>
             <template #select>
-                <el-form-item label='关键词'>
+                <el-form-item label='筛选数据'>
                     <el-input
                         v-model='tableStore.table.params.searchValue'
                         clearable

src/views/system/ReportConfiguration/components/Administration.vue

@@ -12,7 +12,7 @@
                 </template>
               </el-page-header>
             </el-form-item>
-            <el-form-item label="关键字筛选">
+            <el-form-item label="筛选数据">
               <el-input
                 style="width: 240px"
                 v-model="tableStore.table.params.searchValue"