微调

# Conflicts:
#	src/views/pqs/voltageSags/Region/components/echart.vue

.env.hainan

@@ -0,0 +1,5 @@
+NODE_ENV = hainan
+VITE_NAME="hainan"
+# 电网一张图 地图图层
+VITE_NARIMAP=null
+VITE_NRGISCOMMON=null

.env.qujing

@@ -0,0 +1,6 @@
+# 云南曲靖
+NODE_ENV = qujing
+VITE_NAME="qujing"
+# 电网一张图 地图图层
+VITE_NARIMAP=null
+VITE_NRGISCOMMON=null

package.json

@@ -6,9 +6,13 @@
   "scripts": {
     "dev": "vite --mode dev",
     "dev:jibei": "vite --mode jibei",
+    "dev:hainan": "vite --mode hainan",
+    "dev:qujing": "vite --mode qujing",
     "dev:removeMode": "vite --mode removeMode",
     "build": "vite build --mode dev",
     "build:jibei": "vite build --mode jibei",
+    "build:hainan": "vite build --mode hainan",
+    "build:qujing": "vite build --mode qujing",
     "build:removeMode": "vite build --mode removeMode",
     "preview": "vite preview"
   },
@@ -19,7 +23,7 @@
     "@form-create/element-ui": "^3.1.24",
     "@fortawesome/fontawesome-free": "^6.5.1",
     "@kjgl77/datav-vue3": "^1.7.4",
-    "@vue-office/docx": "^1.6.2",
+    "@vue-office/docx": "^1.6.3",
     "@vue-office/excel": "^1.7.8",
     "@vue-office/pdf": "^2.0.2",
     "@vueuse/core": "^10.7.0",

src/api/device-boot/Business.ts

@@ -134,6 +134,22 @@ export function selectUserList(data: any) {
         data
     })
 }
+//获取用户
+export function selectUserAssessMentList(data: any) {
+    return createAxios({
+        url: '/supervision-boot/userReport/selectUserAssessMentList',
+        method: 'post',
+        data
+    })
+}
+//绑定用户
+export function bindAssessmentId(data: any) {
+    return createAxios({
+        url: '/supervision-boot/userReport/bindAssessmentId',
+        method: 'get',
+        params: data
+    })
+}
 //查询列表
 export function getStatusManageList(data: any) {
     return createAxios({
@@ -190,3 +206,11 @@ export function exportTerminalBase() {
         responseType: 'blob'
     })
 }
+//一键分配终端
+export function allotTerminal(data: any) {
+    return createAxios({
+        url: '/device-boot/nodeDevice/oneKeyDistribution',
+        method: 'post',
+        params: data
+    })
+}

src/api/event-boot/report.ts

@@ -1,4 +1,5 @@
 import createAxios from '@/utils/request'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
 
 //事件报告
 export function getEventReport(data) {
@@ -15,8 +16,39 @@ export function getAreaReport(data) {
         method: 'post',
         data,
         responseType: 'blob'
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
     })
 }
+async function readJsonBlob(blob) {
+    try {
+        // 1. Blob.text() 读取二进制 → 直接转为 字符串（自动处理编码）
+        const jsonStr = await blob.text()
+        // 2. JSON.parse 解析字符串 → 得到可用的 JS 对象/数组
+        const jsonData = JSON.parse(jsonStr)
+        // 3. 拿到数据，后续随便用
+        return {
+            code: true,
+            data: jsonData
+        }
+    } catch (err) {
+        return {
+            code: false,
+            data: {}
+        }
+        // console.error('解析Blob的JSON数据失败：', err)
+    }
+}
+
 //查询所有模板
 export function getList(data) {
     return createAxios({
@@ -38,6 +70,17 @@ export function getLineExport(data) {
         method: 'post',
         data: data,
         responseType: 'blob'
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
     })
 }
 export function getVoltage(data: any) {

src/api/harmonic-boot/harmonic.ts

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
 export function getHistoryResult(data: any) {
     return request({
         url: '/harmonic-boot/harmonic/getHistoryResult',
@@ -14,5 +14,35 @@ export function exportModelJB(data: any) {
         method: 'post',
         responseType: 'blob',
         data: data
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
     })
 }
+async function readJsonBlob(blob) {
+    try {
+        // 1. Blob.text() 读取二进制 → 直接转为 字符串（自动处理编码）
+        const jsonStr = await blob.text()
+        // 2. JSON.parse 解析字符串 → 得到可用的 JS 对象/数组
+        const jsonData = JSON.parse(jsonStr)
+        // 3. 拿到数据，后续随便用
+        return {
+            code: true,
+            data: jsonData
+        }
+    } catch (err) {
+        return {
+            code: false,
+            data: {}
+        }
+        // console.error('解析Blob的JSON数据失败：', err)
+    }
+}

src/api/process-boot/reportForms.ts

@@ -1,4 +1,5 @@
 import createAxios from '@/utils/request'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
 
 export function exportModel(data: any) {
     return createAxios({
@@ -6,5 +7,54 @@ export function exportModel(data: any) {
         method: 'post',
         data: data,
         responseType: 'blob'
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
     })
 }
+export function areaHarmonicReport(data: any) {
+    return createAxios({
+        url: '/harmonic-boot/areaHarmonicReport/areaHarmonicReport',
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
+    })
+}
+async function readJsonBlob(blob) {
+    try {
+        // 1. Blob.text() 读取二进制 → 直接转为 字符串（自动处理编码）
+        const jsonStr = await blob.text()
+        // 2. JSON.parse 解析字符串 → 得到可用的 JS 对象/数组
+        const jsonData = JSON.parse(jsonStr)
+        // 3. 拿到数据，后续随便用
+        return {
+            code: true,
+            data: jsonData
+        }
+    } catch (err) {
+        return {
+            code: false,
+            data: {}
+        }
+        // console.error('解析Blob的JSON数据失败：', err)
+    }
+}

src/api/system-boot/file.ts

@@ -7,8 +7,20 @@ const SYSTEM_PREFIX = '/system-boot'
  * @param file
  */
 export const uploadFile = (file: any, path: string) => {
+    const regex = /\[|\]/g
+    // 替换规则：[ 换成 (，] 换成 )
+
+    const newFile = new File(
+        [file], // 原文件的二进制内容
+        file.name.replace(regex, match => (match === '[' ? '(' : ')')), // 新的文件名
+        {
+            type: file.type, // 复用原文件的MIME类型
+            lastModified: file.lastModified // 复用最后修改时间
+        }
+    )
+
     let form = new FormData()
-    form.append('file', file)
+    form.append('file', newFile)
     form.append('path', path)
     return createAxios({
         url: SYSTEM_PREFIX + '/file/upload',
@@ -19,7 +31,7 @@ export const uploadFile = (file: any, path: string) => {
         data: form
     }).then(res => {
         if (res.code == `A0000`) {
-            ElMessage.success('上传成功!')
+            ElMessage.success('文件上传成功!')
             return res
         }
     })

src/components/FormCreate/src/utils/index.ts

@@ -23,7 +23,7 @@ export function upper(str) {
 }
 
 export function makeOptionsRule(t, to, userOptions) {
-  console.log(userOptions[0])
+  //console.log(userOptions[0])
   const options = [
     { label: t('props.optionsType.struct'), value: 0 },
     { label: t('props.optionsType.json'), value: 1 },

src/components/PreviewFile/index.vue

@@ -1,11 +1,19 @@
 <template>
     <div style="overflow: auto; height: 100vh">
-        <vue-office-docx v-if="url.includes('.doc') || url.includes('.docx')" :src="url" />
+        <vue-office-docx v-if="urlKey.includes('.doc') || urlKey.includes('.docx')" :src="url" />
-        <vue-office-excel v-if="url.includes('.xls') || url.includes('.xlsx')" :src="url" :options="excelOptions" />
+        <vue-office-excel
+            v-if="urlKey.includes('.xls') || urlKey.includes('.xlsx')"
+            :src="url"
+            :options="excelOptions"
+        />
         <!-- <vue-office-pdf v-if="url.includes('.pdf')" :src="url" /> -->
-        <iframe v-if="url.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
+        <iframe v-if="urlKey.includes('.pdf')||urlKey.includes('.txt')" :src="url" style="width: 100%; height: 99%"></iframe>
-        <img v-if="url.includes('.png') || url.includes('.jpg') || url.includes('.gif') || url.includes('.bmp')"
+        <img
-            :src="url" />
+            v-if="
+                urlKey.includes('.png') || urlKey.includes('.jpg') || urlKey.includes('.gif') || urlKey.includes('.bmp')
+            "
+            :src="url"
+        />
     </div>
 </template>
 <script lang="ts" setup>
@@ -19,22 +27,33 @@ import VueOfficeExcel from '@vue-office/excel'
 //引入VueOfficePdf组件
 import VueOfficePdf from '@vue-office/pdf'
 import { downloadFile } from '@/api/system-boot/file'
+import { previewFile } from '@/utils/fileDownLoad'
+
 const { push, options, currentRoute } = useRouter()
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 // const url = 'http://192.168.1.22:9009/excelreport' + currentRoute.value.href?.split('?')[1]
 const url = ref('')
 const excelOptions = ref({})
-if(VITE_FLAG){
+const urlKey = currentRoute.value?.href?.split('?')[1]
+
+if (VITE_FLAG) {
     url.value = '/api-docx/excelreport' + currentRoute.value?.href?.split('?')[1]
     excelOptions.value = ref({
         xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false
     })
-}else{
+} else {
-    //下载
+    setTimeout(async () => {
-    
+        const previewUrl = await previewFile(currentRoute.value?.href?.split('?')[1])
-}
+        url.value = previewUrl
+        excelOptions.value = ref({
+            xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false
+        })
+    }, 0)
+ }
 
 onMounted(() => {
+    // 从路由参数获取文件路径
+
     console.log()
 })
 </script>

src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue

@@ -707,7 +707,7 @@ const processSave = async () => {
 //   return result.value || ' '
 // }
 onBeforeMount(() => {
-  console.log(props, 'propspropspropsprops')
+  //console.log(props, 'propspropspropsprops')
 })
 onMounted(() => {
   initBpmnModeler()

src/components/bpmnProcessDesigner/package/palette/ProcessPalette.vue

@@ -15,7 +15,7 @@ const addTask = (event, options: any = {}) => {
   const ElementFactory = bpmnInstances().elementFactory
   const create = bpmnInstances().modeler.get('create')
 
-  console.log(ElementFactory, create)
+  //console.log(ElementFactory, create)
 
   const shape = ElementFactory.createShape(assign({ type: 'bpmn:UserTask' }, options))
 
@@ -23,8 +23,8 @@ const addTask = (event, options: any = {}) => {
     shape.businessObject.di.isExpanded = options.isExpanded
   }
 
-  console.log(event, 'event')
+  //console.log(event, 'event')
-  console.log(shape, 'shape')
+  //console.log(shape, 'shape')
   create.start(event, shape)
 }
 </script>

src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue

@@ -172,7 +172,7 @@ const unwatchBpmn = watch(
         return
       }
 
-      console.log('props.bpmnModeler 有值了！！！')
+      //console.log('props.bpmnModeler 有值了！！！')
       const w = window as any
       w.bpmnInstances = {
         modeler: props.bpmnModeler,

src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue

@@ -179,7 +179,7 @@ onBeforeUnmount(() => {
 watch(
   () => props.businessObject,
   (val) => {
-    console.log(val, 'val')
+    //console.log(val, 'val')
     nextTick(() => {
       resetFlowCondition()
     })

src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue

@@ -376,7 +376,7 @@ const openListenerForm = (listener, index?) => {
 }
 // 移除监听器
 const removeListener = (listener, index?) => {
-  console.log(listener, 'listener')
+  //console.log(listener, 'listener')
   ElMessageBox.confirm('确认移除该监听器吗？', '提示', {
     confirmButtonText: '确 认',
     cancelButtonText: '取 消'

src/components/bpmnProcessDesigner/package/penal/listeners/utilSelf.ts

@@ -20,7 +20,7 @@ export function initListenerForm(listener) {
           self.eventDefinitionType = key.replace('time', '').toLowerCase()
         }
       }
-      console.log(k)
+      //console.log(k)
       self.eventTimeDefinitions = listener.eventDefinitions[0][k].body
     }
   }

src/components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue

@@ -68,7 +68,7 @@ const modelConfig = computed(() => {
 const bpmnInstances = () => (window as any)?.bpmnInstances
 
 const initDataList = () => {
-  console.log(window, 'window')
+  //console.log(window, 'window')
   rootElements.value = bpmnInstances().modeler.getDefinitions().rootElements
   messageIdMap.value = {}
   signalIdMap.value = {}

src/components/bpmnProcessDesigner/src/utils/xml2json.js

@@ -39,7 +39,7 @@ function xml2json(xml) {
 
 function xmlObj2json(xml) {
   const xmlObj = xmlStr2XmlObj(xml)
-  console.log(xmlObj)
+ // console.log(xmlObj)
   let jsonObj = {}
   if (xmlObj.childNodes.length > 0) {
     jsonObj = xml2json(xmlObj)

src/components/cockpit/integrity/index.vue

@@ -223,7 +223,7 @@ const echart = () => {
 
             series: [
                 {
-                    name: '异常总数',
+                    name: '',
                     type: 'bar',
                     barWidth: 12,
                     data: [100],
@@ -240,7 +240,7 @@ const echart = () => {
                                 colorStops: [
                                     {
                                         offset: 1,
-                                        color: '#57bc6e' // 100% 处的颜色
+                                        color: '#FF9100' // 100% 处的颜色
                                     }
                                 ],
                                 global: false // 缺省为 false
@@ -249,7 +249,7 @@ const echart = () => {
                     }
                 },
                 {
-                    name: '异常占比',
+                    name: '',
                     type: 'bar',
                     barWidth: 13,
                     data: [
@@ -270,11 +270,11 @@ const echart = () => {
                                 colorStops: [
                                     {
                                         offset: 0,
-                                        color: '#FF9100' // 0% 处的颜色
+                                        color: '#57bc6e ' // 0% 处的颜色
                                     },
                                     {
                                         offset: 1,
-                                        color: '#FF9100' // 100% 处的颜色
+                                        color: '#57bc6e' // 100% 处的颜色
                                     }
                                 ],
                                 global: false // 缺省为 false

src/components/cockpit/onlineRate/index.vue

@@ -222,7 +222,7 @@ const echart = () => {
 
             series: [
                 {
-                    name: '异常总数',
+                    name: '',
                     type: 'bar',
                     barWidth: 12,
                     data: [100],
@@ -239,7 +239,7 @@ const echart = () => {
                                 colorStops: [
                                     {
                                         offset: 1,
-                                        color: '#57bc6e' // 100% 处的颜色
+                                        color: '#FF9100' // 100% 处的颜色
                                     }
                                 ],
                                 global: false // 缺省为 false
@@ -248,7 +248,7 @@ const echart = () => {
                     }
                 },
                 {
-                    name: '异常占比',
+                    name: '',
                     type: 'bar',
                     barWidth: 13,
                     data: [
@@ -269,11 +269,11 @@ const echart = () => {
                                 colorStops: [
                                     {
                                         offset: 0,
-                                        color: '#FF9100' // 0% 处的颜色
+                                        color: '#57bc6e' // 0% 处的颜色
                                     },
                                     {
                                         offset: 1,
-                                        color: '#FF9100' // 100% 处的颜色
+                                        color: '#57bc6e' // 100% 处的颜色
                                     }
                                 ],
                                 global: false // 缺省为 false

src/components/echarts/MyEchart.vue

@@ -17,6 +17,7 @@ const config = useConfig()
 // import { nextTick } from 'process'
 const emit = defineEmits(['triggerPoint', 'group', 'echartClick'])
 color[0] = config.layout.elementUiPrimary[0]
+
 const chartRef = ref<HTMLDivElement>()
 
 const props = defineProps(['options', 'isInterVal', 'pieInterVal'])
@@ -70,6 +71,8 @@ const initChart = () => {
                     const value =
                         item.value === 3.14159 || item.value === 0.14159
                             ? '暂无数据'
+                            : item.value === 0.14158
+                            ? 0
                             : Math.round(item.value * 100) / 100 // 处理特殊值
                     tips += `<div style=" display: flex;justify-content: space-between;">
                            <span>${item.marker}
@@ -154,7 +157,6 @@ const initChart = () => {
         if (params.seriesName == '暂态触发点') {
             emit('triggerPoint', params.data)
         } else {
-
             emit('echartClick', params)
         }
     })

src/components/echarts/MyEchartMap.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script setup lang="ts">
-import { onBeforeUnmount, ref, watch, onMounted, defineEmits } from 'vue'
+import { onBeforeUnmount, ref, watch, onMounted,  } from 'vue'
 import * as echarts from 'echarts'
 import 'echarts-gl'
 import 'echarts-liquidfill'
@@ -19,14 +19,21 @@ const myCharts = ref()
 const showCircle = ref(false)
 
 const fetchConfig = async (name: string) => {
-    const res = await import(`../../assets/map/${name.replace(/市$/, "")}.json`)
+    try {
+        // 处理城市名称（去掉末尾的"市"）并尝试导入对应文件
+        const res = await import(`../../assets/map/${name.replace(/市$/, '')}.json`)
         return res.default
+    } catch (error) {
+        const chinaRes = await import(`../../assets/map/中国.json`) // 请确认中国文件的实际命名
+        return chinaRes.default
+    }
+    // const res = await import(`../../assets/map/${name.replace(/市$/, "")}.json`)
+    // return res.default
     // GetEchar(res.default)
 }
 // fetchConfig()
 
 const emit = defineEmits(['getRegionByRegion', 'eliminate', 'clickMap'])
-onMounted(() => { })
 
 const GetEchar = async (name: string) => {
     let chartDom = document.getElementById('chartMap')
@@ -36,6 +43,7 @@ const GetEchar = async (name: string) => {
     name == dictData.state.area?.[0].name ? (showCircle.value = false) : (showCircle.value = true)
 
     echarts.registerMap(name, await fetchConfig(name)) //注册可用的地图
+
     let option = {
         title: {
             left: 'center',
@@ -91,6 +99,7 @@ const GetEchar = async (name: string) => {
             // top: 10,
             //    bottom: 0,
             roam: true,
+             
             label: {
                 normal: {
                     show: true,
@@ -170,6 +179,7 @@ const GetEchar = async (name: string) => {
     }, 0)
     window.addEventListener('resize', resizeHandler)
     const flag1 = ref(true)
+
     // 点击事件
     myCharts.value.off('click')
     myCharts.value.on('click', (e: any) => {

src/components/echarts/analytics.vue

@@ -26,7 +26,7 @@
                         </el-table-column>
                         <el-table-column align="center" prop="number" label="总分段数目"></el-table-column>
                         <el-table-column align="center" prop="number" label="三相电压不平衡度(%)" width="180"></el-table-column>
-                        <el-table-column align="center" prop="number" label="暂降类型"></el-table-column>
+                        <el-table-column align="center" prop="number" label="触发类型"></el-table-column>
                         <el-table-column align="center" prop="number" label="暂降原因"></el-table-column>
                     </el-table>
                 </el-tab-pane>

src/components/form/datePicker/index.vue

@@ -127,7 +127,7 @@ const timeChange = (e: number) => {
 
 // 当前
 const nowTime = () => {
-    console.log(interval.value, '000000000')
+    //console.log(interval.value, '000000000')
     timeChange(interval.value)
 }
 // 上一个
@@ -312,7 +312,7 @@ const next = () => {
             }
         } else {
             month = month + 3
-            console.log('🚀 ~ next ~ presentM:', presentM, month)
+           // console.log('🚀 ~ next ~ presentM:', presentM, month)
 
             // 季度进位后，超过当前月份是不科学的
             if (year == presentY && !props.nextFlag) {
@@ -327,7 +327,7 @@ const next = () => {
                             endTime = year + '-0' + presentM + '-' + presentD
                         }
                     } else if (presentM > 3 && presentM < 7) {
-                        console.log(123123)
+                       // console.log(123123)
                         // 第二季度
                         startTime = year + '-04-01'
                         if (presentD < 10) {
@@ -380,7 +380,7 @@ const next = () => {
                 }
             }
         }
-        console.log(startTime, endTime)
+       // console.log(startTime, endTime)
     } else if (interval.value == 5) {
     } else if (interval.value == 4) {
         //根据开始时间推

src/components/table/header/index.vue

@@ -23,7 +23,7 @@
                 </el-form-item>
 
                 <el-form-item label="区域" v-if="area">
-                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex" />
+                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex"  @change-value="onAreaChange" />
                 </el-form-item>
                 <slot name="select"></slot>
             </el-form>
@@ -52,7 +52,7 @@
                 <el-button
                     @click="onExport"
                     v-if="showExport"
-                    :loading="tableStore.table.loading"
+                    :loading="tableStore.table.exportLoading"
                     type="primary"
                     icon="el-icon-Download"
                 >
@@ -81,7 +81,7 @@ import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
 import { Search, RefreshLeft } from '@element-plus/icons-vue'
 import { defineProps } from 'vue'
-const emit = defineEmits(['selectChange'])
+const emit = defineEmits(['selectChange','areaChange'])
 const tableStore = inject('tableStore') as TableStore
 const tableHeader = ref()
 const datePickerRef = ref()
@@ -132,11 +132,17 @@ const headerFormSecondStyleClose = {
     padding: '0'
 }
 
+const onAreaChange = (data) => {
+
+     emit('areaChange', {label: data.label})
+}
+
 watch(
     () => tableStore?.table.params.deptIndex,
     newVal => {
         setTimeout(() => {
             areaRef.value && areaRef.value.change()
+         
         }, 0)
     }
 )
@@ -232,6 +238,16 @@ const onResetForm = () => {
     //时间重置成默认值
     datePickerRef.value?.setTheDate(3)
 
+    if(props.showTimeAll){
+         timeAll.value = false
+         delete tableStore.table.params.searchBeginTime
+         delete tableStore.table.params.searchEndTime
+         delete tableStore.table.params.startTime
+         delete tableStore.table.params.endTime
+         delete tableStore.table.params.timeFlag
+         delete tableStore.table.params.interval
+    }
+
     if (props.datePicker && timeAll.value) {
         tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
         tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]

src/components/tree/allocation.vue

@@ -0,0 +1,187 @@
+<template>
+    <div :style="{ width: menuCollapse ? '40px' : props.width }" style="transition: all 0.3s; overflow: hidden">
+        <div class="mt15 mr10" style="display: flex; justify-content: end">
+            <el-button type="primary" icon="el-icon-Select" @click="save" :loading="loading">保存</el-button>
+        </div>
+        <Icon
+            v-show="menuCollapse"
+            @click="onMenuCollapse"
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+            :class="menuCollapse ? 'unfold' : ''"
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+        />
+        <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
+            <div style="display: flex; align-items: center" class="mb10">
+                <el-input maxlength="32" show-word-limit v-model.trim="filterText" placeholder="请输入内容" clearable>
+                    <template #prefix>
+                        <Icon name="el-icon-Search" style="font-size: 16px" />
+                    </template>
+                </el-input>
+                <el-tooltip placement="bottom" :hide-after="0" v-if="props.showPush">
+                    <template #content>
+                        <span>台账推送</span>
+                    </template>
+
+                    <Icon
+                        name="el-icon-Promotion"
+                        size="20"
+                        class="fold ml10 menu-collapse"
+                        style="cursor: pointer"
+                        :style="{ color: config.getColorVal('elementUiPrimary') }"
+                        @click="onAdd"
+                    />
+                </el-tooltip>
+                <!-- <Icon @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'" v-else
+                    :class="menuCollapse ? 'unfold' : ''" size='18' class='fold ml10 menu-collapse'
+                    style='cursor: pointer' v-if='props.canExpand' /> -->
+            </div>
+
+            <el-tree
+                :style="{ height: 'calc(100vh - 235px)' }"
+                style="overflow: auto"
+                ref="treeRef"
+                :props="defaultProps"
+                highlight-current
+                :default-expand-all="false"
+                @check-change="checkTreeNodeChange"
+                :filter-node-method="filterNode"
+                node-key="id"
+                v-bind="$attrs"
+            >
+                <template #default="{ node, data }">
+                    <span class="custom-tree-node">
+                        <Icon
+                            :name="data.icon"
+                            style="font-size: 16px"
+                            :style="{ color: data.color }"
+                            v-if="data.icon"
+                        />
+                        <span style="margin-left: 4px">{{ node.label }}</span>
+                    </span>
+                </template>
+            </el-tree>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import { ElTree } from 'element-plus'
+import { emit } from 'process'
+import { ref, watch } from 'vue'
+import { t } from 'vxe-table'
+import { useConfig } from '@/stores/config'
+
+defineOptions({
+    name: 'govern/tree'
+})
+
+interface Props {
+    width?: string
+    canExpand?: boolean
+    showPush?: boolean
+}
+const loading = ref(false)
+const props = withDefaults(defineProps<Props>(), {
+    width: '280px',
+    canExpand: true,
+    showPush: false
+})
+const config = useConfig()
+const { proxy } = useCurrentInstance()
+const menuCollapse = ref(false)
+const filterText = ref('')
+const defaultProps = {
+    label: 'name',
+    value: 'id'
+}
+const emit = defineEmits(['checkTreeNodeChange', 'onAdd', 'checkChange'])
+watch(filterText, val => {
+    treeRef.value!.filter(val)
+})
+const onMenuCollapse = () => {
+    menuCollapse.value = !menuCollapse.value
+    proxy.eventBus.emit('cnTreeCollapse', menuCollapse)
+}
+const save = () => {
+    loading.value = true
+    emit('checkChange')
+}
+const filterNode = (value: string, data: any, node: any) => {
+    console.log(value, data, node, 'filterNode')
+    if (!value) return true
+    // return data.name.includes(value)
+    if (data.name) {
+        return chooseNode(value, data, node)
+    }
+}
+
+// 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
+const chooseNode = (value: string, data: any, node: any) => {
+    if (data.name.indexOf(value) !== -1) {
+        return true
+    }
+    const level = node.level
+    // 如果传入的节点本身就是一级节点就不用校验了
+    if (level === 1) {
+        return false
+    }
+    // 先取当前节点的父节点
+    let parentData = node.parent
+    // 遍历当前节点的父节点
+    let index = 0
+    while (index < level - 1) {
+        // 如果匹配到直接返回，此处name值是中文字符，enName是英文字符。判断匹配中英文过滤
+        if (parentData.data.name.indexOf(value) !== -1) {
+            return true
+        }
+        // 否则的话再往上一层做匹配
+        parentData = parentData.parent
+        index++
+    }
+    // 没匹配到返回false
+    return false
+}
+const checkTreeNodeChange = () => {
+    // console.log(treeRef.value?.getCheckedNodes(), "ikkkkkiisiiisis");
+    emit('checkTreeNodeChange', treeRef.value?.getCheckedNodes())
+}
+
+const onAdd = () => {
+    emit('onAdd')
+}
+
+const treeRef = ref<InstanceType<typeof ElTree>>()
+defineExpose({ treeRef, loading })
+</script>
+
+<style lang="scss" scoped>
+.cn-tree {
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    padding: 10px;
+    height: 100%;
+    width: 100%;
+
+    :deep(.el-tree) {
+        border: 1px solid var(--el-border-color);
+    }
+
+    :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
+        background-color: var(--el-color-primary-light-7);
+    }
+
+    .menu-collapse {
+        color: var(--el-color-primary);
+    }
+}
+
+.custom-tree-node {
+    display: flex;
+    align-items: center;
+}
+</style>

src/components/tree/index.vue

@@ -147,7 +147,7 @@ const onMenuCollapse = () => {
 }
 // 查看详情
 const viewDetails = (data: any) => {
-    console.log('🚀 ~ viewDetails ~ data:', data)
+   // console.log('🚀 ~ viewDetails ~ data:', data)
     if (data.level == 3) {
         // 变电站详情
         // substationDetails
@@ -201,7 +201,7 @@ onMounted(async () => {
 })
 
 const scrollToNode = (id: string) => {
-    console.log("🚀 ~ scrollToNode ~ id:", id)
+   // console.log("🚀 ~ scrollToNode ~ id:", id)
     if (!treeRef.value) return
 
     // 获取目标节点的元素

src/components/tree/pqs/algorithmTree.vue

@@ -8,7 +8,6 @@
                 style="width: 100%; height: 100%"
                 v-bind="$attrs"
                 default-expand-all
-                
                 @onAddTree="onAddTree"
             />
         </div>
@@ -20,7 +19,6 @@ import { nextTick, onMounted, ref, useAttrs } from 'vue'
 import Tree from '../index.vue'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { useDictData } from '@/stores/dictData'
-import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
 import { useConfig } from '@/stores/config'
 import { queryAllAlgorithmLibrary } from '@/api/supervision-boot/database/index'
 defineOptions({
@@ -36,7 +34,7 @@ const tree = ref()
 const treeRef = ref()
 
 const loadData = (id?: any) => {
-    console.log('🚀 ~ loadData ~ id:', id)
+   // console.log('🚀 ~ loadData ~ id:', id)
     let nodeKey = ''
     queryAllAlgorithmLibrary().then(res => {
         res.data.forEach((item: any) => {
@@ -72,8 +70,28 @@ const loadData = (id?: any) => {
 const onAddTree = () => {
     emit('onAddTree')
 }
+const setKey = (id: string) => {
+    treeRef.value.treeRef.setCurrentKey(id)
+    return findNodeById(tree.value, id)
+}
+const findNodeById = (tree1: any, targetId: any) => {
+    for (const node of tree1) {
+        // 1. 当前节点匹配ID，直接返回该节点
+        if (node.id === targetId) {
+            return node
+        }
+        // 2. 当前节点有子节点，递归查找子节点
+        if (node.children && node.children.length > 0) {
+            const result: any = findNodeById(node.children, targetId)
+            // 子节点中找到结果，立即返回（终止递归）
+            if (result) return result
+        }
+    }
+    // 3. 遍历完未找到，返回null
+    return null
+}
 loadData()
-defineExpose({ loadData })
+defineExpose({ loadData, setKey })
 </script>
 <style lang="scss">
 .point-tree {
@@ -85,4 +103,3 @@ defineExpose({ loadData })
     border: 1px solid var(--el-border-color);
 }
 </style>
- 

src/components/tree/pqs/areaTree.vue

@@ -0,0 +1,150 @@
+<template>
+    <div class="point-tree">
+        <div style="flex: 1; overflow: hidden">
+            <Tree ref="treeRef" :data="tree" style="width: 100%; height: 100%" :canExpand="false" v-bind="$attrs" />
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { nextTick, onMounted, ref, useAttrs } from 'vue'
+import Tree from '../index.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
+import { useConfig } from '@/stores/config'
+import { getAreaList } from '@/api/common'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'qujing'
+defineOptions({
+    name: 'pms/pointTree'
+})
+interface Props {
+    showSelect?: boolean
+}
+const props = withDefaults(defineProps<Props>(), {
+    showSelect: true
+})
+const emit = defineEmits(['init'])
+const attrs = useAttrs()
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const config = useConfig()
+const tree = ref()
+const treeRef = ref()
+
+const loadData = () => {
+    let nodeKey = ''
+    getAreaList().then(res => {
+        processTreeData(res.data, res.data[0].level)
+        let firstLevel6Node = getDeepestFirstChildData(res.data)
+
+        nodeKey = firstLevel6Node.id
+        emit('init', firstLevel6Node)
+
+        tree.value = res.data
+        if (nodeKey) {
+            nextTick(() => {
+                treeRef.value.treeRef.setCurrentKey(nodeKey)
+
+                // treeRef.value.treeRef.setExpandedKeys(nodeKey)
+            })
+        }
+    })
+}
+const scrollToNode = (id: string) => {
+    // 树滚动
+    treeRef.value.scrollToNode(id)
+}
+
+// 定义不同层级对应的图标配置（可根据实际需求调整）
+const levelIconMap = {
+    '-1': 'el-icon-HomeFilled',
+    0: 'el-icon-CollectionTag',
+    1: 'el-icon-CollectionTag',
+    2: 'el-icon-Flag',
+    3: 'el-icon-OfficeBuilding',
+    4: 'el-icon-DataAnalysis',
+    5: 'el-icon-DataAnalysis',
+    7: 'el-icon-DataAnalysis',
+    6: 'fa-solid fa-location-dot'
+}
+
+/**
+ * 递归处理树形数据，为不同层级节点设置图标和颜色
+ * @param data 树形数据数组
+ * @param level 当前层级（默认从1开始）
+ */
+function processTreeData(data: any[], level: number = -1, alias: string = '') {
+    // 空值判断，避免数组为空或undefined时报错
+    if (!Array.isArray(data) || data.length === 0) return
+
+    data.forEach(item => {
+        // 1. 设置基础图标（根据层级匹配）
+        item.icon = levelIconMap[level] || ''
+        item.alias = alias + `${item.name}`
+        // 2. 设置基础颜色
+        item.color = config.getColorVal('elementUiPrimary')
+
+        // 3. 第6层特殊处理：根据comFlag调整颜色
+        if (level === 6 && item.hasOwnProperty('comFlag')) {
+            switch (item.comFlag) {
+                case 0:
+                    item.color = 'red !important'
+                    break
+                case 1:
+                    item.color = '#00f93b !important'
+                    break
+                case 2:
+                    item.color = '#8c8c8c !important'
+                    break
+                // 默认值：保持原有基础颜色
+                default:
+                    item.color = config.getColorVal('elementUiPrimary')
+            }
+        }
+
+        // 4. 递归处理子节点，层级+1
+        if (item.children && item.children.length > 0) {
+            processTreeData(item.children, item.children[0].level, level == '-1' ? '' : item.alias + '>')
+        }
+    })
+}
+/**
+ * 递归获取树形结构中一直向下的第一个children的最后一组有效数据
+ * @param {Array} treeData - 原始递归树形数据
+ * @returns {Object|null} 路径最后一组有效数据，无有效数据时返回null
+ */
+function getDeepestFirstChildData(treeData) {
+    // 递归辅助函数：逐层查找第一个children
+    function findDeepestNode(currentNode) {
+        // 检查当前节点是否有有效的children数组
+        if (currentNode && Array.isArray(currentNode.children) && currentNode.children.length > 0) {
+            // 有下一级children，继续递归查找下一级第一个元素
+            return findDeepestNode(currentNode.children[0])
+        }
+        // 没有下一级children，返回当前节点（递归终止）
+        return currentNode
+    }
+
+    // 边界处理：原始数据非数组/空数组时返回null
+    if (!Array.isArray(treeData) || treeData.length === 0) {
+        return null
+    }
+
+    // 从根节点第一个元素开始递归查找
+    return findDeepestNode(treeData[0])
+}
+
+defineExpose({ treeRef, scrollToNode, tree })
+loadData()
+</script>
+<style lang="scss">
+.point-tree {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    border: 1px solid var(--el-border-color);
+}
+</style>

src/components/tree/pqs/assessTree.vue

@@ -11,7 +11,6 @@ import { nextTick, onMounted, ref, useAttrs } from 'vue'
 import Tree from '../index.vue'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { useDictData } from '@/stores/dictData'
-import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
 import { useConfig } from '@/stores/config'
 import { defineProps } from 'vue'
 import { getTree } from '@/api/advance-boot/assess'

src/components/tree/pqs/bearingTree.vue

@@ -36,6 +36,7 @@ const adminInfo = useAdminInfo()
 const dictData = useDictData()
 const config = useConfig()
 const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const VITE_FLAG = import.meta.env.VITE_NAME == 'qujing'
 const tree = ref()
 const treeRef = ref()
 const formData = ref({
@@ -54,6 +55,9 @@ const loadData = () => {
     }) || { code: '' }
     let form = JSON.parse(JSON.stringify(formData.value))
     form.statisticalType = classificationData.find((item: any) => item.id == form.statisticalType)
+    if (VITE_FLAG && form.statisticalType.code == 'Power_Network') {
+        form.statisticalType.deptName = 'qujing'
+    }
     let nodeKey = ''
     getTerminalTreeForFive(form).then(res => {
         console.log(res)
@@ -67,56 +71,62 @@ const loadData = () => {
                 }
             ]
         }
-        res.data.forEach((item: any) => {
+        // if (VITE_FLAG) {
-            item.icon = 'el-icon-HomeFilled'
+        processTreeData(res.data)
-            item.color = config.getColorVal('elementUiPrimary')
+        let firstLevel6Node = findFirstLevel6Node(res.data)
-            item.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-CollectionTag'
-                item2.color = config.getColorVal('elementUiPrimary')
-                item2.children.forEach((item3: any) => {
-                    item3.icon = 'el-icon-Flag'
-                    item3.color = config.getColorVal('elementUiPrimary')
-                    item3.children.forEach((item4: any) => {
-                        item4.icon = 'el-icon-OfficeBuilding'
-                        item4.color = config.getColorVal('elementUiPrimary')
-                        item4.children.forEach((item5: anyObj) => {
-                            if (item5.level == 7) {
-                                item5.icon = 'el-icon-DataAnalysis'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                item5.children.forEach((item6: anyObj) => {
-                                    item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
-                                    item6.pid = item4.id
-                                    item6.icon = 'fa-solid fa-location-dot'
-                                    item6.color = config.getColorVal('elementUiPrimary')
-                                    if (item6.comFlag == 0) {
-                                        item6.color = 'red !important'
-                                    } else if (item6.comFlag == 1) {
-                                        item6.color = '#00f93b !important'
-                                    } else if (item6.comFlag == 2) {
-                                        item6.color = '#8c8c8c !important'
-                                    }
-                                })
-                            } else {
-                                item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
-                                item5.pid = item4.id
-                                item5.icon = 'fa-solid fa-location-dot'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                if (item5.comFlag == 0) {
-                                    item5.color = 'red !important'
-                                } else if (item5.comFlag == 1) {
-                                    item5.color = '#00f93b !important'
-                                } else if (item5.comFlag == 2) {
-                                    item5.color = '#8c8c8c !important'
-                                }
-                            }
-                        })
-                    })
-                })
-            })
-        })
 
-        nodeKey = res.data[0].children[0].children[0].children[0].children[0].id
+        nodeKey = firstLevel6Node.id
-        emit('init', res.data[0].children[0].children[0].children[0].children[0])
+        emit('init', firstLevel6Node)
+        // res.data.forEach((item: any) => {
+        //     item.icon = 'el-icon-HomeFilled'
+        //     item.color = config.getColorVal('elementUiPrimary')
+        //     item.children.forEach((item2: any) => {
+        //         item2.icon = 'el-icon-CollectionTag'
+        //         item2.color = config.getColorVal('elementUiPrimary')
+        //         item2.children.forEach((item3: any) => {
+        //             item3.icon = 'el-icon-Flag'
+        //             item3.color = config.getColorVal('elementUiPrimary')
+        //             item3.children.forEach((item4: any) => {
+        //                 item4.icon = 'el-icon-OfficeBuilding'
+        //                 item4.color = config.getColorVal('elementUiPrimary')
+        //                 item4.children.forEach((item5: anyObj) => {
+        //                     if (item5.level == 7) {
+        //                         item5.icon = 'el-icon-DataAnalysis'
+        //                         item5.color = config.getColorVal('elementUiPrimary')
+        //                         item5.children.forEach((item6: anyObj) => {
+        //                             item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
+        //                             item6.pid = item4.id
+        //                             item6.icon = 'fa-solid fa-location-dot'
+        //                             item6.color = config.getColorVal('elementUiPrimary')
+        //                             if (item6.comFlag == 0) {
+        //                                 item6.color = 'red !important'
+        //                             } else if (item6.comFlag == 1) {
+        //                                 item6.color = '#00f93b !important'
+        //                             } else if (item6.comFlag == 2) {
+        //                                 item6.color = '#8c8c8c !important'
+        //                             }
+        //                         })
+        //                     } else {
+        //                         item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
+        //                         item5.pid = item4.id
+        //                         item5.icon = 'fa-solid fa-location-dot'
+        //                         item5.color = config.getColorVal('elementUiPrimary')
+        //                         if (item5.comFlag == 0) {
+        //                             item5.color = 'red !important'
+        //                         } else if (item5.comFlag == 1) {
+        //                             item5.color = '#00f93b !important'
+        //                         } else if (item5.comFlag == 2) {
+        //                             item5.color = '#8c8c8c !important'
+        //                         }
+        //                     }
+        //                 })
+        //             })
+        //         })
+        //     })
+        // })
+
+        // nodeKey = res.data[0].children[0].children[0].children[0].children[0].id
+        // emit('init', res.data[0].children[0].children[0].children[0].children[0])
 
         tree.value = res.data
         if (nodeKey) {
@@ -127,9 +137,113 @@ const loadData = () => {
         }
     })
 }
+
 const setKey = (key: string) => {
     treeRef.value.treeRef.setCurrentKey(key)
 }
+
+// 定义不同层级对应的图标配置（可根据实际需求调整）
+const levelIconMap = {
+    '-1': 'el-icon-HomeFilled',
+    0: 'el-icon-CollectionTag',
+    1: 'el-icon-CollectionTag',
+    2: 'el-icon-Flag',
+    3: 'el-icon-OfficeBuilding',
+    4: 'el-icon-DataAnalysis',
+    5: 'el-icon-DataAnalysis',
+    7: 'el-icon-DataAnalysis',
+    6: 'fa-solid fa-location-dot'
+}
+
+/**
+ * 递归处理树形数据，为不同层级节点设置图标和颜色
+ * @param data 树形数据数组
+ * @param level 当前层级（默认从1开始）
+ */
+function processTreeData(data: any[], level: number = -1) {
+    // 空值判断，避免数组为空或undefined时报错
+    if (!Array.isArray(data) || data.length === 0) return
+
+    data.forEach(item => {
+        // 1. 设置基础图标（根据层级匹配）
+        item.icon = levelIconMap[level] || ''
+
+        // 2. 设置基础颜色
+        item.color = config.getColorVal('elementUiPrimary')
+
+        // 3. 第6层特殊处理：根据comFlag调整颜色
+        if (level === 6 && item.hasOwnProperty('comFlag')) {
+            switch (item.comFlag) {
+                case 0:
+                    item.color = 'red !important'
+                    break
+                case 1:
+                    item.color = '#00f93b !important'
+                    break
+                case 2:
+                    item.color = '#8c8c8c !important'
+                    break
+                // 默认值：保持原有基础颜色
+                default:
+                    item.color = config.getColorVal('elementUiPrimary')
+            }
+        }
+
+        // 4. 递归处理子节点，层级+1
+        if (item.children && item.children.length > 0) {
+            processTreeData(item.children, item.children[0].level)
+        }
+    })
+}
+/**
+ * 递归查找树形结构中第一个level===6的节点（找到即终止递归）
+ * @param {Object|Array} tree - 树形数据（根节点数组 或 单个根节点）
+ * @returns {Object|null} 第一个level为6的节点，无则返回null
+ */
+function findFirstLevel6Node(tree: any) {
+    // 统一处理入参：如果是数组，遍历根节点数组（按顺序找第一个符合条件的）
+    if (Array.isArray(tree)) {
+        for (const rootNode of tree) {
+            const result = traverse(rootNode)
+            // 找到第一个匹配节点，立即返回（终止根节点遍历）
+            if (result) return result
+        }
+        // 所有根节点遍历完未找到
+        return null
+    } else {
+        // 入参是单个节点，直接递归遍历
+        return traverse(tree)
+    }
+
+    // 核心递归遍历函数
+    function traverse(node) {
+        // 终止条件1：节点不存在，返回null
+        if (!node) return null
+
+        // 终止条件2：找到level===6的节点，立即返回（终止递归）
+        if (node.level === 6) {
+            return node
+        }
+
+        // 终止条件3：节点无children，返回null
+        if (!node.children || node.children.length === 0) {
+            return null
+        }
+
+        // 按顺序遍历当前节点的子节点
+        for (const child of node.children) {
+            const foundNode = traverse(child)
+            // 子节点中找到目标节点，立即返回（终止后续子节点遍历）
+            if (foundNode) {
+                return foundNode
+            }
+        }
+
+        // 当前节点及所有子节点都无匹配，返回null
+        return null
+    }
+}
+
 defineExpose({ setKey })
 loadData()
 </script>

src/components/tree/pqs/index.vue

@@ -11,7 +11,7 @@
         />
         <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
             <div style="display: flex; align-items: center" class="mb10">
-                <el-input v-model="filterText" placeholder="请输入内容" clearable>
+                <el-input v-model="filterText" placeholder="请输入内容" maxlength="10" show-word-limit clearable>
                     <template #prefix>
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>

src/components/tree/pqs/pointTree.vue

@@ -28,6 +28,7 @@ import { useDictData } from '@/stores/dictData'
 import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
 import { useConfig } from '@/stores/config'
 import { defineProps } from 'vue'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'qujing'
 defineOptions({
     name: 'pms/pointTree'
 })
@@ -61,6 +62,9 @@ const loadData = () => {
     }) || { code: '' }
     let form = JSON.parse(JSON.stringify(formData.value))
     form.statisticalType = classificationData.find((item: any) => item.id == form.statisticalType)
+    if (VITE_FLAG && form.statisticalType.code == 'Power_Network') {
+        form.statisticalType.deptName = 'qujing'
+    }
     let nodeKey = ''
     getTerminalTreeForFive(form).then(res => {
         //console.log('---',res)
@@ -74,62 +78,71 @@ const loadData = () => {
                 }
             ]
         }
-        res.data.forEach((item: any) => {
+        // if (VITE_FLAG) {
-            item.icon = 'el-icon-HomeFilled'
+        processTreeData(res.data)
-            item.color = config.getColorVal('elementUiPrimary')
+        let firstLevel6Node = findFirstLevel6Node(res.data)
-            item.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-CollectionTag'
-                item2.color = config.getColorVal('elementUiPrimary')
-                item2.children.forEach((item3: any) => {
-                    item3.icon = 'el-icon-Flag'
-                    item3.color = config.getColorVal('elementUiPrimary')
-                    item3.children.forEach((item4: any) => {
-                        item4.icon = 'el-icon-OfficeBuilding'
-                        item4.color = config.getColorVal('elementUiPrimary')
-                        item4.children.forEach((item5: anyObj) => {
-                            if (item5.level == 7) {
-                                item5.icon = 'el-icon-DataAnalysis'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                item5.children.forEach((item6: anyObj) => {
-                                    item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
-                                    item6.pid = item4.id
-                                    item6.icon = 'fa-solid fa-location-dot'
-                                    item6.color = config.getColorVal('elementUiPrimary')
-                                    if (item6.comFlag == 0) {
-                                        item6.color = 'red !important'
-                                    } else if (item6.comFlag == 1) {
-                                        item6.color = '#00f93b !important'
-                                    } else if (item6.comFlag == 2) {
-                                        item6.color = '#8c8c8c !important'
-                                    }
-                                })
-                            } else {
-                                item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
-                                item5.pid = item4.id
-                                item5.icon = 'fa-solid fa-location-dot'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                if (item5.comFlag == 0) {
-                                    item5.color = 'red !important'
-                                } else if (item5.comFlag == 1) {
-                                    item5.color = '#00f93b !important'
-                                } else if (item5.comFlag == 2) {
-                                    item5.color = '#8c8c8c !important'
-                                }
-                            }
-                        })
-                    })
-                })
-            })
-        })
 
-        nodeKey =
+        nodeKey = firstLevel6Node.id
-            res.data[0].children[0].children[0].children[0].children[0].children[0]?.id ||
+        emit('init', firstLevel6Node)
-            res.data[0].children[0].children[0].children[0].children[0]?.id
+        // } else {
-        emit(
+        //     // 正常树处理
-            'init',
+        //     res.data.forEach((item: any) => {
-            res.data[0].children[0].children[0].children[0].children[0]?.children[0] ||
+        //         item.icon = 'el-icon-HomeFilled'
-                res.data[0].children[0].children[0].children[0].children[0]
+        //         item.color = config.getColorVal('elementUiPrimary')
-        )
+        //         item.children.forEach((item2: any) => {
+        //             item2.icon = 'el-icon-CollectionTag'
+        //             item2.color = config.getColorVal('elementUiPrimary')
+        //             item2.children.forEach((item3: any) => {
+        //                 item3.icon = 'el-icon-Flag'
+        //                 item3.color = config.getColorVal('elementUiPrimary')
+        //                 item3.children.forEach((item4: any) => {
+        //                     item4.icon = 'el-icon-OfficeBuilding'
+        //                     item4.color = config.getColorVal('elementUiPrimary')
+        //                     item4.children.forEach((item5: anyObj) => {
+        //                         if (item5.level == 7) {
+        //                             item5.icon = 'el-icon-DataAnalysis'
+        //                             item5.color = config.getColorVal('elementUiPrimary')
+        //                             item5.children.forEach((item6: anyObj) => {
+        //                                 item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
+        //                                 item6.pid = item4.id
+        //                                 item6.icon = 'fa-solid fa-location-dot'
+        //                                 item6.color = config.getColorVal('elementUiPrimary')
+        //                                 if (item6.comFlag == 0) {
+        //                                     item6.color = 'red !important'
+        //                                 } else if (item6.comFlag == 1) {
+        //                                     item6.color = '#00f93b !important'
+        //                                 } else if (item6.comFlag == 2) {
+        //                                     item6.color = '#8c8c8c !important'
+        //                                 }
+        //                             })
+        //                         } else {
+        //                             item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
+        //                             item5.pid = item4.id
+        //                             item5.icon = 'fa-solid fa-location-dot'
+        //                             item5.color = config.getColorVal('elementUiPrimary')
+        //                             if (item5.comFlag == 0) {
+        //                                 item5.color = 'red !important'
+        //                             } else if (item5.comFlag == 1) {
+        //                                 item5.color = '#00f93b !important'
+        //                             } else if (item5.comFlag == 2) {
+        //                                 item5.color = '#8c8c8c !important'
+        //                             }
+        //                         }
+        //                     })
+        //                 })
+        //             })
+        //         })
+        //     })
+
+        //     nodeKey =
+        //         res.data[0].children[0].children[0].children[0].children[0].children[0]?.id ||
+        //         res.data[0].children[0].children[0].children[0].children[0]?.id
+        //     emit(
+        //         'init',
+        //         res.data[0].children[0].children[0].children[0].children[0]?.children[0] ||
+        //             res.data[0].children[0].children[0].children[0].children[0]
+        //     )
+        // }
 
         tree.value = res.data
         if (nodeKey) {
@@ -145,6 +158,109 @@ const scrollToNode = (id: string) => {
     // 树滚动
     treeRef.value.scrollToNode(id)
 }
+
+// 定义不同层级对应的图标配置（可根据实际需求调整）
+const levelIconMap = {
+    '-1': 'el-icon-HomeFilled',
+    0: 'el-icon-CollectionTag',
+    1: 'el-icon-CollectionTag',
+    2: 'el-icon-Flag',
+    3: 'el-icon-OfficeBuilding',
+    4: 'el-icon-DataAnalysis',
+    5: 'el-icon-DataAnalysis',
+    7: 'el-icon-DataAnalysis',
+    6: 'fa-solid fa-location-dot'
+}
+
+/**
+ * 递归处理树形数据，为不同层级节点设置图标和颜色
+ * @param data 树形数据数组
+ * @param level 当前层级（默认从1开始）
+ */
+function processTreeData(data: any[], level: number = -1, alias: string = '') {
+    // 空值判断，避免数组为空或undefined时报错
+    if (!Array.isArray(data) || data.length === 0) return
+
+    data.forEach(item => {
+        // 1. 设置基础图标（根据层级匹配）
+        item.icon = levelIconMap[level] || ''
+        item.alias = alias + `${item.name}`
+        // 2. 设置基础颜色
+        item.color = config.getColorVal('elementUiPrimary')
+
+        // 3. 第6层特殊处理：根据comFlag调整颜色
+        if (level === 6 && item.hasOwnProperty('comFlag')) {
+            switch (item.comFlag) {
+                case 0:
+                    item.color = 'red !important'
+                    break
+                case 1:
+                    item.color = '#00f93b !important'
+                    break
+                case 2:
+                    item.color = '#8c8c8c !important'
+                    break
+                // 默认值：保持原有基础颜色
+                default:
+                    item.color = config.getColorVal('elementUiPrimary')
+            }
+        }
+
+        // 4. 递归处理子节点，层级+1
+        if (item.children && item.children.length > 0) {
+            processTreeData(item.children, item.children[0].level, level == '-1' ? '' : item.alias + '>')
+        }
+    })
+}
+/**
+ * 递归查找树形结构中第一个level===6的节点（找到即终止递归）
+ * @param {Object|Array} tree - 树形数据（根节点数组 或 单个根节点）
+ * @returns {Object|null} 第一个level为6的节点，无则返回null
+ */
+function findFirstLevel6Node(tree: any) {
+    // 统一处理入参：如果是数组，遍历根节点数组（按顺序找第一个符合条件的）
+    if (Array.isArray(tree)) {
+        for (const rootNode of tree) {
+            const result = traverse(rootNode)
+            // 找到第一个匹配节点，立即返回（终止根节点遍历）
+            if (result) return result
+        }
+        // 所有根节点遍历完未找到
+        return null
+    } else {
+        // 入参是单个节点，直接递归遍历
+        return traverse(tree)
+    }
+
+    // 核心递归遍历函数
+    function traverse(node) {
+        // 终止条件1：节点不存在，返回null
+        if (!node) return null
+
+        // 终止条件2：找到level===6的节点，立即返回（终止递归）
+        if (node.level === 6) {
+            return node
+        }
+
+        // 终止条件3：节点无children，返回null
+        if (!node.children || node.children.length === 0) {
+            return null
+        }
+
+        // 按顺序遍历当前节点的子节点
+        for (const child of node.children) {
+            const foundNode = traverse(child)
+            // 子节点中找到目标节点，立即返回（终止后续子节点遍历）
+            if (foundNode) {
+                return foundNode
+            }
+        }
+
+        // 当前节点及所有子节点都无匹配，返回null
+        return null
+    }
+}
+
 defineExpose({ treeRef, scrollToNode, tree })
 loadData()
 </script>

src/components/tree/pqs/standardTree.vue

@@ -28,7 +28,7 @@ const tree = ref()
 const treeRef = ref()
 
 const loadData = (id?: any) => {
-    console.log('🚀 ~ loadData ~ id:', id)
+   
     let nodeKey = ''
     queryAll().then(res => {
         res.data.forEach((item: any) => {

src/layouts/admin/components/globalPopUp.vue

@@ -25,7 +25,7 @@
                             {{ Math.floor(row.eventValue * 10000) / 100 }}
                         </template>
                     </vxe-column>
-                    <vxe-column field="eventType" width="100px" title="暂降类型">
+                    <vxe-column field="eventType" width="100px" title="触发类型">
                         <template #default="{ row }">
                             {{ event.filter(item => item.id == row.eventType)[0]?.name || '/' }}
                         </template>
@@ -79,7 +79,7 @@ const init = async () => {
         // 设置消息接收回调
         mqttClient.onMessage((topic, message) => {
             const msg = JSON.parse(message.toString())
-            console.log('🚀 ~ init ~ msg:', msg)
+        //    console.log('🚀 ~ init ~ msg:', msg)
             if (msg.deptList.includes(adminInfo.$state.deptId)) {
                 drawer.value = true
                 isLoading.value = true

src/layouts/admin/components/logo.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="layout-logo">
-        <img v-if="!config.layout.menuCollapse" class="logo-img" :src="getTheme.logoUrl" />
+        <img  v-if="!config.layout.menuCollapse && getTheme && getTheme.logoUrl"  class="logo-img" :src="getTheme.logoUrl" />
         <!--        <div-->
         <!--            v-if="!config.layout.menuCollapse"-->
         <!--            :style="{ color: config.getColorVal('menuActiveColor') }"-->
@@ -28,7 +28,9 @@ import { Session } from '@/utils/storage'
 import { setNavTabsWidth } from '@/utils/layout'
 
 const config = useConfig()
-const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
+const getTheme = window.localStorage.getItem('getTheme') 
+  ? JSON.parse(window.localStorage.getItem('getTheme') as string) 
+  : null
 const onMenuCollapse = function () {
     if (config.layout.shrink && !config.layout.menuCollapse) {
         closeShade()

src/layouts/admin/components/navBar/classic.vue

@@ -9,7 +9,7 @@
             />
         </div>
         <span class="nav-bar-title">
-            {{ getTheme.name }}
+            {{ getTheme?.name || '' }}
             <span style="font-size: 14px">({{ Version || 'v1.0.0' }})</span>
             <!-- <span style="font-size: 14px;" v-if="Version?.versionName">
                 ({{ Version?.versionName }})
@@ -28,8 +28,10 @@ import { getLastData } from '@/api/systerm'
 
 const Version: any = ref(null)
 const config = useConfig()
-const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
+const getTheme = window.localStorage.getItem('getTheme') 
-
+  ? JSON.parse(window.localStorage.getItem('getTheme') as string) 
+  : { name: '' }
+const VITE_FLAG = import.meta.env.VITE_NAME == 'hainan'
 const onMenuCollapse = () => {
     showShade('ba-aside-menu-shade', () => {
         config.setLayout('menuCollapse', true)
@@ -37,10 +39,13 @@ const onMenuCollapse = () => {
     config.setLayout('menuCollapse', false)
 }
 onMounted(() => {
+    if(!VITE_FLAG){
          getLastData({ versionType: 'WEB' }).then(res => {
             Version.value = res.data.versionName
         })
-    document.title = getTheme.name
+    }
+   
+    document.title = getTheme?.name || ''
 })
 </script>
 

src/layouts/admin/components/popup/password.vue

@@ -28,7 +28,9 @@ import { ElMessage } from 'element-plus'
 import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
 import { validatePwd } from '@/utils/common'
 import { useAdminInfo } from '@/stores/adminInfo'
-
+import router from '@/router'
+import { useNavTabs } from '@/stores/navTabs'
+const navTabs = useNavTabs()
 const adminInfo = useAdminInfo()
 const dialogVisible = ref(false)
 const title = ref('修改密码')
@@ -97,8 +99,14 @@ const submit = () => {
                     id: adminInfo.$state.userIndex,
                     newPassword: form.newPwd
                 }).then((res: any) => {
-                    ElMessage.success('密码修改成功')
+                    ElMessage.success('密码修改成功,请重新登录!')
                     dialogVisible.value = false
+                     setTimeout(() => {
+                    navTabs.closeTabs()
+                    window.localStorage.clear()
+                    adminInfo.reset()
+                    router.push({ name: 'login' })
+                }, 0)
                 })
             })
         }

src/layouts/components/UserInfo/src/components/LockDialog.vue

@@ -29,7 +29,7 @@ const emit = defineEmits(['update:modelValue'])
 const dialogVisible = computed({
   get: () => props.modelValue,
   set: (val) => {
-    console.log('set: ', val)
+ 
     emit('update:modelValue', val)
   }
 })

src/router/index.ts

@@ -28,7 +28,7 @@ router.beforeEach((to, from, next) => {
         const token = adminInfo.getToken()
         // token 不存在
         if (token === null || token === '') {
-            ElMessage.error('您还没有登录，请先登录')
+            // ElMessage.error('您还没有登录，请先登录')
             next('/login')
         } else {
             next()

src/stores/config.ts

@@ -110,7 +110,7 @@ export const useConfig = defineStore(
         }
 
         const getColorVal = function (name: keyof Layout): string {
-            const colors = layout[name] as string[]
+            const colors = layout[name] as string[] || ['#082E6C',  '#0e8780']
             if (layout.isDark) {
                 return colors[1]
             } else {

src/stores/monitoringPoint.ts

@@ -29,12 +29,10 @@ export const useMonitoringPoint = defineStore(
         const setShowCheckBox = (val: boolean) => {
             if (val && state.lineIds.length === 0) {
                 state.lineIds = [state.lineId]
-                console.log('====================================')
-                console.log(state.lineIds)
-                console.log('====================================')
             }
             state.showCheckBox = val
         }
+
         return { state, setValue, setShowCheckBox }
     },
     {

src/template/table.vue

@@ -75,10 +75,10 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
-            fixed: 'right',
+            
             buttons: [
                 {
                     name: 'edit',

src/utils/fileDownLoad.ts

@@ -1,36 +1,52 @@
 import { downloadFile } from '@/api/system-boot/file'
+
+const sanitizeUrl = (url: string): string => {
+    return url.replace(/\[/g, '(').replace(/\]/g, ')')
+}
+
 // 下载文件
 export const download = (urls: string) => {
-    downloadFile({ filePath: urls }).then((res: any) => {
+    //console.log('下载', urls)
-        let blob = new Blob([res], {
+    
-            type: urls.includes('.pdf')
+    downloadFile({ filePath: urls })
-                ? 'application/pdf'
+        .then((res: any) => {
-                : urls.includes('.zip')
+            // 1. 确定文件MIME类型（优化：用更简洁的方式）
-                ? 'application/zip'
+            const getFileType = (url: string) => {
-                : urls.includes('.doc')
+                const ext = url.split('.').pop()?.toLowerCase() || ''
-                ? 'application/msword'
+                const mimeMap: Record<string, string> = {
-                : urls.includes('.docx')
+                    pdf: 'application/pdf',
-                ? 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+                    zip: 'application/zip',
-                : urls.includes('.xls')
+                    doc: 'application/msword',
-                ? 'application/vnd.ms-excel'
+                    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-                : urls.includes('.xlsx')
+                    xls: 'application/vnd.ms-excel',
-                ? 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-                : urls.includes('.png')
+                    png: 'image/png',
-                ? 'image/png'
+                    jpeg: 'image/jpeg',
-                : urls.includes('.jpeg')
+                    jpg: 'image/jpg'
-                ? 'image/jpeg'
+                }
-                : urls.includes('.jpg')
+                return mimeMap[ext] || ''
-                ? 'image/jpg'
+            }
-                : ''
+          
-        })
+            const blob = new Blob([res], { type: getFileType(urls) })
+         
+            // 2. 提取文件名并保留原生后缀（核心修复点）
+            const fileName = urls.split('/').at(-1) || '下载文件' // 先提取URL最后一段（文件名）
+
+            // 3. 创建下载链接
             const url = window.URL.createObjectURL(blob)
             const link = document.createElement('a')
-        let name = removeLastDotSuffix(urls.split('/')[2])
             link.href = url
-        link.download = name
+            link.download = fileName // 直接使用原文件名（保留后缀）
             document.body.appendChild(link)
             link.click()
+
+            // 4. 清理资源（优化）
             link.remove()
+            window.URL.revokeObjectURL(url) // 释放blob URL
+        })
+        .catch(err => {
+            console.error('下载失败：', err)
+            // 可添加错误提示（如Toast）
         })
 }
 function removeLastDotSuffix(str: string) {
@@ -39,3 +55,37 @@ function removeLastDotSuffix(str: string) {
     // 如果存在 .，截取到 . 之前的部分；否则返回原字符串
     return lastDotIndex !== -1 ? str.slice(0, lastDotIndex) : str
 }
+
+// 预览文件
+export const previewFile = async (urls: any) => {
+    //console.log('预览', urls)
+    let url = ''
+    await downloadFile({ filePath: decodeURI(urls) })
+        .then((res: any) => {           
+            // 1. 确定文件MIME类型（优化：用更简洁的方式）
+            const getFileType = (url: string) => {
+                const ext = url.split('.').pop()?.toLowerCase() || ''
+                const mimeMap: Record<string, string> = {
+                    pdf: 'application/pdf',
+                    zip: 'application/zip',
+                    doc: 'application/msword',
+                    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                    xls: 'application/vnd.ms-excel',
+                    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                    png: 'image/png',
+                    jpeg: 'image/jpeg',
+                    jpg: 'image/jpg'
+                }
+                return mimeMap[ext] || ''
+            }           
+            const blob = new Blob([res], { type: getFileType(decodeURI(urls)) })
+            // 3. 创建下载链接
+            url = window.URL.createObjectURL(blob)
+        })
+        .catch(err => {
+            console.error('下载失败：', err)
+            // 可添加错误提示（如Toast）
+        })
+    //console.log('url', url)
+    return url
+}

src/utils/mqtt.ts

@@ -52,11 +52,12 @@ class MQTT {
         }
 
         try {
-            const mqttUrl =
+            // const mqttUrl =
-                localStorage.getItem('MqttUrl') == 'null'
+            //     localStorage.getItem('MqttUrl') == 'null'
-                    ? 'ws://192.168.1.68:8083/mqtt'
+            //         ? 'ws://192.168.1.68:8083/mqtt'
-                    : localStorage.getItem('MqttUrl')
+            //         : localStorage.getItem('MqttUrl')
-
+            const mqttUrl = localStorage.getItem('MqttUrl')
+            if (mqttUrl == 'null' || mqttUrl == null) return
             this.client = mqtt.connect(mqttUrl, this.defaultOptions as IClientOptions)
             this.setupEventListeners()
 

src/utils/request.ts

@@ -4,8 +4,8 @@ import { ElLoading, ElNotification, type LoadingOptions } from 'element-plus'
 import { refreshToken } from '@/api/user-boot/user'
 import router from '@/router/index'
 import { useAdminInfo } from '@/stores/adminInfo'
-import { debounce } from 'lodash-es';
+import { debounce } from 'lodash-es'
-let loginExpireTimer:any = null
+let loginExpireTimer: any = null
 window.requests = []
 window.tokenRefreshing = false
 const pendingMap = new Map()
@@ -84,7 +84,8 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                     config.url == '/system-boot/file/upload' ||
                     config.url == '/harmonic-boot/grid/getAssessOverview' ||
                     config.url == '/system-boot/file/getFileVO' ||
-                    config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData'
+                    config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData' ||
+                    config.url == '/supervision-boot/userReport/bindAssessmentId'
                 )
             )
                 removePending(config)

src/utils/tableStore.ts

@@ -19,7 +19,7 @@ interface TableStoreParams {
     publicHeight?: number //计算高度
     resetCallback?: () => void // 重置
     loadCallback?: () => void // 接口调用后的回调
-    exportProcessingData?:() => void //导出处理数据
+    exportProcessingData?: () => void //导出处理数据
     beforeSearchFun?: () => void // 接口调用前的回调
 }
 
@@ -45,8 +45,9 @@ export default class TableStore {
             pageNum: 1,
             pageSize: 20
         },
-        filename:null,
+        filename: null,
         loading: true,
+        exportLoading: false,
         column: [],
         loadCallback: null,
         exportProcessingData: null,
@@ -84,13 +85,11 @@ export default class TableStore {
             this.initData = JSON.parse(JSON.stringify(this.table.params))
         }
         if (!this.timeAll) {
-            delete this.table.params.startTime;
+            delete this.table.params.startTime
-            delete this.table.params.endTime;
+            delete this.table.params.endTime
-            delete this.table.params.searchBeginTime;
+            delete this.table.params.searchBeginTime
-            delete this.table.params.searchEndTime;
+            delete this.table.params.searchEndTime
-            delete this.table.params.timeFlag;
+            delete this.table.params.timeFlag
-
-      
         }
         createAxios(
             Object.assign(
@@ -130,11 +129,11 @@ export default class TableStore {
      * @param data 携带数据
      */
     onTableAction = (event: string, data: anyObj) => {
-     
         const actionFun = new Map([
             [
                 'search',
                 () => {
+                  
                     this.table.params.pageNum = 1
                     this.index()
                 }
@@ -202,8 +201,9 @@ export default class TableStore {
             [
                 'export',
                 () => {
+                     this.table.exportLoading = true
                     // this.index()
-                    console.log('export')
+                    //console.log('export')
                     let params = { ...this.table.params, pageNum: 1, pageSize: this.table.total }
                     createAxios(
                         Object.assign(
@@ -213,11 +213,16 @@ export default class TableStore {
                             },
                             requestPayload(this.method, params, this.paramsPOST)
                         )
-                    ).then(res => {
+                    )
+                        .then(res => {
                             this.table.allData = filtration(res.data.records || res.data)
-                        console.log('11111',this.table.allData)
                             this.table.exportProcessingData && this.table.exportProcessingData()
                             this.table.allFlag = data.showAllFlag || true
+                            this.table.exportLoading = false
+                            
+                        })
+                        .catch(() => {
+                            this.table.exportLoading = false
                         })
                 }
             ]

src/views/LN/newEnergy/newEnergyAnalysis/index.vue

@@ -301,7 +301,7 @@ const options1 = [
 const height = mainHeight(20)
 const heightB = mainHeight(448)
 const heightA = mainHeight(180)
-const size = ref(23)
+const size = ref(19)
 const TableHeaderRef = ref()
 const detailRef = ref()
 const dotList: any = ref({})
@@ -786,7 +786,7 @@ onMounted(() => {
 })
 
 const handleNodeClick = (data: any, node: any) => {
-    console.log('🚀 ~ handleNodeClick ~ data:', data)
+    //console.log('🚀 ~ handleNodeClick ~ data:', data)
     if (data.level == 6) {
         dotList.value = data
         // dotList.value.id = '6469e77fda42db12c7ca6620a092f03c1'

src/views/LN/newEnergy/newEnergyAnalysis/test.vue

@@ -321,7 +321,7 @@ const options1 = [
 ]
 const height = mainHeight(20)
 const heightB = mainHeight(445)
-const size = ref(23)
+const size = ref(19)
 const TableHeaderRef = ref()
 const detailRef = ref()
 const dotList: any = ref({})
@@ -757,7 +757,7 @@ const timeClick = (row: any) => {
 }
 // 点击越限
 const detailClick = (row: any, title: string, key: string) => {
-    console.log('🚀 ~ detailClick ~ row:', row)
+   // console.log('🚀 ~ detailClick ~ row:', row)
     detailRef.value.open({
         row: row,
         title: title,
@@ -802,7 +802,7 @@ onMounted(() => {
 })
 
 const handleNodeClick = (data: any, node: any) => {
-    console.log('🚀 ~ handleNodeClick ~ data:', data)
+   // console.log('🚀 ~ handleNodeClick ~ data:', data)
     if (data.level == 6) {
         dotList.value = data
         // dotList.value.id = '6469e77fda42db12c7ca6620a092f03c1'

src/views/LN/newEnergy/newEnergyLedger/index.vue

@@ -64,10 +64,10 @@ const tableStore = new TableStore({
         { field: 'longitude', title: '经度' },
         { field: 'latitude', title: '纬度' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             render: 'buttons',
-            fixed: 'right',
+          
             buttons: [
                 {
                     name: 'edit',

src/views/dashboard/index.vue

@@ -38,6 +38,7 @@ const tableStore = new TableStore({
         echarts.value.Grade(tableStore.table.data.voltageStatistics)
         echarts.value.Relation(tableStore.table.data.monthlyStatistics)
         table.value.info(tableStore.table.data)
+    
     }
 })
 provide('tableStore', tableStore)

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

@@ -3,7 +3,7 @@
         <TableHeader datePicker :showReset="false" showExport ref="TableHeaderRef">
             <template v-slot:select>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.loginName" placeholder="请输入"></el-input>
+                    <el-input v-model="tableStore.table.params.loginName" placeholder="请输入" clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
             </template>
         </TableHeader>

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

@@ -289,17 +289,20 @@ const equipment = (row: any) => {}
 const assess = () => {
     // vxeRef.value.getRadioRecord()
     
-    if (equipmentList.value.length == null) {
+    if (equipmentList.value.length == 0) {
-        return ElMessage.warning('请选择用户')
+        return ElMessage.warning('请选择有终端设备的用户')
     }
     loading.value = true
     formRef.value.validate((valid: any) => {
+
         if (valid) {
             form.value.devList = equipmentList.value
             carryCapacityEvaluate(form.value).then(res => {
                 rendering(res.data)
                 loading.value = false
             })
+        }else{
+            loading.value = false
         }
     })
 }
@@ -450,7 +453,7 @@ const selChange = async (e: any) => {
 }
 // 导出
 const onExport = () => {
-    console.log("🚀 ~ onExport ~ document.getElementById('exportId'):", document.getElementById('exportId'))
+   // console.log("🚀 ~ onExport ~ document.getElementById('exportId'):", document.getElementById('exportId'))
 
     // 转换成canvas
     html2canvas(document.getElementById('exportId'), {
@@ -459,7 +462,7 @@ const onExport = () => {
         logging: false, // 关闭日志
         scale: 2 // 提高缩放比例以获得更清晰的截图
     }).then(function (canvas) {
-        console.log('🚀 ~ onExport ~ canvas:', canvas)
+       // console.log('🚀 ~ onExport ~ canvas:', canvas)
         // 创建a标签，实现下载
         let creatIMg = document.createElement('a')
         creatIMg.download = '光伏电站承载能力评估结果.png' // 设置下载的文件名，

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

@@ -205,7 +205,7 @@ const props = defineProps(['rowList'])
 const harmonic = harmonicOptions.filter(item => item.value < 26)
 const currentLod = ref(false)
 const monitoringPoint = useMonitoringPoint()
-const size = ref(23)
+const size = ref(19)
 const dictData = useDictData()
 const datePickerRef = ref()
 const height = mainHeight(80).height
@@ -734,6 +734,7 @@ const choose = (e: any) => {
 
     uploadExcel(e.raw, form).then(res => {
         ElMessage.success('导入成功')
+         onSubmit()
     })
 }
 const tabChange = (e: any) => {

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

@@ -176,7 +176,7 @@ const info = () => {
                 })
             })
         })
-        console.log('🚀 ~ queyDetail ~ photovoltaicData.value:', photovoltaicData.value)
+       // console.log('🚀 ~ queyDetail ~ photovoltaicData.value:', photovoltaicData.value)
     })
     // 电弧炉
     queyDetailDhl().then(res => {

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

@@ -136,7 +136,7 @@ const tableStore: any = new TableStore({
         { field: 'evaluateDate', title: '评估日期' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [

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

@@ -56,8 +56,10 @@
                     </el-form-item>
 
                     <el-form-item label="区域" prop="regionList">
-                        <el-cascader v-model="form.regionList" style="width: 100%" :props="props" :options="areaList" />
+                        <!-- <el-cascader v-model="form.regionList" style="width: 100%" :props="props" :options="areaList" /> -->
+                        <el-cascader v-model="form.regionList" :props="props" :options="areaList"  style="width: 100%"  placeholder="请选择区域" />
                     </el-form-item>
+                 
                     <el-form-item label="详细地址：" prop="area">
                         <el-input
                             clearable
@@ -93,6 +95,8 @@ import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
 import equipment from './equipment.vue'
 import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
+import { getAreaDept } from '@/api/harmonic-boot/area'
+
 defineOptions({
     name: 'estimate/photovoltaic'
 })
@@ -104,7 +108,8 @@ const disabled = ref(false)
 const TableHeaderRef = ref()
 const equipmentRef = ref()
 const title = ref('')
-const areaList: any = dictData.areaSelect()
+//const areaList: any = dictData.areaSelect()
+const areaList = ref([])
 const userShow: any = ref('Power_Station_Users')
 
 const form = ref({
@@ -182,7 +187,7 @@ const tableStore: any = new TableStore({
         { field: 'createBy', title: '创建者' },
         { field: 'createTime', title: '创建日期' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [
@@ -254,7 +259,7 @@ const tableStore: any = new TableStore({
     ],
 
     loadCallback: () => {
-        console.log(tableStore.table.data)
+       
     }
 })
 
@@ -263,14 +268,20 @@ tableStore.table.params.userType = ''
 provide('tableStore', tableStore)
 onMounted(() => {
     tableStore.index()
+
+
 })
 const useChange = (e: string) => {
     userShow.value = uesrList.filter(item => item.id == e)[0].code
 }
 // 新增
-const add = () => {
+const add = async () => {
     disabled.value = false
     title.value = '新增承载能力待评估用户'
+
+    await getAreaDept().then(res => {
+        areaList.value = JSON.parse(JSON.stringify(res.data))
+    })
     dialogVisible.value = true
 }
 // 保存

src/views/pqs/business/log/TerminalLog/index.vue

@@ -8,7 +8,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入筛选数据" clearable />
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入筛选数据" clearable maxlength="32" show-word-limit/>
                 </el-form-item>
             </template>
             <template #operation>

src/views/pqs/business/log/frontLog/detail.vue

@@ -4,13 +4,13 @@
         <TableHeader datePicker showExport :showReset="false">
             <template v-slot:select>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入筛选数据" clearable />
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入筛选数据" clearable maxlength="32" show-word-limit/>
                 </el-form-item>
             </template>
         </TableHeader>
 
         <div :key="key">
-            <Table ref="tableRef" :height="'49vh'"></Table>
+            <Table ref="tableRef" :height="'calc(50vh - 100px)'"></Table>
         </div>
     </el-dialog>
 </template>
@@ -31,10 +31,12 @@ const dialogVisible = ref(false)
 const tableStore = new TableStore({
     url: '/system-boot/frontLog/queryLogCHild',
     method: 'POST',
+    filename: '前置交互日志详情',
     column: [
         {
             field: 'index',
             title: '序号',
+        
             width: '80',
             formatter: (row: any) => {
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1

src/views/pqs/business/log/frontLog/index.vue

@@ -3,7 +3,7 @@
         <TableHeader datePicker showExport>
             <template v-slot:select>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入筛选数据" clearable />
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入筛选数据" clearable maxlength="32" show-word-limit/>
                 </el-form-item>
             </template>
         </TableHeader>
@@ -77,7 +77,7 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [

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

@@ -40,7 +40,7 @@
                 ></Table>
             </div>
             <div class="pd10" style="width: 400px" v-loading="loading">
-                <el-input v-model="filterText" placeholder="请输入内容" clearable show-word-limit @input="change">
+                <el-input v-model="filterText" placeholder="请输入内容" clearable maxlength="32" show-word-limit @input="change">
                     <template #prefix>
                         <Icon name="el-icon-Search" style="font-size: 16px" />
                     </template>
@@ -83,7 +83,7 @@
                                     v-else
                                     class="box-item"
                                     title="确定重启吗？"
-                                    placement="bottom"
+                                    placement="left"
                                     @confirm="restart(data)"
                                 >
                                     <template #actions="{ confirm, cancel }">
@@ -139,9 +139,9 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="最大终端数:" prop="nodeDevNum" class="top">
+                <el-form-item label="最大终端数:" prop="nodeDevNum" class="top" >
                     <el-input
-                        v-model="formData.nodeDevNum"
+                        v-model.trim.number="formData.nodeDevNum"
                         onkeyup="value = value.replace(/[^0-9]/g,'')"
                         maxlength="5"
                         placeholder="请输入最大终端数"
@@ -149,7 +149,7 @@
                 </el-form-item>
                 <el-form-item label="最大进程数:" prop="maxProcessNum" class="top">
                     <el-input
-                        v-model="formData.maxProcessNum"
+                        v-model.trim.number="formData.maxProcessNum"
                         onkeyup="value = value.replace(/[^0-9]/g,'')"
                         maxlength="5"
                         placeholder="请根据监测点规模填写合适进程数（1个进程最大可承载200个监测点）"
@@ -209,7 +209,8 @@ import {
     updateNode,
     nodeDeviceTree,
     updateDeviceProcess,
-    askRestartProcess
+    askRestartProcess,
+    allotTerminal
 } from '@/api/device-boot/Business'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -218,6 +219,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { ElButton } from 'element-plus'
 import { mainHeight } from '@/utils/layout'
 import Bind from './bind.vue'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'hainan'
 defineOptions({
     name: 'BusinessAdministrator/TerminalManagement/FrontManagement'
 })
@@ -239,6 +241,7 @@ const tableRef = ref()
 const processNo = ref('')
 const ruleFormRef = ref()
 const dataSource: any = ref([])
+const deviceInfoList: any = ref([])
 const defaultProps = {
     children: 'deviceInfoList',
     label: 'name'
@@ -287,7 +290,7 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '最大监测点数量',
+            title: '最大终端数量',
             field: 'nodeDevNum'
         },
         {
@@ -314,7 +317,7 @@ const tableStore = new TableStore({
         { title: '描述', field: 'remark' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
@@ -332,29 +335,32 @@ const tableStore = new TableStore({
                         formData.value = JSON.parse(JSON.stringify(row))
                     }
                 },
-                // {
+                {
-                //     name: 'edit',
+                    name: 'edit',
-                //     title: '重启',
+                    title: '重启',
-                //     type: 'warning',
+                    type: 'warning',
-                //     icon: 'el-icon-Delete',
+                    icon: 'el-icon-Delete',
-                //     render: 'confirmButton',
+                    render: 'confirmButton',
-                //     popconfirm: {
+                    disabled: row => {
-                //         confirmButtonText: '确认',
+                        return VITE_FLAG
-                //         cancelButtonText: '取消',
+                    },
-                //         confirmButtonType: 'warning',
+                    popconfirm: {
-                //         title: '确定重启吗？'
+                        confirmButtonText: '确认',
-                //     },
+                        cancelButtonText: '取消',
-                //     click: row => {
+                        confirmButtonType: 'warning',
-                //         askRestartProcess({
+                        title: '确定重启吗？'
-                //             deviceRebootType: null,
+                    },
-                //             nodeId: row.id,
+                    click: row => {
-                //             processNo: 1
+                        askRestartProcess({
-                //         }).then(res => {
+                            deviceRebootType: 1,
-                //             ElMessage.success('重启成功')
+                            nodeId: row.id,
-                //             tableStore.index()
+                            processNo: 1
-                //         })
+                        }).then(res => {
-                //     }
+                            ElMessage.success('重启成功')
-                // },
+                            tableStore.index()
+                        })
+                    }
+                },
 
                 {
                     name: 'del',
@@ -369,12 +375,42 @@ const tableStore = new TableStore({
                         title: '确定删除吗？'
                     },
                     click: row => {
+                        if (hasDevices.value) {
+                            ElMessage.warning('此前置机绑定了设备，无法删除！');
+                            return;
+                        }
+
                         delNode(row.id).then(res => {
                             ElMessage.success('删除成功')
                             tableStore.index()
                         })
                     }
+                },
+                 {
+                    name: 'edit',
+                    title: '分配终端',
+                    type: 'primary',
+                    icon: 'InfoFilled',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'primary',
+                        title: '确定分配终端吗？'
+                    },
+                    click: row => {
+                        if (!hasDevices.value) {
+                            ElMessage.warning('此前置机下无设备，无法分配终端！');
+                            return;
                         }
+                        allotTerminal({
+                            nodeId: row.id
+                        }).then(res => {
+                            ElMessage.success(res.message)
+                            tableStore.index()
+                        })
+                    }
+                },
             ]
         }
     ],
@@ -391,12 +427,14 @@ const tableStore = new TableStore({
     }
 })
 const nodeId = ref('')
-// 点击行
+const hasDevices = ref(false)
+/// 点击行
 const currentChangeEvent = () => {
     // 确保 tableRef 和当前记录存在
     if (!tableRef.value || !tableRef.value.getRef().getCurrentRecord()) {
         loading.value = false
         dataSource.value = []
+        hasDevices.value = false
         return
     }
 
@@ -409,15 +447,27 @@ const currentChangeEvent = () => {
             nodeId.value = tableRef.value.getRef().getCurrentRecord().id
             // 检查返回的数据是否存在且不为空
             if (res.data && res.data.processDeviceList) {
-                dataSource.value = res.data.processDeviceList.filter(item => (item.name = item.processNo + ''))
+                // 检查是否有设备绑定
+                const hasAnyDevices = res.data.processDeviceList.some(item => 
+                    item.deviceInfoList && item.deviceInfoList.length > 0
+                );
+                hasDevices.value = hasAnyDevices;
+                
+                dataSource.value = res.data.processDeviceList.filter(item => {
+                    item.name = item.processNo + '';
+                    return true; // 保持原有的过滤逻辑
+                });
             } else {
                 dataSource.value = []
+                hasDevices.value = false;
             }
             loading.value = false
+            
         })
         .catch(() => {
             // 添加错误处理，确保 loading 状态也能关闭
             dataSource.value = []
+            hasDevices.value = false;
             loading.value = false
         })
 
@@ -426,11 +476,11 @@ const currentChangeEvent = () => {
 
 // 重启进程
 const restart = (data: any) => {
-    console.log('🚀 ~ restart ~ data:', data)
+   // console.log('🚀 ~ restart ~ data:', data)
     askRestartProcess({
-        deviceRebootType: data.processNo,
+        deviceRebootType: null,
         nodeId: nodeId.value,
-        processNo: 2
+        processNo: data.processNo
     }).then(res => {
         ElMessage.success('重启成功')
         currentChangeEvent()

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

@@ -32,7 +32,7 @@
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="程序版本">
+                <!-- <el-form-item label="程序版本">
                     <el-select v-model="tableStore.table.params.program" clearable placeholder="请选择程序版本">
                         <el-option
                             v-for="item in programoption"
@@ -41,19 +41,21 @@
                             :value="item.id"
                         ></el-option>
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="筛选数据">
                     <el-input
                         v-model="tableStore.table.params.filterName"
                         @keyup="searchEvent"
+                        maxlength="32"
+                        show-word-limit
                         placeholder="输入关键字筛选"
                     />
                 </el-form-item>
             </template>
-            <template #operation>
+            <!-- <template #operation>
                 <el-button icon="el-icon-Download" @click="add">导出</el-button>
                 <el-button icon="el-icon-Check" @click="add">批量升级</el-button>
-            </template>
+            </template> -->
         </TableHeader>
         <div :style="`height: calc(${tableStore.table.height} + 58px)`">
             <vxe-table
@@ -104,7 +106,7 @@
                 <vxe-column field="updateTime" title="最新升级时间"></vxe-column>
                 <vxe-column title="操作" min-width="100">
                     <template #default="{ row }">
-                        <el-button v-if="row.level == 4" size="small" link @click="updateprogram(row)">升级</el-button>
+                        <!-- <el-button v-if="row.level == 4" size="small" link @click="updateprogram(row)">升级</el-button> -->
                         <el-button
                             v-if="row.level == 4"
                             :disabled="row.state == 1 ? true : false"
@@ -251,6 +253,7 @@ const tableStore = new TableStore({
     }
 })
 tableStore.table.params.teriminal = ''
+tableStore.table.params.teriminalstatus = ''
 tableStore.table.params.state = ''
 tableStore.table.params.program = ''
 tableStore.table.params.searchEvent = ''

src/views/pqs/business/terminal/TerminalManagement/components/detail.vue

@@ -35,7 +35,7 @@ const dialogVisible = ref(false)
 const tableData = ref([])
 
 const open = (e: any) => {
-    console.log("🚀 ~ open ~ e:", e)
+    //console.log("🚀 ~ open ~ e:", e)
     echartsXq.value = {
         title: {
             text: e.name + '性能详情'

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

@@ -43,6 +43,8 @@
                         v-model="tableStore.table.params.filterName"
                         @keyup="searchEvent"
                         clearable
+                        maxlength="32"
+                        show-word-limit
                         placeholder="输入关键字筛选"
                     />
                 </el-form-item>
@@ -75,6 +77,7 @@
                 :checkbox-config="{ labelField: 'name' }"
             >
                 <vxe-column
+                    v-if="treeData && treeData.length > 0"
                     field="name"
                     align="left"
                     type="checkbox"
@@ -82,6 +85,15 @@
                     min-width="200"
                     tree-node
                 ></vxe-column>
+                <!-- 没有数据时显示普通列 -->
+                <vxe-column
+                    v-else
+                    field="name"
+                    align="left"
+                    title="电网拓扑"
+                    min-width="200"
+                    tree-node
+                ></vxe-column>
                 <vxe-column field="devType" title="终端型号">
                     <template #default="{ row }">
                         {{ teriminaloption.find((item: any) => item.id === row.devType)?.name }}
@@ -223,7 +235,7 @@ const manage = (name: string, key: number) => {
             .getCheckboxRecords()
             .filter((item: any) => item.level == 4)
             .map(item => item.id)
-        console.log('🚀 ~ deviceData ~ selectRecords:', selectRecords)
+        //console.log('🚀 ~ deviceData ~ selectRecords:', selectRecords)
         if (selectRecords.length == 0) {
             return ElMessage({
                 message: '请至少选择一台装置',

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

@@ -1694,7 +1694,7 @@ import { useDictData } from '@/stores/dictData'
 import { ref, reactive, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getYwZtSubstation } from '@/api/device-boot/device'
-const size = ref(23)
+const size = ref(19)
 const TerminalRef = ref()
 const pageHeight = mainHeight(20)
 const Height = mainHeight(100)
@@ -2313,7 +2313,7 @@ const remove = () => {
 const next = async () => {
     await mainForm.value.validate((valid: any) => {
         if (valid) {
-            console.log('🚀 ~ awaitmainForm.value.validate ~ nodeLevel.value:', nodeLevel.value)
+           // console.log('🚀 ~ awaitmainForm.value.validate ~ nodeLevel.value:', nodeLevel.value)
 
             switch (nodeLevel.value) {
                 case 100:
@@ -2397,10 +2397,10 @@ const onsubmit = () => {
 /**
  * 提交数据
  */
-const submitData = () => {
+const submitData = async () => {
     const project = JSON.parse(JSON.stringify(AddProjectBO.value))
-
+    await mainForm.value.validate((valid: any) => {
-    // project: JSON.stringify(project)
+        if (valid) {
             addTerminal(project).then((res: any) => {
                 ElMessage({
                     type: 'success',
@@ -2411,12 +2411,18 @@ const submitData = () => {
                 initAddProjectBoId()
                 treedata()
             })
+        }
+    })
+    // project: JSON.stringify(project)
+    
 }
 /**
  * 修改数据
  */
-const updateDate = () => {
+const updateDate = async () => {
     // console.log("updateProject:", this.updateProject);
+    await mainForm.value.validate((valid: any) => {
+        if (valid){
              let data = updateProject.value
             updateTerminal(data).then((res: any) => {
                 ElMessage({
@@ -2426,6 +2432,10 @@ const updateDate = () => {
                 pageStatus.value = 1
                 treedata()
             })
+
+        }
+    })
+   
 }
 const updateProjectF = () => {
     updateProject.value = {

src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue

@@ -74,7 +74,7 @@
         >
             <el-form :model="ruleForm" :rules="rules" ref="ruleFormRef" label-width="100px">
                 <el-form-item label="变压器名:" prop="tfName">
-                    <el-input v-model="ruleForm.tfName" placeholder="请输入" clearable></el-input>
+                    <el-input v-model="ruleForm.tfName" placeholder="请输入" clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item label="接线方式:" prop="wiring" class="top">
                     <el-select style="width: 100%" v-model="ruleForm.wiring" clearable placeholder="请选择接线方式">
@@ -113,7 +113,7 @@
                 <el-col :span="8">
                     <div style="border-right: 1px solid; height: 100%" class="xiaoshou">
                         <div style="overflow-y: auto; height: 100%; overflow-x: auto;max-height: 350px;" class="tree mr10 xiaoshou">
-                            <el-input placeholder="输入关键字检索" v-model="filterText1" clearable></el-input>
+                            <el-input placeholder="输入关键字检索" v-model="filterText1" clearable maxlength="32" show-word-limit></el-input>
                             <el-tree
                                 style="cursor: pointer;display: inline-block;"
                                 :data="treeMenuLeftData"
@@ -163,7 +163,7 @@
                 <el-col :span="8">
                     <div style="border-left: 1px solid; height: 100%" class="xiaoshou">
                         <div style="overflow-y: auto; height: 100%;overflow-x: auto;max-height: 350px;" class="ml10 tree xiaoshou">
-                            <el-input placeholder="输入关键字检索" v-model="filterText2" clearable></el-input>
+                            <el-input placeholder="输入关键字检索" v-model="filterText2" clearable maxlength="32" show-word-limit></el-input>
                             <el-tree
                                 style="cursor: pointer"
                                 :data="treeMenuRightData"
@@ -328,7 +328,7 @@ const tableStore = new TableStore({
             field: 'tfDescribe'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
@@ -372,6 +372,7 @@ const tableStore = new TableStore({
                     click: row => {
                         delTransformer([row.tfIndex]).then(res => {
                             ElMessage.success('删除成功')
+                            menuTree.value.loadData()
                             tableStore.index()
                         })
                     }
@@ -413,6 +414,7 @@ const transformerAdd = () => {
             message: '请选择变电站'
         })
     } else {
+        ruleForm.subIndex = parentId.value
         transformerTitle.value = '新增变压器信息'
         transformerInformation.value = true
         nextTick(() => {
@@ -614,6 +616,7 @@ const checkLeft = (checkedNodes: any, checkedKeys: any) => {
 //下节点选择
 const checkRight = (checkedNodes: any, checkedKeys: any) => {
     maintenanceData.downNode = checkedNodes.id
+  
      if (maintenanceData.downNode === maintenanceData.upNode) {
          menuTreeLeft.value?.setCheckedKeys([])
          maintenanceData.upNode = ''
@@ -625,32 +628,49 @@ const checkRight = (checkedNodes: any, checkedKeys: any) => {
 
 //节点维护提交
 const maintenanceOnsubmit = () => {
-    for (let i = 0; i < bind.value.length; i++) {
+   
-        if (bind.value[i][0] == maintenanceData.upNode) {
+    if(maintenanceData.downNode == '' || maintenanceData.upNode == '') {
-            for (let j = 0; j < bind.value.length; j++) {
-                if (bind.value[j][1] == maintenanceData.downNode) {
         ElMessage({
             type: 'warning',
-                        message: '上下节点无法选择相同母线！！！'
+            message: '请确保上下节点各自选择一个母线！'
         })
          return
     }
-            }
-            return
-        }
-    }
 
-    if (bindLevel.value != 5) {
+
-        for (let i = 0; i < bind.value.length; i++) {
+    if (maintenanceData.upNode == maintenanceData.downNode) {
-            if (maintenanceData.upNode == bind.value[i][1] && maintenanceData.downNode == bind.value[i][0]) {
         ElMessage({
             type: 'warning',
-                    message: '上下节点无法选择相同母线！！！'
+            message: '上下节点无法选择相同母线！'
         })
-                return
-            }
-        }
     }
+    // for (let i = 0; i < bind.value.length; i++) {
+    //     if (bind.value[i] == maintenanceData.upNode) {
+    //         for (let j = 0; j < bind.value.length; j++) {
+              
+    //             if (bind.value[j] == maintenanceData.downNode) {
+    //                 ElMessage({
+    //                     type: 'warning',
+    //                     message: '上下节点无法选择相同母线！！！'
+    //                 })
+    //                 return
+    //             }
+    //         }
+    //         return
+    //     }
+    // }
+
+    // if (bindLevel.value != 5) {
+    //     for (let i = 0; i < bind.value.length; i++) {
+    //         if (maintenanceData.upNode == bind.value[i] && maintenanceData.downNode == bind.value[i]) {
+    //             ElMessage({
+    //                 type: 'warning',
+    //                 message: '上下节点无法选择相同母线！！！'
+    //             })
+    //             return
+    //         }
+    //     }
+    // }
     
     nodeMaintenance(maintenanceData).then((res: any) => {
         if (res.code == 'A0000') {

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

@@ -53,12 +53,12 @@
                 </el-col>
                 <el-col :span="14">
                     <div class="box">
-                        <el-form :model="form" label-width="100px" ref="ruleFormRef">
+                        <el-form :model="form" label-width="100px" ref="ruleFormRef" :rules="rules">
-                            <el-form-item label="名称:">
+                            <el-form-item label="名称:" prop="tpName">
-                                <el-input v-model="form.tpName" placeholder="请输入"></el-input>
+                                <el-input v-model="form.tpName" placeholder="请输入" maxlength="32" show-word-limit clearable></el-input>
                             </el-form-item>
                             <el-form-item label="描述:" class="mt20">
-                                <el-input v-model="form.tfDescribe" placeholder="请输入"></el-input>
+                                <el-input v-model="form.tfDescribe" placeholder="请输入" ></el-input>
                             </el-form-item>
                             <el-form-item class="mt20 ml20">
                                 <el-button @click="dialogFormVisible = false">取消</el-button>
@@ -122,13 +122,8 @@ const menuTree = ref()
 const TableHeaderRef = ref()
 
 const rules = reactive({
-    name: [{ required: true, message: '名称不可为空', trigger: 'blur' }],
+    tpName: [{ required: true, message: '名称不可为空', trigger: 'blur' }],
-    ip: [{ required: true, message: 'ip不可为空', trigger: 'blur' }],
+   
-    nodeGrade: [{ required: true, message: '等级不可为空', trigger: 'blur' }],
-    nodeDevNum: [{ required: true, message: '最大终端数不可为空', trigger: 'blur' }],
-    maxProcessNum: [{ required: true, message: '最大进程数不可为空', trigger: 'blur' }],
-    sort: [{ required: true, message: '排序不可为空', trigger: 'blur' }],
-    remark: [{ required: true, message: '描述不可为空', trigger: 'blur' }]
 })
 
 const dialogFormVisible = ref(false)
@@ -161,7 +156,7 @@ const tableStore = new TableStore({
             field: 'tfDescribe'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',

src/views/pqs/business/terminal/userLedger/components/addForm.vue

@@ -48,7 +48,7 @@
                     v-model.trim="form.projectName"
                     autocomplete="off"
                     placeholder="请输入项目名称"
-                    maxlength="64"
+                    maxlength="32"
                     show-word-limit
                 />
             </el-form-item>
@@ -112,7 +112,7 @@
                     v-model.trim="form.substation"
                     autocomplete="off"
                     placeholder="请输入厂站名称"
-                    maxlength="64"
+                    maxlength="32"
                     show-word-limit
                 />
             </el-form-item>
@@ -364,6 +364,8 @@
                     v-model.trim="form.evaluationChekDept"
                     autocomplete="off"
                     placeholder="请输入预测评估评审单位"
+                    maxlength="32"
+                    show-word-limit
                 />
             </el-form-item>
             <el-form-item for="-" label="预测评估结论：" style="width: 100%">
@@ -1059,7 +1061,7 @@ const filterUsers = (arr: any) => {
     userTypeList.value = userTypeList.value.filter(item => !arr.includes(item.value))
 }
 const setcontroFlag = () => {
-    console.log(12333)
+ 
 
     controFlag.value = true
 }

src/views/pqs/business/terminal/userLedger/components/detail.vue

@@ -1,5 +1,9 @@
 <template>
     <div class="default-main">
+         <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
         <el-descriptions :column="2" border>
             <el-descriptions-item label="所在地市">
                 {{ detailData.city }}
@@ -111,7 +115,7 @@
                 {{ proviteData.agreementCapacity }}
             </el-descriptions-item>
             <el-descriptions-item label="装机容量（MW）">
-                {{ proviteData?.ratePower }}
+                {{ detailData?.ratePower }}
             </el-descriptions-item>
             <el-descriptions-item
                 label="PCC供电设备容量（MVA）"
@@ -209,6 +213,7 @@
             </el-descriptions-item>
         </el-descriptions>
         </div>
+    </div>
 </template>
 <script lang="ts" setup>
 import { onMounted, ref, reactive, watch } from 'vue'
@@ -327,6 +332,7 @@ const powerSupplyInfoOptionList = dictData.getBasicData('supply_condition')
 /** 获得数据 */
 const getInfo = async () => {
     detailLoading.value = true
+
     try {
         if (props.update) {
             await getUserReportUpdateById(props.id || queryId).then(res => {
@@ -336,6 +342,7 @@ const getInfo = async () => {
         } else {
             await getUserReportById(props.id || queryId).then(res => {
                 detailData.value = res.data
+              
                 getProviteData()
             })
         }
@@ -378,7 +385,7 @@ const preview = (val: any, url: any) => {
         }
         //预测评估报告
         if (val == 'predictionEvaluationReport') {
-            console.log(url, '9999999')
+    
             predictionEvaluationReportRef?.value.open(url)
         }
         //预测评估评审意见报告

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

@@ -112,9 +112,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: 150,
-            fixed: 'right',
+           
             render: 'buttons',
             buttons: [
                 {

src/views/pqs/cockpit/homePage/index.vue

@@ -181,7 +181,7 @@ const zoom = (value: any) => {
             component: registerComponent(item.path)
         }))
     }
-    console.log('🚀 ~ zoom ~ layout.value:', layout.value)
+   // console.log('🚀 ~ zoom ~ layout.value:', layout.value)
 
     flag.value = !flag.value
 

src/views/pqs/database/algorithm/components/form.vue

@@ -83,7 +83,7 @@ const cycle = [
     { value: '3', label: '年' }
 ]
 const changeTree = (row: any) => {
-    console.log("🚀 ~ changeTree ~ row:", row)
+   // console.log("🚀 ~ changeTree ~ row:", row)
     TreeList.value = row
     if (title.value == '修改算法') {
         if (row.level != 4) {

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

@@ -1,346 +1,59 @@
 <template>
-    <div class="default-main" :style="height">
+    <div class="default-main">
-        <!-- 算法库 -->
+        <el-tabs v-model="activeName" type="border-card">
-        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <el-tab-pane label="总览" name="1" v-if="tabList.includes('1')">
-            <pane :size="size">
+                <overview v-if="activeName == '1'" @algorithm="algorithm" />
-                <algorithmTree
+            </el-tab-pane>
-                    ref="treeRef"
+            <el-tab-pane label="算法库" name="2" v-if="tabList.includes('2')">
-                    :default-expand-all="false"
+                <list v-if="activeName == '2'" ref="listRef" />
-                    :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
+            </el-tab-pane>
-                    :current-node-key="monitoringPoint.state.lineId"
+        </el-tabs>
-                    @node-click="handleNodeClick"
-                    @init="handleNodeClick"
-                    @onAddTree="onAddTree"
-                ></algorithmTree>
-            </pane>
-            <pane style="background: #fff" :style="height">
-                <div class="boxTop">
-                    <div>
-                        <el-radio-group v-model="radio">
-                            <el-radio-button v-for="(item, i) in dotList?.childrens" :label="item.name" :value="i" />
-                        </el-radio-group>
-                    </div>
-                    <div v-if="information">
-                        <el-button icon="el-icon-Plus" type="primary" @click="addUser">新增</el-button>
-                        <el-button icon="el-icon-Edit" type="primary" @click="revise">修改</el-button>
-                        <el-button icon="el-icon-Delete" type="primary" @click="deletes">删除</el-button>
-                    </div>
-                </div>
-
-                <div :style="heightTab">
-                    <vxe-table height="auto" v-bind="defaultAttribute" :data="dotList?.childrens[radio]?.children">
-                        <vxe-column field="name" title="算法名称"></vxe-column>
-                        <vxe-column field="createTime" title="创建时间"></vxe-column>
-
-                        <vxe-column field="period" title="计算周期">
-                            <template #default="{ row }">
-                                {{
-                                    row.period == 0
-                                        ? '日'
-                                        : row.period == 1
-                                        ? '月'
-                                        : row.period == 2
-                                        ? '季'
-                                        : row.period == 3
-                                        ? '年'
-                                        : ''
-                                }}
-                            </template>
-                        </vxe-column>
-                        <vxe-column field="source" title="数据来源"></vxe-column>
-                        <!-- <vxe-column field="useFLag" title="是否启用">
-                            <template #default="{ row }">
-                                <el-tag :type="row.useFLag === 1 ? 'success' : 'info'" effect="dark"
-                                    style="cursor: pointer" @click="change(row)">
-                                    {{ row.useFLag === 1 ? '是' : '否' }}
-                                </el-tag>
-                            </template>
-                        </vxe-column> -->
-                        <vxe-column field="definition" title="定义">
-                            <template #default="{ row }">
-                                <el-button type="primary" link @click="view(row)">查看</el-button>
-                            </template>
-                        </vxe-column>
-                        <!-- <vxe-column title="操作" width="150px">
-                            <template #default="{ row }">
-                                <el-button type="primary" link @click="edit(row)">修改</el-button>
-                                <el-button type="danger" link @click="del(row)">删除</el-button>
-                                <el-popconfirm title="确定删除吗？" confirm-button-type='danger'  @confirm="del(row)">
-                                    <template #reference>
-                                        <el-button type="danger" link>删除</el-button>
-                                    </template>
-                                </el-popconfirm>
-                            </template>
-                        </vxe-column> -->
-                    </vxe-table>
-                </div>
-            </pane>
-        </splitpanes>
-        <!-- 树弹框 -->
-        <addTree ref="addTreeRef" @getTree="treeRef.loadData(dotList.id)" />
-        <!-- 弹框 -->
-        <PopupEdit
-            ref="popupEditRef"
-            v-if="popupEditFlag"
-            @getTree="treeRef.loadData(dotList.id), (popupEditFlag = false)"
-        />
-        <!-- 定义 -->
-        <el-dialog draggable v-model="viewFlag" title="定义" width="60%">
-            <div style="min-height: 300px; max-height: 55vh">
-                <div class="editor" ref="editorRef" v-html="summary" />
-            </div>
-        </el-dialog>
-        <!-- 删除 -->
-        <el-dialog draggable v-model="dialogVisible" title="请选择需要删除的数据" width="400">
-            <el-tree-select
-                v-model="TreeValue"
-                :data="TreeData"
-                filterable
-                check-strictly
-                :props="defaultProps"
-                default-expand-all
-                :render-after-expand="false"
-            />
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button @click="dialogVisible = false">取消</el-button>
-                    <el-button type="primary" @click="del">删除</el-button>
-                </div>
-            </template>
-        </el-dialog>
     </div>
 </template>
+
 <script setup lang="ts">
-import { onMounted, ref, provide } from 'vue'
+import { nextTick, ref, provide, onMounted } from 'vue'
-import 'splitpanes/dist/splitpanes.css'
-import { Splitpanes, Pane } from 'splitpanes'
-import algorithmTree from '@/components/tree/pqs/algorithmTree.vue'
 import { mainHeight } from '@/utils/layout'
-import { defaultAttribute } from '@/components/table/defaultAttribute'
+import overview from './overview.vue'
-import { getLineExport, getList, selectReleation } from '@/api/event-boot/report'
+import list from './list.vue'
-import addTree from './components/addTree.vue'
+import { useRoute } from 'vue-router'
-import PopupEdit from './components/form.vue'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
-import { useMonitoringPoint } from '@/stores/monitoringPoint'
+const route = useRoute()
-import { ElMessage, ElMessageBox } from 'element-plus'
+const Undocumented = ref()
-import { deleteyById } from '@/api/supervision-boot/database/index'
+const InterferenceUserTable = ref()
-import { queryAllAlgorithmLibrary, updateAlgorithmLibrary } from '@/api/supervision-boot/database/index'
-import { useAdminInfo } from '@/stores/adminInfo'
-import katex from 'katex'
-import 'katex/dist/katex.css'
-const adminInfo = useAdminInfo()
 defineOptions({
-    name: 'database/algorithm'
+    name: 'supervision/interferencemanagement  '
 })
-const monitoringPoint = useMonitoringPoint()
+const activeName = ref('1')
-const height = mainHeight(20)
+const id = ref('')
-const heightTab = mainHeight(82)
+const key = ref('')
-const size = ref(23)
+const listRef = ref()
-const addTreeRef = ref()
+const tabList = ref(['1', '2'])
-const editorRef = ref()
-const dialogVisible = ref(false)
-const viewFlag = ref(false)
-const popupEditFlag = ref(false)
-const treeRef = ref()
-const summary = ref('')
-const popupEditRef = ref()
-const TreeData = ref([])
-const TreeValue = ref([])
-const information = adminInfo.roleCode.includes('information_info')
-
-const defaultProps = {
-    label: 'name',
-    value: 'id'
-}
-const dotList: any = ref()
-
-const templatePolicy: any = ref([])
-// const tableStore = new TableStore({
-//     url: '/supervision-boot/libalgorithm/queryAllAlgorithmLibrary',
-//     method: 'GET',
-//     column: [
-//         { title: '算法名称', field: 'name' },
-//         {
-//             title: '定义',
-//             field: 'name1'
-//         },
-//         {
-//             title: '计算公式',
-//             field: 'name2'
-//         },
-//         {
-//             title: '计算周期',
-//             field: 'name3'
-//         },
-//         {
-//             title: '数据来源',
-//             field: 'name4'
-//         },
-//         {
-//             title: '是否启用',
-//             field: 'name5',
-//             render: 'tag',
-//             effect: 'dark',
-//             custom: {
-//                 0: 'info',
-//                 1: 'success'
-//             },
-//             replaceValue: {
-//                 0: '否',
-//                 1: '是'
-//             }
-//         }
-//     ],
-//     loadCallback: () => {}
-// })
-const radio = ref(0)
-
-// 新增弹框
-const addUser = () => {
-    popupEditFlag.value = true
-    setTimeout(() => {
-        popupEditRef.value.open({
-            title: '新增算法'
-        })
-    }, 100)
-}
-// 修改弹框
-const revise = () => {
-    popupEditFlag.value = true
-    setTimeout(() => {
-        popupEditRef.value.open({
-            title: '修改算法',
-            row: dotList.value
-        })
-    }, 100)
-}
-
 onMounted(() => {
-    const dom = document.getElementById('navigation-splitpanes')
+    let key = window.location.href.split('?')[0].slice(-1)
-    if (dom) {
+    const isNumber = /^\d$/.test(key)
-        size.value = Math.round((180 / dom.offsetHeight) * 120)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
     }
-    // tableStore.index()
 })
-
+const algorithm = (val: any) => {
-const view = (row: any) => {
+    activeName.value = '2'
-    viewFlag.value = true
-    summary.value = row.definition
     setTimeout(() => {
-        const spans = document.querySelectorAll('span[data-value]')
+        listRef.value.getList(val)
-        // 遍历每个 span 标签
-        spans.forEach(function (span) {
-            let val = katex.renderToString(span.getAttribute('data-value'), {
-                throwOnError: false
-            })
-            // var newDiv = document.createElement('div');
-            var newDiv = span
-            newDiv.innerHTML = val
-
-            span.parentNode.replaceChild(newDiv, span)
-        })
     }, 100)
-
-    //
-}
-
-const handleNodeClick = (data: any, node: any) => {
-    if (data.pid != '0') {
-        dotList.value = data
-        radio.value = 0
-    }
-}
-const onAddTree = () => {
-    addTreeRef.value.open('新增')
-}
-const deletes = () => {
-    TreeValue.value = []
-    queryAllAlgorithmLibrary().then(res => {
-        TreeData.value = res.data
-    })
-    dialogVisible.value = true
-}
-// 删除
-const del = () => {
-    if (TreeValue.value.length == 0) {
-        return ElMessage.warning('请选择数据')
-    }
-    ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    }).then(() => {
-        deleteyById({ id: TreeValue.value }).then(res => {
-            ElMessage.success('删除成功')
-            dialogVisible.value = false
-            treeRef.value.loadData()
-        })
-    })
-
-    // if (TreeValue.value.length > 0) {
-    //     ElMessage.warning('请选择数据')
-    //     return
-    // }
-}
-// 启用
-const change = (row: any) => {
-    console.log('🚀 ~ change ~ row:', row)
-    ElMessageBox.confirm(`请确认是否${row.useFLag == 0 ? '启用' : '关闭'}算法?`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    }).then(() => {
-        updateAlgorithmLibrary({ ...row, useFLag: row.useFLag == 0 ? 1 : 0 }).then(res => {
-            ElMessage.success(row.useFLag == 0 ? '启用' : '关闭' + '成功')
-            treeRef.value.loadData(dotList.value.id)
-        })
-    })
 }
+const layout = mainHeight(63) as any
 </script>
-<style lang="scss">
-.splitpanes.default-theme .splitpanes__pane {
-    background: #eaeef1;
-}
 
-.grid-content {
+<style lang="scss" scoped>
-    text-align: center;
+.bars_w {
-}
-
-.el-divider--horizontal {
-    margin: 10px 0;
-}
-
-.mTop {
-    margin-top: 5px;
-    margin-bottom: 5px;
-}
-
-.boxTop {
-    height: 52px;
-    padding: 10px 10px 10px 0;
-    display: flex;
-    justify-content: space-between;
-}
-
-.editor {
-    table {
     width: 100%;
-        border-collapse: collapse;
+    height: 500px;
-    }
+}
 
-    th,
+:deep(.el-tabs__content) {
-    td {
+    height: v-bind('layout.height');
-        border: 1px solid black;
+    overflow-y: auto;
-        padding: 8px;
-        text-align: center;
-    }
-
-    th {
-        background-color: #f2f2f2;
-        font-weight: bold;
-    }
-
-    td {
-        background-color: #ffffff;
-    }
 }
 </style>

src/views/pqs/database/algorithm/list.vue

@@ -0,0 +1,359 @@
+<template>
+    <div class="default-main" :style="height">
+        <!-- 算法库 -->
+        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <pane :size="size">
+                <algorithmTree
+                    ref="treeRef"
+                    :default-expand-all="false"
+                    :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
+                    :current-node-key="monitoringPoint.state.lineId"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                    @onAddTree="onAddTree"
+                ></algorithmTree>
+            </pane>
+            <pane style="background: #fff; width: 100%" :style="height">
+                <div class="boxTop">
+                    <div>
+                        <el-radio-group v-model="radio">
+                            <el-radio-button v-for="(item, i) in dotList?.childrens" :label="item.name" :value="i" />
+                        </el-radio-group>
+                    </div>
+                    <div >
+                        <el-button icon="el-icon-Plus" type="primary" @click="addUser">新增</el-button>
+                        <el-button icon="el-icon-Edit" type="primary" @click="revise">修改</el-button>
+                        <el-button icon="el-icon-Delete" type="primary" @click="deletes">删除</el-button>
+                    </div>
+                </div>
+
+                <div :style="heightTab">
+                    <vxe-table height="auto" v-bind="defaultAttribute" :data="dotList?.childrens[radio]?.children">
+                        <vxe-column field="name" title="算法名称"></vxe-column>
+                        <vxe-column field="createTime" title="创建时间"></vxe-column>
+
+                        <vxe-column field="period" title="计算周期">
+                            <template #default="{ row }">
+                                {{
+                                    row.period == 0
+                                        ? '日'
+                                        : row.period == 1
+                                        ? '月'
+                                        : row.period == 2
+                                        ? '季'
+                                        : row.period == 3
+                                        ? '年'
+                                        : ''
+                                }}
+                            </template>
+                        </vxe-column>
+                        <vxe-column field="source" title="数据来源"></vxe-column>
+                        <!-- <vxe-column field="useFLag" title="是否启用">
+                            <template #default="{ row }">
+                                <el-tag :type="row.useFLag === 1 ? 'success' : 'info'" effect="dark"
+                                    style="cursor: pointer" @click="change(row)">
+                                    {{ row.useFLag === 1 ? '是' : '否' }}
+                                </el-tag>
+                            </template>
+                        </vxe-column> -->
+                        <vxe-column field="definition" title="定义">
+                            <template #default="{ row }">
+                                <el-button type="primary" link @click="view(row)">查看</el-button>
+                            </template>
+                        </vxe-column>
+                        <!-- <vxe-column title="操作" width="150px">
+                            <template #default="{ row }">
+                                <el-button type="primary" link @click="edit(row)">修改</el-button>
+                                <el-button type="danger" link @click="del(row)">删除</el-button>
+                                <el-popconfirm title="确定删除吗？" confirm-button-type='danger'  @confirm="del(row)">
+                                    <template #reference>
+                                        <el-button type="danger" link>删除</el-button>
+                                    </template>
+                                </el-popconfirm>
+                            </template>
+                        </vxe-column> -->
+                    </vxe-table>
+                </div>
+            </pane>
+        </splitpanes>
+        <!-- 树弹框 -->
+        <addTree ref="addTreeRef" @getTree="treeRef.loadData(dotList.id)" />
+        <!-- 弹框 -->
+        <PopupEdit
+            ref="popupEditRef"
+            v-if="popupEditFlag"
+            @getTree="treeRef.loadData(dotList.id), (popupEditFlag = false)"
+        />
+        <!-- 定义 -->
+        <el-dialog draggable v-model="viewFlag" title="定义" width="60%">
+            <div style="min-height: 300px; max-height: 55vh">
+                <div class="editor" ref="editorRef" v-html="summary" />
+            </div>
+        </el-dialog>
+        <!-- 删除 -->
+        <el-dialog draggable v-model="dialogVisible" title="请选择需要删除的数据" width="400">
+            <el-tree-select
+                v-model="TreeValue"
+                :data="TreeData"
+                filterable
+                check-strictly
+                :props="defaultProps"
+                default-expand-all
+                :render-after-expand="false"
+            />
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="del">删除</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref, provide, nextTick } from 'vue'
+import 'splitpanes/dist/splitpanes.css'
+import { Splitpanes, Pane } from 'splitpanes'
+import algorithmTree from '@/components/tree/pqs/algorithmTree.vue'
+import { mainHeight } from '@/utils/layout'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { getLineExport, selectReleation } from '@/api/event-boot/report'
+import addTree from './components/addTree.vue'
+import PopupEdit from './components/form.vue'
+import { useMonitoringPoint } from '@/stores/monitoringPoint'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { deleteyById } from '@/api/supervision-boot/database/index'
+import { queryAllAlgorithmLibrary, updateAlgorithmLibrary } from '@/api/supervision-boot/database/index'
+import { useAdminInfo } from '@/stores/adminInfo'
+import katex from 'katex'
+import 'katex/dist/katex.css'
+const adminInfo = useAdminInfo()
+defineOptions({
+    name: 'database/algorithm'
+})
+const monitoringPoint = useMonitoringPoint()
+const height = mainHeight(20)
+const heightTab = mainHeight(82)
+const size = ref(19)
+const addTreeRef = ref()
+const editorRef = ref()
+const dialogVisible = ref(false)
+const viewFlag = ref(false)
+const popupEditFlag = ref(false)
+const treeRef = ref()
+const summary = ref('')
+const popupEditRef = ref()
+const TreeData = ref([])
+const TreeValue = ref([])
+const information = adminInfo.roleCode.includes('information_info')
+
+const defaultProps = {
+    label: 'name',
+    value: 'id'
+}
+const dotList: any = ref()
+
+const templatePolicy: any = ref([])
+// const tableStore = new TableStore({
+//     url: '/supervision-boot/libalgorithm/queryAllAlgorithmLibrary',
+//     method: 'GET',
+//     column: [
+//         { title: '算法名称', field: 'name' },
+//         {
+//             title: '定义',
+//             field: 'name1'
+//         },
+//         {
+//             title: '计算公式',
+//             field: 'name2'
+//         },
+//         {
+//             title: '计算周期',
+//             field: 'name3'
+//         },
+//         {
+//             title: '数据来源',
+//             field: 'name4'
+//         },
+//         {
+//             title: '是否启用',
+//             field: 'name5',
+//             render: 'tag',
+//             effect: 'dark',
+//             custom: {
+//                 0: 'info',
+//                 1: 'success'
+//             },
+//             replaceValue: {
+//                 0: '否',
+//                 1: '是'
+//             }
+//         }
+//     ],
+//     loadCallback: () => {}
+// })
+const radio = ref(0)
+
+// 新增弹框
+const addUser = () => {
+    popupEditFlag.value = true
+    setTimeout(() => {
+        popupEditRef.value.open({
+            title: '新增算法'
+        })
+    }, 100)
+}
+// 修改弹框
+const revise = () => {
+    popupEditFlag.value = true
+    setTimeout(() => {
+        popupEditRef.value.open({
+            title: '修改算法',
+            row: dotList.value
+        })
+    }, 100)
+}
+
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+    if (dom) {
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
+    }
+    // tableStore.index()
+})
+
+const view = (row: any) => {
+    viewFlag.value = true
+    summary.value = row.definition
+    setTimeout(() => {
+        const spans = document.querySelectorAll('span[data-value]')
+        // 遍历每个 span 标签
+        spans.forEach(function (span) {
+            let val = katex.renderToString(span.getAttribute('data-value'), {
+                throwOnError: false
+            })
+            // var newDiv = document.createElement('div');
+            var newDiv = span
+            newDiv.innerHTML = val
+
+            span.parentNode.replaceChild(newDiv, span)
+        })
+    }, 100)
+
+    //
+}
+
+const handleNodeClick = (data: any, node: any) => {
+    if (data.pid != '0') {
+        dotList.value = data
+        radio.value = 0
+    }
+}
+const onAddTree = () => {
+    addTreeRef.value.open('新增')
+}
+const deletes = () => {
+    TreeValue.value = []
+    queryAllAlgorithmLibrary().then(res => {
+        TreeData.value = res.data
+    })
+    dialogVisible.value = true
+}
+// 删除
+const del = () => {
+    if (TreeValue.value.length == 0) {
+        return ElMessage.warning('请选择数据')
+    }
+    ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    }).then(() => {
+        deleteyById({ id: TreeValue.value }).then(res => {
+            ElMessage.success('删除成功')
+            dialogVisible.value = false
+            treeRef.value.loadData()
+        })
+    })
+
+    // if (TreeValue.value.length > 0) {
+    //     ElMessage.warning('请选择数据')
+    //     return
+    // }
+}
+// 启用
+const change = (row: any) => {
+    console.log('🚀 ~ change ~ row:', row)
+    ElMessageBox.confirm(`请确认是否${row.useFLag == 0 ? '启用' : '关闭'}算法?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    }).then(() => {
+        updateAlgorithmLibrary({ ...row, useFLag: row.useFLag == 0 ? 1 : 0 }).then(res => {
+            ElMessage.success(row.useFLag == 0 ? '启用' : '关闭' + '成功')
+            treeRef.value.loadData(dotList.value.id)
+        })
+    })
+}
+const getList = (val: any) => {
+    setTimeout(async () => {
+        dotList.value = await treeRef.value.setKey(val.data.pid)
+        await dotList.value?.childrens.forEach((item: any, i: number) => {
+            if (item.id == val.data.id) {
+                radio.value = i
+            }
+        })
+    }, 500)
+}
+defineExpose({
+    getList
+})
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #eaeef1;
+}
+
+.grid-content {
+    text-align: center;
+}
+
+.el-divider--horizontal {
+    margin: 10px 0;
+}
+
+.mTop {
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
+.boxTop {
+    height: 52px;
+    padding: 10px 10px 10px 0;
+    display: flex;
+    justify-content: space-between;
+}
+
+.editor {
+    table {
+        width: 100%;
+        border-collapse: collapse;
+    }
+
+    th,
+    td {
+        border: 1px solid black;
+        padding: 8px;
+        text-align: center;
+    }
+
+    th {
+        background-color: #f2f2f2;
+        font-weight: bold;
+    }
+
+    td {
+        background-color: #ffffff;
+    }
+}
+</style>

src/views/pqs/database/algorithm/overview.vue

@@ -0,0 +1,196 @@
+<template>
+    <div class="default-main pt50" :style="height">
+        <!-- 算法库 -->
+        <!--  -->
+
+        <MyEchart :options="echartList" style="width: 100%" :style="height" @echart-click="echartClick"></MyEchart>
+    </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref, provide } from 'vue'
+import 'splitpanes/dist/splitpanes.css'
+
+import { mainHeight } from '@/utils/layout'
+
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { useRouter } from 'vue-router'
+import { queryAllAlgorithmLibrary, updateAlgorithmLibrary } from '@/api/supervision-boot/database/index'
+import { useAdminInfo } from '@/stores/adminInfo'
+import 'katex/dist/katex.css'
+import { useConfig } from '@/stores/config'
+const router = useRouter()
+const config = useConfig()
+const adminInfo = useAdminInfo()
+defineOptions({
+    name: 'database/algorithm'
+})
+const emits = defineEmits(['algorithm'])
+const height = mainHeight(20)
+const size = ref(19)
+
+const popupEditFlag = ref(false)
+
+const popupEditRef = ref()
+const TreeList: any = ref([])
+
+const echartList = ref({})
+
+const dotList: any = ref()
+
+const radio = ref(0)
+
+// 新增弹框
+const addUser = () => {
+    popupEditFlag.value = true
+    setTimeout(() => {
+        popupEditRef.value.open({
+            title: '新增算法'
+        })
+    }, 100)
+}
+
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+    if (dom) {
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
+    }
+    info()
+    // tableStore.index()
+})
+
+const info = () => {
+    queryAllAlgorithmLibrary().then(async res => {
+        TreeList.value = await setTreeAllNodeExpand([
+            {
+                name: '算法库',
+                level: 0,
+                children: res.data
+            }
+        ])
+
+        echartList.value = {
+            series: [
+                {
+                    type: 'tree',
+                    data: TreeList.value,
+                    top: '20',
+                    bottom: '40',
+                    left: '20',
+                    symbolSize: 7,
+                    label: {
+                        position: 'left',
+                        verticalAlign: 'middle',
+                        align: 'left',
+                        fontSize: 14,
+                        fontWeight: 600,
+                        backgroundColor: config.layout.elementUiPrimary[0],
+                        color: '#fff',
+                        borderRadius: 5,
+                        formatter: function (params) {
+                            return [`{name|${params.data.name}}`]
+                        },
+                        rich: {
+                            name: {
+                                fontSize: 14,
+                                fontWeight: 'bold',
+                                padding: [10, 10]
+                            }
+                        }
+                    },
+                    leaves: {
+                        label: {
+                            position: 'left',
+                            verticalAlign: 'middle',
+                            fontWeight: 600,
+                            align: 'left'
+                        }
+                    },
+
+                    edgeShape: 'polyline', // 折线连接线
+                    roam: true, // 可移动,可缩放
+                    expandAndCollapse: false,
+                    animationDuration: 550,
+                    animationDurationUpdate: 750
+                }
+            ]
+        }
+    })
+}
+// 点击echart
+const echartClick = (params: any) => {
+   if(params.data.level == 3){
+     emits('algorithm', params)
+   }
+}
+const setTreeAllNodeExpand = (treeData: any) => {
+    if (!treeData) return []
+    // 兼容单对象/数组两种树数据格式
+    const data = Array.isArray(treeData) ? treeData : [treeData]
+    return data.map(node => {
+        // 深拷贝节点，彻底隔离原数据
+        const newNode = {
+            ...node,
+            collapsed: node.level <= 2 ? false : true // 强制添加展开属性
+        }
+        // 递归处理子节点
+        if (node.children && node.children.length > 0) {
+            newNode.children = setTreeAllNodeExpand(node.children)
+        }
+        return newNode
+    })
+}
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #eaeef1;
+}
+
+.grid-content {
+    text-align: center;
+}
+
+.el-divider--horizontal {
+    margin: 10px 0;
+}
+
+.mTop {
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
+.boxTop {
+    height: 52px;
+    padding: 10px 10px 10px 0;
+
+    display: flex;
+    justify-content: space-between;
+}
+
+.editor {
+    table {
+        width: 100%;
+        border-collapse: collapse;
+    }
+
+    th,
+    td {
+        border: 1px solid black;
+        padding: 8px;
+        text-align: center;
+    }
+
+    th {
+        background-color: #f2f2f2;
+        font-weight: bold;
+    }
+
+    td {
+        background-color: #ffffff;
+    }
+}
+.button {
+    position: absolute;
+    right: 10px;
+    top: 10px;
+}
+</style>

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

@@ -12,7 +12,7 @@
                     <div style="display: flex;align-items: center;">
                         <div>{{ item.name }}</div>
 
-                        <el-icon class="elView" v-if="item.name && VITE_FLAG" @click="view(item)">
+                        <el-icon class="elView" v-if="item.name" @click="view(item)">
                             <View />
                         </el-icon>
                         <el-icon class="elView" v-if="item.name" @click="download(item)">
@@ -50,7 +50,7 @@ import { ref, reactive } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { getFileNameAndFilePath, downloadFile } from '@/api/system-boot/file'
 import { Download, View } from '@element-plus/icons-vue'
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+
 const dialogVisible = ref(false)
 const tableData: any = ref({
 

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

@@ -3,7 +3,7 @@
         <el-drawer v-model="drawer" size="60%">
             <div class="box mt20">
                 <el-upload :show-file-list="false" action="" :auto-upload="false" class="ml10" :on-change="choose"
-                    v-if="information">
+                  v-if="information" >
                     <el-button icon="el-icon-Top" type="primary">上传常见治理措施</el-button>
                 </el-upload>
                 <el-button icon="el-icon-Download" type="primary" class="ml10" @click="downloadTheReport">
@@ -15,16 +15,16 @@
                 <el-collapse-item title="国家电网有限公司企业标准" name="2">
                     <!-- <el-empty description="暂无数据" class="custom-empty iframe" /> -->
                     <div :style="`overflow: auto;`" class="iframe">
-                        <vue-office-docx v-if="url.includes('.doc') || url.includes('.docx')" :src="url" />
+                        <vue-office-docx v-if="urlKey.includes('.doc') || urlKey.includes('.docx')" :src="url" />
-                        <vue-office-excel v-if="url.includes('.xls') || url.includes('.xlsx')" :src="url"
+                        <vue-office-excel v-if="urlKey.includes('.xls') || urlKey.includes('.xlsx')" :src="url"
                             :options="excelOptions" />
-                        <!-- <vue-office-pdf v-if="url.includes('.pdf')" :src="url" /> -->
+                        <!-- <vue-office-pdf v-if="urlKey.includes('.pdf')" :src="url" /> -->
-                        <iframe v-if="url.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
+                        <iframe v-if="urlKey.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
                         <img v-if="
-                            url.includes('.png') ||
+                            urlKey.includes('.png') ||
-                            url.includes('.jpg') ||
+                            urlKey.includes('.jpg') ||
-                            url.includes('.gif') ||
+                            urlKey.includes('.gif') ||
-                            url.includes('.bmp')
+                            urlKey.includes('.bmp')
                         " :src="url" />
                     </div>
                 </el-collapse-item>
@@ -45,6 +45,7 @@ import { useAdminInfo } from '@/stores/adminInfo'
 import { ElMessage } from 'element-plus'
 import { uploadFile, getFileNameAndFilePath, downloadFile } from '@/api/system-boot/file'
 import { addStandardCase, queryStandardCase } from '@/api/supervision-boot/database/index'
+import { previewFile } from '@/utils/fileDownLoad'
 const adminInfo = useAdminInfo()
 const drawer = ref(false)
 const activeName = ref('2')
@@ -53,17 +54,14 @@ const url = ref('')
 const excelOptions = ref({})
 const information = adminInfo.roleCode.includes('information_info')
 
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
-const open = (row: any) => {
-    // console.log('🚀 ~ open ~ row:', row)
-    // url.value = row
-    drawer.value = true
-    if(VITE_FLAG){
-        url.value = `/api-docx/excelreport` + row
-        excelOptions.value = { xls: row.split('.')[1] == 'xls' ? true : false }
-    }else{
 
-    }
+const urlKey=ref('')
+const open = async (row: any) => {
+    drawer.value = true
+    urlKey.value=row
+        const previewUrl = await previewFile(row);
+        url.value = previewUrl;
+        
     // getFileNameAndFilePath({ filePath: row }).then(res => {
     //     url.value = res.data.url
     // })

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

@@ -123,7 +123,7 @@ const tableStore = new TableStore({
             ]
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '200',
             render: 'buttons',
             buttons: [

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

@@ -20,13 +20,13 @@
                 <el-empty v-if="url.length == 0" description="暂无数据" class="custom-empty"
                     :style="`height: calc(${height.height} - 60px);`" />
                 <div :style="`height: calc(${height.height} - 60px);overflow: auto;`" v-else>
-                    <vue-office-docx v-if="url.includes('.doc') || url.includes('.docx')" :src="url" />
+                    <vue-office-docx v-if="urlKey.includes('.doc') || urlKey.includes('.docx')" :src="url" />
-                    <vue-office-excel v-if="url.includes('.xls') || url.includes('.xlsx')" :src="url"
+                    <vue-office-excel v-if="urlKey.includes('.xls') || urlKey.includes('.xlsx')" :src="url"
                         :options="excelOptions" />
                     <!-- <vue-office-pdf v-if="url.includes('.pdf')" :src="url"/> -->
-                    <iframe v-if="url.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
+                    <iframe v-if="urlKey.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
                     <img v-if="
-                        url.includes('.png') || url.includes('.jpg') || url.includes('.gif') || url.includes('.bmp')
+                        urlKey.includes('.png') || urlKey.includes('.jpg') || urlKey.includes('.gif') || urlKey.includes('.bmp')
                     " :src="url" />
                 </div>
             </pane>
@@ -56,6 +56,7 @@ import VueOfficeExcel from '@vue-office/excel'
 import VueOfficePdf from '@vue-office/pdf'
 import { deleteyLibstandard } from '@/api/supervision-boot/database/index'
 import { useAdminInfo } from '@/stores/adminInfo'
+import {previewFile } from '@/utils/fileDownLoad'
 const adminInfo = useAdminInfo()
 defineOptions({
     name: 'database/standard'
@@ -63,7 +64,7 @@ defineOptions({
 const excelOptions = ref({})
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(20)
-const size = ref(23)
+const size = ref(19)
 const treeRef = ref()
 const addTreeRef = ref()
 const url = ref('')
@@ -77,22 +78,24 @@ onMounted(() => {
     }
 })
 
-
+const urlKey=ref('')
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const handleNodeClick = (data: any, node: any) => {
-    console.log("🚀 ~ handleNodeClick ~ data:", data)
+   // console.log("🚀 ~ handleNodeClick ~ data:", data)
     dotList.value = data
     url.value = ''
     flag.value = false
     if (data?.url != null && data?.url != '') {
         flag.value = true
-
+        urlKey.value = data.url
-        setTimeout(() => {
+        console.log('urlKey.value',urlKey.value)
+        setTimeout(async () => {
              if(VITE_FLAG){
                    url.value = `/api-docx/excelreport` + data.url
                    excelOptions.value = { xls: data.url.split('.')[1] == 'xls' ? true : false }
              }else{
-                   
+                   const previewUrl = await previewFile(data.url);
+                    url.value = previewUrl;
              }
          
             // getFileNameAndFilePath({ filePath: data.url }).then(res => {

src/views/pqs/database/stencil/components/form.vue

@@ -91,8 +91,10 @@ const submit = () => {
     formRef.value.validate(async (valid: boolean) => {
         if (valid) {
             if (urlList.value.length > 0) {
+               
                 const promises = urlList.value.map(async (item: any) => {
                     if (urlList.value[0].raw) {
+                        
                         return new Promise((resolve, reject) => {
                             uploadFile(item.raw, '/supervision/')
                                 .then((res: any) => {

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

@@ -36,7 +36,7 @@ defineOptions({
 })
 const information = adminInfo.roleCode.includes('information_info')
 const popupEditRef = ref()
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const TableHeaderRef = ref()
 
 const tableStore = new TableStore({
@@ -49,7 +49,7 @@ const tableStore = new TableStore({
             field: 'createTime'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '280',
             render: 'buttons',
             buttons: [
@@ -59,6 +59,9 @@ const tableStore = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-Plus',
                     render: 'basicButton',
+                    // disabled: row => {
+                    //     return !VITE_FLAG
+                    // },
                     click: row => {
                         window.open(window.location.origin + '/#/previewFile?' + row.url)
                     }

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

@@ -4,7 +4,7 @@
             <TableHeader datePicker area showExport>
                 <template #select>
                     <el-form-item label="筛选数据">
-                        <el-input v-model="tableStore.table.params.searchValue" placeholder="输入关键字筛选" />
+                        <el-input v-model="tableStore.table.params.searchValue" placeholder="输入关键字筛选" clearable maxlength="32" show-word-limit/>
                     </el-form-item>
                     <el-form-item label="统计类型:">
                         <el-select
@@ -131,7 +131,7 @@ const tableStore = new TableStore({
         { field: 'scale', title: '电压等级', minWidth: '110' },
         // {
         //     field: 'advanceType',
-        //     title: '暂降类型',
+        //     title: '触发类型',
         //     minWidth: '90',
         //     formatter: (row: any) => {
         //         return row.cellValue || '其他'
@@ -147,7 +147,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'eventType',
-            title: '暂态统计类型',
+            title: '触发类型',
             minWidth: '120',
             formatter: (row: any) => {
                 return eventList.filter(item => item.id === row.cellValue)[0]?.name
@@ -179,7 +179,7 @@ const tableStore = new TableStore({
         { field: 'duration', title: '持续时间(s)', minWidth: '100' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [

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

@@ -75,11 +75,11 @@ const tableStore = new TableStore({
             yData = []
         chartsData.value.map((item: any) => {
             xData.push(item.type)
-            if (item.single == 0 || item.single == 3.14159) {
+            // if (item.single == 0 || item.single == 3.14159) {
-                yData.push(1)
+            //     yData.push(0)
-            } else {
+            // } else {
                 yData.push(item.single)
-            }
+            //}
         })
         // tableStore.table.data.type
         const legendColorList = ['#0099CC', '#9A6601', '#CCCCCC', '#FFFFFF']
@@ -111,7 +111,19 @@ const tableStore = new TableStore({
             },
            
             tooltip: {
-               
+                formatter: function (params: any) {
+                    var tips = ''
+                    for (var i = 0; i < params.length; i++) {
+                        if (params[i].value == 3.14159) {
+                            tips += params[i].name + '</br>'
+                            tips += params[i].marker + '完整性:暂无数据'
+                        } else {
+                            tips += params[i].name + '</br>'
+                            tips += params[i].marker + '完整性:' + params[i].value.toFixed(2)
+                        }
+                    }
+                    return tips
+                }
                 // formatter: function (params: any) {
                 //     var tips = `<div style="min-width:80px;display:flex;justify-content:space-between;align-items:center">
                 //         <span style="margin-left:5px;dislpay:block;min-width:80px;color:#000">${params[0].name}</span></div>`
@@ -181,7 +193,21 @@ const tableStore = new TableStore({
 
                             // 定制显示（按顺序）
                             color: function (params) {
-                                if (params.value >= 90) {
+                                if (params.value == 3.14159) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#ccc'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (params.value >= 90) {
                                     return new echarts.graphic.LinearGradient(
                                         0,
                                         1,
@@ -209,7 +235,7 @@ const tableStore = new TableStore({
                                         ],
                                         false
                                     )
-                                } else if (params.value > 0.5 && params.value <= 60) {
+                                } else if (params.value > 0 && params.value <= 60) {
                                     return new echarts.graphic.LinearGradient(
                                         0,
                                         1,
@@ -223,7 +249,7 @@ const tableStore = new TableStore({
                                         ],
                                         false
                                     )
-                                } else if (params.value > 0 && params.value <= 0.5) {
+                                } else if (params.value == 0) {
                                     return new echarts.graphic.LinearGradient(
                                         0,
                                         1,

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

@@ -56,7 +56,7 @@
                     </el-form-item>
                 </template>
                 <template #operation>
-                    <el-button type="primary" icon="el-icon-Tickets" @click="makeUp">补招</el-button>
+                    <el-button type="primary" icon="el-icon-Tickets" @click="makeUp" v-if="!VITE_FLAG">补招</el-button>
                 </template>
             </TableHeader>
         </div>
@@ -113,6 +113,7 @@ const adminInfo = useAdminInfo()
 defineOptions({
     name: 'harmonic-boot/harmonic/getIntegrityData'
 })
+const VITE_FLAG = import.meta.env.VITE_NAME == 'hainan'
 const logRef = ref()
 const tableRef = ref()
 const chartsRef = ref()

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

@@ -0,0 +1,189 @@
+<template>
+    <div class="default-main">
+        <TableHeader date-picker area showExport>
+            <template #select>
+                    <el-form-item label="统计类型:" v-if="false">
+                        <el-select
+                            v-model="tableStore.table.params.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="电压等级:" v-if="false">
+                        <el-select
+                            v-model="tableStore.table.params.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="终端厂家:" v-if="false">
+                        <el-select
+                            v-model="tableStore.table.params.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-select
+                            v-model="tableStore.table.params.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-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                        <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
+                    </el-select>
+                    </el-form-item>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+    </div>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, watch } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import { getAreaDept } from '@/api/harmonic-boot/area'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+
+defineOptions({
+    name: 'harmonic-boot/area/harmonicDistortionRate'
+})
+
+const dictData = useDictData()
+//字典获取电压等级
+const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
+//字典获取终端厂家
+const terminaloption = dictData.getBasicData('Dev_Manufacturers')
+//字典获取统计类型
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+//字典获取干扰源类型
+const interfereoption = dictData.getBasicData('Interference_Source')
+const sign = dictData.getBasicData('power_flag')
+
+
+
+const tableStore = new TableStore({
+    url: '/harmonic-boot/tHDistortion/getTHDistortionTableData',
+    isWebPaging: true,
+    method: 'POST',
+     column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },  
+        {
+            field: 'subStation',
+            title: '变电站',
+             minWidth: 150
+        },
+         {
+            field: 'city',
+            title: '所在地市',
+            minWidth: 100
+        },
+        {
+            field: 'manufacturer',
+            title: '终端厂家',
+            minWidth: 80
+        },
+         {
+            field: 'deviceName',
+            title: '终端名称',
+            minWidth: 80
+        },
+      
+        {
+            title: '网络参数',
+            field: 'ip',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue ? row.cellValue : '/'
+            },
+            minWidth: 120
+        },
+        {
+            title: '监测点名称',
+            field: 'lineName',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue ? row.cellValue : '/'
+            },
+            minWidth: 100
+        },
+        {
+            title: '总谐波畸变率(%)',
+            field: 'distortion',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue == 3.14159 ? '暂无数据' : row.cellValue
+            },
+            minWidth: 120
+        }
+    ],
+
+  
+})
+
+tableStore.table.params.statisticalType = classificationData[0]
+tableStore.table.params.scale = []
+tableStore.table.params.manufacturer = []
+tableStore.table.params.loadType = []
+tableStore.table.params.serverName = 'harmonicBoot'
+tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
+provide('tableStore', tableStore)
+
+
+onMounted(() => {
+    tableStore.index()
+})
+</script>

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

@@ -107,12 +107,12 @@ const tableStore = new TableStore({
                     var tips = ''
 
                     for (var i = 0; i < params.length; i++) {
-                        if (params[i].value == 1) {
+                        if (params[i].value == 3.14159) {
                             tips += params[i].name + '</br>'
-                            tips += '在线率:暂无数据'
+                            tips += params[i].marker + '在线率:暂无数据'
                         } else {
                             tips += params[i].name + '</br>'
-                            tips += '在线率:' + params[i].value.toFixed(2)
+                            tips += params[i].marker + '在线率:' + params[i].value.toFixed(2)
                         }
                     }
                     return tips
@@ -143,7 +143,21 @@ const tableStore = new TableStore({
                             //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
                             // 定制显示（按顺序）
                             color: function (params: any) {
-                                if (params.value >= 90) {
+                                if (params.value == 3.14159) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#ccc'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                }else if (params.value >= 90) {
                                     return new echarts.graphic.LinearGradient(
                                         0,
                                         1,
@@ -171,7 +185,7 @@ const tableStore = new TableStore({
                                         ],
                                         false
                                     )
-                                } else if (params.value <= 60 && params.value > 1) {
+                                } else if (params.value > 0 && params.value <= 60) {
                                     return new echarts.graphic.LinearGradient(
                                         0,
                                         1,
@@ -180,12 +194,12 @@ const tableStore = new TableStore({
                                         [
                                             {
                                                 offset: 1,
-                                                color: '#A52a2a'
+                                                color: '#CC0100'
                                             }
                                         ],
                                         false
                                     )
-                                } else if (params.value > 0 && params.value <= 1) {
+                                } else if (params.value == 0) {
                                     return new echarts.graphic.LinearGradient(
                                         0,
                                         1,

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

@@ -131,6 +131,12 @@ import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import charts from './components/charts.vue'
+
+
+defineOptions({
+    name: 'device-boot/getOnlineRateData'
+})
+
 const tableRef = ref()
 const chartsRef = ref()
 const dictData = useDictData()
@@ -147,7 +153,7 @@ const treeData = ref([])
 const idArr = ref([])
 const activeName = ref(0)
 const getTreeData = async () => {
-    console.log('getTreeData')
+   
     await getAreaDept().then(res => {
         var data = res.data
         data.forEach(element => {

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

@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader datePicker ref="header">
+        <TableHeader area datePicker ref="header">
             <template v-slot:select>
                 <el-form-item label="电网标志">
                     <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
@@ -11,82 +11,119 @@
         </TableHeader>
         <div v-loading="tableStore.table.loading" class="pr10">
             <el-row>
-                <el-col :span="12" class="pd10">
+                <el-col :span="12" class="pd10" v-if="!VITE_FLAG">
-                    <el-tag style="background: #339966;" class="tag" size="small">5级</el-tag>
+                    <el-tag style="background: #339966" class="tag" size="small">5级</el-tag>
-                    <span style="color: #339966;" class="text">:优秀--(4.5,5]</span>
+                    <span style="color: #339966" class="text">:优秀--(4.5,5]</span>
-                    <el-tag style="background: #3399ff;" class="tag" size="small">4级</el-tag>
+                    <el-tag style="background: #3399ff" class="tag" size="small">4级</el-tag>
-                    <span style="color: #3399ff;" class="text">:良好--(4,4.5]</span>
+                    <span style="color: #3399ff" class="text">:良好--(4,4.5]</span>
-                    <el-tag style="background: #ffcc33;" class="tag" size="small">3级</el-tag>
+                    <el-tag style="background: #ffcc33" class="tag" size="small">3级</el-tag>
-                    <span style="color: #ffcc33;" class="text">:合格--(3,4]</span>
+                    <span style="color: #ffcc33" class="text">:合格--(3,4]</span>
-                    <el-tag style="background: #ff9900;" class="tag" size="small">2级</el-tag>
+                    <el-tag style="background: #ff9900" class="tag" size="small">2级</el-tag>
-                    <span style="color: #ff9900;" class="text">:较差--(2,3]</span>
+                    <span style="color: #ff9900" class="text">:较差--(2,3]</span>
-                    <el-tag style="background: #A52a2a;" class="tag" size="small">1级</el-tag>
+                    <el-tag style="background: #a52a2a" class="tag" size="small">1级</el-tag>
-                    <span style="color: #A52a2a;" class="text">:极差--[1,2]</span>
+                    <span style="color: #a52a2a" class="text">:极差--[1,2]</span>
                     <div :style="{ height: layout.height }" style="overflow-y: auto" class="mt10">
-                        <div class=" cardBox">
+                        <div class="cardBox">
                             <el-card v-for="(item, index) in tableStore.table.data" :key="index">
                                 <template #header>
-                                    <div style="cursor: pointer;">
+                                    <div style="cursor: pointer">
-                                        <el-tag v-if="item.data == 3.14159 || item.data == 0"
+                                        <el-tag
-                                            style="background: #ccc; color: #fff" size="small">
+                                            v-if="item.data == 3.14159 || item.data == 0"
+                                            style="background: #ccc; color: #fff"
+                                            size="small"
+                                        >
                                             无
                                         </el-tag>
-                                        <el-tag v-if="4.5 < item.data && item.data <= 5 && item.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #339966; color: #fff" size="small">
+                                            v-if="4.5 < item.data && item.data <= 5 && item.data !== 3.14159"
+                                            style="background: #339966; color: #fff"
+                                            size="small"
+                                        >
                                             5级
                                         </el-tag>
-                                        <el-tag v-if="4 < item.data && item.data <= 4.5 && item.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #3399ff; color: #fff" size="small">
+                                            v-if="4 < item.data && item.data <= 4.5 && item.data !== 3.14159"
+                                            style="background: #3399ff; color: #fff"
+                                            size="small"
+                                        >
                                             4级
                                         </el-tag>
-                                        <el-tag v-if="3 < item.data && item.data <= 4 && item.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #ffcc33; color: #fff" size="small">
+                                            v-if="3 < item.data && item.data <= 4 && item.data !== 3.14159"
+                                            style="background: #ffcc33; color: #fff"
+                                            size="small"
+                                        >
                                             3级
                                         </el-tag>
-                                        <el-tag v-if="2 < item.data && item.data <= 3 && item.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #ff9900; color: #fff" size="small">
+                                            v-if="2 < item.data && item.data <= 3 && item.data !== 3.14159"
+                                            style="background: #ff9900; color: #fff"
+                                            size="small"
+                                        >
                                             4级
                                         </el-tag>
-                                        <el-tag v-if="1 <= item.data && item.data <= 2 && item.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #A52a2a; color: #fff" size="small">
+                                            v-if="1 <= item.data && item.data <= 2 && item.data !== 3.14159"
+                                            style="background: #a52a2a; color: #fff"
+                                            size="small"
+                                        >
                                             1级
                                         </el-tag>
                                         <span>{{ item.name }}</span>
                                     </div>
-
-
-
                                 </template>
                                 <div class="card-content">
                                     <div class="card-item" v-for="(item1, index1) in item.children" :key="index1">
-                                        <el-tag v-if="item1.data == 3.14159 || item1.data == 0"
+                                        <el-tag
-                                            style="background: #ccc; color: #fff" size="small">
+                                            v-if="item1.data == 3.14159 || item1.data == 0"
+                                            style="background: #ccc; color: #fff"
+                                            size="small"
+                                        >
                                             无
                                         </el-tag>
-                                        <el-tag v-if="4.5 < item1.data && item1.data <= 5 && item1.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #339966; color: #fff" size="small">
+                                            v-if="4.5 < item1.data && item1.data <= 5 && item1.data !== 3.14159"
+                                            style="background: #339966; color: #fff"
+                                            size="small"
+                                        >
                                             5级
                                         </el-tag>
-                                        <el-tag v-if="4 < item1.data && item1.data <= 4.5 && item1.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #3399ff; color: #fff" size="small">
+                                            v-if="4 < item1.data && item1.data <= 4.5 && item1.data !== 3.14159"
+                                            style="background: #3399ff; color: #fff"
+                                            size="small"
+                                        >
                                             4级
                                         </el-tag>
-                                        <el-tag v-if="3 < item1.data && item1.data <= 4 && item1.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #ffcc33; color: #fff" size="small">
+                                            v-if="3 < item1.data && item1.data <= 4 && item1.data !== 3.14159"
+                                            style="background: #ffcc33; color: #fff"
+                                            size="small"
+                                        >
                                             3级
                                         </el-tag>
-                                        <el-tag v-if="2 < item1.data && item1.data <= 3 && item1.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #ff9900; color: #fff" size="small">
+                                            v-if="2 < item1.data && item1.data <= 3 && item1.data !== 3.14159"
+                                            style="background: #ff9900; color: #fff"
+                                            size="small"
+                                        >
                                             2级
                                         </el-tag>
-                                        <el-tag v-if="1 <= item1.data && item1.data <= 2 && item1.data !== 3.14159"
+                                        <el-tag
-                                            style="background: #A52a2a; color: #fff" size="small">
+                                            v-if="1 <= item1.data && item1.data <= 2 && item1.data !== 3.14159"
+                                            style="background: #a52a2a; color: #fff"
+                                            size="small"
+                                        >
                                             1级
                                         </el-tag>
                                         <span class="xdf">
-                                            <el-tooltip :show-arrow="false" :offset="-0" :content="item1.name"
+                                            <el-tooltip
-                                                popper-class="atooltip" placement="bottom-start">
+                                                :show-arrow="false"
+                                                :offset="-0"
+                                                :content="item1.name"
+                                                placement="bottom-start"
                                              
+                                            >
                                                 <div class="tooltipText">
                                                     {{ item1.name }}
                                                 </div>
@@ -98,34 +135,26 @@
                         </div>
                     </div>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="VITE_FLAG ? 24 : 12">
                     <my-echart class="tall" :options="echartList" />
-                    <div class="tall">
+                    <div class="tall mb10">
                         <vxe-table height="auto" auto-resize :data="tableStore.table.data" v-bind="defaultAttribute">
-
                             <vxe-column field="name" title="名称"></vxe-column>
                             <vxe-column field="zc" title="综合评估值">
                                 <template #default="scope">
-                                    <span v-if="scope.row.data == 3.14159" style="color: #000;">
+                                    <span v-if="scope.row.data == 3.14159" style="color: #000">暂无数据</span>
-                                        暂无数据
+                                    <span v-if="scope.row.data !== 3.14159" style="color: #000">
-                                    </span>
-                                    <span v-if="scope.row.data !== 3.14159" style="color: #000;">
                                         {{ scope.row.data }}
                                     </span>
                                 </template>
                             </vxe-column>
                             <vxe-column field="monitors" title="监测点个数(个)"></vxe-column>
-                            <vxe-column field="level" title="评估等级">
+                            <vxe-column field="level" title="评估等级"></vxe-column>
-
-                            </vxe-column>
                         </vxe-table>
                     </div>
-
                 </el-col>
             </el-row>
         </div>
-
-
     </div>
 </template>
 <script setup lang="ts">
@@ -138,14 +167,22 @@ import TableStore from '@/utils/tableStore'
 import { ref, onMounted, provide } from 'vue'
 import { mainHeight } from '@/utils/layout'
 import * as echarts from 'echarts/core'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'qujing'
 defineOptions({
-    name: 'harmonic-boot/qydetailedAnalysis/pollutionqy'
+    name: 'harmonic-boot/area/powerAssessment'
 })
 const dictData = useDictData()
 const echartList = ref({})
 const sign = dictData.getBasicData('power_flag')
 const header = ref()
-const options = dictData.getBasicData('Pollution_Statis', ['I_Neg', 'V_Inharm', 'V_Dev', 'V_Unbalance', 'Plt', 'Freq_Dev'])
+const options = dictData.getBasicData('Pollution_Statis', [
+    'I_Neg',
+    'V_Inharm',
+    'V_Dev',
+    'V_Unbalance',
+    'Plt',
+    'Freq_Dev'
+])
 const tableStore = new TableStore({
     url: '/harmonic-boot/comAccess/getComAccessData',
     method: 'POST',
@@ -153,10 +190,6 @@ const tableStore = new TableStore({
     loadCallback: () => {
         histogram(tableStore.table.data)
         header.value.areaRef.change()
-        
-
-
-
     }
 })
 provide('tableStore', tableStore)
@@ -164,13 +197,11 @@ provide('tableStore', tableStore)
 tableStore.table.params.deptIndex = dictData.state.area[0].id
 tableStore.table.params.monitorFlag = 2
 tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
-tableStore.table.params.statisticalType = {}
 
+tableStore.table.params.statisticalType = {}
 
 // 柱状图数据处理
 const histogram = (res: any) => {
-    console.log(123);
-
     echartList.value = {
         title: {
             text: '区域'
@@ -185,7 +216,7 @@ const histogram = (res: any) => {
             data: res.map((item: any) => item.name)
         },
         yAxis: {
-            name: '等级',// 给X轴加单位
+            name: '等级', // 给X轴加单位
             min: 0,
             max: 5,
             splitLine: {
@@ -207,11 +238,10 @@ const histogram = (res: any) => {
                         texts.push('4级')
                     } else if (value == 5) {
                         texts.push('5级')
-
                     }
                     return texts
                 }
-            },
+            }
         },
 
         options: {
@@ -221,10 +251,10 @@ const histogram = (res: any) => {
                     name: '评估值',
                     type: 'bar',
                     data: res.map((item: any) => {
-                        return item.data == 3.14159 ? 0.14159 : item.data
+                        return item.data == 3.14159 ? 0.14159 : item.data == 0 ? 0.14158 : item.data
                     }),
                     barMaxWidth: 30,
-
+                    barMinHeight: 10,
                     itemStyle: {
                         normal: {
                             // 随机显示
@@ -233,44 +263,106 @@ const histogram = (res: any) => {
                             // 定制显示（按顺序）
                             color: function (params) {
                                 if (4.5 < params.value && params.value <= 5 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
                                             {
                                                 offset: 1,
-                                            color: '#339966',
+                                                color: '#339966'
-                                        }], false)
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (4 < params.value && params.value <= 4.5 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
                                             {
                                                 offset: 1,
                                                 color: '#3399FF'
-                                        }], false)
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (3 < params.value && params.value <= 4 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
                                             {
                                                 offset: 1,
                                                 color: '#FFCC33'
-                                        }], false)
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (2 < params.value && params.value <= 3 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
                                             {
                                                 offset: 1,
                                                 color: '#FF9900'
-                                        }], false)
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (params.value >= 1 && params.value <= 2 && params.value !== 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
                                             {
                                                 offset: 1,
                                                 color: '#A52a2a'
-                                        }], false)
+                                            }
+                                        ],
+                                        false
+                                    )
                                 } else if (params.value == 0.2) {
-                                    return new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
                                             {
                                                 offset: 1,
-                                            color: "#999999"
+                                                color: '#ccc'
-                                        }], false)
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (params.value == 0.14158) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#ccc'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                }
                             }
                         }
-                        },
                     },
                     markLine: {
                         silent: false,
@@ -282,90 +374,81 @@ const histogram = (res: any) => {
                         emphasis: {
                             lineStyle: {
                                 width: 1
-                            },
+                            }
                         },
                         data: [
-
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 1,
                                 lineStyle: {
-                                    color: '#A52a2a',
+                                    color: '#A52a2a'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#A52a2a',
+                                        color: '#A52a2a'
-
-
                                     }
                                 }
                             },
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 2,
                                 lineStyle: {
-                                    color: '#FF9900',
+                                    color: '#FF9900'
-
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#FF9900',
+                                        color: '#FF9900'
-
                                     }
                                 }
                             },
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 3,
                                 lineStyle: {
-                                    color: '#FFCC33',
+                                    color: '#FFCC33'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#FFCC33',
+                                        color: '#FFCC33'
-
                                     }
                                 }
                             },
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 4,
                                 lineStyle: {
-                                    color: '#3399FF',
+                                    color: '#3399FF'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#3399FF',
+                                        color: '#3399FF'
-
                                     }
                                 }
                             },
                             {
-                                name: "",
+                                name: '',
                                 yAxis: 5,
                                 lineStyle: {
-                                    color: '#339966',
+                                    color: '#339966'
                                 },
                                 label: {
                                     // position:"middle",
                                     formatter: '{b}',
                                     textStyle: {
-                                        color: '#339966',
+                                        color: '#339966'
-
+                                    }
                                 }
                             }
-                            },
                         ]
-                    },
+                    }
-
                 }
             ]
         }
@@ -396,7 +479,6 @@ const layout1 = mainHeight(93) as any
 }
 
 :deep(.cardBox) {
-
     box-sizing: border-box;
     overflow: auto;
     display: grid;
@@ -409,8 +491,6 @@ const layout1 = mainHeight(93) as any
         background-image: linear-gradient(var(--el-color-primary), var(--el-color-primary-light-3));
         font-weight: bold;
 
-
-
         .el-card__header {
             padding: 10px !important;
             color: #fff;
@@ -419,7 +499,6 @@ const layout1 = mainHeight(93) as any
                 display: flex;
                 justify-content: space-between;
             }
-
         }
 
         .el-card__body {
@@ -439,7 +518,6 @@ const layout1 = mainHeight(93) as any
                 width: 50%;
                 display: flex;
                 cursor: pointer;
-
             }
 
             .xdf {
@@ -455,11 +533,8 @@ const layout1 = mainHeight(93) as any
                 text-overflow: ellipsis;
                 white-space: nowrap;
                 margin-left: 5px;
-
-            }
-
             }
         }
-
+    }
 }
 </style>

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

@@ -75,7 +75,12 @@
                     </el-form-item>
                     <el-form-item label="电网标志">
                         <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
-                        <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
+                            <el-option
+                                v-for="item in sign"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.algoDescribe"
+                            />
                         </el-select>
                     </el-form-item>
                 </template>
@@ -98,6 +103,7 @@
         </div>
     </div>
 </template>
+
 <script lang="ts" setup>
 import { ref, onMounted, watch } from 'vue'
 import { useDictData } from '@/stores/dictData'
@@ -158,6 +164,8 @@ const tableStore = new TableStore({
             title: '电压等级',
             field: 'voltageLevel',
             align: 'center',
+            minWidth: 80,
+
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -166,6 +174,7 @@ const tableStore = new TableStore({
             title: '网络参数',
             field: 'networkParam',
             align: 'center',
+            minWidth: 120,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -174,6 +183,7 @@ const tableStore = new TableStore({
             title: '监测点名称',
             field: 'lineName',
             align: 'center',
+            minWidth: 120,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -182,6 +192,7 @@ const tableStore = new TableStore({
             title: '厂家',
             field: 'factoryName',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -190,6 +201,7 @@ const tableStore = new TableStore({
             title: '谐波电压(%)',
             field: 'harmonicVoltage',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -198,6 +210,7 @@ const tableStore = new TableStore({
             title: '电压偏差(%)',
             field: 'voltageOffset',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -206,6 +219,7 @@ const tableStore = new TableStore({
             title: '三相电压不平衡度(%)',
             field: 'voltageUnbalance',
             align: 'center',
+            minWidth: 100,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -214,6 +228,7 @@ const tableStore = new TableStore({
             title: '间谐波电压含有率(%)',
             field: 'interHarmonic',
             align: 'center',
+            minWidth: 100,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -222,6 +237,7 @@ const tableStore = new TableStore({
             title: '谐波电流(%)',
             field: 'harmonicCurrent',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -230,6 +246,7 @@ const tableStore = new TableStore({
             title: '负序电流(%)',
             field: 'negativeCurrent',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -238,6 +255,7 @@ const tableStore = new TableStore({
             title: '频率偏差(%)',
             field: 'freqOffset',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -246,6 +264,7 @@ const tableStore = new TableStore({
             title: '闪变(%)',
             field: 'flicker',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -311,11 +330,12 @@ const tree2List = (list: any, id?: string) => {
     })
     // 返回结果数组
     return arr
-  }
+}
 onMounted(() => {
     tableStore.index()
 })
 </script>
+
 <style lang="scss" scoped>
 // .online {
 //     width: 100%;

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

@@ -0,0 +1,253 @@
+<template>
+    <div class="default-main">
+        <TableHeader date-picker area showExport>
+            <template #select>
+                    <el-form-item label="统计类型:" v-if="false">
+                        <el-select
+                            v-model="tableStore.table.params.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="电压等级:" v-if="false">
+                        <el-select
+                            v-model="tableStore.table.params.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="终端厂家:" v-if="false">
+                        <el-select
+                            v-model="tableStore.table.params.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-select
+                            v-model="tableStore.table.params.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-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                        <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
+                    </el-select>
+                    </el-form-item>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+    </div>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, watch } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import { getAreaDept } from '@/api/harmonic-boot/area'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+
+defineOptions({
+    name: 'harmonic-boot/area/qualifiedRate'
+})
+
+const dictData = useDictData()
+//字典获取电压等级
+const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
+//字典获取终端厂家
+const terminaloption = dictData.getBasicData('Dev_Manufacturers')
+//字典获取统计类型
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+//字典获取干扰源类型
+const interfereoption = dictData.getBasicData('Interference_Source')
+const sign = dictData.getBasicData('power_flag')
+
+
+
+const tableStore = new TableStore({
+    url: '/harmonic-boot/steadyQualify/getSteadyQualifyTableData',
+    isWebPaging: true,
+    method: 'POST',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+       
+        {
+            field: 'subStation',
+            title: '变电站',
+             minWidth: 150
+        },
+         {
+            field: 'city',
+            title: '所在地市',
+            minWidth: 100
+        },   
+         {
+            field: 'manufacturer',
+            title: '终端厂家',
+            minWidth: 80
+        },
+         {
+            field: 'deviceName',
+            title: '终端名称',
+            minWidth: 80
+        },
+        {
+            title: '网络参数',
+            field: 'ip',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue ? row.cellValue : '/'
+            },
+            minWidth: 120
+        },
+        {
+            title: '监测点名称',
+            field: 'lineName',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue ? row.cellValue : '/'
+            },
+            minWidth: 100
+        },
+       
+        {
+            title: '谐波电压(%)',
+            field: 'harmonicVoltage',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '电压偏差(%)',
+            field: 'voltageOffset',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '三相电压不平衡度(%)',
+            field: 'voltageUnbalance',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '间谐波电压含有率(%)',
+            field: 'interHarmonic',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '谐波电流(%)',
+            field: 'harmonicCurrent',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '负序电流(%)',
+            field: 'negativeCurrent',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '频率偏差(%)',
+            field: 'freqOffset',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        },
+        {
+            title: '闪变(%)',
+            field: 'flicker',
+            align: 'center',
+            formatter: function (row) {
+                return row.cellValue != 3.14159 ? row.cellValue : '/'
+            },
+            minWidth: 80
+        }
+    ],
+
+
+})
+
+tableStore.table.params.statisticalType = classificationData[0]
+tableStore.table.params.scale = []
+tableStore.table.params.manufacturer = []
+tableStore.table.params.loadType = []
+tableStore.table.params.serverName = 'harmonicBoot'
+tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
+provide('tableStore', tableStore)
+
+
+onMounted(() => {
+    tableStore.index()
+})
+</script>

src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/components/provinceDetails.vue

@@ -85,7 +85,7 @@ const title = ref('')
 const key = ref(0)
 const statisticalName = ref('')
 const open = (row: any, flag: boolean, params: any) => {
-    console.log('🚀 ~ open ~ row:', row)
+  
     voltageLevelFlag.value = flag
     loading.value = true
     title.value = row.name + '详情'

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

@@ -8,7 +8,7 @@
         <TableHeader :showReset="false" ref="TableHeaderRef">
             <template #select>
                 <el-form-item label="关键字">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入关键字" />
+                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入关键字" maxlength="32" show-word-limit/>
                 </el-form-item>
             </template>
             <template #operation>
@@ -69,7 +69,7 @@ const tableStore = new TableStore({
         { title: '更新时间', field: 'updateTime' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [

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

@@ -194,7 +194,7 @@ const dotList: any = ref({})
 const height = mainHeight(20)
 const heightB = mainHeight(70)
 const harmonic = harmonicOptions.slice(1)
-const size = ref(23)
+const size = ref(19)
 const showTabs = ref(false)
 const loadDataOptions: any = ref([])
 const form: any = reactive({

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

@@ -49,7 +49,7 @@ const tableStore = new TableStore({
         { title: '计算时间', field: 'updateTime' },
         { title: '计算窗口', field: 'timeWindow' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [
@@ -62,7 +62,7 @@ const tableStore = new TableStore({
                     render: 'basicButton',
 
                     click: row => {
-                    console.log("🚀 ~ row:", row)
+             
                         push({
                             path: "/admin/division/detail",
                             query: {