修改地图api

.env.LN

@@ -0,0 +1,6 @@
+# 辽宁嵌入
+NODE_ENV = LN
+VITE_NAME="LN"
+# 电网一张图 地图图层
+VITE_NARIMAP=null
+VITE_NRGISCOMMON=null

package.json

@@ -8,12 +8,14 @@
     "dev:jibei": "vite --mode jibei",
     "dev:hainan": "vite --mode hainan",
     "dev:qujing": "vite --mode qujing",
+    "dev:LN": "vite --mode LN",
     "dev:LNqr": "vite --mode LNqr",
     "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:LN": "vite build --mode LN",
     "build:LNqr": "vite build --mode LNqr",
     "build:removeMode": "vite build --mode removeMode",
     "preview": "vite preview"

public/plugin/offline/api3.0.js

@@ -4747,10 +4747,11 @@ window.BMAP_AUTHENTIC_KEY = ''
             c.Nm
                 ? c.Nm.sa(b)
                 : ((c.Nm = new U(b, {
-                      icon: new qc(G.qa + 'blank.gif', {
-                          width: 1,
-                          height: 1
-                      }),
+                      //   icon: new qc(G.qa + 'blank.gif', {
+                      //       width: 1,
+                      //       height: 1
+                      //   }),
+                      icon: '',
                       offset: new O(0, 0),
                       clickable: t
                   })),
@@ -5886,7 +5887,7 @@ window.BMAP_AUTHENTIC_KEY = ''
     Qc.prototype.co = function () {
         this.Gb.src =
             0 < z.ca.ia && 6 >= z.ca.ia && this.GJ
-                ? G.qa + 'blank.gif'
+                ? '' //G.qa + 'blank.gif'
                 : '' !== this.src && this.Gb.src == this.src
                 ? this.src + '&t = ' + Date.now()
                 : this.src

src/App.vue

@@ -9,16 +9,20 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import useSetTheme from '@/utils/setTheme'
 import { onMounted } from 'vue'
 useSetTheme()
-onMounted(async () => {
+const fetchMqttUrl = async () => {
     const response = await fetch('/')
-    const WebSocketUrl:any = response.headers.get('X-WebSocket-Url')
-    const WebSocketUrl2:any = response.headers.get('X-WebSocket-Url2')
-    const WebSocketUrl3:any = response.headers.get('X-WebSocket-Url3')
-    const MqttUrl:any = response.headers.get('X-MqttUrl-Url')
+    const WebSocketUrl: any = response.headers.get('X-WebSocket-Url')
+    const WebSocketUrl2: any = response.headers.get('X-WebSocket-Url2')
+    const WebSocketUrl3: any = response.headers.get('X-WebSocket-Url3')
+    const MqttUrl: any = response.headers.get('X-MqttUrl-Url')
     localStorage.setItem('WebSocketUrl', WebSocketUrl)
     localStorage.setItem('WebSocketUrl2', WebSocketUrl2)
     localStorage.setItem('WebSocketUrl3', WebSocketUrl3)
     localStorage.setItem('MqttUrl', MqttUrl)
+}
+
+onMounted(() => {
+    fetchMqttUrl()
 })
 </script>
 

src/api/device-boot/panorama.ts

@@ -4,6 +4,10 @@ import request from '@/utils/request'
 export function getSubLineGiveAnAlarm(data: any) {
     return request({ url: '/harmonic-boot/gridDiagram/getSubLineGiveAnAlarm', method: 'post', data })
 }
+
+export function getAreaObjAlarm(data: any) {
+    return request({ url: '/harmonic-boot/gridDiagram/getAreaObjAlarm', method: 'post', data })
+}
 // 变电站详细列表
 export function getPollutionAlarmPageData(data: any) {
     return request({ url: '/harmonic-boot/gridDiagram/getPollutionAlarmPageData', method: 'post', data })

src/api/user-boot/user.ts

@@ -44,13 +44,30 @@ export async function login(params: any) {
     })
 }
 //辽宁嵌入登录获取token
-export async function loginLNqr() {
+export async function loginLNqr(data: any) {
     return request({
         url: '/pqs-auth/oauth/lnLogin',
         method: 'get',
+        params: data
     })
 }
 
+export async function lnRefreshToken(data: any) {
+    return request({
+        url: '/pqs-auth/oauth/lnRefreshToken',
+        method: 'get',
+        params: data
+    })
+}
+
+export async function logout() {
+    return request({
+        url: '/pqs-auth/oauth/logout',
+        method: 'DELETE',
+    })
+}
+
+
 //获取用户信息
 export function getUserById() {
     const adminInfo = useAdminInfo()
@@ -77,6 +94,17 @@ export function refreshToken(): Promise<any> {
     })
 }
 
+
+export function lnRefreshTokenTo(): Promise<any> {
+    // 调用useAdminInfo函数获取管理员信息，并将其赋值给adminInfo变量
+    const adminInfo = useAdminInfo()
+    return lnRefreshToken({
+        refreshToken: adminInfo.refresh_token,
+        clientId: "njcn",
+        clientSecret:"njcnpqs"
+    })
+}
+
 /**
  * 获取营销用户列表
  * @returns {AxiosPromise}

src/components/PreviewFile/index.vue

@@ -30,7 +30,7 @@ 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 VITE_FLAG = false//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({})

src/components/cockpit/dataCleaning/index.vue

@@ -126,7 +126,8 @@ const prop = defineProps({
     width: { type: [String, Number] },
     height: { type: [String, Number] },
     timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+    timeValue: { type: Object },
+    searchKey: { type: [String, Number] }
 })
 
 const headerHeight = ref(57)
@@ -347,22 +348,22 @@ onMounted(() => {
     tableStore.index()
 })
 watch(
-    () => prop.timeKey,
+    () => prop.searchKey,
     val => {
         tableStore.index()
     }
 )
-watch(
-    () => prop.timeValue,
+// watch(
+//     () => prop.timeValue,
 
-    val => {
-        tableStore.index()
-    },
+//     val => {
+//         tableStore.index()
+//     },
 
-    {
-        deep: true
-    }
-)
+//     {
+//         deep: true
+//     }
+// )
 </script>
 <style lang="scss" scoped>
      @import '@/assets/font/iconfont.css';

src/components/cockpit/integrity/index.vue

@@ -122,7 +122,8 @@ const prop = defineProps({
     width: { type: [String, Number] },
     height: { type: [String, Number] },
     timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+    timeValue: { type: Object },
+    searchKey: { type: [String, Number] }
 })
 
 const headerHeight = ref(57)
@@ -329,22 +330,22 @@ onMounted(() => {
     tableStore.index()
 })
 watch(
-    () => prop.timeKey,
+    () => prop.searchKey,
     val => {
         tableStore.index()
     }
 )
-watch(
-    () => prop.timeValue,
+// watch(
+//     () => prop.timeValue,
 
-    val => {
-        tableStore.index()
-    },
+//     val => {
+//         tableStore.index()
+//     },
 
-    {
-        deep: true
-    }
-)
+//     {
+//         deep: true
+//     }
+// )
 </script>
 <style lang="scss" scoped>
       @import '@/assets/font/iconfont.css';

src/components/cockpit/onlineRate/index.vue

@@ -7,7 +7,8 @@
             @selectChange="selectChange"
             datePicker
             v-if="fullscreen"
-        ></TableHeader>
+        >
+    </TableHeader>
         <div
             class="monitoringPoints"
             :style="{
@@ -120,7 +121,8 @@ const prop = defineProps({
     width: { type: [String, Number] },
     height: { type: [String, Number] },
     timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+    timeValue: { type: Object },
+    searchKey: { type: [String, Number] }
 })
 
 const headerHeight = ref(57)
@@ -328,22 +330,22 @@ onMounted(() => {
     tableStore.index()
 })
 watch(
-    () => prop.timeKey,
+    () => prop.searchKey,
     val => {
         tableStore.index()
     }
 )
-watch(
-    () => prop.timeValue,
+// watch(
+//     () => prop.timeValue,
 
-    val => {
-        tableStore.index()
-    },
+//     val => {
+//         tableStore.index()
+//     },
 
-    {
-        deep: true
-    }
-)
+//     {
+//         deep: true
+//     }
+// )
 </script>
 <style lang="scss" scoped>
       @import '@/assets/font/iconfont.css';

src/components/cockpit/terminalEvaluation/index.vue

@@ -150,7 +150,8 @@ const prop = defineProps({
     width: { type: [String, Number] },
     height: { type: [String, Number] },
     timeKey: { type: [String, Number] },
-    timeValue: { type: Object }
+    timeValue: { type: Object },
+    searchKey: { type: [String, Number] }
 })
 
 const headerHeight = ref(57)
@@ -233,7 +234,7 @@ const tableStore: any = new TableStore({
             if (tableStore.table.params.statisticalType.name == '终端厂家') {
                 return k.count != 0
             } else {
-                return !k.citName.includes('上送')
+                return !k.name.includes('上送')
             }
         })
     }
@@ -246,22 +247,28 @@ onMounted(() => {
     tableStore.index()
 })
 watch(
-    () => prop.timeKey,
+    () => prop.searchKey,
     val => {
         tableStore.index()
     }
 )
-watch(
-    () => prop.timeValue,
+// watch(
+//     () => prop.timeKey,
+//     val => {
+//         tableStore.index()
+//     }
+// )
+// watch(
+//     () => prop.timeValue,
 
-    val => {
-        tableStore.index()
-    },
+//     val => {
+//         tableStore.index()
+//     },
 
-    {
-        deep: true
-    }
-)
+//     {
+//         deep: true
+//     }
+// )
 </script>
 <style lang="scss" scoped>
       @import '@/assets/font/iconfont.css';

src/components/echarts/rmsWorker.js

@@ -0,0 +1,322 @@
+// 辅助函数
+const getMax = (temp, tempA, tempB, tempC) => {
+    temp = temp > tempA ? temp : tempA
+    temp = temp > tempB ? temp : tempB
+    if (tempC !== undefined) {
+        temp = temp > tempC ? temp : tempC
+    }
+    return temp
+}
+
+const getMaxTwo = (temp, tempA, tempB) => {
+    temp = temp > tempA ? temp : tempA
+    temp = temp > tempB ? temp : tempB
+    return temp
+}
+
+const getMin = (temp, tempA, tempB, tempC) => {
+    temp = temp < tempA ? temp : tempA
+    temp = temp < tempB ? temp : tempB
+    if (tempC !== undefined) {
+        temp = temp < tempC ? temp : tempC
+    }
+    return temp
+}
+
+const getMinOpen = (temp, tempA, tempB) => {
+    temp = temp < tempA ? temp : tempA
+    temp = temp < tempB ? temp : tempB
+    return temp
+}
+
+// 数据处理函数
+const fliteWaveData = (wp, step, iphasicValue, isOpen) => {
+    const rmsData = wp.listRmsData
+    const pt = Number(wp.pt) / 1000
+    const ct = Number(wp.ct)
+    const titleList = wp.waveTitle
+    let xishu = pt
+    let aTitle = '',
+        bTitle = '',
+        cTitle = '',
+        unit = '电压'
+    let rmsvFirstX = 0,
+        rmsvFirstY = 0,
+        rmsvSecondX = 0,
+        rmsvSecondY = 0,
+        firstZhou = 'a',
+        secondeZhou = 'a'
+    let ifmax = 0,
+        ifmin = 0,
+        ismax = 0,
+        ismin = 0,
+        rfmax = 0,
+        rfmin = 0,
+        rsmax = 0,
+        rsmin = 0
+
+    const shunshiFA = []
+    const shunshiFB = []
+    const shunshiFC = []
+    const shunshiSA = []
+    const shunshiSB = []
+    const shunshiSC = []
+    const rmsFA = []
+    const rmsFB = []
+    const rmsFC = []
+    const rmsSA = []
+    const rmsSB = []
+    const rmsSC = []
+
+    if (titleList[iphasicValue * step + 1]?.substring(0, 1) !== 'U') {
+        xishu = ct
+        unit = '电流'
+    }
+
+    for (let i = 1; i <= iphasicValue; i++) {
+        switch (i) {
+            case 1:
+                aTitle = titleList[iphasicValue * step + i]?.substring(1) || ''
+                break
+            case 2:
+                bTitle = titleList[iphasicValue * step + i]?.substring(1) || ''
+                break
+            case 3:
+                cTitle = titleList[iphasicValue * step + i]?.substring(1) || ''
+                break
+        }
+    }
+
+    if (rmsData[0] && rmsData[0][iphasicValue * step + 1] !== undefined) {
+        rfmax = rmsData[0][iphasicValue * step + 1] * xishu
+        rfmin = rmsData[0][iphasicValue * step + 1] * xishu
+        rmsvFirstY = rmsData[0][iphasicValue * step + 1] * xishu
+        rmsvFirstX = rmsData[0][0]
+        rsmax = rmsData[0][iphasicValue * step + 1]
+        rsmin = rmsData[0][iphasicValue * step + 1]
+        rmsvSecondY = rmsData[0][iphasicValue * step + 1]
+        rmsvSecondX = rmsData[0][0]
+    }
+
+    for (let rms = 0; rms < rmsData.length; rms++) {
+        if (!rmsData[rms] || rmsData[rms][iphasicValue * step + 1] === undefined) {
+            break
+        }
+
+        switch (iphasicValue) {
+            case 1:
+                const rmsFirstA = rmsData[rms][iphasicValue * step + 1] * xishu
+                rmsFA.push([rmsData[rms][0], rmsFirstA])
+                rfmax = rfmax > rmsFirstA ? rfmax : rmsFirstA
+                rfmin = rfmin < rmsFirstA ? rfmin : rmsFirstA
+                if (rfmin < rmsvFirstY) {
+                    rmsvFirstY = rfmin
+                    firstZhou = 'a'
+                    rmsvFirstX = rmsData[rms][0]
+                }
+
+                const rmsSecondA = rmsData[rms][iphasicValue * step + 1]
+                rmsSA.push([rmsData[rms][0], rmsSecondA])
+                rsmax = rsmax > rmsSecondA ? rsmax : rmsSecondA
+                rsmin = rsmin < rmsSecondA ? rsmin : rmsSecondA
+                if (rsmin < rmsvSecondY) {
+                    rmsvSecondY = rsmin
+                    secondeZhou = 'a'
+                    rmsvSecondX = rmsData[rms][0]
+                }
+                break
+            case 2:
+                const rmsFirstA2 = rmsData[rms][iphasicValue * step + 1] * xishu
+                const rmsFirstB2 = rmsData[rms][iphasicValue * step + 2] * xishu
+                rmsFA.push([rmsData[rms][0], rmsFirstA2])
+                rmsFB.push([rmsData[rms][0], rmsFirstB2])
+                rfmax = getMaxTwo(rfmax, rmsFirstA2, rmsFirstB2)
+                rfmin = getMinOpen(rfmin, rmsFirstA2, rmsFirstB2)
+                if (rfmin < rmsvFirstY) {
+                    rmsvFirstY = rfmin
+                    if (rfmin === rmsFirstA2) {
+                        firstZhou = 'a'
+                    } else if (rfmin === rmsFirstB2) {
+                        firstZhou = 'b'
+                    }
+                    rmsvFirstX = rmsData[rms][0]
+                }
+
+                const rmsSecondA2 = rmsData[rms][iphasicValue * step + 1]
+                const rmsSecondB2 = rmsData[rms][iphasicValue * step + 2]
+                rmsSA.push([rmsData[rms][0], rmsSecondA2])
+                rmsSB.push([rmsData[rms][0], rmsSecondB2])
+                rsmax = getMaxTwo(rsmax, rmsSecondA2, rmsSecondB2)
+                rsmin = getMinOpen(rsmin, rmsSecondA2, rmsSecondB2)
+                if (rsmin < rmsvSecondY) {
+                    rmsvSecondY = rsmin
+                    if (rsmin === rmsSecondA2) {
+                        secondeZhou = 'a'
+                    } else if (rsmin === rmsSecondB2) {
+                        secondeZhou = 'b'
+                    }
+                    rmsvSecondX = rmsData[rms][0]
+                }
+                break
+            case 3:
+                const rmsFirstA3 = rmsData[rms][iphasicValue * step + 1] * xishu
+                const rmsFirstB3 = rmsData[rms][iphasicValue * step + 2] * xishu
+                const rmsFirstC3 = rmsData[rms][iphasicValue * step + 3] * xishu
+                rmsFA.push([rmsData[rms][0], rmsFirstA3])
+                rmsFB.push([rmsData[rms][0], rmsFirstB3])
+                rmsFC.push([rmsData[rms][0], rmsFirstC3])
+                rfmax = getMax(rfmax, rmsFirstA3, rmsFirstB3, rmsFirstC3)
+                rfmin = isOpen
+                    ? getMinOpen(rfmin, rmsFirstA3, rmsFirstC3)
+                    : getMin(rfmin, rmsFirstA3, rmsFirstB3, rmsFirstC3)
+                if (rfmin < rmsvFirstY) {
+                    rmsvFirstY = rfmin
+                    if (rfmin === rmsFirstA3) {
+                        firstZhou = 'a'
+                    } else if (rfmin === rmsFirstB3) {
+                        firstZhou = 'b'
+                    } else {
+                        firstZhou = 'c'
+                    }
+                    rmsvFirstX = rmsData[rms][0]
+                }
+
+                const rmsSecondA3 = rmsData[rms][iphasicValue * step + 1]
+                const rmsSecondB3 = rmsData[rms][iphasicValue * step + 2]
+                const rmsSecondC3 = rmsData[rms][iphasicValue * step + 3]
+                rmsSA.push([rmsData[rms][0], rmsSecondA3])
+                rmsSB.push([rmsData[rms][0], rmsSecondB3])
+                rmsSC.push([rmsData[rms][0], rmsSecondC3])
+                rsmax = getMax(rsmax, rmsSecondA3, rmsSecondB3, rmsSecondC3)
+                rsmin = isOpen
+                    ? getMinOpen(rsmin, rmsSecondA3, rmsSecondC3)
+                    : getMin(rsmin, rmsSecondA3, rmsSecondB3, rmsSecondC3)
+                if (rsmin < rmsvSecondY) {
+                    rmsvSecondY = rsmin
+                    if (rsmin === rmsSecondA3) {
+                        secondeZhou = 'a'
+                    } else if (rsmin === rmsSecondB3) {
+                        secondeZhou = 'b'
+                    } else {
+                        secondeZhou = 'c'
+                    }
+                    rmsvSecondX = rmsData[rms][0]
+                }
+                break
+        }
+    }
+
+    const instantF = { max: ifmax, min: ifmin }
+    const instantS = { max: ismax, min: ismin }
+    const RMSF = { max: rfmax, min: rfmin }
+    const RMSS = { max: rsmax, min: rsmin }
+    const RMSFMinDetail = { rmsvFirstX, rmsvFirstY, firstZhou }
+    const RMSSMinDetail = { rmsvSecondX, rmsvSecondY, secondeZhou }
+    const shunshiF = { shunshiFA, shunshiFB, shunshiFC }
+    const shunshiS = { shunshiSA, shunshiSB, shunshiSC }
+    const RMSFWave = { rmsFA, rmsFB, rmsFC }
+    const RMSSWave = { rmsSA, rmsSB, rmsSC }
+    const title = { aTitle, bTitle, cTitle, unit }
+
+    return {
+        instantF,
+        instantS,
+        RMSF,
+        RMSS,
+        RMSFMinDetail,
+        RMSSMinDetail,
+        shunshiF,
+        shunshiS,
+        RMSFWave,
+        RMSSWave,
+        title,
+        unit
+    }
+}
+
+// 监听消息
+self.onmessage = function (e) {
+    const { wp, isOpen, value, boxoList, requestId } = e.data
+
+    try {
+        const iphasicValue = wp.iphasic || 1
+
+        const picCounts = (wp.waveTitle.length - 1) / iphasicValue
+        const waveDatas = []
+
+        for (let i = 0; i < picCounts; i++) {
+            const data = fliteWaveData(wp, i, iphasicValue, isOpen, boxoList)
+            waveDatas.push(data)
+        }
+        // 处理标题
+        let titles = ''
+        if (boxoList.systemType == 'pms') {
+            titles =
+                '变电站名称:' +
+                boxoList.powerStationName +
+                '　监测点名称:' +
+                boxoList.measurementPointName +
+                '　发生时刻:' +
+                boxoList.startTime +
+                '　暂降(骤升)幅值:' +
+                (boxoList.featureAmplitude * 100).toFixed(2) +
+                '% 　持续时间:' +
+                boxoList.duration +
+                's'
+        } else if (boxoList.systemType == 'ZL') {
+            titles =
+                (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+                '　监测点名称:' +
+                boxoList.equipmentName +
+                '　发生时刻:' +
+                boxoList.startTime +
+                '　暂降(骤升)幅值:' +
+                boxoList.evtParamVVaDepth +
+                '%　持续时间:' +
+                boxoList.evtParamTm +
+                's'
+        } else if (boxoList.systemType == 'YPT') {
+            titles =
+                (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+                '　监测点名称:' +
+                boxoList.lineName +
+                '　发生时刻:' +
+                boxoList.startTime +
+                '　暂降(骤升)幅值:' +
+                (boxoList.featureAmplitude * 100).toFixed(2) +
+                '%　持续时间:' +
+                boxoList.persistTime +
+                's'
+        } else {
+            titles =
+                '　变电站名称:' +
+                boxoList.subName +
+                '　监测点名称:' +
+                boxoList.lineName +
+                '　发生时刻:' +
+                boxoList.startTime +
+                '　暂降(骤升)幅值:' +
+                (boxoList.featureAmplitude * 100).toFixed(2) +
+                '%　持续时间:' +
+                boxoList.duration +
+                's'
+        }
+        // 发送处理结果回主线程
+        self.postMessage({
+            requestId,
+            titles: titles,
+            success: true,
+            waveDatas,
+            time: wp.time,
+            type: wp.waveType,
+            severity: wp.yzd,
+            iphasic: iphasicValue
+        })
+    } catch (error) {
+        self.postMessage({
+            requestId,
+            success: false,
+            error: error.message
+        })
+    }
+}

src/components/echarts/shuWorker.js

@@ -0,0 +1,207 @@
+// waveData.worker.js
+self.addEventListener('message', function (e) {
+    const { wp, value, iphasic, isOpen, boxoList, requestId } = e.data
+
+    // 处理波形数据的函数
+    const fliteWaveData = (wp, step) => {
+        // 将原有的fliteWaveData函数实现复制到这里
+        const shunData = wp.listWaveData
+        const pt = Number(wp.pt) / 1000
+        const ct = Number(wp.ct)
+        const titleList = wp.waveTitle
+        let xishu = pt
+        let aTitle = '',
+            bTitle = '',
+            cTitle = '',
+            unit = '电压'
+        let ifmax = 0,
+            ifmin = 0,
+            ismax = 0,
+            ismin = 0
+
+        const shunshiFA = []
+        const shunshiFB = []
+        const shunshiFC = []
+        const shunshiSA = []
+        const shunshiSB = []
+        const shunshiSC = []
+
+        if (shunData.length > 0) {
+            if (titleList[iphasic * step + 1]?.substring(0, 1) !== 'U') {
+                xishu = ct
+                unit = '电流'
+            }
+
+            for (let i = 1; i <= iphasic; i++) {
+                switch (i) {
+                    case 1:
+                        aTitle = titleList[iphasic * step + i]?.substring(1) || ''
+                        break
+                    case 2:
+                        bTitle = titleList[iphasic * step + i]?.substring(1) || ''
+                        break
+                    case 3:
+                        cTitle = titleList[iphasic * step + i]?.substring(1) || ''
+                        break
+                }
+            }
+
+            if (shunData[0][iphasic * step + 1] !== undefined) {
+                ifmax = shunData[0][iphasic * step + 1] * xishu
+                ifmin = shunData[0][iphasic * step + 1] * xishu
+                ismax = shunData[0][iphasic * step + 1]
+                ismin = shunData[0][iphasic * step + 1]
+            }
+
+            for (let shun = 0; shun < shunData.length; shun++) {
+                if (shunData[shun][iphasic * step + 1] === undefined) {
+                    break
+                }
+
+                switch (iphasic) {
+                    case 1:
+                        const shunFirstA = shunData[shun][iphasic * step + 1] * xishu
+                        shunshiFA.push([shunData[shun][0], shunFirstA])
+                        ifmax = Math.max(ifmax, shunFirstA)
+                        ifmin = Math.min(ifmin, shunFirstA)
+
+                        const shunSecondA = shunData[shun][iphasic * step + 1]
+                        shunshiSA.push([shunData[shun][0], shunSecondA])
+                        ismax = Math.max(ismax, shunSecondA)
+                        ismin = Math.min(ismin, shunSecondA)
+                        break
+                    case 2:
+                        const shunFirstA2 = shunData[shun][iphasic * step + 1] * xishu
+                        const shunFirstB2 = shunData[shun][iphasic * step + 2] * xishu
+                        shunshiFA.push([shunData[shun][0], shunFirstA2])
+                        shunshiFB.push([shunData[shun][0], shunFirstB2])
+                        ifmax = Math.max(ifmax, shunFirstA2, shunFirstB2)
+                        ifmin = Math.min(ifmin, shunFirstA2, shunFirstB2)
+
+                        const shunSecondA2 = shunData[shun][iphasic * step + 1]
+                        const shunSecondB2 = shunData[shun][iphasic * step + 2]
+                        shunshiSA.push([shunData[shun][0], shunSecondA2])
+                        shunshiSB.push([shunData[shun][0], shunSecondB2])
+                        ismax = Math.max(ismax, shunSecondA2, shunSecondB2)
+                        ismin = Math.min(ismin, shunSecondA2, shunSecondB2)
+                        break
+                    case 3:
+                        const shunFirstA3 = shunData[shun][iphasic * step + 1] * xishu
+                        const shunFirstB3 = shunData[shun][iphasic * step + 2] * xishu
+                        const shunFirstC3 = shunData[shun][iphasic * step + 3] * xishu
+                        shunshiFA.push([shunData[shun][0], shunFirstA3])
+                        shunshiFB.push([shunData[shun][0], shunFirstB3])
+                        shunshiFC.push([shunData[shun][0], shunFirstC3])
+                        ifmax = Math.max(ifmax, shunFirstA3, shunFirstB3, shunFirstC3)
+                        ifmin = isOpen
+                            ? Math.min(ifmin, shunFirstA3, shunFirstC3)
+                            : Math.min(ifmin, shunFirstA3, shunFirstB3, shunFirstC3)
+
+                        const shunSecondA3 = shunData[shun][iphasic * step + 1]
+                        const shunSecondB3 = shunData[shun][iphasic * step + 2]
+                        const shunSecondC3 = shunData[shun][iphasic * step + 3]
+                        shunshiSA.push([shunData[shun][0], shunSecondA3])
+                        shunshiSB.push([shunData[shun][0], shunSecondB3])
+                        shunshiSC.push([shunData[shun][0], shunSecondC3])
+                        ismax = Math.max(ismax, shunSecondA3, shunSecondB3, shunSecondC3)
+                        ismin = isOpen
+                            ? Math.min(ismin, shunSecondA3, shunSecondC3)
+                            : Math.min(ismin, shunSecondA3, shunSecondB3, shunSecondC3)
+                        break
+                }
+            }
+        }
+
+        const instantF = { max: ifmax, min: ifmin }
+        const instantS = { max: ismax, min: ismin }
+        const shunshiF = { shunshiFA, shunshiFB, shunshiFC }
+        const shunshiS = { shunshiSA, shunshiSB, shunshiSC }
+        const title = { aTitle, bTitle, cTitle, unit }
+
+        return { instantF, instantS, shunshiF, shunshiS, title, unit }
+    }
+
+    // 处理标题
+    let titles = ''
+    if (boxoList.systemType == 'pms') {
+        titles =
+            '变电站名称:' +
+            boxoList.powerStationName +
+            '　监测点名称:' +
+            boxoList.measurementPointName +
+            '　发生时刻:' +
+            boxoList.startTime +
+            '　暂降(骤升)幅值:' +
+            (boxoList.featureAmplitude * 100).toFixed(2) +
+            '%　持续时间:' +
+            boxoList.duration +
+            's'
+    } else if (boxoList.systemType == 'ZL') {
+        titles =
+            (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+            '　监测点名称:' +
+            boxoList.equipmentName +
+            '　发生时刻:' +
+            boxoList.startTime +
+            '　暂降(骤升)幅值:' +
+            boxoList.evtParamVVaDepth +
+            '%　持续时间:' +
+            boxoList.evtParamTm +
+            's'
+    } else if (boxoList.systemType == 'YPT') {
+        titles =
+            (boxoList.engineeringName == undefined ? '' : ' 项目名称:' + boxoList.engineeringName) +
+            '　监测点名称:' +
+            boxoList.lineName +
+            '　发生时刻:' +
+            boxoList.startTime +
+            '　暂降(骤升)幅值:' +
+            (boxoList.featureAmplitude * 100).toFixed(2) +
+            '%　持续时间:' +
+            boxoList.persistTime +
+            's'
+    } else {
+        titles =
+            '变电站名称:' +
+            boxoList.subName +
+            '　监测点名称:' +
+            boxoList.lineName +
+            '　发生时刻:' +
+            boxoList.startTime +
+            '　暂降(骤升)幅值:' +
+            (boxoList.featureAmplitude * 100).toFixed(2) +
+            '%　持续时间:' +
+            boxoList.duration +
+            's'
+    }
+
+    const iphasicValue = wp.iphasic || 1
+    const picCounts = (wp.waveTitle.length - 1) / iphasicValue
+    const waveDatas = []
+
+    for (let i = 0; i < picCounts; i++) {
+        const data = fliteWaveData(wp, i)
+        waveDatas.push(data)
+    }
+
+    const time = wp.time
+    const type = wp.waveType
+    let severity = wp.yzd
+
+    if (severity < 0) {
+        severity = '/'
+        type = '/'
+    }
+
+    // 将处理结果发送回主线程
+    self.postMessage({
+        requestId,
+        success: true,
+        waveDatas,
+        time,
+        type,
+        severity,
+        titles,
+        iphasic: iphasicValue
+    })
+})

src/components/echarts/waveForm.vue

@@ -2,7 +2,7 @@
     <div v-if="view2">
         <el-row>
             <el-col :span="12">
-                <span style="font-size: 14px; line-height: 30px">值类型选择:</span>
+                <!-- <span style="font-size: 14px; line-height: 30px">值类型选择:</span>
                 <el-select
                     style="min-width: 200px; width: 200px"
                     @change="changeView"
@@ -15,7 +15,11 @@
                         :label="item.label"
                         :value="item.value"
                     ></el-option>
-                </el-select>
+                </el-select> -->
+                <el-radio-group v-model.trim="value" @change="changeView">
+                    <el-radio-button label="一次值" :value="1" />
+                    <el-radio-button label="二次值" :value="2" />
+                </el-radio-group>
                 <!-- <el-button v-if="view2 && senior" class="ml10" type="primary" @click="AdvancedAnalytics">
                     高级分析
                 </el-button> -->
@@ -24,37 +28,18 @@
                 <el-button @click="backbxlb" icon="el-icon-Back" style="float: right">返回</el-button>
             </el-col>
         </el-row>
-        <div v-loading="loading" style="height: calc(100vh - 190px)">
-            <el-tabs v-if="view4" class="default-main" v-model="bxactiveName" @tab-click="bxhandleClick">
-                <el-tab-pane
-                    label="瞬时波形"
-                    name="ssbx"
-                    class="boxbx pt10 pb10"
-                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
-                >
-                    <shushiboxi
-                        ref="shushiboxiRef"
-                        v-if="bxactiveName == 'ssbx' && showBoxi"
-                        :value="value"
-                        :parentHeight="parentHeight"
-                        :boxoList="boxoList"
-                        :wp="wp"
-                    ></shushiboxi>
+        <div v-loading="loading" style="height: calc(100vh - 190px)" class="mt10">
+            <el-tabs v-if="view4" type="border-card"  v-model="bxactiveName"
+                @tab-click="bxhandleClick">
+                <el-tab-pane label="瞬时波形" name="ssbx" class="boxbx pt10 pb10"
+                    :style="'height:' + bxecharts + ';overflow-y: scroll;'">
+                    <shushiboxi ref="shushiboxiRef" v-if="bxactiveName == 'ssbx' && showBoxi" :value="value"
+                        :parentHeight="parentHeight" :boxoList="boxoList" :wp="wp"></shushiboxi>
                 </el-tab-pane>
-                <el-tab-pane
-                    label="RMS波形"
-                    class="boxbx pt10 pb10"
-                    name="rmsbx"
-                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
-                >
-                    <rmsboxi
-                        ref="rmsboxiRef"
-                        v-if="bxactiveName == 'rmsbx' && showBoxi"
-                        :value="value"
-                        :parentHeight="parentHeight"
-                        :boxoList="boxoList"
-                        :wp="wp"
-                    ></rmsboxi>
+                <el-tab-pane label="RMS波形" class="boxbx pt10 pb10" name="rmsbx"
+                    :style="'height:' + bxecharts + ';overflow-y: scroll;'">
+                    <rmsboxi ref="rmsboxiRef" v-if="bxactiveName == 'rmsbx' && showBoxi" :value="value"
+                        :parentHeight="parentHeight" :boxoList="boxoList" :wp="wp"></rmsboxi>
                 </el-tab-pane>
             </el-tabs>
             <el-empty v-else description="暂无数据" style="height: calc(100vh - 190px)" />
@@ -100,7 +85,7 @@ const options = ref([
     }
 ])
 const shushiboxiRef = ref()
-const bxecharts = ref(mainHeight(95).height as any)
+const bxecharts = ref(mainHeight(145).height as any)
 const view2 = ref(true)
 const boxoList: any = ref(null)
 const wp = ref(null)
@@ -128,9 +113,6 @@ const open = async (row: any) => {
         })
 }
 const bxhandleClick = (tab: any) => {
-    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
-    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
-
     loading.value = true
     if (tab.name == 'ssbx') {
         bxactiveName.value = 'ssbx'
@@ -145,8 +127,7 @@ const bxhandleClick = (tab: any) => {
 const backbxlb = () => {
     boxoList.value = null
     wp.value = null
-    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
-    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
+
 
     emit('backbxlb')
 }

src/components/form/datePicker/index.vue

@@ -1,22 +1,22 @@
 <template>
-    <div style="width: 540px">
+    <div :style="{ width: isMinuteData ? '750px' : '610px' }">
         <el-select v-model="interval" style="min-width: 90px; width: 90px; margin-right: 10px" @change="timeChange">
             <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
 
         <el-date-picker
             v-model="timeValue"
-            type="daterange"
+            :type="pickerType"
             :disabled="disabledPicker"
             :disabled-date="isFutureDate"
-            style="width: 220px; margin-right: 10px"
+            :style="{ width: isMinuteData ? '360px' : '220px', marginRight: '10px' }"
             unlink-panels
             :clearable="false"
             range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="YYYY-MM-DD"
-            :shortcuts="shortcuts"
+            :start-placeholder="isMinuteData ? '开始时间' : '开始日期'"
+            :end-placeholder="isMinuteData ? '结束时间' : '结束日期'"
+            :value-format="pickerValueFormat"
+            :shortcuts="isMinuteData ? undefined : shortcuts"
         />
         <el-button :disabled="backDisabled" type="primary" :icon="DArrowLeft" @click="preClick"></el-button>
         <el-button type="primary" :icon="VideoPause" @click="nowTime">当前</el-button>
@@ -26,18 +26,41 @@
 
 <script lang="ts" setup>
 import { DArrowLeft, VideoPause, DArrowRight } from '@element-plus/icons-vue'
-import { ref, onMounted, nextTick, watch } from 'vue'
+import { ref, onMounted, computed, watch } from 'vue'
 
 interface Props {
     nextFlag?: boolean
     theCurrentTime?: boolean
+    isStatisticData?: number | string
 }
 
 const props = withDefaults(defineProps<Props>(), {
     nextFlag: false,
-    theCurrentTime: false
+    theCurrentTime: false,
+    isStatisticData: 1
 })
 
+const isMinuteData = computed(() => Number(props.isStatisticData) === 0)
+const pickerType = computed(() => (isMinuteData.value ? 'datetimerange' : 'daterange'))
+const pickerValueFormat = computed(() => (isMinuteData.value ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'))
+
+const toDatePart = (value: string) => (value?.includes(' ') ? value.split(' ')[0] : value)
+
+const toMinuteStart = (date: string) => `${toDatePart(date)} 00:00:00`
+
+const toMinuteEnd = (date: string) => `${toDatePart(date)} 23:59:59`
+
+const normalizeRange = (start: string, end: string) => {
+    if (!isMinuteData.value) {
+        return [toDatePart(start), toDatePart(end)]
+    }
+    return [toMinuteStart(start), toMinuteEnd(end)]
+}
+
+const setRangeValue = (start: string, end: string) => {
+    timeValue.value = normalizeRange(start, end)
+}
+
 const interval = ref(3)
 const timeFlag = ref(1)
 const count = ref(0)
@@ -95,13 +118,13 @@ const timeChange = (e: number) => {
     if (e == 1) {
         disabledPicker.value = true
 
-        timeValue.value = [setTime(1), setTime()]
+        setRangeValue(setTime(1), setTime())
     } else if (e == 2) {
         disabledPicker.value = true
-        timeValue.value = [setTime(2), setTime()]
+        setRangeValue(setTime(2), setTime())
     } else if (e == 3) {
         disabledPicker.value = true
-        timeValue.value = [setTime(3), setTime()]
+        setRangeValue(setTime(3), setTime())
     } else if (e == 4) {
         let year = parseInt(setTime().substring(0, 4))
         let month = parseInt(setTime().substring(5, 7))
@@ -111,12 +134,12 @@ const timeChange = (e: number) => {
         var dayOfWeek = start.getDay() == 0 ? 7 : start.getDay() - 1 // 如果为周日，则置为7天
 
         disabledPicker.value = true
-        timeValue.value = [setTime(0, dayOfWeek), setTime(0, -6 + dayOfWeek)]
+        setRangeValue(setTime(0, dayOfWeek), setTime(0, -6 + dayOfWeek))
     } else if (e == 5) {
         disabledPicker.value = false
         backDisabled.value = true
         preDisabled.value = props.nextFlag ? false : true
-        timeValue.value = [setTime(), setTime()]
+        setRangeValue(setTime(), setTime())
     }
     if (e == 1 || e == 2) {
         timeFlag.value = 0
@@ -186,7 +209,7 @@ const preClick = () => {
         startTime = year + '-01-01'
         endTime = year + '-12-31'
     }
-    timeValue.value = [startTime, endTime]
+    setRangeValue(startTime, endTime)
 
     // 判断向后键的状态
     // var temp = NowgetEndTime()
@@ -415,16 +438,27 @@ const next = () => {
     }
     if (!props.nextFlag) {
         if (
-            new Date(endTime + ' 00:00:00').getTime() >=
+            new Date(toDatePart(endTime) + ' 00:00:00').getTime() >=
             new Date(window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd ') + ' 00:00:00').getTime()
         ) {
             preDisabled.value = props.nextFlag ? false : true
         }
     }
 
-    timeValue.value = [startTime, endTime]
+    setRangeValue(startTime, endTime)
 }
 
+watch(
+    () => props.isStatisticData,
+    () => {
+        if (timeValue.value?.length === 2) {
+            setRangeValue(timeValue.value[0], timeValue.value[1])
+        } else {
+            timeChange(interval.value)
+        }
+    }
+)
+
 const setTime = (flag = 0, e = 0) => {
     let dd = window.XEUtils.toDateString(new Date().getTime() - e * 3600 * 1000 * 24, 'dd')
 

src/components/table/header/index.vue

@@ -3,13 +3,14 @@
         <div class="table-header ba-scroll-style">
             <el-form style="flex: 1; height: 32px; display: flex; flex-wrap: wrap" ref="headerForm" @submit.prevent=""
                 @keyup.enter="onComSearch" label-position="left" :inline="true">
-                <el-form-item v-if="datePicker" style="grid-column: span 2; max-width: 630px">
+                <el-form-item v-if="datePicker" style="grid-column: span 2; "
+                    :style="{ maxWidth: isStatisticData == 0 ? '750px' : '610px' }">
                     <template #label>
                         <el-checkbox v-if="showTimeAll" v-model="timeAll" label="统计时间" />
                         <span v-else>{{ dateLabel }}</span>
                     </template>
-                    <DatePicker ref="datePickerRef" v-if="timeAll" :nextFlag="nextFlag"
-                        :theCurrentTime="theCurrentTime"></DatePicker>
+                    <DatePicker ref="datePickerRef" v-if="timeAll" :nextFlag="nextFlag" :theCurrentTime="theCurrentTime"
+                        :isStatisticData="isStatisticData"></DatePicker>
                 </el-form-item>
 
                 <el-form-item label="区域" v-if="area">
@@ -72,6 +73,7 @@ interface Props {
     showExport?: boolean //导出控制
     showTimeAll?: boolean //控制时间是否显示
     dateLabel?: string //设置时间名称
+    isStatisticData?: number | string // 0分钟数据 1统计数据
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -83,7 +85,8 @@ const props = withDefaults(defineProps<Props>(), {
     showReset: true,
     showExport: false,
     showTimeAll: false,
-    dateLabel: '统计日期'
+    dateLabel: '统计日期',
+    isStatisticData: 1
 })
 // 动态计算table高度
 const resizeObserver = new ResizeObserver(entries => {

src/components/table/index.vue

@@ -1,24 +1,44 @@
 <template>
     <div :style="{ height: typeof props.height === 'string' ? props.height : tableStore.table.height }">
-        <vxe-table ref="tableRef" height="auto" :key="key" :data="tableStore.table.data"
-            v-loading="tableStore.table.loading" v-bind="Object.assign({}, defaultAttribute, $attrs)"
-            @checkbox-all="selectChangeEvent" @checkbox-change="selectChangeEvent" :showOverflow="showOverflow"
-            @sort-change="handleSortChange">
+        <vxe-table
+            ref="tableRef"
+            height="auto"
+            :key="key"
+            :data="tableStore.table.data"
+            v-loading="tableStore.table.loading"
+            v-bind="Object.assign({}, defaultAttribute, $attrs)"
+            @checkbox-all="selectChangeEvent"
+            @checkbox-change="selectChangeEvent"
+            :showOverflow="showOverflow"
+          
+        >
+          <!-- @sort-change="handleSortChange" -->
             <!-- Column 组件内部是 el-table-column -->
             <template v-if="isGroup">
                 <GroupColumn :column="tableStore.table.column" />
             </template>
             <template v-else>
-                <Column :attr="item" :key="key + '-column'" v-for="(item, key) in tableStore.table.column"
-                    :tree-node="item.treeNode">
+                <Column
+                    :attr="item"
+                    :key="key + '-column'"
+                    v-for="(item, key) in tableStore.table.column"
+                    :tree-node="item.treeNode"
+                >
                     <!-- tableStore 预设的列 render 方案 -->
                     <template v-if="item.render" #default="scope">
-                        <FieldRender :field="item" :row="scope.row" :column="scope.column" :index="scope.rowIndex" :key="key +
-                            '-' +
-                            item.render +
-                            '-' +
-                            (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
-                            " />
+                        <FieldRender
+                            :field="item"
+                            :row="scope.row"
+                            :column="scope.column"
+                            :index="scope.rowIndex"
+                            :key="
+                                key +
+                                '-' +
+                                item.render +
+                                '-' +
+                                (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
+                            "
+                        />
                     </template>
                 </Column>
             </template>
@@ -27,11 +47,16 @@
     </div>
 
     <div v-if="tableStore.showPage" class="table-pagination">
-        <el-pagination :currentPage="tableStore.table.params!.pageNum" :page-size="tableStore.table.params!.pageSize"
-            :page-sizes="pageSizes" background
+        <el-pagination
+            :currentPage="tableStore.table.params!.pageNum"
+            :page-size="tableStore.table.params!.pageSize"
+            :page-sizes="pageSizes"
+            background
             :layout="config.layout.shrink ? 'prev, next, jumper' : 'sizes,total, ->, prev, pager, next, jumper'"
-            :total="tableStore.table.total" @size-change="onTableSizeChange"
-            @current-change="onTableCurrentChange"></el-pagination>
+            :total="tableStore.table.total"
+            @size-change="onTableSizeChange"
+            @current-change="onTableCurrentChange"
+        ></el-pagination>
     </div>
     <slot name="footer"></slot>
 </template>

src/layouts/admin/components/globalPopUp.vue

@@ -11,25 +11,25 @@
                     :data="eventList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
                 >
                     <!-- <vxe-column type="seq" width="70px" title="序号"></vxe-column> -->
-                    <vxe-column field="time" width="180px" sortable title="发生时刻"></vxe-column>
-                    <vxe-column field="lineName" title="监测点"></vxe-column>
-                    <vxe-column field="powerCompany" title="变电站" width="100px"></vxe-column>
-                    <vxe-column field="powerCompany" title="供电公司" width="100px"></vxe-column>
-                    <vxe-column field="persistTime" width="120px" sortable title="持续时间(s)">
-                        <template #default="{ row }">
-                            {{ Math.floor(row.persistTime * 1000) / 1000 }}
-                        </template>
-                    </vxe-column>
+                    <vxe-column field="time" width="180px"       sortable title="暂降发生时刻"></vxe-column>
                     <vxe-column field="eventValue" width="160px" sortable title="暂降(骤升)幅值(%)">
                         <template #default="{ row }">
                             {{ Math.floor(row.eventValue * 10000) / 100 }}
                         </template>
                     </vxe-column>
+                    <vxe-column field="persistTime" width="120px" sortable title="持续时间(s)">
+                        <template #default="{ row }">
+                            {{ Math.floor(row.persistTime * 1000) / 1000 }}
+                        </template>
+                    </vxe-column>
                     <vxe-column field="eventType" width="100px" title="触发类型">
                         <template #default="{ row }">
                             {{ event.filter(item => item.id == row.eventType)[0]?.name || '/' }}
                         </template>
                     </vxe-column>
+                    <vxe-column field="powerCompany" title="变电站" width="100px"></vxe-column>
+                    <vxe-column field="powerCompany" title="供电公司" width="100px"></vxe-column>
+                    <vxe-column field="lineName" title="监测点"></vxe-column>
                 </vxe-table>
                 <div class="table-pagination mt10">
                     <el-pagination
@@ -99,7 +99,6 @@ const dataSocket = reactive({
 // }
 const socket = async () => {
     const url = localStorage.getItem('WebSocketUrl3') || 'null' //'ws://192.168.2.130:10203/event/'
-   
 
     // const url = 'ws://192.168.1.68:10203/event/'
 

src/layouts/admin/components/navMenus.vue

@@ -8,41 +8,14 @@
                     name="el-icon-BellFilled"
                     size="18"
                 />
-                <span class="nav-menu-text" v-if="globalPopUpRef?.eventList.length != 0">
-                    {{ (globalPopUpRef?.eventList.length>99? '99+':globalPopUpRef?.eventList.length)    || 0 }}
+                <span class="nav-menu-text" v-if="globalPopUpRef?.eventList?.length > 0">
+                    {{ globalPopUpRef.eventList.length > 99 ? '99+' : globalPopUpRef.eventList.length }}
                 </span>
             </div>
         </el-tooltip>
-        <!-- <el-tooltip effect="dark" content="截图" placement="bottom">
-            <div @click="savePng" class="nav-menu-item">
-                <Icon
-                    :color="configStore.getColorVal('headerBarTabColor')"
-                    class="nav-menu-icon"
-                    name="el-icon-Camera"
-                    size="18"
-                />
-            </div>
-        </el-tooltip>
-        <el-tooltip effect="dark" :content="state.isFullScreen ? '缩小' : '放大'" placement="bottom">
-            <div @click="onFullScreen" class="nav-menu-item" :class="state.isFullScreen ? 'hover' : ''">
-                <Icon
-                    :color="configStore.getColorVal('headerBarTabColor')"
-                    class="nav-menu-icon"
-                    v-if="state.isFullScreen"
-                    name="fa-solid fa-compress"
-                    size="18"
-                />
-                <Icon
-                    :color="configStore.getColorVal('headerBarTabColor')"
-                    class="nav-menu-icon"
-                    v-else
-                    name="fa-solid fa-expand"
-                    size="18"
-                />
-            </div>
-        </el-tooltip> -->
+
         <el-dropdown style="height: 100%" @command="handleCommand">
-            <div class="admin-info" :class="state.currentNavMenu == 'adminInfo' ? 'hover' : ''">
+            <div class="admin-info" :class="state.currentNavMenu === 'adminInfo' ? 'hover' : ''">
                 <el-avatar :size="25" fit="fill">
                     <img src="@/assets/avatar.png" alt="" />
                 </el-avatar>
@@ -51,105 +24,114 @@
             <template #dropdown>
                 <el-dropdown-menu>
                     <el-dropdown-item command="adminInfo">个人资料</el-dropdown-item>
-                    <el-dropdown-item command="changePwd">修改密码</el-dropdown-item>
-                    <el-dropdown-item command="layout">退出登录</el-dropdown-item>
+                    <el-dropdown-item command="changePwd" v-if="!IS_LNQR">修改密码</el-dropdown-item>
+                    <el-dropdown-item command="logout">退出登录</el-dropdown-item>
                 </el-dropdown-menu>
             </template>
         </el-dropdown>
-        <!-- <div @click="configStore.setLayout('showDrawer', true)" class="nav-menu-item">
-            <Icon
-                :color="configStore.getColorVal('headerBarTabColor')"
-                class="nav-menu-icon"
-                name="fa fa-cogs"
-                size="18"
-            />
-        </div> -->
+
         <Config />
         <PopupPwd ref="popupPwd" />
         <AdminInfo ref="popupAdminInfo" />
-        <!-- <TerminalVue /> -->
-        <!-- 全局暂降事件 -->
         <globalPopUp ref="globalPopUpRef" />
     </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
-import screenfull from 'screenfull'
 import { useConfig } from '@/stores/config'
-import { ElMessage } from 'element-plus'
-import Config from './config.vue'
 import { useAdminInfo } from '@/stores/adminInfo'
-import router from '@/router'
-import globalPopUp from './globalPopUp.vue'
-import { routePush } from '@/utils/router'
-import html2canvas from 'html2canvas'
+import { useNavTabs } from '@/stores/navTabs'
+import { logout } from '@/api/user-boot/user'
+import Config from './config.vue'
 import PopupPwd from './popup/password.vue'
 import AdminInfo from './popup/adminInfo.vue'
-import { useNavTabs } from '@/stores/navTabs'
+const { replace } = useRouter()
+// 环境标识
+const IS_LNQR = import.meta.env.VITE_NAME === 'LNqr'
 
 const adminInfo = useAdminInfo()
 const navTabs = useNavTabs()
 const configStore = useConfig()
+
+// 引用
 const popupPwd = ref()
 const popupAdminInfo = ref()
-const state = reactive({
-    isFullScreen: false,
-    currentNavMenu: '',
-    showLayoutDrawer: false,
-    showAdminInfoPopover: false
-})
 const globalPopUpRef = ref()
-const savePng = () => {
-    html2canvas(document.body, {
-        scale: 1,
-        useCORS: true
-    }).then(function (canvas) {
-        var link = document.createElement('a')
-        link.href = canvas.toDataURL('image/png')
-        link.download = 'screenshot.png'
-        link.click()
-    })
-}
-const onFullScreen = () => {
-    if (!screenfull.isEnabled) {
-        ElMessage.warning('layouts.Full screen is not supported')
-        return false
+
+// 状态
+const state = reactive({
+    currentNavMenu: ''
+})
+
+// 打开暂降事件
+const temporaryLandingEvent = () => {
+    if (globalPopUpRef.value) {
+        globalPopUpRef.value.open()
     }
-    screenfull.toggle()
-    screenfull.onchange(() => {
-        state.isFullScreen = screenfull.isFullscreen
-    })
 }
 
-const handleCommand = async(key: string) => {
-    console.log(key)
+// 下拉菜单命令
+const handleCommand = async (key: string) => {
     switch (key) {
         case 'adminInfo':
-            popupAdminInfo.value.open()
+            popupAdminInfo.value?.open()
             break
         case 'changePwd':
-            popupPwd.value.open()
+            popupPwd.value?.open()
             break
-        case 'layout':
-              await window.location.reload()
-            setTimeout(() => {
-                navTabs.closeTabs()
-                window.localStorage.clear()
-                adminInfo.reset()
-                router.push({ name: 'login' })
-            }, 0)
-            // navTabs.closeTabs()
-            // window.localStorage.clear()
-            // adminInfo.reset()
-            // router.push({ name: 'login' })
-            break
-        default:
+        case 'logout':
+            await handleLogout()
             break
     }
 }
-const temporaryLandingEvent = () => {
-    globalPopUpRef.value.open()
+
+// 统一登出逻辑
+const handleLogout = async () => {
+    try {
+        // 1. 调用后端登出接口
+        await logout()
+        console.log('✅ 后端登出成功')
+    } catch (err) {
+        console.error('❌ 登出接口异常', err)
+    } finally {
+        // 2. 清理本地所有数据
+        clearLocalData()
+
+        // 3. LNqr 环境跳 CAS 登出
+        if (IS_LNQR) {
+            redirectToCasLogout()
+        } else {
+            // 普通环境直接跳登录页
+           replace('/login')
+        }
+    }
+}
+
+// 清理本地数据
+const clearLocalData = () => {
+    // 清空 localStorage
+    window.localStorage.clear()
+
+    // 清空用户状态
+    adminInfo.reset()
+
+    // 清空标签页
+    navTabs.closeTabs()
+
+    console.log('✅ 本地数据已全部清空')
+}
+
+// CAS 登出跳转
+const redirectToCasLogout = () => {
+    const casLogoutUrl =
+        'http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/logout?service=http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/login?service=http://PQMonitoring.dcloud.ln.dc.sgcc.com.cn'
+    window.location.href = casLogoutUrl
+    // 清 Cookie
+    document.cookie.split(';').forEach(cookie => {
+        const name = cookie.split('=')[0].trim()
+        document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`
+    })
 }
 </script>
 
@@ -163,7 +145,6 @@ const temporaryLandingEvent = () => {
     height: 60px;
     display: flex;
     align-items: center;
-    // height: 100%;
     margin-left: auto;
     background-color: v-bind('configStore.getColorVal("headerBarBackground")');
 
@@ -219,37 +200,15 @@ const temporaryLandingEvent = () => {
     }
 }
 
-.dropdown-menu-box :deep(.el-dropdown-menu__item) {
-    justify-content: center;
-}
-
-.admin-info-base {
-    display: flex;
-    justify-content: center;
-    flex-wrap: wrap;
-    padding-top: 10px;
-
-    .admin-info-other {
-        display: block;
-        width: 100%;
-        text-align: center;
-        padding: 10px 0;
-
-        .admin-info-name {
-            font-size: var(--el-font-size-large);
-        }
-    }
-}
-
-.admin-info-footer {
-    padding: 10px 0;
-    margin: 0 -12px -12px -12px;
-    display: flex;
-    justify-content: space-around;
-}
-
-.pt2 {
-    padding-top: 2px;
+.nav-menu-text {
+    position: absolute;
+    top: 13px;
+    left: 20px;
+    font-size: 12px;
+    background: #ff0000;
+    color: #fff;
+    border-radius: 5px;
+    padding: 0 3px;
 }
 
 @keyframes twinkle {
@@ -263,15 +222,4 @@ const temporaryLandingEvent = () => {
         transform: scale(1);
     }
 }
-.nav-menu-text {
-    position: absolute;
-    top: 13px;
-    left:  20px;
-    font-size: 12px;
-    display: inline-block;
-    background-color: #ff0000;
-    color: #fff;
-    border-radius: 5px;
-    padding: 0 3px;
-}
 </style>

src/utils/chartAxisHelper.ts

@@ -0,0 +1,59 @@
+const AXIS_DECIMALS = 2
+
+export function roundAxisValue(val: number, decimals = AXIS_DECIMALS): number {
+    if (!Number.isFinite(val)) return 0
+    const factor = 10 ** decimals
+    return Math.round(val * factor) / factor
+}
+
+/** Y 轴刻度：最多 2 位小数，末尾 0 去掉（如 1.00 → 1，0.10 → 0.1） */
+export function formatAxisLabel(value: number): string {
+    if (!Number.isFinite(value)) return '0'
+    return String(Number(roundAxisValue(value).toFixed(AXIS_DECIMALS)))
+}
+
+/** 瞬间波形 Y 轴范围 */
+export function calcShuYAxisRange(dataMin: number, dataMax: number): { min: number; max: number } {
+    const min = Number(dataMin)
+    const max = Number(dataMax)
+    if (!Number.isFinite(min) || !Number.isFinite(max)) {
+        return { min: 0, max: 1 }
+    }
+
+    let axisMax = max * 1.1
+    let axisMin = min > 0 ? min - min * 0.1 : min * 1.1
+
+    if (axisMax <= axisMin) {
+        const pad = Math.abs(max) * 0.1 || 0.01
+        axisMax = max + pad
+        axisMin = min - pad
+    }
+
+    return {
+        min: roundAxisValue(axisMin),
+        max: roundAxisValue(axisMax)
+    }
+}
+
+/** RMS 波形 Y 轴范围 */
+export function calcRmsYAxisRange(dataMin: number, dataMax: number): { min: number; max: number } {
+    const min = Number(dataMin)
+    const max = Number(dataMax)
+    if (!Number.isFinite(min) || !Number.isFinite(max)) {
+        return { min: 0, max: 1 }
+    }
+
+    let axisMax = max * 1.06 * 1.1
+    let axisMin = min - min * 0.2
+
+    if (axisMax <= axisMin) {
+        const pad = Math.abs(max - min) * 0.1 || Math.abs(max) * 0.1 || 0.01
+        axisMax = max + pad
+        axisMin = min - pad
+    }
+
+    return {
+        min: roundAxisValue(axisMin),
+        max: roundAxisValue(axisMax)
+    }
+}

src/utils/echartMethod.ts

@@ -53,82 +53,23 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
 export const yMethod = (arr: any) => {
     let num = 0.2
     let numList = dataProcessing(arr)
-    let maxValue = 0
-    let minValue = 0
-    let max = 0
+    if (numList.length === 0) {
+        return [0, 0]
+    }
+    const maxValue = Math.max(...numList)
+    const minValue = Math.min(...numList)
     let min = 0
-    maxValue = Math.max(...numList)
-    minValue = Math.min(...numList)
-    const o = maxValue - minValue == 0 ? maxValue : maxValue - minValue
-    min = calculateValue(o, minValue, num, true)
+    let max = 0
 
-    max = calculateValue(o, maxValue, num, false)
-    // if (-100 >= minValue) {
-    //     min = Math.floor((minValue + num * minValue) / 100) * 100
-    // } else if (-10 >= minValue && minValue > -100) {
-    //     min = Math.floor((minValue + num * minValue) / 10) * 10
-    // } else if (-1 >= minValue && minValue > -10) {
-    //     min = Math.floor(minValue + num * minValue)
-    // } else if (0 > minValue && minValue > -1) {
-    //     min = parseFloat((minValue + num * minValue).toFixed(1))
-    // } else if (minValue == 0) {
-    //     min = 0
-    // } else if (0 < minValue && minValue < 1) {
-    //     min = parseFloat((minValue - num * minValue).toFixed(1))
-    // } else if (1 <= minValue && minValue < 10) {
-    //     min = Math.floor(minValue - num * minValue)
-    // } else if (10 <= minValue && minValue < 100) {
-    //     min = Math.floor((minValue - num * minValue) / 10) * 10
-    // } else if (100 <= minValue) {
-    //     min = Math.floor((minValue - num * minValue) / 100) * 100
-    // }
-
-    // if (-100 >= maxValue) {
-    //     max = Math.ceil((maxValue - num * maxValue) / 100) * 100
-    // } else if (-10 >= maxValue && maxValue > -100) {
-    //     max = Math.ceil((maxValue - num * maxValue) / 10) * 10
-    // } else if (-1 >= maxValue && maxValue > -10) {
-    //     max = Math.ceil(maxValue - num * maxValue)
-    // } else if (0 > maxValue && maxValue > -1) {
-    //     max = parseFloat((maxValue - num * maxValue).toFixed(1))
-    // } else if (maxValue == 0) {
-    //     max = 0
-    // } else if (0 < maxValue && maxValue < 1) {
-    //     max = parseFloat((maxValue + num * maxValue).toFixed(1))
-    // } else if (1 <= maxValue && maxValue < 10) {
-    //     max = Math.ceil(maxValue + num * maxValue)
-    // } else if (10 <= maxValue && maxValue < 100) {
-    //     max = Math.ceil((maxValue + num * maxValue) / 10) * 10
-    // } else if (100 <= maxValue) {
-    //     max = Math.ceil((maxValue + num * maxValue) / 100) * 100
-    // }
-
-    // if (maxValue > 1000 || minValue < -1000) {
-    //     max = Math.ceil(maxValue / 100) * 100
-    //     if (minValue == 0) {
-    //         min = 0
-    //     } else {
-    //         min = Math.floor(minValue / 100) * 100
-    //     }
-    // } else if (maxValue < 60 && minValue > 40) {
-    //     max = 60
-    //     min = 40
-    // } else if (maxValue == minValue && maxValue < 10 && minValue > 0) {
-    //     max = Math.ceil(maxValue / 10) * 10
-    //     min = Math.floor(minValue / 10) * 10
-    // } else if (maxValue == minValue && maxValue != 0 && minValue != 0) {
-    //     max = Math.ceil(maxValue / 10 + 1) * 10
-    //     min = Math.floor(minValue / 10 - 1) * 10
-    // } else {
-    //     max = Math.ceil(maxValue / 10) * 10
-    //     min = Math.floor(minValue / 10) * 10
-    // }
-
-    // if (maxValue > 0 && maxValue < 1) {
-    //     max = 1
-    // } else if (max == 0 && minValue > -1 && minValue < 0) {
-    //     min = -1
-    // }
+    // 一正一负时各自按绝对值范围计算，不用 max - min 作为跨度
+    if (maxValue > 0 && minValue < 0) {
+        min = calculateValue(Math.abs(minValue), minValue, num, true)
+        max = calculateValue(Math.abs(maxValue), maxValue, num, false)
+    } else {
+        const o = maxValue - minValue === 0 ? maxValue : maxValue - minValue
+        min = calculateValue(o, minValue, num, true)
+        max = calculateValue(o, maxValue, num, false)
+    }
 
     return [min, max]
 }

src/utils/request.ts

@@ -1,10 +1,11 @@
 import type { AxiosRequestConfig, Method } from 'axios'
 import axios from 'axios'
 import { ElLoading, ElNotification, type LoadingOptions } from 'element-plus'
-import { refreshToken } from '@/api/user-boot/user'
+import { lnRefreshToken, lnRefreshTokenTo, refreshToken } from '@/api/user-boot/user'
 import router from '@/router/index'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { debounce } from 'lodash-es'
+const IS_LN_VERSION = import.meta.env.VITE_NAME === 'LNqr'
 let loginExpireTimer: any = null
 window.requests = []
 window.tokenRefreshing = false
@@ -110,7 +111,8 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
             if (
                 config.url == '/user-boot/user/generateSm2Key' ||
                 config.url == '/pqs-auth/oauth/token' ||
-                config.url == '/LNapi/pqs-auth/oauth/lnLogin'
+                config.url == '/pqs-auth/oauth/lnLogin' ||
+                config.url == '/pqs-auth/oauth/lnRefreshToken'
             ) {
                 config.headers.Authorization = 'Basic bmpjbjpuamNucHFz'
             }
@@ -146,24 +148,46 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                 if (!window.tokenRefreshing) {
                     window.tokenRefreshing = true
 
-                    return refreshToken()
-                        .then(res => {
-                            adminInfo.setToken(res.data.access_token, 'auth')
-                            adminInfo.setToken(res.data.refresh_token, 'refresh')
-                            window.requests.forEach(cb => cb(res.data.access_token))
-                            window.requests = []
+                    if (IS_LN_VERSION) {
+                        //辽宁版本
+                        return lnRefreshTokenTo()
+                            .then(res => {
+                                adminInfo.setToken(res.data.access_token, 'auth')
+                                adminInfo.setToken(res.data.refresh_token, 'refresh')
+                                window.requests.forEach(cb => cb(res.data.access_token))
+                                window.requests = []
 
-                            return Axios(response.config)
-                        })
-                        .catch(err => {
-                            window.location.reload()
-                            adminInfo.removeToken()
-                            router.push({ name: 'login' })
-                            return Promise.reject(err)
-                        })
-                        .finally(() => {
-                            window.tokenRefreshing = false
-                        })
+                                return Axios(response.config)
+                            })
+                            .catch(err => {
+                                // refresh_token + CAS 都过期 → 重新走CAS登录
+                                window.location.href = '/api/pqs-auth/oauth/lnCheck'
+                                return Promise.reject(err)
+                            })
+                            .finally(() => {
+                                window.tokenRefreshing = false
+                            })
+                    } else {
+                        //通用版本
+                        return refreshToken()
+                            .then(res => {
+                                adminInfo.setToken(res.data.access_token, 'auth')
+                                adminInfo.setToken(res.data.refresh_token, 'refresh')
+                                window.requests.forEach(cb => cb(res.data.access_token))
+                                window.requests = []
+
+                                return Axios(response.config)
+                            })
+                            .catch(err => {
+                                window.location.reload()
+                                adminInfo.removeToken()
+                                router.push({ name: 'login' })
+                                return Promise.reject(err)
+                            })
+                            .finally(() => {
+                                window.tokenRefreshing = false
+                            })
+                    }
                 } else {
                     return new Promise(resolve => {
                         // 用函数形式将 resolve 存入，等待刷新后再执行
@@ -188,6 +212,13 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                     router.push({ name: 'login' })
                     loginExpireTimer = null // 执行后清空定时器
                 }, 100) // 可根据实际情况调整延迟时间
+                return Promise.reject(response.data)
+            } else if (response.data.code == 'A0121') {
+                //统一认证过期
+                const casLogoutUrl =
+                    'http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/login?service=http://PQMonitoring.dcloud.ln.dc.sgcc.com.cn'
+                window.location.href = casLogoutUrl
+
                 return Promise.reject(response.data)
             } else {
                 if (options.showCodeMessage) {

src/utils/waveCache.ts

@@ -0,0 +1,42 @@
+const MAX_CACHE_SIZE = 30
+
+const cache = new Map<string, unknown>()
+
+function dataFingerprint(data: unknown[][] | undefined): string {
+    if (!data?.length) return '0'
+    const first = data[0]
+    const last = data[data.length - 1]
+    return `${data.length}:${first?.[0]}:${last?.[0]}`
+}
+
+export function buildWaveCacheKey(
+    type: 'shu' | 'rms',
+    wp: Record<string, any> | undefined,
+    value: number,
+    isOpen: boolean,
+    boxoList: Record<string, any>
+): string {
+    if (!wp) return ''
+    const waveFp =
+        type === 'shu' ? dataFingerprint(wp.listWaveData) : dataFingerprint(wp.listRmsData)
+    const boxoFp = boxoList?.startTime ?? boxoList?.lineName ?? boxoList?.equipmentName ?? ''
+    return `${type}|${wp.time}|${wp.waveType}|${wp.iphasic}|${value}|${isOpen}|${waveFp}|${boxoFp}`
+}
+
+export function getWaveCache<T>(key: string): T | null {
+    if (!key || !cache.has(key)) return null
+    const value = cache.get(key) as T
+    cache.delete(key)
+    cache.set(key, value)
+    return value
+}
+
+export function setWaveCache(key: string, value: unknown): void {
+    if (!key) return
+    if (cache.has(key)) cache.delete(key)
+    cache.set(key, value)
+    while (cache.size > MAX_CACHE_SIZE) {
+        const oldest = cache.keys().next().value
+        if (oldest !== undefined) cache.delete(oldest)
+    }
+}

src/utils/waveWorkerPool.ts

@@ -0,0 +1,96 @@
+import { toRaw } from 'vue'
+
+type WorkerMessageHandler = (data: any) => void
+
+let shuWorker: Worker | null = null
+let rmsWorker: Worker | null = null
+
+/** 递归剥离 Vue 响应式代理，得到可 structuredClone 的纯对象 */
+export function toPlainDeep<T>(value: T): T {
+    const raw = toRaw(value as object) as T
+    if (Array.isArray(raw)) {
+        return raw.map(item => toPlainDeep(item)) as T
+    }
+    if (raw !== null && typeof raw === 'object') {
+        const out: Record<string, unknown> = {}
+        for (const [key, val] of Object.entries(raw)) {
+            out[key] = toPlainDeep(val)
+        }
+        return out as T
+    }
+    return raw
+}
+
+const BOXO_LIST_KEYS = [
+    'systemType',
+    'powerStationName',
+    'measurementPointName',
+    'startTime',
+    'featureAmplitude',
+    'duration',
+    'engineeringName',
+    'equipmentName',
+    'evtParamVVaDepth',
+    'evtParamTm',
+    'lineName',
+    'persistTime',
+    'subName'
+] as const
+
+export function buildWorkerPayload(
+    type: 'shu' | 'rms',
+    wp: Record<string, any>,
+    boxoList: Record<string, any>,
+    extras: { requestId: number; value: number; isOpen: boolean; iphasic?: number }
+) {
+    const plainWp = toPlainDeep(wp)
+    const wpPayload: Record<string, unknown> = {
+        pt: plainWp.pt,
+        ct: plainWp.ct,
+        waveTitle: plainWp.waveTitle,
+        iphasic: plainWp.iphasic,
+        time: plainWp.time,
+        waveType: plainWp.waveType,
+        yzd: plainWp.yzd
+    }
+    if (type === 'shu') {
+        wpPayload.listWaveData = plainWp.listWaveData
+    } else {
+        wpPayload.listRmsData = plainWp.listRmsData
+    }
+
+    const plainBoxo: Record<string, unknown> = {}
+    const rawBoxo = toPlainDeep(boxoList)
+    for (const key of BOXO_LIST_KEYS) {
+        if (rawBoxo[key] !== undefined) {
+            plainBoxo[key] = rawBoxo[key]
+        }
+    }
+
+    return {
+        requestId: extras.requestId,
+        value: extras.value,
+        isOpen: extras.isOpen,
+        iphasic: extras.iphasic,
+        wp: wpPayload,
+        boxoList: plainBoxo
+    }
+}
+
+export function getShuWorker(onMessage: WorkerMessageHandler): Worker {
+    if (!shuWorker) {
+        shuWorker = new Worker(new URL('../components/echarts/shuWorker.js', import.meta.url))
+    }
+    shuWorker.onmessage = e => onMessage(e.data)
+    shuWorker.onerror = error => console.error('Shu worker error:', error)
+    return shuWorker
+}
+
+export function getRmsWorker(onMessage: WorkerMessageHandler): Worker {
+    if (!rmsWorker) {
+        rmsWorker = new Worker(new URL('../components/echarts/rmsWorker.js', import.meta.url))
+    }
+    rmsWorker.onmessage = e => onMessage(e.data)
+    rmsWorker.onerror = error => console.error('Rms worker error:', error)
+    return rmsWorker
+}

src/utils/webSocketClient.ts

@@ -58,7 +58,7 @@ export default class SocketService {
     }
     // 处理连接成功事件
     private handleOpen(): void {
-        ElMessage.success('webSocket连接服务端成功了')
+        // ElMessage.success('webSocket连接服务端成功了')
         console.log('连接服务端成功了')
         this.connected = true
         this.connectRetryCount = 0
@@ -110,6 +110,7 @@ export default class SocketService {
             }
         } else {
             this.callBackMapping['message']!({ Flag: false })
+            if(event.data == 'connect')return
             ElMessage.error(event.data)
         }
     }

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

@@ -1,423 +1,423 @@
-<template>
-    <div class="default-main">
-        <TableHeader datePicker theCurrentTime area ref="header">
-            <!-- <template v-slot:select>
-               
-            </template> -->
-        </TableHeader>
-        <div v-loading="tableStore.table.loading">
-            <el-row :gutter="10" class="pd10">
-                <el-col :span="11" style="position: relative">
-                    <el-card>
-                        <el-radio-group
-                            v-model="tableStore.table.params.type"
-                            class="group"
-                            @change="tableStore.index()"
-                        >
-                            <el-radio-button label="风电场" value="1" />
-                            <el-radio-button label="光伏电站" value="2" />
-                        </el-radio-group>
-                        <MyEchartMap
-                            ref="EchartMap"
-                            :options="echartMapList"
-                            class="map"
-                            @eliminate="eliminate"
-                            @getRegionByRegion="getRegionByRegion"
-                            @clickMap="clickMap"
-                        />
-                    </el-card>
-                </el-col>
-                <el-col :span="13">
-                    <el-card>
-                        <template #header>
-                            <div class="card-header">
-                                <span>暂降列表</span>
-                            </div>
-                        </template>
-
-                        <!-- <h3 class="mb10">暂降列表</h3> -->
-                        <div class="tall1">
-                            <vxe-table
-                                height="auto"
-                                auto-resize
-                                :data="distributionData"
-                                v-loading="loading"
-                                v-bind="defaultAttribute"
-                            >
-                                <vxe-column
-                                    field="newStationName"
-                                    title="新能源站名称"
-                                    min-width="150px"
-                                    show-overflow-tooltip
-                                ></vxe-column>
-                                <vxe-column field="startTime" title="暂降发生时刻" min-width="150px"></vxe-column>
-                                <vxe-column
-                                    field="featureAmplitude"
-                                    title="暂降(骤升)幅值(%)"
-                                    sortable
-                                    min-width="150px"
-                                ></vxe-column>
-                                <vxe-column
-                                    field="advanceReason"
-                                    title="暂降原因"
-                                    sortable
-                                    :formatter="formFilter"
-                                    min-width="100px"
-                                ></vxe-column>
-                                <vxe-column field="severity" title="严重度" min-width="100px" sortable></vxe-column>
-                                <vxe-column title="操作" width="80px">
-                                    <template #default="{ row }">
-                                        <el-button
-                                            type="primary"
-                                            v-if="row.wavePath != null"
-                                            size="small"
-                                            link
-                                            @click="boxi(row)"
-                                        >
-                                            查看波形
-                                        </el-button>
-                                        <el-button v-else disabled size="small" link>暂无波形</el-button>
-                                    </template>
-                                </vxe-column>
-                            </vxe-table>
-                        </div>
-                    </el-card>
-                    <el-card class="mt10">
-                        <template #header>
-                            <div class="card-header">
-                                <span>暂降波形</span>
-                            </div>
-                        </template>
-                        <div class="tall" v-loading="loading1">
-                            <!-- <h3 class="mb10">暂降波形</h3> -->
-                            <div v-if="wp != null">
-                                <rmsboxi :value="1" :height="height" :boxoList="boxoList" :wp="wp" />
-                            </div>
-                            <el-empty v-else description="暂无数据" class="custom-empty" />
-                        </div>
-                    </el-card>
-                </el-col>
-            </el-row>
-        </div>
-    </div>
-</template>
-<script setup lang="ts">
-import TableHeader from '@/components/table/header/index.vue'
-
-import { useDictData } from '@/stores/dictData'
-import { defaultAttribute } from '@/components/table/defaultAttribute'
-import MyEchartMap from '@/components/echarts/MyEchartMap.vue'
-import TableStore from '@/utils/tableStore'
-import { voltageRideThroughEventQueryPage } from '@/api/event-boot/highAndLowPressure'
-import { getMonitorEventAnalyseWave, getTransientDetailById } from '@/api/event-boot/transient'
-import rmsboxi from '@/components/echarts/rmsboxi.vue'
-import { ref, onMounted, provide } from 'vue'
-import { mainHeight } from '@/utils/layout'
-import { FormItem } from 'vxe-table'
-defineOptions({
-    name: 'newEnergy/highAndLowPressure'
-})
-const EchartMap = ref()
-const dictData = useDictData()
-const reason = dictData.getBasicData('Event_Reason')
-const triggerType = dictData.getBasicData('Event_Statis')
-const echartMapList: any = ref({})
-const header = ref()
-const distributionData: any = ref([])
-const loading = ref(false)
-const loading1 = ref(false)
-const boxoList = ref(null)
-const wp = ref(null)
-const tableStore = new TableStore({
-    url: '/event-boot/voltageRideThrough/view',
-    method: 'POST',
-    column: [],
-    beforeSearchFun: () => {
-        tableStore.table.params.areaId = tableStore.table.params.deptIndex
-    },
-    loadCallback: () => {
-        // 处理地图数据
-        map(tableStore.table.data)
-        // tabulation(tableStore.table.data)
-        EchartMap.value.GetEchar(header.value.areaRef.areaName)
-        if (tableStore.table.data.length > 0) {
-            tabulation({ data: tableStore.table.data[0], seriesName: '高压' })
-        }
-    }
-})
-const height = mainHeight(200, 2).height
-provide('tableStore', tableStore)
-tableStore.table.params.type = '1'
-
-// 地图点击事件
-const getRegionByRegion = (list: any) => {
-    tableStore.table.params.deptIndex = list.id
-    tableStore.onTableAction('search', {})
-}
-// 消除点
-const eliminate = (name: string) => {
-    echartMapList.value.options.series = []
-    EchartMap.value.GetEchar(name)
-}
-
-// 地图数处理
-const map = (res: any) => {
-    echartMapList.value = {
-        title: {
-            text: '高/低电压穿越'
-        },
-        tooltip: {
-            trigger: 'item',
-            formatter: function (params) {
-                if (params.seriesType == 'bar3D') {
-                    return [params.seriesName, params.name + '：' + params.value[2] + (params.value[3] || '')].join(
-                        '<br />'
-                    )
-                }
-            }
-        },
-
-        legend: {
-            selectedMode: false
-        },
-        geo3D: {
-            show: true,
-            // name: '浙江',
-            itemStyle: {
-                color: getComputedStyle(document.documentElement).getPropertyValue('--el-color-primary-light-3'),
-                borderWidth: 1,
-                borderColor: '#fff'
-            },
-            emphasis: {
-                label: { show: true, fontSize: 16 },
-                itemStyle: {
-                    color: getComputedStyle(document.documentElement).getPropertyValue('--el-color-primary-light-7')
-                }
-            },
-            viewControl: {
-                alpha: 60,
-                distance: 120,
-                panMouseButton: 'right', //平移操作使用的鼠标按键
-                rotateMouseButton: 'left' //旋转操作使用的鼠标按键
-            },
-            label: {
-                show: true,
-                color: '#000',
-                fontSize: 14,
-                distance: 0,
-                textStyle: {
-                    color: '#000',
-                    backgroundColor: '#000'
-                }
-            },
-
-            data: [
-                { name: '低压', field: 'lowPressure', unit: '次' },
-                { name: '高压', field: 'highPressure', unit: '次' }
-            ]
-        },
-        options: {
-            series: [
-                {
-                    name: '低压',
-                    type: 'bar3D',
-                    coordinateSystem: 'geo3D',
-                    shading: 'lambert',
-                    label: {
-                        show: true,
-                        position: 'top',
-                        formatter: params => {
-                            return params.value[2]
-                        }
-                    },
-
-                    data:
-                        res.length == 0
-                            ? []
-                            : res.map((item: any) => {
-                                  return {
-                                      ...item,
-                                      value: [item.lng, item.lat, item.lowPressure || 0]
-                                  }
-                              }),
-                    // data:[],
-                    barSize: 1,
-                    minHeight: 1,
-                    itemStyle: {
-                        color: '#77DA63'
-                    },
-                    emphasis: {
-                        label: { show: true }
-                    }
-                },
-                {
-                    name: '高压',
-                    type: 'bar3D',
-                    coordinateSystem: 'geo3D',
-                    shading: 'lambert',
-                    label: {
-                        show: true,
-                        // position: 'top',
-                        formatter: params => {
-                            return params.value[2]
-                        }
-                    },
-
-                    data:
-                        res.length == 0
-                            ? []
-                            : res.map((item: any) => {
-                                  return {
-                                      ...item,
-                                      value: [item.lng - 0.1, item.lat, item.highPressure || 0]
-                                  }
-                              }),
-                    // [
-
-                    //     {
-                    //         adcode: 330400,
-                    //         name: '大连',
-
-                    //         wcs: 10,
-                    //         mbs: 40,
-                    //         wcl: 100,
-                    //         value: [121.67391, 38.947468, 40, '']
-                    //     }
-                    // ],
-                    barSize: 1,
-                    minHeight: 1,
-                    itemStyle: {
-                        color: '#FFBF00'
-                    },
-                    emphasis: {
-                        label: { show: true }
-                    }
-                }
-            ]
-        }
-    }
-}
-
-// 点击地图
-const clickMap = (e: any) => {
-    tabulation(e)
-}
-// 表格数据处理
-const tabulation = (e: any) => {
-    console.log()
-
-    loading.value = true
-    voltageRideThroughEventQueryPage({
-        ...tableStore.table.params,
-        areaId: e.data.id,
-        frequencyType:
-            e.seriesName == '高压'
-                ? triggerType.filter(item => item.code == 'Voltage_Rise')[0].id
-                : triggerType.filter(item => item.code == 'Voltage_Dip')[0].id
-    })
-        .then(res => {
-            distributionData.value = res.data
-
-            for (let i = 0; i < res.data.length; i++) {
-                if (res.data[i].wavePath != null) {
-                    boxi(res.data[i])
-                    break
-                }
-            }
-
-            // res.data.forEach((item: any) => {
-            //     if (item.wavePath != null) {
-            //         boxi(item)
-            //         return
-            //     }
-            // })
-            // 。wavePath
-            loading.value = false
-        })
-        .catch(() => {
-            loading.value = false
-        })
-}
-
-const formFilter = (row: any) => {
-    if (row.column.property == 'advanceReason') {
-        let title = ''
-        reason.forEach(item => {
-            if (item.id == row.row.advanceReason) {
-                title = item.name
-            } else if (row.row.advanceReason == null || row.row.advanceReason == '') {
-                title = '/'
-            }
-        })
-        return title
-    } else {
-        return row.row[row.column.property]
-    }
-}
-// 查看波形数据
-const boxi = async (row: any) => {
-    loading1.value = true
-    wp.value = null
-    await getTransientDetailById({
-        eventId: row.eventId,
-        sysType: 0,
-        smallType: 0
-    }).then(res => {
-        boxoList.value = res.data
-    })
-
-    await getMonitorEventAnalyseWave({
-        id: row.eventId,
-        systemType: 0,
-        type: 0
-    }).then(res => {
-        if (res != undefined) {
-            wp.value = res.data
-        }
-        loading1.value = false
-    })
-}
-
-onMounted(() => {
-    tableStore.index()
-})
-const layout = mainHeight(83) as any
-const layout1 = mainHeight(93) as any
-</script>
-<style lang="scss" scoped>
-.map {
-    height: calc(v-bind('layout1.height') - 30px);
-}
-.tall {
-    height: calc((v-bind('layout1.height') - 100px) / 2);
-}
-.tall1 {
-    height: calc((v-bind('layout1.height') - 100px) / 2 - 50px);
-}
-
-.group {
-    position: absolute;
-    top: 15px;
-    right: 20px;
-    z-index: 10;
-}
-
-:deep(.el-card__body) {
-    padding: 10px;
-}
-/* 自定义 el-empty 的样式 */
-:deep(.custom-empty) {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100%; /* 调整高度 */
-    padding: 20px; /* 调整内边距 */
-    .el-empty__image {
-        display: none; /* 隐藏默认图片 */
-    }
-    .el-empty__description {
-        font-size: 14px; /* 调整字体大小 */
-        color: var(--vxe-font-color);
-    }
-}
-</style>
+<template>
+    <div class="default-main">
+        <TableHeader datePicker theCurrentTime area ref="header">
+            <!-- <template v-slot:select>
+               
+            </template> -->
+        </TableHeader>
+        <div v-loading="tableStore.table.loading">
+            <el-row :gutter="10" class="pd10">
+                <el-col :span="11" style="position: relative">
+                    <el-card>
+                        <el-radio-group
+                            v-model="tableStore.table.params.type"
+                            class="group"
+                            @change="tableStore.index()"
+                        >
+                            <el-radio-button label="风电场" value="1" />
+                            <el-radio-button label="光伏电站" value="2" />
+                        </el-radio-group>
+                        <MyEchartMap
+                            ref="EchartMap"
+                            :options="echartMapList"
+                            class="map"
+                            @eliminate="eliminate"
+                            @getRegionByRegion="getRegionByRegion"
+                            @clickMap="clickMap"
+                        />
+                    </el-card>
+                </el-col>
+                <el-col :span="13">
+                    <el-card>
+                        <template #header>
+                            <div class="card-header">
+                                <span>暂降列表</span>
+                            </div>
+                        </template>
+
+                        <!-- <h3 class="mb10">暂降列表</h3> -->
+                        <div class="tall1">
+                            <vxe-table
+                                height="auto"
+                                auto-resize
+                                :data="distributionData"
+                                v-loading="loading"
+                                v-bind="defaultAttribute"
+                            >
+                                <vxe-column
+                                    field="newStationName"
+                                    title="新能源站名称"
+                                    min-width="150px"
+                                    show-overflow-tooltip
+                                ></vxe-column>
+                                <vxe-column field="startTime" title="暂降发生时刻" min-width="180px" sortable></vxe-column>
+                                <vxe-column
+                                    field="featureAmplitude"
+                                    title="暂降(骤升)幅值(%)"
+                                    sortable
+                                    min-width="160px"
+                                ></vxe-column>
+                                <vxe-column
+                                    field="advanceReason"
+                                    title="暂降原因"
+                                    sortable
+                                    :formatter="formFilter"
+                                    min-width="100px"
+                                ></vxe-column>
+                                <vxe-column field="severity" title="严重度" min-width="100px" sortable></vxe-column>
+                                <vxe-column title="操作" width="80px">
+                                    <template #default="{ row }">
+                                        <el-button
+                                            type="primary"
+                                            v-if="row.wavePath != null"
+                                            size="small"
+                                            link
+                                            @click="boxi(row)"
+                                        >
+                                            查看波形
+                                        </el-button>
+                                        <el-button v-else disabled size="small" link>暂无波形</el-button>
+                                    </template>
+                                </vxe-column>
+                            </vxe-table>
+                        </div>
+                    </el-card>
+                    <el-card class="mt10">
+                        <template #header>
+                            <div class="card-header">
+                                <span>暂降波形</span>
+                            </div>
+                        </template>
+                        <div class="tall" v-loading="loading1">
+                            <!-- <h3 class="mb10">暂降波形</h3> -->
+                            <div v-if="wp != null">
+                                <rmsboxi :value="1" :height="height" :boxoList="boxoList" :wp="wp" />
+                            </div>
+                            <el-empty v-else description="暂无数据" class="custom-empty" />
+                        </div>
+                    </el-card>
+                </el-col>
+            </el-row>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import TableHeader from '@/components/table/header/index.vue'
+
+import { useDictData } from '@/stores/dictData'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import MyEchartMap from '@/components/echarts/MyEchartMap.vue'
+import TableStore from '@/utils/tableStore'
+import { voltageRideThroughEventQueryPage } from '@/api/event-boot/highAndLowPressure'
+import { getMonitorEventAnalyseWave, getTransientDetailById } from '@/api/event-boot/transient'
+import rmsboxi from '@/components/echarts/rmsboxi.vue'
+import { ref, onMounted, provide } from 'vue'
+import { mainHeight } from '@/utils/layout'
+import { FormItem } from 'vxe-table'
+defineOptions({
+    name: 'newEnergy/highAndLowPressure'
+})
+const EchartMap = ref()
+const dictData = useDictData()
+const reason = dictData.getBasicData('Event_Reason')
+const triggerType = dictData.getBasicData('Event_Statis')
+const echartMapList: any = ref({})
+const header = ref()
+const distributionData: any = ref([])
+const loading = ref(false)
+const loading1 = ref(false)
+const boxoList = ref(null)
+const wp = ref(null)
+const tableStore = new TableStore({
+    url: '/event-boot/voltageRideThrough/view',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params.areaId = tableStore.table.params.deptIndex
+    },
+    loadCallback: () => {
+        // 处理地图数据
+        map(tableStore.table.data)
+        // tabulation(tableStore.table.data)
+        EchartMap.value.GetEchar(header.value.areaRef.areaName)
+        if (tableStore.table.data.length > 0) {
+            tabulation({ data: tableStore.table.data[0], seriesName: '高压' })
+        }
+    }
+})
+const height = mainHeight(200, 2).height
+provide('tableStore', tableStore)
+tableStore.table.params.type = '1'
+
+// 地图点击事件
+const getRegionByRegion = (list: any) => {
+    tableStore.table.params.deptIndex = list.id
+    tableStore.onTableAction('search', {})
+}
+// 消除点
+const eliminate = (name: string) => {
+    echartMapList.value.options.series = []
+    EchartMap.value.GetEchar(name)
+}
+
+// 地图数处理
+const map = (res: any) => {
+    echartMapList.value = {
+        title: {
+            text: '高/低电压穿越'
+        },
+        tooltip: {
+            trigger: 'item',
+            formatter: function (params) {
+                if (params.seriesType == 'bar3D') {
+                    return [params.seriesName, params.name + '：' + params.value[2] + (params.value[3] || '')].join(
+                        '<br />'
+                    )
+                }
+            }
+        },
+
+        legend: {
+            selectedMode: false
+        },
+        geo3D: {
+            show: true,
+            // name: '浙江',
+            itemStyle: {
+                color: getComputedStyle(document.documentElement).getPropertyValue('--el-color-primary-light-3'),
+                borderWidth: 1,
+                borderColor: '#fff'
+            },
+            emphasis: {
+                label: { show: true, fontSize: 16 },
+                itemStyle: {
+                    color: getComputedStyle(document.documentElement).getPropertyValue('--el-color-primary-light-7')
+                }
+            },
+            viewControl: {
+                alpha: 60,
+                distance: 120,
+                panMouseButton: 'right', //平移操作使用的鼠标按键
+                rotateMouseButton: 'left' //旋转操作使用的鼠标按键
+            },
+            label: {
+                show: true,
+                color: '#000',
+                fontSize: 14,
+                distance: 0,
+                textStyle: {
+                    color: '#000',
+                    backgroundColor: '#000'
+                }
+            },
+
+            data: [
+                { name: '低压', field: 'lowPressure', unit: '次' },
+                { name: '高压', field: 'highPressure', unit: '次' }
+            ]
+        },
+        options: {
+            series: [
+                {
+                    name: '低压',
+                    type: 'bar3D',
+                    coordinateSystem: 'geo3D',
+                    shading: 'lambert',
+                    label: {
+                        show: true,
+                        position: 'top',
+                        formatter: params => {
+                            return params.value[2]
+                        }
+                    },
+
+                    data:
+                        res.length == 0
+                            ? []
+                            : res.map((item: any) => {
+                                  return {
+                                      ...item,
+                                      value: [item.lng, item.lat, item.lowPressure || 0]
+                                  }
+                              }),
+                    // data:[],
+                    barSize: 1,
+                    minHeight: 1,
+                    itemStyle: {
+                        color: '#77DA63'
+                    },
+                    emphasis: {
+                        label: { show: true }
+                    }
+                },
+                {
+                    name: '高压',
+                    type: 'bar3D',
+                    coordinateSystem: 'geo3D',
+                    shading: 'lambert',
+                    label: {
+                        show: true,
+                        // position: 'top',
+                        formatter: params => {
+                            return params.value[2]
+                        }
+                    },
+
+                    data:
+                        res.length == 0
+                            ? []
+                            : res.map((item: any) => {
+                                  return {
+                                      ...item,
+                                      value: [item.lng - 0.1, item.lat, item.highPressure || 0]
+                                  }
+                              }),
+                    // [
+
+                    //     {
+                    //         adcode: 330400,
+                    //         name: '大连',
+
+                    //         wcs: 10,
+                    //         mbs: 40,
+                    //         wcl: 100,
+                    //         value: [121.67391, 38.947468, 40, '']
+                    //     }
+                    // ],
+                    barSize: 1,
+                    minHeight: 1,
+                    itemStyle: {
+                        color: '#FFBF00'
+                    },
+                    emphasis: {
+                        label: { show: true }
+                    }
+                }
+            ]
+        }
+    }
+}
+
+// 点击地图
+const clickMap = (e: any) => {
+    tabulation(e)
+}
+// 表格数据处理
+const tabulation = (e: any) => {
+    console.log()
+
+    loading.value = true
+    voltageRideThroughEventQueryPage({
+        ...tableStore.table.params,
+        areaId: e.data.id,
+        frequencyType:
+            e.seriesName == '高压'
+                ? triggerType.filter(item => item.code == 'Voltage_Rise')[0].id
+                : triggerType.filter(item => item.code == 'Voltage_Dip')[0].id
+    })
+        .then(res => {
+            distributionData.value = res.data
+
+            for (let i = 0; i < res.data.length; i++) {
+                if (res.data[i].wavePath != null) {
+                    boxi(res.data[i])
+                    break
+                }
+            }
+
+            // res.data.forEach((item: any) => {
+            //     if (item.wavePath != null) {
+            //         boxi(item)
+            //         return
+            //     }
+            // })
+            // 。wavePath
+            loading.value = false
+        })
+        .catch(() => {
+            loading.value = false
+        })
+}
+
+const formFilter = (row: any) => {
+    if (row.column.property == 'advanceReason') {
+        let title = ''
+        reason.forEach(item => {
+            if (item.id == row.row.advanceReason) {
+                title = item.name
+            } else if (row.row.advanceReason == null || row.row.advanceReason == '') {
+                title = '/'
+            }
+        })
+        return title
+    } else {
+        return row.row[row.column.property]
+    }
+}
+// 查看波形数据
+const boxi = async (row: any) => {
+    loading1.value = true
+    wp.value = null
+    await getTransientDetailById({
+        eventId: row.eventId,
+        sysType: 0,
+        smallType: 0
+    }).then(res => {
+        boxoList.value = res.data
+    })
+
+    await getMonitorEventAnalyseWave({
+        id: row.eventId,
+        systemType: 0,
+        type: 0
+    }).then(res => {
+        if (res != undefined) {
+            wp.value = res.data
+        }
+        loading1.value = false
+    })
+}
+
+onMounted(() => {
+    tableStore.index()
+})
+const layout = mainHeight(83) as any
+const layout1 = mainHeight(93) as any
+</script>
+<style lang="scss" scoped>
+.map {
+    height: calc(v-bind('layout1.height') - 30px);
+}
+.tall {
+    height: calc((v-bind('layout1.height') - 100px) / 2);
+}
+.tall1 {
+    height: calc((v-bind('layout1.height') - 100px) / 2 - 50px);
+}
+
+.group {
+    position: absolute;
+    top: 15px;
+    right: 20px;
+    z-index: 10;
+}
+
+:deep(.el-card__body) {
+    padding: 10px;
+}
+/* 自定义 el-empty 的样式 */
+:deep(.custom-empty) {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%; /* 调整高度 */
+    padding: 20px; /* 调整内边距 */
+    .el-empty__image {
+        display: none; /* 隐藏默认图片 */
+    }
+    .el-empty__description {
+        font-size: 14px; /* 调整字体大小 */
+        color: var(--vxe-font-color);
+    }
+}
+</style>

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

@@ -1107,7 +1107,7 @@
                                             </el-form-item>
                                             <el-form-item
                                                 class="form-item"
-                                                label="测量点性质:"
+                                                label="电网标志:"
                                                 :prop="
                                                     'deviceParam.' +
                                                     [deviceIndex] +
@@ -1119,14 +1119,14 @@
                                                 "
                                                 :rules="{
                                                     required: true,
-                                                    message: '请选择测量点性质',
+                                                    message: '请选择电网标志',
                                                     trigger: 'blur'
                                                 }"
                                             >
                                                 <el-select
                                                     filterable
                                                     v-model="lineItem.powerFlag"
-                                                    placeholder="请选择测量点性质"
+                                                    placeholder="请选择电网标志"
                                                     :disabled="pageStatus == 1"
                                                     @change="lineItem.objId = ''"
                                                 >
@@ -1140,14 +1140,15 @@
                                             </el-form-item>
                                             <el-form-item
                                                 class="form-item"
-                                                label="用户名称:"
+                                                label="监测对象名称:"
                                                 v-if="lineItem.powerFlag == 1"
                                             >
                                                 <el-select
                                                     filterable
                                                     v-model="lineItem.objId"
-                                                    placeholder="请选择用户名称"
+                                                    placeholder="请选择对象名称"
                                                     :disabled="pageStatus == 1"
+                                                    @change="(val) => handleSelect(lineItem, val)"
                                                     clearable
                                                 >
                                                     <el-option
@@ -1355,7 +1356,7 @@
                                                     lIndex +
                                                     '.bigObjType'
                                                 "
-                                                :rules="{ required: true, message: '请选择对象大类', trigger: 'blur' }"
+
                                             >
                                                 <el-select
                                                     filterable
@@ -1384,7 +1385,7 @@
                                                     lIndex +
                                                     '.smallObjType'
                                                 "
-                                                :rules="{ required: true, message: '请选择对象小类', trigger: 'blur' }"
+
                                             >
                                                 <el-select
                                                     filterable
@@ -2202,6 +2203,22 @@ const category = () => {
         bigList.value = convertToTree(res.data)
     })
 }
+
+//用户对象chage事件
+const handleSelect = (item, selectedId) => {
+    // 清空选择
+    if (!selectedId) {
+        item.projectName = ''
+        return
+    }
+    // 过滤当前下拉数据源
+
+    const options = newStationIdArr.value.find(i => i.id === selectedId)
+    if (options) {
+        item.objName = options.projectName
+    }
+}
+
 // 组装用户大小类
 const convertToTree = (data: any) => {
     const nodeMap: any = {}

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

@@ -504,14 +504,16 @@ const maintenance = (val: any) => {
         id: val.tfIndex,
         subId: val.subIndex
     }).then(res => {
+
         bind.value = res.data.bind
         treeMenuLeftData.value = res.data.upNode
         treeMenuRightData.value = res.data.downNode
+
         setDisabled(treeMenuRightData.value)
         setDisabled(treeMenuLeftData.value)
         isLoading3.value = false
         if (treeMenuLeftData.value && treeMenuLeftData.value.length > 0) {
-            treeMenuLeftData.value[0].children?.forEach(item => {
+    /*        treeMenuLeftData.value[0].children?.forEach(item => {
                 item.children?.forEach(item1 => {
                     item1.children?.forEach(item2 => {
                         item2.children?.forEach(item3 => {
@@ -523,21 +525,25 @@ const maintenance = (val: any) => {
                         })
                     })
                 })
-            })
+            })*/
+            menuTreeLeft.value?.setCheckedKeys([bind.value[0]])
+            maintenanceData.upNode = bind.value[0]
+            bindLevel.value = 5
         }
         if (treeMenuRightData.value && treeMenuRightData.value.length > 0) {
-            treeMenuRightData.value[0].children?.forEach(item => {
+           /* treeMenuRightData.value[0].children?.forEach(item => {
                 item.children?.forEach(item1 => {
                     item1.children?.forEach(item2 => {
                         item2.children?.forEach(item3 => {
                             if (item3.level != null) {
-                                menuTreeRight.value?.setCheckedKeys([item3.id])
-                                maintenanceData.downNode = item3.id
+
                             }
                         })
                     })
                 })
-            })
+            })*/
+            menuTreeRight.value?.setCheckedKeys([bind.value[1]])
+            maintenanceData.downNode = bind.value[1]
         }
         nodemaintenanceInformation.value = true
     })

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

@@ -694,7 +694,7 @@ const rules = ref({
     reporter: [{ required: true, message: '请输入填报人', trigger: 'blur' }],
     reportDate: [{ required: true, message: '请选择填报日期', trigger: 'change' }],
     orgId: [{ required: true, message: '请选择填报部门', trigger: 'change' }],
-    stationId: [{ required: true, message: '请选择所属电站', trigger: 'change' }],
+    //stationId: [{ required: true, message: '请选择所属电站', trigger: 'change' }],
     expectedProductionDate: [{ required: true, message: '请选择工程预期投产日期', trigger: 'change' }],
     userType: [{ required: true, message: '清选择用户性质', trigger: 'change' }],
     city: [{ required: true, message: '请选择所在地市', trigger: 'change' }],

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

@@ -89,7 +89,7 @@ const tableStore = new TableStore({
             }
         },
         { field: 'city', title: '所在地市', minWidth: 80 },
-        { field: 'substation', title: '厂站名称', minWidth: 100 },
+   /*     { field: 'substation', title: '厂站名称', minWidth: 100 },*/
         { field: 'projectName', title: '项目名称', minWidth: 170 },
         {
             field: 'userType',
@@ -103,6 +103,7 @@ const tableStore = new TableStore({
 
         // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
         { field: 'ratePower', title: '装机容量(MW)', minWidth: 130 },
+        { field: 'stationId', title: '所属电站', minWidth: 130 },
         {
             field: 'createBy',
             title: '创建人',

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

@@ -2,32 +2,39 @@
     <div class="default-main" :style="height">
         <!-- 标准库 -->
 
-        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+        <splitpanes
+            style="height: 100%"
+            class="default-theme"
+            id="navigation-splitpanes"
+            @resize="onPaneResize"
+            @resized="onPaneResized"
+        >
             <pane :size="size">
                 <standardTree ref="treeRef"
                     :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
                     :current-node-key="monitoringPoint.state.lineId" @node-click="handleNodeClick"
                     @init="handleNodeClick"></standardTree>
             </pane>
-            <pane style="background: #fff" :style="height">
-                <div class="pd10" style="display: flex; justify-content: end">
+            <pane style="background: #fff" class="standard-pane">
+                <div class="pd10 standard-pane__toolbar" style="display: flex; justify-content: end">
                     <el-button icon="el-icon-Plus" type="primary" @click="addUser" v-if="information">新增</el-button>
                     <el-button icon="el-icon-Edit" type="primary" @click="editUser" v-if="information">修改</el-button>
                     <el-button icon="el-icon-Delete" type="primary" @click="deleteEven"
                         v-if="information">删除</el-button>
                     <el-button icon="el-icon-Download" type="primary" @click="download" v-if="flag">下载</el-button>
                 </div>
-                <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="urlKey.includes('.doc') || urlKey.includes('.docx')" :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="urlKey.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
-                    <img v-if="
-                        urlKey.includes('.png') || urlKey.includes('.jpg') || urlKey.includes('.gif') || urlKey.includes('.bmp')
-                    " :src="url" />
+                <el-empty v-if="url.length == 0" description="暂无数据" class="custom-empty standard-pane__content" />
+                <div v-else class="standard-pane__content">
+                    <div v-show="!isPaneResizing" class="standard-preview">
+                        <vue-office-docx v-if="urlKey.includes('.doc') || urlKey.includes('.docx')" :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="urlKey.includes('.pdf')" :src="url" style="width: 100%; height: 100%"></iframe>
+                        <img v-if="
+                            urlKey.includes('.png') || urlKey.includes('.jpg') || urlKey.includes('.gif') || urlKey.includes('.bmp')
+                        " :src="url" />
+                    </div>
                 </div>
             </pane>
         </splitpanes>
@@ -70,7 +77,16 @@ const addTreeRef = ref()
 const url = ref('')
 const dotList: any = ref({})
 const flag: any = ref(false)
+const isPaneResizing = ref(false)
 const information = adminInfo.roleCode.includes('information_info')
+const onPaneResize = () => {
+    isPaneResizing.value = true
+}
+const onPaneResized = () => {
+    requestAnimationFrame(() => {
+        isPaneResizing.value = false
+    })
+}
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
@@ -79,7 +95,7 @@ onMounted(() => {
 })
 
 const urlKey=ref('')
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+const VITE_FLAG = false//import.meta.env.VITE_NAME == 'jibei'
 const handleNodeClick = (data: any, node: any) => {
    // console.log("🚀 ~ handleNodeClick ~ data:", data)
     dotList.value = data
@@ -166,6 +182,36 @@ const download = () => {
     background: #eaeef1;
 }
 
+:deep(.splitpanes__pane) {
+    overflow: hidden;
+}
+
+.standard-pane {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+}
+
+.standard-pane__toolbar {
+    flex-shrink: 0;
+}
+
+.standard-pane__content {
+    flex: 1;
+    min-height: 0;
+    overflow: auto;
+}
+
+.standard-preview {
+    height: 99%;
+    min-height: 99%;
+}
+
+:deep(.splitpanes--dragging) .standard-preview {
+    visibility: hidden;
+}
+
 .grid-content {
     text-align: center;
 }

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

@@ -4,7 +4,13 @@
             <TableHeader datePicker area showExport>
                 <template #select>
                     <el-form-item label="筛选数据">
-                        <el-input v-model="tableStore.table.params.searchValue" placeholder="输入关键字筛选" clearable maxlength="32" show-word-limit/>
+                        <el-input
+                            v-model="tableStore.table.params.searchValue"
+                            placeholder="输入关键字筛选"
+                            clearable
+                            maxlength="32"
+                            show-word-limit
+                        />
                     </el-form-item>
                     <el-form-item label="统计类型">
                         <el-select
@@ -127,7 +133,7 @@ const tableStore = new TableStore({
         { field: 'lineName', title: '监测点名称', minWidth: '180' },
         { field: 'gdName', title: '供电公司', minWidth: '120' },
         { field: 'subName', title: '变电站', minWidth: '150' },
-        { field: 'ip', title: '网络参数' ,width:'120px' },
+        { field: 'ip', title: '网络参数', width: '120px' },
         { field: 'scale', title: '电压等级', minWidth: '110' },
         {
             field: 'advanceType',
@@ -137,7 +143,7 @@ const tableStore = new TableStore({
                 return row.cellValue || '其他'
             }
         },
-         {
+        {
             field: 'eventType',
             title: '触发类型',
             minWidth: '120',
@@ -153,7 +159,7 @@ const tableStore = new TableStore({
                 return row.cellValue || '其他'
             }
         },
-       
+
         // {
         //     field: 'severity', title: '严重度', minWidth: "80", formatter: (row: any) => {
         //         return row.cellValue.toFixed(2)
@@ -180,7 +186,8 @@ const tableStore = new TableStore({
         { field: 'duration', title: '持续时间(s)', minWidth: '100' },
 
         {
-             title: '操作',fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [
@@ -278,6 +285,7 @@ const download = () => {
         document.body.appendChild(link)
         link.click() //执行下载
         document.body.removeChild(link) //释放标签
+        ElMessage.success('波形下载成功')
     })
 }
 </script>

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

@@ -1,5 +1,6 @@
 <template>
     <div class="default-main online">
+
         <div class="online_header">
             <TableHeader date-picker ref="tableHeaderRef">
                 <template #select>
@@ -54,8 +55,17 @@
                                 :value="item"></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="通讯状态">
+                        <el-select v-model="tableStore.table.params.comFlagStatus" clearable placeholder="请选择通讯状态"
+                            style="width: 100%">
+                            <el-option label="正常" value="1" />
+                            <el-option label="中断" value="0" />
+
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="筛选数据">
-                        <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入关键字"></el-input>
+                        <el-input v-model="tableStore.table.params.searchValue" clearable
+                            placeholder="请输入关键字"></el-input>
                     </el-form-item>
                 </template>
                 <template #operation>
@@ -77,9 +87,10 @@
         </div>
         <el-dialog v-model="timePopUp" draggable title="补招" width="500">
             补招时间：
-            <el-date-picker v-model="timeData" type="datetimerange" format="YYYY-MM-DD HH:mm:00"
-                value-format="YYYY-MM-DD HH:mm:00" range-separator="至" date-format="YYYY-MM-DD" time-format="HH:mm:00"
-                start-placeholder="开始日期" end-placeholder="结束日期" style="width: 400px" :disabledDate="disabledDate" />
+            <el-date-picker v-model="timeData" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" date-format="YYYY-MM-DD" time-format="HH:mm:ss"
+                start-placeholder="开始日期" end-placeholder="结束日期" style="width: 400px" :disabledDate="disabledDate"
+                :default-time="defaultTimeRange" />
             <template #footer>
                 <div class="dialog-footer">
                     <el-button @click="timePopUp = false">取消</el-button>
@@ -139,6 +150,10 @@ const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Ty
 const treeData = ref([])
 const idArr = ref([])
 const timeData = ref([])
+const defaultTimeRange: [Date, Date] = [
+    new Date(2000, 0, 1, 0, 0, 0),
+    new Date(2000, 0, 1, 23, 59, 59)
+]
 const logList: any = ref([])
 const activeName = ref(0)
 const getTreeData = async () => {
@@ -198,7 +213,7 @@ const tableStore = new TableStore({
         {
             title: '网络参数',
             field: 'ip',
-            align: 'center',width:'120px',
+            align: 'center', width: '120px',
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -288,7 +303,7 @@ const tableStore = new TableStore({
         // tableStore.table.params.searchEndTime =  tableHeaderRef.value.datePickerRef.timeValue[1]
     },
     loadCallback: () => {
-        tableStore.table.data = tree2List(filterTreeByKeyword( tableStore.table.data,tableStore.table.params.searchValue), Math.random() * 1000)
+        tableStore.table.data = tree2List(filterTreeByKeyword(tableStore.table.data, tableStore.table.params.searchValue), Math.random() * 1000)
         tableStore.table.column[0].title = formData.value.statisticalType.name
 
         chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
@@ -313,6 +328,7 @@ tableStore.table.params.statisticalType = []
 tableStore.table.params.scale = []
 tableStore.table.params.manufacturer = []
 tableStore.table.params.loadType = []
+tableStore.table.params.comFlagStatus = ''
 provide('tableStore', tableStore)
 const tree2List = (list: any, id?: string) => {
     //存储结果的数组
@@ -353,65 +369,65 @@ const tree2List = (list: any, id?: string) => {
  * @returns {Array} 筛选后的嵌套树形数据，保持原层级
  */
 function filterTreeByKeyword(treeData, keyword) {
-  // 关键词为空，直接返回原树（深拷贝，避免修改原数据）
-  if (!keyword || keyword.trim() === '') {
-    return JSON.parse(JSON.stringify(treeData));
-  }
-  const targetKey = keyword.trim();
-  // 存储需要保留的节点ID（匹配节点+所有上级+所有下级）
-  const keepIdSet = new Set();
+    // 关键词为空，直接返回原树（深拷贝，避免修改原数据）
+    if (!keyword || keyword.trim() === '') {
+        return JSON.parse(JSON.stringify(treeData));
+    }
+    const targetKey = keyword.trim();
+    // 存储需要保留的节点ID（匹配节点+所有上级+所有下级）
+    const keepIdSet = new Set();
 
-  // 第一步：递归遍历树形，标记所有需要保留的节点ID
-  const markKeepNodes = (node, parentNodes = []) => {
-    // 1. 若当前节点名称包含关键词，标记自身+所有上级+所有下级
-    const isMatch = node.name && node.name.includes(targetKey);
-    if (isMatch) {
-      // 标记自身
-      keepIdSet.add(node.id);
-      // 标记所有上级父节点
-      parentNodes.forEach(pNode => keepIdSet.add(pNode.id));
-      // 标记所有下级子节点（递归）
-      const markChildren = (childNode) => {
-        keepIdSet.add(childNode.id);
-        if (childNode.children && childNode.children.length) {
-          childNode.children.forEach(markChildren);
+    // 第一步：递归遍历树形，标记所有需要保留的节点ID
+    const markKeepNodes = (node, parentNodes = []) => {
+        // 1. 若当前节点名称包含关键词，标记自身+所有上级+所有下级
+        const isMatch = node.name && node.name.includes(targetKey);
+        if (isMatch) {
+            // 标记自身
+            keepIdSet.add(node.id);
+            // 标记所有上级父节点
+            parentNodes.forEach(pNode => keepIdSet.add(pNode.id));
+            // 标记所有下级子节点（递归）
+            const markChildren = (childNode) => {
+                keepIdSet.add(childNode.id);
+                if (childNode.children && childNode.children.length) {
+                    childNode.children.forEach(markChildren);
+                }
+            };
+            if (node.children && node.children.length) {
+                node.children.forEach(markChildren);
+            }
         }
-      };
-      if (node.children && node.children.length) {
-        node.children.forEach(markChildren);
-      }
-    }
 
-    // 2. 递归遍历子节点，传递当前节点的上级链（parentNodes + 当前节点）
-    if (node.children && node.children.length) {
-      node.children.forEach(child => markKeepNodes(child, [...parentNodes, node]));
-    }
-  };
+        // 2. 递归遍历子节点，传递当前节点的上级链（parentNodes + 当前节点）
+        if (node.children && node.children.length) {
+            node.children.forEach(child => markKeepNodes(child, [...parentNodes, node]));
+        }
+    };
 
-  // 遍历根节点，开始标记
-  treeData.forEach(rootNode => markKeepNodes(rootNode));
+    // 遍历根节点，开始标记
+    treeData.forEach(rootNode => markKeepNodes(rootNode));
 
-  // 第二步：递归重构树形，只保留标记过的节点，保持层级
-  const rebuildTree = (node) => {
-    // 若当前节点无需保留，直接返回null
-    if (!keepIdSet.has(node.id)) {
-      return null;
-    }
-    // 深拷贝当前节点，避免修改原数据
-    const newNode = { ...node };
-    // 递归处理子节点，过滤掉无需保留的，只保留有效子节点
-    if (newNode.children && newNode.children.length) {
-      const newChildren = newNode.children.map(child => rebuildTree(child)).filter(Boolean);
-      newNode.children = newChildren;
-    } else {
-      newNode.children = [];
-    }
-    return newNode;
-  };
+    // 第二步：递归重构树形，只保留标记过的节点，保持层级
+    const rebuildTree = (node) => {
+        // 若当前节点无需保留，直接返回null
+        if (!keepIdSet.has(node.id)) {
+            return null;
+        }
+        // 深拷贝当前节点，避免修改原数据
+        const newNode = { ...node };
+        // 递归处理子节点，过滤掉无需保留的，只保留有效子节点
+        if (newNode.children && newNode.children.length) {
+            const newChildren = newNode.children.map(child => rebuildTree(child)).filter(Boolean);
+            newNode.children = newChildren;
+        } else {
+            newNode.children = [];
+        }
+        return newNode;
+    };
 
-  // 重构根节点，过滤掉null的根节点
-  const filteredTree = treeData.map(rootNode => rebuildTree(rootNode)).filter(Boolean);
-  return filteredTree;
+    // 重构根节点，过滤掉null的根节点
+    const filteredTree = treeData.map(rootNode => rebuildTree(rootNode)).filter(Boolean);
+    return filteredTree;
 }
 
 
@@ -429,7 +445,7 @@ const makeUp = () => {
             .getCheckboxRecords()
             .filter((item: any) => item.level == '6') || []
 
-    
+
 
     if (list.length == 0) {
         return ElMessage({
@@ -468,24 +484,29 @@ const makeUpSubmit = () => {
         reCallStartTime: timeData.value[0]
     }
 
-    socket(form)
-    timePopUp.value = false
-    logPopUp.value = true
+    setTimeout(() => {
+        socket(form)
+        timePopUp.value = false
+        logPopUp.value = true
+    }, 500)
 }
 const socket = async (form: any) => {
-    const url = (localStorage.getItem('WebSocketUrl2') || 'null')//'ws://192.168.1.67:10405/api/recell/')
+    const url = (localStorage.getItem('WebSocketUrl2') || 'null')//'ws://192.168.1.68:10405/api/recell/')
     logList.value = []
     await dataSocket.socketServe.connect(`${url}${adminInfo.id}`)
-    await dataSocket.socketServe.send(form)
+    setTimeout(() => {
+        dataSocket.socketServe.send(form)
+    }, 500)
     logList.value.push({
         type: '',
-        time: formatDate(new Date(), 'YYYY-MM-DD hh:mm:ss'),
+        time: formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss'),
         name: '开始补召,请稍等...',
     })
     await dataSocket.socketServe.registerCallBack('message', (res: any) => {
+        if (res.code == undefined) return
         logList.value.push({
             type: res.code == 500 ? 'error' : '',
-            time: formatDate(new Date(), 'YYYY-MM-DD hh:mm:ss'),
+            time: formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss'),
             name: res.message
         })
 

src/views/pqs/harmonicMonitoring/embed/dataOverview_JB/index.vue

@@ -12,6 +12,7 @@
                 </el-form-item>
             </template>
             <template v-slot:operation>
+                <el-button type="primary" icon="el-icon-Search" @click="Search">查询</el-button>
                 <el-button type="primary" icon="el-icon-Download" @click="exportTemplate">导出</el-button>
             </template>
         </TableHeader>
@@ -51,6 +52,7 @@
                             :interval="datePickerRef?.interval"
                             :w="item.w"
                             :h="item.h"
+                            :searchKey="searchKey"
                         />
                         <div v-else class="pd10">组件加载失败...</div>
                     </div>
@@ -114,6 +116,7 @@ const layout: any = ref([
     //     path: '/src/views/pqs/runManage/assessment/components/uese/index.vue'
     // },
 ])
+const searchKey = ref(0)
 const layoutCopy: any = ref([])
 const flag = ref(true)
 // 组件映射
@@ -293,6 +296,10 @@ const fetchLayoutData = async () => {
         // 可以添加错误提示逻辑
     }
 }
+const Search = () => {
+    searchKey.value += 1
+}
+
 // 导出
 const exportTemplate = () => {
     console.log(123)

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

@@ -29,7 +29,7 @@
                         <el-tab-pane label="稳态指标合格率" name="2" lazy v-if="!isReload">
                             <Wentaizhibiaohegelv v-if="activeName == '2'" />
                         </el-tab-pane>
-                        <el-tab-pane label="稳态数据分析" name="3" lazy v-if="!isReload">
+                        <el-tab-pane label="稳态数据分析" name="3" lazy v-if="!isReload && !IS_LNQR">
                             <Wentaishujufenxi v-if="activeName == '3'" />
                         </el-tab-pane>
                         <el-tab-pane label="谐波频谱" name="4" lazy v-if="!isReload">
@@ -41,7 +41,7 @@
                         <el-tab-pane label="监测点运行状态" name="6" lazy v-if="!isReload">
                             <Yunxingzhuangtai v-if="activeName == '6'" />
                         </el-tab-pane>
-                        <el-tab-pane label="实时数据" name="7" lazy v-if="!isReload  && !VITE_FLAG1">
+                        <el-tab-pane label="实时数据" name="7" lazy v-if="!isReload  && !VITE_FLAG1 && !IS_LNQR">
                             <Shishishuju v-if="activeName == '7'" />
                         </el-tab-pane>
                         <el-tab-pane label="统计报表" name="8" lazy v-if="!isReload && VITE_FLAG">
@@ -77,6 +77,8 @@ import { useRoute } from 'vue-router'
 import StatisticalReport from './statisticalReport/index.vue'
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const VITE_FLAG1 = import.meta.env.VITE_NAME == 'hainan'
+// 环境标识
+const IS_LNQR = import.meta.env.VITE_NAME === 'LNqr'
 import router from '@/router'
 import { useMonitoringPoint } from '@/stores/monitoringPoint'
 import { id } from 'element-plus/es/locale'

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

@@ -11,11 +11,12 @@
             <pane style="background: #fff" :style="height">
                 <TableHeader ref="TableHeaderRef" datePicker :show-search="false">
                     <template #operation>
-                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent" :loading="loading">
+                        <el-button icon="el-icon-Download" type="primary" @click="openDialog" :loading="loading">
                             生成
                         </el-button>
                     </template>
                 </TableHeader>
+
                 <div class="box">
                     <div id="luckysheet">
                         <img
@@ -25,13 +26,46 @@
                         />
                     </div>
                 </div>
+
+                <!-- 电压等级选择弹窗 -->
+                <el-dialog
+                    v-model="dialogVisible"
+                    title="选择电压等级"
+                    width="420px"
+                    :close-on-click-modal="false"
+                >
+                    <el-form label-width="100px" style="padding:10px 0;">
+                        <el-form-item label="电压等级">
+                            <el-select
+                                v-model="voltageLevel"
+                                multiple
+                                collapse-tags
+                                clearable
+                                value-key="id"
+                                placeholder="请选择电压等级"
+                                style="width: 260px;"
+                            >
+                                <el-option
+                                    v-for="item in voltageleveloption"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-form>
+                    <template #footer>
+                        <el-button @click="dialogVisible = false">取消</el-button>
+                        <el-button type="primary" @click="confirmExport" :loading="loading">确定并生成</el-button>
+                    </template>
+                </el-dialog>
             </pane>
         </splitpanes>
     </div>
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref, provide } from 'vue'
+import { onMounted, ref, provide, watch } from 'vue'
 import 'splitpanes/dist/splitpanes.css'
 import { Splitpanes, Pane } from 'splitpanes'
 import TableStore from '@/utils/tableStore'
@@ -40,8 +74,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
 import { areaHarmonicReport } from '@/api/process-boot/reportForms'
-import { genFileId, ElMessage, ElNotification } from 'element-plus'
-import type { UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 
 defineOptions({
@@ -53,7 +86,11 @@ const loading = ref(false)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
-const Template: any = ref({})
+const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand') || []
+const voltageLevel: any = ref([])
+
+// 弹窗状态
+const dialogVisible = ref(false)
 
 const tableStore = new TableStore({
     url: '',
@@ -64,9 +101,15 @@ const tableStore = new TableStore({
 })
 provide('tableStore', tableStore)
 
+// 弹窗打开时默认全选所有电压等级
+watch(dialogVisible, (val) => {
+    if (val && voltageleveloption.length) {
+        voltageLevel.value = [...voltageleveloption]
+    }
+})
+
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
-
     if (dom) {
         size.value = Math.round((180 / dom.offsetHeight) * 120)
     }
@@ -76,45 +119,62 @@ const handleNodeClick = (data: any, node: any) => {
     dotList.value = data
 }
 
-// 生成
-const exportEvent = () => {
+// 打开弹窗
+const openDialog = () => {
+    if (!dotList.value?.id) {
+        ElMessage.warning('请先在左侧选择站点/区域')
+        return
+    }
+    dialogVisible.value = true
+}
+
+// 确认生成
+const confirmExport = async () => {
     loading.value = true
     ElMessage('生成报告中...')
-    areaHarmonicReport({
-        deptId: dotList.value.id,
-        areaReportFlag: 1,
-        startTime: TableHeaderRef.value.datePickerRef.timeValue[0],
-        endTime: TableHeaderRef.value.datePickerRef.timeValue[1]
-    })
-        .then((res: any) => {
-            if (res == undefined) {
-                loading.value = false
-                return
-            }
-            let blob = new Blob([res], {
-                type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
-            })
 
-            // createObjectURL(blob); //创建下载的链接
-            const url = window.URL.createObjectURL(blob)
-            const link = document.createElement('a') // 创建a标签
-            link.href = url
-            link.download = dotList.value.name + '区域稳态报告' + dayjs().format('YYYYMMDD') // 设置下载的文件名
-            document.body.appendChild(link)
-            link.click() //执行下载
-            document.body.removeChild(link)
-            loading.value = false
+    try {
+        // 选中数据转为id数组，空数组代表导出全部
+        const voltageIds = voltageLevel.value.map((item: any) => item.id)
+        const res: any = await areaHarmonicReport({
+            deptId: dotList.value.id,
+            areaReportFlag: 1,
+            startTime: TableHeaderRef.value.datePickerRef.timeValue[0],
+            endTime: TableHeaderRef.value.datePickerRef.timeValue[1],
+            voltageIds
         })
-        .catch(() => {
+
+        if (!res) {
             loading.value = false
+            return
+        }
+
+        const blob = new Blob([res], {
+            type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
         })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = dotList.value.name + '区域稳态报告' + dayjs().format('YYYYMMDD')
+        document.body.appendChild(link)
+        link.click()
+        document.body.removeChild(link)
+        URL.revokeObjectURL(url)
+
+        ElMessage.success('生成成功')
+        dialogVisible.value = false
+    } catch (e) {
+        ElMessage.error('生成失败，请重试')
+    } finally {
+        loading.value = false
+    }
 }
 </script>
+
 <style lang="scss">
 .splitpanes.default-theme .splitpanes__pane {
     background: #eaeef1;
 }
-
 .box {
     padding: 10px;
 }

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

@@ -10,8 +10,14 @@
                 ></PointTree>
             </pane>
             <pane style="background: #fff" :style="height">
-                <TableHeader ref="TableHeaderRef" datePicker @selectChange="selectChange">
+                <TableHeader ref="TableHeaderRef" datePicker :isStatisticData="isStatisticData" @selectChange="selectChange">
                     <template v-slot:select>
+                        <el-form-item >
+                            <el-radio-group v-model="isStatisticData" @change="onStatisticDataChange">
+                                <el-radio-button value="1">统计数据</el-radio-button>
+                                <el-radio-button value="0">分钟数据</el-radio-button>
+                            </el-radio-group>
+                        </el-form-item>
                         <el-form-item label="模板策略">
                             <el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id">
                                 <el-option
@@ -22,22 +28,10 @@
                                 ></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="报表类型">
+                        <!-- <el-form-item label="报表类型">
                             <el-input readonly type="text" value="分析报表"></el-input>
-                            <!--                            <el-select-->
-                            <!--                                :disabled="true"-->
-                            <!--                                v-model="reportForm"-->
-                            <!--                                :popper-append-to-body="false"-->
-                            <!--                                placeholder="请选择报表类型"-->
-                            <!--                            >-->
-                            <!--                                <el-option-->
-                            <!--                                    v-for="item in reportFormList"-->
-                            <!--                                    :key="item.value"-->
-                            <!--                                    :label="item.label"-->
-                            <!--                                    :value="item.value"-->
-                            <!--                                ></el-option>-->
-                            <!--                            </el-select>-->
-                        </el-form-item>
+                           
+                        </el-form-item> -->
                     </template>
                     <template #operation>
                         <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
@@ -85,6 +79,7 @@ const dotList: any = ref({})
 const Template: any = ref({})
 const reportForm: any = ref('')
 const name = ref('')
+const isStatisticData = ref('1')
 const templatePolicy: any = ref([])
 const reportFormList: any = ref([
     {
@@ -108,6 +103,11 @@ const tableStore = new TableStore({
         tableStore.table.params.tempId = Template.value.id
         tableStore.table.params.lineId = dotList.value.id
         name.value = dotList.value.name
+        if (Number(isStatisticData.value) === 0) {
+            tableStore.table.params.isStatisticData = 0
+        } else {
+            delete tableStore.table.params.isStatisticData
+        }
     },
     loadCallback: () => {
         tableStore.table.data.forEach((item: any) => {
@@ -160,6 +160,12 @@ getTemplateByDept({ id: dictData.state.area[0].id })
 const changetype = (val: any) => {
     reportForm.value = val.reportForm
 }
+const onStatisticDataChange = () => {
+    TableHeaderRef.value?.setTheDate(3)
+    if (dotList.value?.id) {
+        // tableStore.index()
+    }
+}
 const selectChange = () => {
     //console.log('🚀 ~ selectChange ~ tableStore.table.data.lnegth :', tableStore.table.data.length)
     if (tableStore.table.data.length != 0) {

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

@@ -3,28 +3,38 @@
         <DatePicker ref="datePickerRef" style="display: none" theCurrentTime />
         <el-page-header :icon="ArrowLeft" @back="emit('back')">
             <template #content>
-                <span style="font-size: 16px">{{ dropList.lineName }}详情　</span>
-                <span style="font-weight: 500">最新数据时间：</span>
-                <span style="color: var(--color-primary-default)">{{ dropList.updateTime }}</span>
+                <span style="">{{ dropList.gdName }}_{{ dropList.bdName }}_{{ dropList.lineName }}</span>
+                <span style="font-weight: 500" class="ml20">最新数据时间：</span>
+                <span style="color: var(--el-color-primary)">{{ dropList.updateTime }}</span>
+                <span style="font-weight: 500" class="ml20">统计日期：</span>
+                <span style="color: var(--el-color-primary)">
+                    {{ getTimeOfTheMonth('3')[0] + '至' + getTimeOfTheMonth('3')[1] }}
+                </span>
             </template>
         </el-page-header>
         <el-row :gutter="20" class="mt10" :style="`height:${rowHeight}`">
             <el-col :span="8">
-                <h3 class="mb10 iconBox">
+                <h3 class="mb10 iconBox " >
                     <span></span>
                     台账信息
                 </h3>
-                <el-descriptions title="" border :column="2">
-                    <el-descriptions-item label="监测点名称" width="140px">
+                <el-descriptions title="" label-width="100px" border :column="2" size="small">
+                    <el-descriptions-item label="变电站名称">
+                        {{ dropList.bdName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="监测点名称">
                         {{ dropList.lineName }}
                     </el-descriptions-item>
+                    <el-descriptions-item label="监测对象名称">
+                        {{ dropList.objName }}
+                    </el-descriptions-item>
                     <el-descriptions-item label="所属厂家">{{ dropList.manufacturer }}</el-descriptions-item>
                     <el-descriptions-item label="电压等级">{{ dropList.scale }}</el-descriptions-item>
                     <el-descriptions-item label="投运日期">{{ dropList.loginTime }}</el-descriptions-item>
-                    <el-descriptions-item label="PT">{{ dropList.pt }}</el-descriptions-item>
-                    <el-descriptions-item label="CT">{{ dropList.ct }}</el-descriptions-item>
+                    <!-- <el-descriptions-item label="PT">{{ dropList.pt }}</el-descriptions-item>
+                    <el-descriptions-item label="CT">{{ dropList.ct }}</el-descriptions-item> -->
                     <el-descriptions-item label="干扰源类型">{{ dropList.loadType }}</el-descriptions-item>
-                    <el-descriptions-item label="通讯状态" width="140px">
+                    <el-descriptions-item label="通讯状态">
                         <el-tag size="small" :type="dropList.comFlag == '正常' ? 'success' : 'danger'" effect="dark">
                             {{ dropList.comFlag }}
                         </el-tag>
@@ -32,22 +42,33 @@
                 </el-descriptions>
             </el-col>
             <el-col :span="8">
-                <h3 class="mb10 iconBox">
+                <h3
+                    class="mb10 iconBox "
+                   
+                >
                     <span></span>
-                    告警明细 (天)
+                    告警天数
                 </h3>
                 <el-descriptions title="" border :column="2" size="small">
                     <el-descriptions-item width="140px" label="告警原因">
-                        <span style="font-weight: 550"
-                            :style="TargetData.info == 0 ? 'color: #0e8780;' : TargetData.info == 3 ? 'color: #000' : 'color: #ff0000;'">
+                        <span
+                            style="font-weight: 550"
+                            :style="
+                                TargetData.info == 0
+                                    ? 'color: #0e8780;'
+                                    : TargetData.info == 3
+                                    ? 'color: #000'
+                                    : 'color: #ff0000;'
+                            "
+                        >
                             {{
                                 TargetData.info == 1
                                     ? '超标告警'
                                     : TargetData.info == 2
-                                        ? '完整性告警'
-                                        : TargetData.info == 0
-                                            ? '无告警'
-                                            : '暂无数据'
+                                    ? '完整性告警'
+                                    : TargetData.info == 0
+                                    ? '无告警'
+                                    : '暂无数据'
                             }}
                         </span>
                     </el-descriptions-item>
@@ -72,72 +93,27 @@
                     数据质量
                 </h3>
                 <div style="display: flex">
-                    <MyEChart :style="`height: calc(${rowHeight} - 31px)`" :options="ComCharts" @click="Integrity" />
-                    <MyEChart :style="`height: calc(${rowHeight} - 31px)`" :options="onLineCharts"
-                        @click="OnlineRate" />
+                    <MyEChart :style="`height: calc(${rowHeight} - 31px)`" :options="ComCharts" />
+                    <MyEChart
+                        :style="`height: calc(${rowHeight} - 31px)`"
+                        :options="onLineCharts"
+                       
+                    />
                 </div>
             </el-col>
         </el-row>
         <el-row :gutter="20" class="mt10" :style="`height:${rowHeight}`">
+      
             <el-col :span="8">
-                <h3 class="mb10 iconBox">
-                    <span></span>
-                    监测点总体评价结论
-                </h3>
-
-                <div class="evaluationData">
-                    <el-row style="width: 96%" class="row pb5">
-                        <el-col :span="12" style="display: flex">
-                            <span>{{ dropList.lineName }}</span>
-                        </el-col>
-                        <el-col :span="12" style="display: flex">
-                            <div>
-                                综合评估得分:
-                                <span class="conclusion" :class="dropList.assessData == '特质'
-                                    ? 'background1'
-                                    : dropList.assessData == '较差'
-                                        ? 'background2'
-                                        : dropList.assessData == '极差'
-                                            ? 'background3'
-                                            : ''
-                                    ">
-                                    {{ dropList.assessData }}
-                                </span>
-                            </div>
-                        </el-col>
-                    </el-row>
-                    <el-row style="width: 96%" v-for="(item, i) in evaluationData" class="row pb4 pt3">
-                        <el-col :span="14" style="display: flex; align-items: center">
-                            <img :src="url[i]" />
-                            <span style="line-height: 20px">{{ item.targetName }}</span>
-                        </el-col>
-                        <el-col :span="10" style="display: flex; align-items: center">
-                            <div style="width: 100%">
-                                评估得分：
-                                <span class="conclusion" :class="item.avg == '特质'
-                                    ? 'background1'
-                                    : item.avg == '较差'
-                                        ? 'background2'
-                                        : item.avg == '极差'
-                                            ? 'background3'
-                                            : ''
-                                    ">
-                                    {{ item.avg }}
-                                </span>
-                            </div>
-                        </el-col>
-                    </el-row>
-                </div>
-            </el-col>
-            <el-col :span="8">
-                <h3 class="mb10 iconBox">
+                <h3 class="mb10 iconBox ">
                     <span></span>
                     稳态指标合格率
                 </h3>
-                <div :style="`height: calc(${rowHeight} - 31px)`" ref="chartRef"></div>
+
+                <div :style="`height: calc(${rowHeight} - 31px); `" ref="chartRef"></div>
             </el-col>
             <el-col :span="8">
-                <h3 class="mb10 iconBox">
+                <h3 class="mb10 iconBox" >
                     <span></span>
                     暂态事件统计
                 </h3>
@@ -167,6 +143,7 @@ import DatePicker from '@/components/form/datePicker/index.vue'
 import MyEChart from '@/components/echarts/MyEchart.vue'
 import echarts from '@/components/echarts/echarts'
 import { useRouter } from 'vue-router'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
 const router = useRouter()
 import { getLineDetailData } from '@/api/advance-boot/bearingCapacity'
 import {
@@ -175,14 +152,14 @@ import {
     lineQualifiedDetail,
     getLineAssess,
     getEventDetailByLineId,
-    getGridDiagramTargetData
+    getGridDiagramTargetData,
+    
 } from '@/api/device-boot/panorama'
 import { formatter } from 'element-plus'
-
+const loading=ref(false)
 const emit = defineEmits(['back'])
 const dropList: any = ref({})
 const TargetData: any = ref({})
-const evaluationData: any = ref([])
 const incidentCharts: any = ref({})
 const ComCharts: any = ref({})
 const onLineCharts: any = ref({})
@@ -362,42 +339,8 @@ const open = async (id: string) => {
             }
         }
     })
+    loading.value = true
 
-    // 监测点总体评价结论
-    getLineAssess({
-        lineId: id,
-        startTime: datePickerRef.value.timeValue[0],
-        endTime: datePickerRef.value.timeValue[1]
-    }).then((res: any) => {
-        dropList.value.assessData = res.data.assessLevel
-        evaluationData.value = [
-            {
-                targetName: '频率偏差(Hz)',
-                avg: res.data.freqAssessLevel,
-                sd: res.data.freqQualifyData
-            },
-            {
-                targetName: '电压偏差(%)',
-                avg: res.data.vdevAssessLevel,
-                sd: res.data.vdevQualifyData
-            },
-            {
-                targetName: '电压总谐波畸变率(%)',
-                avg: res.data.harmAssessLevel,
-                sd: res.data.harmQualifyData
-            },
-            {
-                targetName: '三相电压不平衡度(%)',
-                avg: res.data.unbalanceAssessLevel,
-                sd: res.data.unbalanceQualifyData
-            },
-            {
-                targetName: '闪变',
-                avg: res.data.flickerAssessLevel,
-                sd: res.data.flickerQualifyData
-            }
-        ]
-    })
     // 稳态指标合格率
 
     lineQualifiedDetail({
@@ -522,7 +465,7 @@ const open = async (id: string) => {
                 if (res.data[k] != '/') {
                     judgment = false
                 }
-                flag += (res.data[k] == '/' ? 0 : res.data[k])
+                flag += res.data[k] == '/' ? 0 : res.data[k]
             }
         }
 
@@ -633,7 +576,7 @@ const echart = (row: any) => {
             },
             indicator: indicator
         },
-
+        color: color,
         series: []
     }
 
@@ -642,32 +585,25 @@ const echart = (row: any) => {
             name: item.time,
             type: 'radar',
             symbol: 'none',
+
             areaStyle: {
-                normal: {
-                    color: '#2a9fe069'
-                }
+                opacity: 0.6, // 调整透明度，避免重叠遮挡
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                    { offset: 0, color: `${color[i]}50` },
+                    { offset: 1, color: `${color[i]}50` } // 渐变透明
+                ])
             },
-            itemStyle: {
-                color: '#2a9fe0'
+            lineStyle: {
+                color: color[i],
+                width: 2
             },
             data: [item.ratioList]
         })
     })
-   // console.log("🚀 ~ echart ~ option:", option)
 
     chart.setOption(option)
 }
-// 跳转
-const Integrity = () => {
-    router.push({
-        name: 'harmonic-boot/harmonic/getIntegrityData'
-    })
-}
-const OnlineRate = () => {
-    router.push({
-        name: 'harmonic-boot/area/OnlineRate'
-    })
-}
+
 
 onMounted(() => {
     // open('4c87b7dff2281254fc55c25a4da31506')
@@ -708,7 +644,7 @@ defineExpose({ open })
 
 .iconBox {
     display: flex;
-
+    align-items: center;
     span {
         display: inline-block;
         width: 3px;
@@ -737,7 +673,16 @@ defineExpose({ open })
 }
 
 .background3 {
-    background-color: #A52a2a;
+    background-color: #a52a2a;
     color: #fff;
 }
+:deep(.el-table--small .el-table__cell) {
+    padding: 2px 0 !important;
+}
+.text-style {
+    cursor: pointer;
+    text-decoration: underline;
+    text-decoration-color: var(--el-color-primary);
+    text-underline-offset: 4px;
+}
 </style>

src/views/pqs/panorama/components/line/info1.vue

@@ -0,0 +1,743 @@
+<template>
+    <div class="default-main lineInfo" :style="height">
+        <DatePicker ref="datePickerRef" style="display: none" theCurrentTime />
+        <el-page-header :icon="ArrowLeft" @back="emit('back')">
+            <template #content>
+                <span style="font-size: 16px">{{ dropList.objName ? dropList.objName + '_' : '' }}{{ dropList.lineName }}详情　</span>
+                <span style="font-weight: 500">最新数据时间：</span>
+                <span style="color: var(--color-primary-default)">{{ dropList.updateTime }}</span>
+            </template>
+        </el-page-header>
+        <el-row :gutter="20" class="mt10" :style="`height:${rowHeight}`">
+            <el-col :span="8">
+                <h3 class="mb10 iconBox">
+                    <span></span>
+                    台账信息
+                </h3>
+                <el-descriptions title="" border :column="2">
+                    <el-descriptions-item label="监测点名称" width="140px">
+                        {{ dropList.lineName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="所属厂家">{{ dropList.manufacturer }}</el-descriptions-item>
+                    <el-descriptions-item label="电压等级">{{ dropList.scale }}</el-descriptions-item>
+                    <el-descriptions-item label="投运日期">{{ dropList.loginTime }}</el-descriptions-item>
+                    <el-descriptions-item label="PT">{{ dropList.pt }}</el-descriptions-item>
+                    <el-descriptions-item label="CT">{{ dropList.ct }}</el-descriptions-item>
+                    <el-descriptions-item label="干扰源类型">{{ dropList.loadType }}</el-descriptions-item>
+                    <el-descriptions-item label="通讯状态" width="140px">
+                        <el-tag size="small" :type="dropList.comFlag == '正常' ? 'success' : 'danger'" effect="dark">
+                            {{ dropList.comFlag }}
+                        </el-tag>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-col>
+            <el-col :span="8">
+                <h3 class="mb10 iconBox">
+                    <span></span>
+                    告警明细 (天)
+                </h3>
+                <el-descriptions title="" border :column="2" size="small">
+                    <el-descriptions-item width="140px" label="告警原因">
+                        <span style="font-weight: 550"
+                            :style="TargetData.info == 0 ? 'color: #0e8780;' : TargetData.info == 3 ? 'color: #000' : 'color: #ff0000;'">
+                            {{
+                                TargetData.info == 1
+                                    ? '超标告警'
+                                    : TargetData.info == 2
+                                        ? '完整性告警'
+                                        : TargetData.info == 0
+                                            ? '无告警'
+                                            : '暂无数据'
+                            }}
+                        </span>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="频率偏差">{{ TargetData.freqDevOvertime }}</el-descriptions-item>
+                    <el-descriptions-item label="电压偏差">{{ TargetData.voltageDevOvertime }}</el-descriptions-item>
+                    <el-descriptions-item label="谐波电流">{{ TargetData.iharmOvertime }}</el-descriptions-item>
+                    <el-descriptions-item label="负序电流">{{ TargetData.inegOvertime }}</el-descriptions-item>
+                    <el-descriptions-item label="间谐波电压">{{ TargetData.inuharmOvertime }}</el-descriptions-item>
+                    <el-descriptions-item label="电压总谐波畸变率">
+                        {{ TargetData.uaberranceOvertime }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="闪变">{{ TargetData.flickerOvertime }}</el-descriptions-item>
+                    <el-descriptions-item label="谐波电压">{{ TargetData.uharmOvertime }}</el-descriptions-item>
+                    <el-descriptions-item width="140px" label="三相电压不平衡度">
+                        {{ TargetData.ubalanceOvertime }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-col>
+            <el-col :span="8">
+                <h3 class="mb10 iconBox">
+                    <span></span>
+                    数据质量
+                </h3>
+                <div style="display: flex">
+                    <MyEChart :style="`height: calc(${rowHeight} - 31px)`" :options="ComCharts" @click="Integrity" />
+                    <MyEChart :style="`height: calc(${rowHeight} - 31px)`" :options="onLineCharts"
+                        @click="OnlineRate" />
+                </div>
+            </el-col>
+        </el-row>
+        <el-row :gutter="20" class="mt10" :style="`height:${rowHeight}`">
+            <el-col :span="8">
+                <h3 class="mb10 iconBox">
+                    <span></span>
+                    监测点总体评价结论
+                </h3>
+
+                <div class="evaluationData">
+                    <el-row style="width: 96%" class="row pb5">
+                        <el-col :span="12" style="display: flex">
+                            <span>{{ dropList.lineName }}</span>
+                        </el-col>
+                        <el-col :span="12" style="display: flex">
+                            <div>
+                                综合评估得分:
+                                <span class="conclusion" :class="dropList.assessData == '特质'
+                                    ? 'background1'
+                                    : dropList.assessData == '较差'
+                                        ? 'background2'
+                                        : dropList.assessData == '极差'
+                                            ? 'background3'
+                                            : ''
+                                    ">
+                                    {{ dropList.assessData }}
+                                </span>
+                            </div>
+                        </el-col>
+                    </el-row>
+                    <el-row style="width: 96%" v-for="(item, i) in evaluationData" class="row pb4 pt3">
+                        <el-col :span="14" style="display: flex; align-items: center">
+                            <img :src="url[i]" />
+                            <span style="line-height: 20px">{{ item.targetName }}</span>
+                        </el-col>
+                        <el-col :span="10" style="display: flex; align-items: center">
+                            <div style="width: 100%">
+                                评估得分：
+                                <span class="conclusion" :class="item.avg == '特质'
+                                    ? 'background1'
+                                    : item.avg == '较差'
+                                        ? 'background2'
+                                        : item.avg == '极差'
+                                            ? 'background3'
+                                            : ''
+                                    ">
+                                    {{ item.avg }}
+                                </span>
+                            </div>
+                        </el-col>
+                    </el-row>
+                </div>
+            </el-col>
+            <el-col :span="8">
+                <h3 class="mb10 iconBox">
+                    <span></span>
+                    稳态指标合格率
+                </h3>
+                <div :style="`height: calc(${rowHeight} - 31px)`" ref="chartRef"></div>
+            </el-col>
+            <el-col :span="8">
+                <h3 class="mb10 iconBox">
+                    <span></span>
+                    暂态事件统计
+                </h3>
+
+                <MyEChart :style="`height: calc(${rowHeight} - 31px)`" :options="incidentCharts" />
+            </el-col>
+        </el-row>
+        <el-row :gutter="20" class="mt10" :style="`height:${rowHeight}`">
+            <el-col :span="24">
+                <h3 class="mb10 iconBox">
+                    <span></span>
+                    历史趋势图
+                </h3>
+                <history :lineId="lineId" ref="historyRef" />
+            </el-col>
+        </el-row>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, reactive, ref, provide } from 'vue'
+import { ArrowLeft } from '@element-plus/icons-vue'
+import { mainHeight } from '@/utils/layout'
+import history from './history.vue'
+import { color } from '@/components/echarts/color'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import MyEChart from '@/components/echarts/MyEchart.vue'
+import echarts from '@/components/echarts/echarts'
+import { useRouter } from 'vue-router'
+const router = useRouter()
+import { getLineDetailData } from '@/api/advance-boot/bearingCapacity'
+import {
+    getTotalIntegrityByLineIds,
+    getTotalOnlineRates,
+    lineQualifiedDetail,
+    getLineAssess,
+    getEventDetailByLineId,
+    getGridDiagramTargetData
+} from '@/api/device-boot/panorama'
+import { formatter } from 'element-plus'
+
+const emit = defineEmits(['back'])
+const dropList: any = ref({})
+const TargetData: any = ref({})
+const evaluationData: any = ref([])
+const incidentCharts: any = ref({})
+const ComCharts: any = ref({})
+const onLineCharts: any = ref({})
+const datePickerRef = ref()
+const chartRef = ref<HTMLDivElement>()
+const historyRef = ref()
+const IntegrityNum = ref(0)
+const url: any = [
+    new URL(`@/assets/img/PLPC.png`, import.meta.url),
+    new URL(`@/assets/img/DYPC.png`, import.meta.url),
+    new URL(`@/assets/img/JBL.png`, import.meta.url),
+    new URL(`@/assets/img/SXDY.png`, import.meta.url),
+    new URL(`@/assets/img/SB.png`, import.meta.url)
+]
+const lineId: any = ref('')
+const height = mainHeight(20)
+const rowHeight = mainHeight(190, 3).height
+
+// 查询
+const open = async (id: string) => {
+    let form = {
+        comFlag: 1,
+        endTime: datePickerRef.value.timeValue[1],
+        lineIds: [id],
+
+        ids: [id],
+        searchValue: '',
+        startTime: datePickerRef.value.timeValue[0]
+    }
+    lineId.value = id
+    const { data } = await getLineDetailData({ id: id })
+    dropList.value = data
+    // 运行状态
+
+    // 完整性
+    getTotalIntegrityByLineIds(form).then((res: any) => {
+        let num = (res.data || 0) / 100
+        IntegrityNum.value = res.data
+        ComCharts.value = {
+            title: {
+                text: '完整性',
+                bottom: '10%',
+                left: 'center',
+                textStyle: {
+                    fontSize: 16
+                }
+            },
+            xAxis: {
+                show: false
+            },
+            yAxis: {
+                show: false
+            },
+
+            options: {
+                dataZoom: null,
+                series: [
+                    {
+                        //第二个球的填充
+                        type: 'liquidFill',
+                        radius: '65%',
+                        center: ['50%', '40%'], //中心点
+                        color: [
+                            {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 0,
+                                y2: 1,
+                                colorStops: [
+                                    {
+                                        offset: 1,
+                                        color: '#2aa1e3'
+                                    }
+                                ],
+                                globalCoord: false
+                            }
+                        ],
+                        data: [num, num], // data个数代表波浪数
+                        backgroundStyle: {
+                            borderWidth: 1,
+                            color: '#f7f8fc'
+                        },
+                        label: {
+                            normal: {
+                                formatter: () => {
+                                    return (num * 100).toFixed(2) + '%'
+                                },
+                                textStyle: {
+                                    fontSize: 20,
+                                    color: '#000'
+                                }
+                            }
+                        },
+                        outline: {
+                            // show: false
+                            borderDistance: 0,
+                            itemStyle: {
+                                borderWidth: 2,
+                                borderColor: '#fff'
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+        // 稳态指标合格率
+    })
+    // 在线率
+    getTotalOnlineRates({ ...form, id: dropList.value.devId, ids: [dropList.value.devId] }).then((res: any) => {
+        let num = (res.data || 0) / 100
+        onLineCharts.value = {
+            title: {
+                text: '在线率',
+                bottom: '10%',
+                left: 'center',
+                textStyle: {
+                    fontSize: 16
+                }
+            },
+            xAxis: {
+                show: false
+            },
+            yAxis: {
+                show: false
+            },
+
+            options: {
+                dataZoom: null,
+                series: [
+                    {
+                        //第二个球的填充
+                        type: 'liquidFill',
+                        radius: '65%',
+                        center: ['50%', '40%'], //中心点
+                        color: [
+                            {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 0,
+                                y2: 1,
+                                colorStops: [
+                                    {
+                                        offset: 1,
+                                        color: '#67c23a'
+                                    }
+                                ],
+                                globalCoord: false
+                            }
+                        ],
+                        data: [num, num], // data个数代表波浪数
+                        backgroundStyle: {
+                            color: '#f7f8fc'
+                        },
+                        label: {
+                            normal: {
+                                formatter: () => {
+                                    return (num * 100).toFixed(2) + '%'
+                                },
+                                textStyle: {
+                                    fontSize: 20,
+                                    color: '#000'
+                                }
+                            }
+                        },
+                        outline: {
+                            // show: false
+                            borderDistance: 0,
+                            itemStyle: {
+                                borderWidth: 2,
+                                borderColor: '#fff'
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+    })
+
+    // 监测点总体评价结论
+    getLineAssess({
+        lineId: id,
+        startTime: datePickerRef.value.timeValue[0],
+        endTime: datePickerRef.value.timeValue[1]
+    }).then((res: any) => {
+        dropList.value.assessData = res.data.assessLevel
+        evaluationData.value = [
+            {
+                targetName: '频率偏差(Hz)',
+                avg: res.data.freqAssessLevel,
+                sd: res.data.freqQualifyData
+            },
+            {
+                targetName: '电压偏差(%)',
+                avg: res.data.vdevAssessLevel,
+                sd: res.data.vdevQualifyData
+            },
+            {
+                targetName: '电压总谐波畸变率(%)',
+                avg: res.data.harmAssessLevel,
+                sd: res.data.harmQualifyData
+            },
+            {
+                targetName: '三相电压不平衡度(%)',
+                avg: res.data.unbalanceAssessLevel,
+                sd: res.data.unbalanceQualifyData
+            },
+            {
+                targetName: '闪变',
+                avg: res.data.flickerAssessLevel,
+                sd: res.data.flickerQualifyData
+            }
+        ]
+    })
+    // 稳态指标合格率
+
+    lineQualifiedDetail({
+        lineId: id,
+        startTime: datePickerRef.value.timeValue[0],
+        endTime: datePickerRef.value.timeValue[1]
+    }).then(res => {
+        echart([
+            {
+                time: datePickerRef.value.timeValue[0].substring(0, 7),
+                targetList: [
+                    '频率偏差(Hz)',
+                    '电压偏差(%)',
+                    '电压总谐波畸变率(%)',
+                    '三相电压不平衡度(%)',
+                    '闪变',
+                    '谐波电压(%)',
+                    '谐波电流(%)',
+                    '间谐波电压(%)',
+                    '负序电流(A)'
+                ],
+                ratioList: [
+                    res.data.freqDev == 3.14159 ? null : res.data.freqDev,
+                    res.data.vdev == 3.14159 ? null : res.data.vdev,
+                    res.data.vthd == 3.14159 ? null : res.data.vthd,
+                    res.data.ubalance == 3.14159 ? null : res.data.ubalance,
+                    res.data.plt == 3.14159 ? null : res.data.plt,
+
+                    res.data.uharm == 3.14159 ? null : res.data.uharm,
+                    res.data.iharm == 3.14159 ? null : res.data.iharm,
+                    res.data.inuHarm == 3.14159 ? null : res.data.inuHarm,
+                    res.data.ineg == 3.14159 ? null : res.data.ineg
+                ]
+            }
+        ])
+    })
+
+    // 暂态事件统计
+    getEventDetailByLineId({
+        id: id,
+        startTime: datePickerRef.value.timeValue[0],
+        endTime: datePickerRef.value.timeValue[1],
+        type: datePickerRef.value.interval
+    }).then((res: any) => {
+        let data = [
+            {
+                name: '电压暂升',
+                value: res.data?.swellTimes || 0
+            },
+            {
+                name: '电压暂降',
+                value: res.data?.sagTimes || 0
+            },
+            {
+                name: '电压中断',
+                value: res.data?.interruptTimes || 0
+            }
+        ]
+        incidentCharts.value = {
+            title: {
+                text: '总数：' + (data[0].value + data[1].value + data[2].value),
+                left: '40%',
+                top: '45%',
+                textStyle: {
+                    // fontWeight: 600,
+                    fontSize: 12
+                }
+                // subtext: '总数',
+                // subtextStyle: {
+                //     fontWeight: 550,
+                //     fontSize: 14
+                // }
+            },
+
+            tooltip: {
+                trigger: 'item'
+            },
+            legend: {
+                orient: 'vertical',
+                top: 'center',
+                right: '10%',
+                formatter: function (e: any) {
+                    return e + '   ' + data.filter(item => item.name == e)[0].value + '条'
+                }
+            },
+            xAxis: {
+                show: false
+            },
+            yAxis: {
+                show: false
+            },
+            options: {
+                dataZoom: null,
+                series: [
+                    {
+                        type: 'pie',
+                        center: ['45%', '50%'],
+                        radius: ['60%', '80%'],
+                        label: {
+                            show: false,
+                            position: 'outside',
+                            textStyle: {
+                                //数值样式
+                            }
+                        },
+
+                        data: data
+                    }
+                ]
+            }
+        }
+    })
+
+    // 告警明细
+    getGridDiagramTargetData({ ...form, id: id, type: 3 }).then(res => {
+        TargetData.value = res.data
+        let num = 0
+        let flag = 0
+        let judgment = true
+        for (let k in res.data) {
+            if (k != 'lineId') {
+                if (res.data[k] != '/') {
+                    judgment = false
+                }
+                flag += (res.data[k] == '/' ? 0 : res.data[k])
+            }
+        }
+
+        if (IntegrityNum.value == 0) {
+            num = 2 //完整性告警
+        } else {
+            if (flag > 0) {
+                num = 1 //超标告警
+            } else {
+                num = 0 //无告警
+            }
+            if (judgment) {
+                num = 3
+            }
+        }
+
+        TargetData.value.info = num
+    })
+}
+const echart = (row: any) => {
+    let chart = echarts.init(chartRef.value as HTMLDivElement)
+
+    let dataname = [
+        '频率偏差(Hz)',
+        '电压偏差(%)',
+        '电压总谐波畸变率(%)',
+        '三相电压不平衡度(%)',
+        '闪变',
+        '谐波电压(%)',
+        '谐波电流(%)',
+        '间谐波电压(%)',
+        '负序电流(A)'
+    ]
+    let datamax = [100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100]
+    let indicator = []
+    for (let i = 0; i < dataname.length; i++) {
+        indicator.push({
+            name: dataname[i],
+            max: datamax[i]
+        })
+    }
+
+    let option: any = {
+        tooltip: {
+            trigger: 'item',
+            axisPointer: {
+                type: 'shadow',
+                label: {
+                    color: '#fff',
+                    fontSize: 16
+                }
+            },
+            textStyle: {
+                color: '#fff',
+                fontStyle: 'normal',
+                opacity: 0.35,
+                fontSize: 14
+            },
+            backgroundColor: 'rgba(0,0,0,0.55)',
+            borderWidth: 0
+        },
+        legend: {
+            data: row.map((item: any) => item.time),
+            type: 'scroll',
+            orient: 'vertical',
+            icon: 'roundRect',
+            right: '20',
+
+            itemGap: 10,
+            itemWidth: 16,
+            itemHeight: 16,
+            textStyle: {
+                fontSize: '15',
+                color: '#656565'
+            }
+        },
+        radar: {
+            center: ['50%', '50%'],
+            radius: '65%',
+            startAngle: 90,
+            splitNumber: 5,
+            splitArea: {
+                areaStyle: {
+                    color: ['#FFFFFF', '#F5F9FF'].reverse()
+                }
+            },
+            axisLabel: {
+                show: false
+            },
+            axisLine: {
+                show: true,
+                lineStyle: {
+                    color: '#D2E4F8'
+                }
+            },
+            splitLine: {
+                show: true,
+                lineStyle: {
+                    color: '#D2E4F8'
+                }
+            },
+            name: {
+                formatter: '{value}',
+                textStyle: {
+                    color: '#656565',
+                    fontSize: 15
+                }
+            },
+            indicator: indicator
+        },
+
+        series: []
+    }
+
+    row.forEach((item: any, i: any) => {
+        option.series.push({
+            name: item.time,
+            type: 'radar',
+            symbol: 'none',
+            areaStyle: {
+                normal: {
+                    color: '#2a9fe069'
+                }
+            },
+            itemStyle: {
+                color: '#2a9fe0'
+            },
+            data: [item.ratioList]
+        })
+    })
+   // console.log("🚀 ~ echart ~ option:", option)
+
+    chart.setOption(option)
+}
+// 跳转
+const Integrity = () => {
+    router.push({
+        name: 'harmonic-boot/harmonic/getIntegrityData'
+    })
+}
+const OnlineRate = () => {
+    router.push({
+        name: 'harmonic-boot/area/OnlineRate'
+    })
+}
+
+onMounted(() => {
+    // open('4c87b7dff2281254fc55c25a4da31506')
+})
+defineExpose({ open })
+</script>
+
+<style lang="scss" scoped>
+.lineInfo {
+    padding: 0 10px 10px 10px;
+}
+
+:deep(.el-page-header__header) {
+    height: 45px;
+    border-bottom: 1px solid #f1eded;
+}
+
+:deep(.el-descriptions__header) {
+    margin-bottom: 10px;
+}
+
+.evaluationData {
+    display: grid;
+    grid-template-rows: repeat(5, auto);
+    height: 87%;
+
+    .row {
+        margin: 4px 2% 0;
+        width: 100%;
+        box-shadow: 1px 1px 1px 1px #e8e3e3;
+    }
+
+    img {
+        width: 6%;
+        margin: 0px 15px;
+    }
+}
+
+.iconBox {
+    display: flex;
+
+    span {
+        display: inline-block;
+        width: 3px;
+        height: 18px;
+        background: var(--el-color-primary);
+        margin-right: 5px;
+        margin-left: 3px;
+    }
+}
+
+.conclusion {
+    display: inline-block;
+    padding: 2px 5px;
+    height: 20px;
+    border-radius: 4px;
+}
+
+.background1 {
+    background-color: #339966;
+    color: #fff;
+}
+
+.background2 {
+    background-color: #97017e;
+    color: #fff;
+}
+
+.background3 {
+    background-color: #A52a2a;
+    color: #fff;
+}
+</style>

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

@@ -7,7 +7,7 @@
                 v-model.trim="inputQuery"
                 style="height: 46px; width: 334px"
                 @keyup.enter="DeviceQ"
-                placeholder="请输入终端名称"
+                placeholder="请输入监测点相关信息"
             >
                 <template #prefix>
                     <div class="Icon"></div>
@@ -37,7 +37,7 @@
                             @click="flyTo(k)"
                         >
                             <p>{{ k.psrName }}</p>
-                            <p>{{ k.vlevelName }}|{{ k.maintOrgName }}</p>
+                            <p>{{ k.vlevelName }} | {{ k.maintOrgName }} {{ k.objName ? `| ${k.objName}` : '' }}</p>
                         </div>
                     </div>
                 </el-collapse-item>
@@ -484,6 +484,9 @@ const lookPoint = (e: any) => {
     emit('show', true)
 }
 // 搜索
+const matchLineItem = (item: any, regex: RegExp) =>
+    regex.test(item.lineName) || (item.objName && regex.test(item.objName))
+
 const DeviceQ = () => {
     showCollapse.value = true
     if (inputQuery.value.length == 0) return
@@ -491,13 +494,14 @@ const DeviceQ = () => {
     let list = []
     let regex = new RegExp(inputQuery.value, 'i')
     let data = areaLineInfo.value
-        .filter((item: any) => regex.test(item.lineName))
+        .filter((item: any) => matchLineItem(item, regex))
         .map((item: any) => {
             return {
                 psrName: item.lineName,
                 vlevelName: item.voltageScale,
                 maintOrgName: item.gdName,
-                coordinate: [item.lng, item.lat]
+                coordinate: [item.lng, item.lat],
+                objName: item.objName
             }
         })
     // data.replace(//s/g,',')
@@ -522,7 +526,7 @@ const flyTo = (e: any, zoom?: number) => {
         zoomMap.value = zoom
     } else {
         zoomMap.value = 15
-        let data = areaLineInfo.value.filter((item: any) => regex.test(item.lineName))[0]
+        let data = areaLineInfo.value.filter((item: any) => matchLineItem(item, regex))[0]
         if (data) {
             markerClick(data)
         }

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

@@ -10,8 +10,7 @@
                     <img src="@/assets/img/FGX.png" />
                 </div>
                 <div style="display: flex">
-                    <div v-for="(item, i) in list" class="cardBox" :style="i == 1 ? 'flex:1.3' : ''">
-                        <div class="card">
+                    <div v-for="(item, i) in list" class="cardBox" :style="i == 1 ? 'flex:1.2' : i === 2 ? 'flex: 1.3' : ''">                        <div class="card">
                             <span style="cursor: pointer" @click="GridDiagram(i)">{{ item.title }}：</span>
                             <span
                                 :style="`color: ${item.color[0]}; cursor:pointer`"
@@ -30,10 +29,10 @@
                 </div>
                 <!-- 监测规模 列表 -->
                 <div>
-                    <div class="vcl mt5">
+                    <div class="vcl mt2">
                         <p
-                            v-for="(item, i) in vList"
-                            :style="i == 0 ? 'width: 60px' : i == vList?.length - 1 ? 'width: 32px' : 'flex:1'"
+                            v-for="(item, i) in displayVList"
+                            :style="i == 0 ? 'width: 60px' : i == displayVList?.length - 1 ? IS_LN ? 'flex:1' : 'width: 32px' : 'flex:1'"
                         >
                             {{ item }}
                         </p>
@@ -44,7 +43,7 @@
                             {{ item.title }}
                         </p>
                         <p
-                            v-for="(k, i) in vList?.slice(0, vList.length - 2)"
+                            v-for="(k, i) in dataVList"
                             class="numOne"
                             @click="LookMap(item.list[i].numOneList, item.list[i].numTwoList, 0)"
                         >
@@ -59,7 +58,7 @@
                         <p class="numOne" @click="LookMap(item.list[3].numOneList, item.list[3].numTwoList, 0)">
                             {{ item.list[3].numOne }}
                         </p> -->
-                        <p
+                        <p v-if="!IS_LN"
                             style="font-size: 12px; width: 32px; cursor: pointer; color: var(--el-color-primary)"
                             @click.stop="open(i)"
                         >
@@ -69,16 +68,16 @@
                 </div>
             </div>
             <!-- 监测点指标统计 -->
-            <div :style="`height:calc(${boxHeight.height} + 50px)`">
+            <div :style="`height:calc(${boxHeight.height} + 10px)`" >
                 <div class="title">
                     <span>监测点指标统计</span>
                 </div>
                 <div style="display: flex" class="mt2">
                     <img src="@/assets/img/FGX.png" />
                 </div>
-                <div :style="`height:calc(${boxHeight.height} + 20px);overflow-y: auto;`">
+                <div :style="`height:calc(${boxHeight.height} );overflow-y: auto;`">
                     <div v-for="item in countList">
-                        <div class="title mt5" style="font-weight: 500">
+                        <div class="title mt3" style="font-weight: 500">
                             <img src="@/assets/img/TJ.png" />
                             {{ item.title }}
                         </div>
@@ -110,7 +109,7 @@
                 </div>
             </div>
             <!-- 监测点指标统计 -->
-            <div :style="`height:calc(${boxHeight.height} - 55px)`">
+            <div :style="`height:calc(${boxHeight.height} - 75px)`" class="mt20">
                 <div class="title">
                     <span>监测运行统计</span>
                 </div>
@@ -166,7 +165,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref, provide } from 'vue'
+import { onMounted, reactive, ref, provide, computed } from 'vue'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
 import { ArrowRight, View } from '@element-plus/icons-vue'
@@ -178,15 +177,53 @@ import {
     getGridDiagramMonitor,
     getGridDiagramDev,
     getGridDiagramStatistics,
-    getGridDiagramRunData
+    getGridDiagramRunData, getAreaObjAlarm
 } from '@/api/device-boot/panorama'
 const emit = defineEmits(['LookMap', 'GridDiagram'])
+const IS_LN = import.meta.env.VITE_NAME == 'LN' || import.meta.env.VITE_NAME == 'LNqr'
 const dictData = useDictData()
 const show = ref(false)
 const standRef = ref()
 const terminalRef = ref()
 const pointRef = ref()
 const list: any = ref([
+    {
+        title: '场站',
+        color: ['#000', '#bd3124'],
+
+        list: [
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            },
+            {
+                numOne: 0,
+                numTwo: 0,
+                numOneList: [],
+                numTwoList: []
+            }
+        ]
+    },
     {
         title: '变电站',
         color: ['#000', '#bd3124'],
@@ -355,6 +392,10 @@ const legengList = [
 ]
 const panoramicVoltage: any = dictData.getBasicData('Dev_Voltage_Stand')
 const vList = ref(['', '500kV', '220kV', '110kV', '35kV', ''])
+const displayVList = computed(() => (IS_LN && vList.value.length ? vList.value.slice(0, -1) : vList.value))
+const dataVList = computed(() =>
+    IS_LN ? vList.value.slice(1, -1) : vList.value.slice(0, vList.value.length - 2)
+)
 const formRow: any = ref({})
 const height = mainHeight(30)
 const boxHeight = mainHeight(290, 2)
@@ -383,8 +424,8 @@ const info = async (row: any) => {
     countList.value[0].title = row.areaName
     formRow.value = form
     vList.value = ['']
-    // 变电站
-    getSubLineGiveAnAlarm(form).then(res => {
+
+    getAreaObjAlarm(form).then(res => {
         let data = row.isUpToGrid == 1 ? res.data.gwInfo : res.data.info
         data[0].data.forEach((item: any) => {
             if (item.columnName) vList.value.push(panoramicVoltage.find((v: any) => v.id == item.columnName).name)
@@ -392,16 +433,22 @@ const info = async (row: any) => {
         vList.value.push('')
         list.value[0].list = data[0].data
     })
+
+    // 变电站
+    getSubLineGiveAnAlarm(form).then(res => {
+        let data = row.isUpToGrid == 1 ? res.data.gwInfo : res.data.info
+        list.value[1].list = data[0].data
+    })
     // 终端
     getGridDiagramDev(form).then(res => {
         let data = row.isUpToGrid == 1 ? res.data.gwInfo : res.data.info
-        list.value[1].list = data[0].data
+        list.value[2].list = data[0].data
     })
     // 监测点
     await getGridDiagramMonitor(form).then(res => {
         let data = row.isUpToGrid == 1 ? res.data.gwInfo : res.data.info
 
-        list.value[2].list = data[0].data.map((item: any) => {
+        list.value[3].list = data[0].data.map((item: any) => {
             return {
                 numOne: item.num,
                 numTwo: item.onLineNum,
@@ -464,12 +511,12 @@ defineExpose({ info, show })
 
     .card {
         justify-content: center;
-        margin-top: 15px;
+        margin-top: 1px;
         margin-right: 2%;
         display: flex;
         flex: 1;
         align-items: center;
-        font-size: 16px;
+        font-size: 15px;
 
         span:nth-child(2) {
             font-weight: 550;

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

@@ -142,14 +142,14 @@ narimap.publicKey = 'JBb74325ae94dc49358b7d699660b692'
 
 narimap.Require(
     [
-        'PSRMap',
-        'ManageGrid',
-        'Components.Query',
-        'Components.DeviceCard',
-        'Popup',
-        'Components.MapSelector',
-        'Components.RegionSelector',
-        'Marker'
+        'PSRMap',//pwgdgeomapsdk
+        'ManageGrid',// pwmagdmapsdk
+        'Components.Query',// EquipSearchCBB
+        'Components.DeviceCard',//EquipOverviewCBB、EquipDetailCBB
+        'Popup', //mapsdk
+        'Components.MapSelector',//MapThemeSwitchCBB 
+        'Components.RegionSelector',//OrgSelectorCBB
+        'Marker' //mapsdk
     ],
     // ['PSRMap', 'Components.Query', 'Marker'],
     () => {

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

@@ -4,12 +4,8 @@
             <template v-slot:select>
                 <el-form-item label="运行状态">
                     <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
-                        <el-option
-                            v-for="item in runFlagList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
+                        <el-option v-for="item in runFlagList" :key="item.id" :label="item.name"
+                            :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="筛选数据">
@@ -40,14 +36,8 @@
                         </div>
                     </template>
                     <div class="mb5" style="height: 40px">
-                        <el-segmented
-                            style="height: 100%"
-                            v-model="segmented"
-                            :props="props"
-                            :options="segmentedList"
-                            block
-                            @change="tableStore.index()"
-                        >
+                        <el-segmented style="height: 100%" v-model="segmented" :props="props" :options="segmentedList"
+                            block @change="tableStore.index()">
                             <template #default="scope">
                                 <div>
                                     <div>{{ scope.item.name }}</div>
@@ -61,8 +51,8 @@
                                 segmented == 'Power_Network'
                                     ? '区域'
                                     : segmented == 'Manufacturer'
-                                    ? '终端厂家'
-                                    : '电网标志'
+                                        ? '终端厂家'
+                                        : '电网标志'
                             }}
                         </span>
                         <span style="width: 90px">终端总数</span>
@@ -77,33 +67,21 @@
                                 {{ o.name }}
                             </span>
                             <!-- 终端总数 -->
-                            <span
-                                style="width: 90px; color: #388e3c"
-                                class="text text-style"
-                                @click="renderTable(o.list, o.name + '_')"
-                            >
+                            <span style="width: 90px; color: #388e3c" class="text text-style"
+                                @click="renderTable(o.list, o.name + '_')">
                                 {{ o.count }}
                             </span>
                             <!--  -->
-                            <span
-                                style="flex: 1; color: #388e3c"
-                                class="text"
-                                :class="` ${o.integrity < 90 ? 'text-red' : ''}`"
-                            >
+                            <span style="flex: 1; color: #388e3c" class="text"
+                                :class="` ${o.integrity < 90 ? 'text-red' : ''}`">
                                 {{ o.integrity }}
                             </span>
-                            <span
-                                style="width: 80px; color: #388e3c"
-                                :class="` ${o.online < 90 ? 'text-red' : ''}`"
-                                class="text"
-                            >
+                            <span style="width: 80px; color: #388e3c" :class="` ${o.online < 90 ? 'text-red' : ''}`"
+                                class="text">
                                 {{ o.online }}
                             </span>
-                            <span
-                                style="width: 80px; color: #388e3c"
-                                :class="` ${o.qualified > 10 ? 'text-red' : ''}`"
-                                class="text"
-                            >
+                            <span style="width: 80px; color: #388e3c" :class="` ${o.qualified > 10 ? 'text-red' : ''}`"
+                                class="text">
                                 {{ o.qualified }}
                             </span>
                         </div>
@@ -120,13 +98,8 @@
                 <!--表格-->
 
                 <div :style="{ height: tableStore.table.height }" v-loading="loading">
-                    <vxe-table
-                        height="auto"
-                        :data="dataList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
-                        v-bind="defaultAttribute"
-                        ref="tableRef"
-                        :scroll-y="{ enabled: true }"
-                    >
+                    <vxe-table height="auto" :data="dataList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+                        v-bind="defaultAttribute" ref="tableRef" :scroll-y="{ enabled: true }">
                         <vxe-column type="seq" title="序号" width="80px">
                             <template #default="{ rowIndex }">
                                 <span>
@@ -146,19 +119,16 @@
                         <vxe-column field="ip" title="终端IP" :formatter="formatter" width="120px"></vxe-column>
                         <vxe-column field="runFlag" title="运行状态" width="100px">
                             <template #default="{ row }">
-                                <el-tag
-                                    :type="
-                                        row.runFlag == '运行'
-                                            ? 'success'
-                                            : row.runFlag == '停运'
+                                <el-tag :type="row.runFlag == '运行'
+                                        ? 'success'
+                                        : row.runFlag == '停运'
                                             ? 'danger'
                                             : row.runFlag == '检修'
-                                            ? 'warning'
-                                            : row.runFlag == '调试'
-                                            ? 'warning'
-                                            : 'danger'
-                                    "
-                                >
+                                                ? 'warning'
+                                                : row.runFlag == '调试'
+                                                    ? 'warning'
+                                                    : 'danger'
+                                    ">
                                     {{ row.runFlag }}
                                 </el-tag>
                             </template>
@@ -169,14 +139,9 @@
                     </vxe-table>
                 </div>
                 <div class="table-pagination">
-                    <el-pagination
-                        v-model:currentPage="pageNum"
-                        v-model:page-size="pageSize"
-                        :page-sizes="[10, 20, 50, 100, 200]"
-                        background
-                        layout="sizes,total, ->, prev, pager, next, jumper"
-                        :total="dataList.length"
-                    ></el-pagination>
+                    <el-pagination v-model:currentPage="pageNum" v-model:page-size="pageSize"
+                        :page-sizes="[10, 20, 50, 100, 200]" background
+                        layout="sizes,total, ->, prev, pager, next, jumper" :total="dataList.length"></el-pagination>
                 </div>
             </el-card>
         </div>
@@ -187,7 +152,7 @@
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref } from 'vue'
+import { onMounted, provide, ref, nextTick } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
@@ -273,7 +238,7 @@ const tableStore = new TableStore({
             if (tableStore.table.params.statisticalType.name == '终端厂家') {
                 return k.count != 0
             } else {
-                return !k.citName.includes('上送')
+                return !k.name.includes('上送')
             }
         })
         // 合并子集数据 并去重
@@ -465,15 +430,9 @@ const onExport = () => {
     })
 }
 onMounted(() => {
-    // TableHeaderRef.value.setDatePicker([
-    //     { label: '年份', value: 1 },
-    //     { label: '季度', value: 2 },
-    //     { label: '月份', value: 3 }
-    // ])
-
-    // 加载数据
-
-    tableStore.index()
+    nextTick(() => {
+        TableHeaderRef.value?.onComSearch()
+    })
 })
 
 tableStore.table.params.name = ''
@@ -482,14 +441,17 @@ provide('tableStore', tableStore)
 <style lang="scss" scoped>
 .card-list {
     display: flex;
+
     .monitoringPoints {
         width: 460px;
         position: relative;
+
         .statistics {
             display: flex;
             flex-wrap: wrap;
             justify-content: space-between;
             margin-bottom: 10px;
+
             .divBox {
                 width: 215x;
                 height: 70px;
@@ -500,33 +462,41 @@ provide('tableStore', tableStore)
                     font-size: 40px;
                     margin-right: 5px;
                 }
+
                 .divBox_title {
                     font-weight: 550;
                 }
+
                 .divBox_num {
                     font-size: 20px;
                     font-weight: 550;
                     margin-left: auto;
                     font-family: AlimamaDongFangDaKai;
                 }
+
                 align-items: center;
                 // text-align: center;
                 border-radius: 5px;
+
                 &:nth-child(1) {
                     background-color: #eef8f0;
                 }
+
                 &:nth-child(2) {
                     background-color: #fff6ed;
                 }
+
                 &:nth-child(3) {
                     background-color: #e5f8f6;
                 }
             }
         }
     }
+
     .detail {
         flex: 1;
     }
+
     .abnormal {
         width: 100%;
         background-color: #f3f6f9;
@@ -535,9 +505,11 @@ provide('tableStore', tableStore)
         // justify-content: space-between;
         align-items: center;
         padding: 5px 0px 5px 10px;
+
         .iconDiv {
             display: flex;
             align-items: center;
+
             div {
                 width: 4px;
                 height: 18px;
@@ -545,6 +517,7 @@ provide('tableStore', tableStore)
                 background-color: var(--el-color-primary);
             }
         }
+
         .text {
             font-weight: 700;
             font-size: 16px;
@@ -555,6 +528,7 @@ provide('tableStore', tableStore)
         }
     }
 }
+
 .header {
     display: flex;
     text-align: center;
@@ -562,40 +536,50 @@ provide('tableStore', tableStore)
     font-weight: 700;
     padding: 5px;
 }
+
 :deep(.el-card__header) {
     padding: 10px;
+
     span {
         font-weight: 600;
     }
 }
+
 :deep(.el-card__body) {
     padding: 10px;
 }
+
 .iconFont {
     font-size: 18px;
     display: inline-block;
     vertical-align: middle;
 }
+
 .form {
     position: relative;
+
     .form_but {
         position: absolute;
         right: -22px;
     }
 }
+
 .card-header {
     font-size: 16px;
 }
+
 :deep(.table_name) {
     color: var(--el-color-primary);
     cursor: pointer;
     text-underline-offset: 4px;
 }
+
 .echartTitle {
     display: flex;
     justify-content: space-between;
     font-size: 14px;
     font-weight: 600;
+
     div:nth-child(2) {
         font-size: 16px;
         color: #ff6600;
@@ -605,20 +589,25 @@ provide('tableStore', tableStore)
 :deep(.el-segmented__item-selected, ) {
     clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
 }
+
 :deep(.el-segmented__item, ) {
     clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
     position: relative;
 }
+
 :deep(.el-segmented) {
     clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
 }
+
 .text-red {
     color: #ff9100 !important;
 }
+
 .text-style {
     cursor: pointer;
     text-decoration: underline;
 }
+
 .segmentedIcon {
     position: absolute;
     top: 1px;
@@ -631,6 +620,7 @@ provide('tableStore', tableStore)
     color: #fff;
     border-radius: 8px;
 }
+
 .table-pagination {
     height: 58px;
     box-sizing: border-box;

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

@@ -10,39 +10,81 @@
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item label="筛选数据">
-                        <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入关键字筛选"
-                            style="width: 200px" maxlength="32" show-word-limit />
+                        <el-input
+                            v-model="tableStore.table.params.searchValue"
+                            clearable
+                            placeholder="输入关键字筛选"
+                            style="width: 200px"
+                            maxlength="32"
+                            show-word-limit
+                        />
                     </el-form-item>
                     <el-form-item label="触发类型">
-                        <el-select v-model="tableStore.table.params.waveType" placeholder="请选择触发类型" clearable multiple
-                            collapse-tags style="width: 100%">
-                            <el-option v-for="item in triggeroptions" :key="item.id" :label="item.name"
-                                :value="item.id"></el-option>
+                        <el-select
+                            v-model="tableStore.table.params.waveType"
+                            placeholder="请选择触发类型"
+                            clearable
+                            multiple
+                            collapse-tags
+                            style="width: 100%"
+                        >
+                            <el-option
+                                v-for="item in triggeroptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="是否有波形">
-                        <el-select v-model="tableStore.table.params.fileFlag" placeholder="请选择是否存在波形" clearable
-                            style="width: 100%">
-                            <el-option v-for="item in wareaoptions" :key="item.id" :label="item.label"
-                                :value="item.id"></el-option>
+                        <el-select
+                            v-model="tableStore.table.params.fileFlag"
+                            placeholder="请选择是否存在波形"
+                            clearable
+                            style="width: 100%"
+                        >
+                            <el-option
+                                v-for="item in wareaoptions"
+                                :key="item.id"
+                                :label="item.label"
+                                :value="item.id"
+                            ></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="暂态持续时间(s)">
-                        <el-input v-model="tableStore.table.params.persistMin" placeholder="请输入X秒"
-                            onkeyup="value=value.replace(/[^\d.]/g,'')" clearable style="width: 94px"></el-input>
+                        <el-input
+                            v-model="tableStore.table.params.persistMin"
+                            placeholder="请输入X秒"
+                            onkeyup="value=value.replace(/[^\d.]/g,'')"
+                            clearable
+                            style="width: 94px"
+                        ></el-input>
                         <el-tag style="margin-left: 5px">&lt; 时间数 &lt;</el-tag>
-                        <el-input v-model="tableStore.table.params.persistMax" placeholder="请输入X秒"
-                            onkeyup="value=value.replace(/[^\d.]/g,'')" clearable
-                            style="margin-left: 5px; width: 94px"></el-input>
+                        <el-input
+                            v-model="tableStore.table.params.persistMax"
+                            placeholder="请输入X秒"
+                            onkeyup="value=value.replace(/[^\d.]/g,'')"
+                            clearable
+                            style="margin-left: 5px; width: 94px"
+                        ></el-input>
                     </el-form-item>
 
                     <el-form-item label="事件严重度">
-                        <el-input v-model="tableStore.table.params.severityMin" placeholder="请输入正负数"
-                            onkeyup="value=value.replace(/[^\d\.-]/g,'')" clearable style="width: 94px"></el-input>
+                        <el-input
+                            v-model="tableStore.table.params.severityMin"
+                            placeholder="请输入正负数"
+                            onkeyup="value=value.replace(/[^\d\.-]/g,'')"
+                            clearable
+                            style="width: 94px"
+                        ></el-input>
                         <el-tag style="margin-left: 5px">&lt; 严重度 &lt;</el-tag>
-                        <el-input v-model="tableStore.table.params.severityMax" placeholder="请输入正负数"
-                            onkeyup="value=value.replace(/[^\d\.-]/g,'')" clearable
-                            style="margin-left: 5px; width: 94px"></el-input>
+                        <el-input
+                            v-model="tableStore.table.params.severityMax"
+                            placeholder="请输入正负数"
+                            onkeyup="value=value.replace(/[^\d\.-]/g,'')"
+                            clearable
+                            style="margin-left: 5px; width: 94px"
+                        ></el-input>
                     </el-form-item>
 
                     <!-- <el-form-item label="触发类型:">
@@ -53,23 +95,52 @@
                         </el-select>
                     </el-form-item> -->
                     <el-form-item label="暂态原因">
-                        <el-select v-model="tableStore.table.params.eventReason" placeholder="请选择暂态原因" clearable
-                            multiple collapse-tags style="width: 100%">
-                            <el-option v-for="item in reasonoptions" :key="item.id" :label="item.name"
-                                :value="item.id"></el-option>
+                        <el-select
+                            v-model="tableStore.table.params.eventReason"
+                            placeholder="请选择暂态原因"
+                            clearable
+                            multiple
+                            collapse-tags
+                            style="width: 100%"
+                        >
+                            <el-option
+                                v-for="item in reasonoptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="暂态核实原因">
-                        <el-select v-model="tableStore.table.params.verifyReason" placeholder="请选择暂态核实原因" clearable
-                            multiple collapse-tags collapse-tags-tooltip>
-                            <el-option v-for="item in verifyReasonList" :key="item.id" :label="item.name"
-                                :value="item.id"></el-option>
+                        <el-select
+                            v-model="tableStore.table.params.verifyReason"
+                            placeholder="请选择暂态核实原因"
+                            clearable
+                            multiple
+                            collapse-tags
+                            collapse-tags-tooltip
+                        >
+                            <el-option
+                                v-for="item in verifyReasonList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="变电站(监测点)">
-                        <el-cascader v-model="tableStore.table.params.lineIds" :options="options" :props="defaultProps"
-                            collapse-tags-tooltip style="width: 257px" filterable clearable collapse-tags
-                            placeholder="请选择变电站(监测点)" :show-all-levels="true" />
+                        <el-cascader
+                            v-model="tableStore.table.params.lineIds"
+                            :options="options"
+                            :props="defaultProps"
+                            collapse-tags-tooltip
+                            style="width: 257px"
+                            filterable
+                            clearable
+                            collapse-tags
+                            placeholder="请选择变电站(监测点)"
+                            :show-all-levels="true"
+                        />
                     </el-form-item>
                 </template>
                 <template #operation>
@@ -146,33 +217,17 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'startTime', title: '暂降发生时刻', minWidth: '200' },
-        { field: 'gdName', title: '供电公司', minWidth: '100' },
-        { field: 'subName', title: '变电站', minWidth: '200' },
-        { field: 'ip', title: '网络参数', width: '120px' },
-        { field: 'lineName', title: '监测点', minWidth: '100' },
-        { field: 'scale', title: '电压等级(kV)', minWidth: '120' },
-        {
-            field: 'verifyReason',
-            title: '暂态核实原因',
-            minWidth: '120',
-            formatter: function (row) {
-                return verifyReasonList.filter(item => item.id == row.cellValue)[0]?.name || '/' //row.cellValue ? row.cellValue : '/'
-            }
-        },
-        // {
-        //     field: 'verifyReasonDetail', title: '暂降核实原因详情', minWidth: '200', formatter: function (row) {
-        //         return row.cellValue ? row.cellValue : '/'
-        //     }
-        // },
+        { field: 'startTime', title: '暂降发生时刻', minWidth: '200', sortable: true },
         {
             field: 'featureAmplitude',
             title: '暂降(骤升)幅值(%)',
-            minWidth: '130',
+            minWidth: '160',
+            sortable: true,
             formatter: (row: any) => {
                 return Math.floor(row.cellValue * 10000) / 100
             }
         },
+        { field: 'duration', title: '持续时间(s)', minWidth: 120, sortable: true },
         {
             field: 'eventType',
             title: '触发类型',
@@ -182,17 +237,32 @@ const tableStore = new TableStore({
                 return triggeroptions.filter(item => item.id == row.eventType)[0]?.name
             }
         },
-        // { field: 'advanceType', title: '触发类型', minWidth: '100', },
-        { field: 'advanceReason', title: '暂态原因', minWidth: '100' },
         {
             field: 'depth',
             title: '暂降深度(%)',
-            minWidth: '100',
+            minWidth: 120,
+
             formatter: ({ row }: any) =>
                 row.featureAmplitude < 1 ? 100 - (row.featureAmplitude * 100).toFixed(0) : '/'
         },
 
-        { field: 'duration', title: '持续时间(s)', minWidth: '100' },
+        { field: 'advanceReason', title: '暂态原因', minWidth: '100' },
+        {
+            field: 'verifyReason',
+            title: '暂态核实原因',
+            minWidth: '120',
+            formatter: function (row) {
+                return verifyReasonList.filter(item => item.id == row.cellValue)[0]?.name || '/' //row.cellValue ? row.cellValue : '/'
+            }
+        },
+        { field: 'gdName', title: '供电公司', minWidth: '100' },
+        { field: 'subName', title: '变电站', minWidth: '200' },
+        { field: 'lineName', title: '监测点', minWidth: '100' },
+        { field: 'ip', title: '网络参数', width: '120px' },
+        { field: 'scale', title: '电压等级(kV)', minWidth: '130', sortable: true },
+
+        // { field: 'advanceType', title: '触发类型', minWidth: '100', },
+
         {
             field: 'severity',
             title: '严重度',
@@ -201,7 +271,8 @@ const tableStore = new TableStore({
         },
 
         {
-            title: '操作', fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             width: '150',
             render: 'buttons',
 
@@ -259,7 +330,7 @@ const tableStore = new TableStore({
         }
     ],
 
-    loadCallback: () => { }
+    loadCallback: () => {}
 })
 const options = ref([])
 const defaultProps = {
@@ -353,6 +424,7 @@ const download = () => {
         document.body.appendChild(link)
         link.click() //执行下载
         document.body.removeChild(link) //释放标签
+        ElMessage.success('波形下载成功')
     })
 }
 </script>

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

@@ -3,9 +3,9 @@
         <div v-show="view">
             <TableHeader datePicker :showReset="false" showExport ref="TableHeaderRef">
                 <template #select>
-<!--                    <el-form-item label="筛选数据">-->
-<!--                        <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入关键字筛选" />-->
-<!--                    </el-form-item>-->
+                    <!--                    <el-form-item label="筛选数据">-->
+                    <!--                        <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入关键字筛选" />-->
+                    <!--                    </el-form-item>-->
                 </template>
                 <template #operation>
                     <el-button icon="el-icon-Tickets" type="primary" @click="analysis1">分析记录管理</el-button>
@@ -29,7 +29,7 @@
                         </template>
                     </vxe-column>
                 </vxe-table>
-                 <el-pagination
+                <el-pagination
                     class="mt10"
                     :currentPage="form.pageNum"
                     :page-size="form.pageSize"
@@ -39,7 +39,7 @@
                     :total="total"
                     @size-change="onTableSizeChange"
                     @current-change="onTableCurrentChange"
-            ></el-pagination>
+                ></el-pagination>
             </el-dialog>
         </div>
         <div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
@@ -70,7 +70,7 @@ const loading = ref(false)
 const view = ref(true)
 const view2 = ref(false)
 const TableHeaderRef = ref()
-const  waveFormRef = ref()
+const waveFormRef = ref()
 const tableStore = new TableStore({
     url: '/advance-boot/process/querySagEventsPage',
     method: 'POST',
@@ -83,19 +83,23 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'startTime', title: '发生时间' },
-        { field: 'duration', title: '持续时间(s)' },
+        { field: 'startTime', title: '暂降发生时刻', sortable: true, minWidth: 200 },
         {
             field: 'featureAmplitude',
-            title: '暂降(骤升)幅值(%)'
+            title: '暂降(骤升)幅值(%)',
+            sortable: true,
+            minWidth: 160
         },
-        { field: 'gdName', title: '供电公司' },
-        { field: 'subName', title: '变电站' },
-        { field: 'lineName', title: '监测点' },
+        { field: 'duration', title: '持续时间(s)', sortable: true, minWidth: 120 },
+        { field: 'gdName', title: '供电公司', minWidth: 140 },
+        { field: 'subName', title: '变电站', minWidth: 140 },
+        { field: 'lineName', title: '监测点', minWidth: 140 },
+
         {
             field: 'dealFlag',
             title: '暂降特征幅值计算',
             render: 'tag',
+            minWidth: 160,
             custom: {
                 0: 'warning',
                 1: 'success',
@@ -115,6 +119,7 @@ const tableStore = new TableStore({
             field: 'fileFlag',
             title: '录波文件',
             render: 'tag',
+            minWidth: 140,
             custom: {
                 0: 'warning',
                 1: 'success'
@@ -125,7 +130,8 @@ const tableStore = new TableStore({
             }
         },
         {
-             title: '操作',fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [
@@ -140,9 +146,9 @@ const tableStore = new TableStore({
                     render: 'basicButton',
                     click: async row => {
                         view.value = false
-                      setTimeout(() => {
-                        waveFormRef.value.open(row)
-                      },100)
+                        setTimeout(() => {
+                            waveFormRef.value.open(row)
+                        }, 100)
                         // row.loading = true
                         // boxoList.value = row
                         // await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 })
@@ -173,7 +179,7 @@ const tableStore = new TableStore({
         }
     ],
 
-    loadCallback: () => { }
+    loadCallback: () => {}
 })
 tableStore.table.params.searchValue = ''
 const bxactiveName = ref('ssbx')
@@ -190,25 +196,21 @@ provide('tableStore', tableStore)
 onMounted(() => {
     TableHeaderRef.value.setTheDate(1)
     nextTick(() => {
-
         // tableStore.index()
         TableHeaderRef.value.onComSearch()
-
     })
 })
 
 // 分页
 const onTableSizeChange = (val: number) => {
-     form.value.pageSize = val
-    form.value.pageNum = 1  // 改变每页条数时回到第一页
-    loadAnalysisData()      // 重新加载数据
- 
+    form.value.pageSize = val
+    form.value.pageNum = 1 // 改变每页条数时回到第一页
+    loadAnalysisData() // 重新加载数据
 }
 
 const onTableCurrentChange = (val: number) => {
     form.value.pageNum = val
-    loadAnalysisData()      // 重新加载数据
-  
+    loadAnalysisData() // 重新加载数据
 }
 
 // 封装数据加载逻辑
@@ -230,13 +232,12 @@ const loadAnalysisData = async () => {
 
 //分析记录管理
 const analysis1 = async () => {
-      // 初始化分页参数
+    // 初始化分页参数
     form.value.pageNum = 1
     await loadAnalysisData()
     dialogAnalysis.value = true
 }
 
-
 // 启动关联分析
 const firing = () => {
     processEvents({
@@ -257,7 +258,7 @@ const details = (row: any) => {
             type: 'success',
             message: res.message
         })
-          // 重新加载当前页的数据
+        // 重新加载当前页的数据
         loadAnalysisData()
     })
 }
@@ -266,6 +267,4 @@ const backbxlb = () => {
     view.value = true
     view2.value = false
 }
-
-
 </script>

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

@@ -3,7 +3,13 @@
         <TableHeader datePicker ref="TableHeaderRef">
             <template #select>
                 <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入事件关联分析描述"  maxlength="32"  show-word-limit/>
+                    <el-input
+                        v-model="tableStore.table.params.searchValue"
+                        clearable
+                        placeholder="输入事件关联分析描述"
+                        maxlength="32"
+                        show-word-limit
+                    />
                 </el-form-item>
             </template>
             <template #operation>
@@ -35,25 +41,18 @@
                 </vxe-table-column>
                 <vxe-table-column
                     field="startTime"
-                    title="发生时间"
+                    title="暂降发生时刻"
                     align="center"
+                    sortable
+                    width="200"
                     :show-overflow="true"
                 ></vxe-table-column>
-                <vxe-table-column field="gdName" title="供电公司" align="center"></vxe-table-column>
-                <vxe-table-column
-                    field="subName"
-                    :show-overflow="true"
-                    title="变电站"
-                    align="center"
-                ></vxe-table-column>
-                <vxe-table-column field="lineName" title="监测点" align="center"></vxe-table-column>
-                <vxe-table-column field="voltageId" title="电压等级(kV)" align="center"></vxe-table-column>
-                <vxe-table-column field="featureAmplitude" title="暂降(骤升)幅值(%)" align="center" width="140">
+                <vxe-table-column field="featureAmplitude" title="暂降(骤升)幅值(%)" sortable align="center" width="160">
                     <template #default="{ row }">
                         <span>{{ (row.featureAmplitude * 100).toFixed(2) }}</span>
                     </template>
                 </vxe-table-column>
-                <vxe-table-column field="duration" title="持续时间(s)" align="center" width="120"></vxe-table-column>
+                <vxe-table-column field="duration" title="持续时间(s)" sortable align="center" width="120"></vxe-table-column>
                 <vxe-table-column
                     field="advanceType"
                     title="触发类型"
@@ -68,6 +67,15 @@
                     width="120"
                     :formatter="formFilter"
                 ></vxe-table-column>
+                <vxe-table-column field="gdName" title="供电公司" align="center"></vxe-table-column>
+                <vxe-table-column
+                    field="subName"
+                    :show-overflow="true"
+                    title="变电站"
+                    align="center"
+                ></vxe-table-column>
+                <vxe-table-column field="lineName" title="监测点" align="center"></vxe-table-column>
+                <vxe-table-column field="voltageId" title="电压等级(kV)" align="center"></vxe-table-column>
             </vxe-table>
             <el-pagination
                 class="mt10"
@@ -131,7 +139,8 @@ const tableStore = new TableStore({
             title: '事件关联分析描述'
         },
         {
-             title: '操作',fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             width: '200',
             render: 'buttons',
             buttons: [
@@ -176,7 +185,6 @@ const bxcontrast = () => {
     }
 }
 
-
 // 波形分析
 const source = () => {
     queryEventDetailByAssId(form.value).then(res => {
@@ -245,14 +253,14 @@ const exportEvent = () => {
 }
 // 导出波形分析
 const positioningexport = () => {
-     const selectedRecords = positioningtableRef.value.getCheckboxRecords();
-    
+    const selectedRecords = positioningtableRef.value.getCheckboxRecords()
+
     if (selectedRecords.length === 0) {
         ElMessage({
             message: '请先选择要导出的数据!',
             type: 'warning'
-        });
-        return;
+        })
+        return
     }
 
     positioningtableRef.value.exportData({

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

@@ -27,22 +27,23 @@
                         <span>{{ (form.pageNum - 1) * form.pageSize + row.rowIndex + 1 }}</span>
                     </template>
                 </vxe-table-column>
-                <vxe-table-column field="startTime" title="发生时间" align="center"
+                <vxe-table-column field="startTime" title="暂降发生时刻" align="center" sortable  width="200"
                     :show-overflow="true"></vxe-table-column>
-                <vxe-table-column field="gdName" title="供电公司" align="center"></vxe-table-column>
-                <vxe-table-column field="subName" :show-overflow="true" title="变电站" align="center"></vxe-table-column>
-                <vxe-table-column field="lineName" title="监测点" align="center"></vxe-table-column>
-                <vxe-table-column field="voltageId" title="电压等级(kV)" align="center"></vxe-table-column>
-                <vxe-table-column field="featureAmplitude" title="暂降(骤升)幅值(%)" align="center" width="140">
+                    <vxe-table-column field="featureAmplitude" title="暂降(骤升)幅值(%)" sortable align="center" width="160">
                     <template #default="{ row }">
                         <span>{{ (row.featureAmplitude * 100).toFixed(2) }}</span>
                     </template>
                 </vxe-table-column>
-                <vxe-table-column field="duration" title="持续时间(s)" align="center" width="120"></vxe-table-column>
+                <vxe-table-column field="duration" title="持续时间(s)" align="center" sortable width="120"></vxe-table-column>
                 <vxe-table-column field="advanceType" title="触发类型" align="center" width="120"
                     :formatter="formFilter"></vxe-table-column>
                 <vxe-table-column field="advanceReason" title="暂降原因" align="center" width="120"
                     :formatter="formFilter"></vxe-table-column>
+                <vxe-table-column field="gdName" title="供电公司" align="center"></vxe-table-column>
+                <vxe-table-column field="subName" :show-overflow="true" title="变电站" align="center"></vxe-table-column>
+                <vxe-table-column field="lineName" title="监测点" align="center"></vxe-table-column>
+                <vxe-table-column field="voltageId" title="电压等级(kV)" align="center"></vxe-table-column>
+                
             </vxe-table>
             <el-pagination class="mt10" :currentPage="form.pageNum" :page-size="form.pageSize"
                 :page-sizes="[10, 20, 50, 100]" background :layout="'sizes,total, ->, prev, pager, next, jumper'"

src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue

@@ -56,37 +56,40 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '变电站名称', field: 'subName', minWidth: '140' },
-        { title: '监测点名称', field: 'lineName', minWidth: '130' },
-        { title: '网络参数', field: 'ip', width: '120px' },
-        { title: '电压等级(kV)', field: 'voltageScale', width: '120' },
-        { title: '暂降发生时刻', field: 'startTime', width: '200' },
-        // { title: '触发类型', field: 'advanceType', minWidth: '130' },
-        { title: '暂降原因', field: 'advanceReason', minWidth: '130' },
-        {
-            title: '触发类型',
-            field: 'eventType',
-            minWidth: '80',
-            formatter: (row: any) => {
-                return eventTypeOptions.find(item => item.id === row.cellValue)?.name || '/'
-            }
-        },
+        { title: '暂降发生时刻', field: 'startTime', width: '200',    sortable: true, },
         {
             title: '暂降(骤升)幅值(%)',
             field: 'featureAmplitude',
-            minWidth: '140',
-
+            minWidth: '160',
+            sortable: true,
             formatter: (row: any) => {
                 return Math.floor(row.cellValue * 10000) / 100
             }
         },
-        { title: '持续时间(s)', field: 'duration', minWidth: '100' },
+        { title: '持续时间(s)', field: 'duration', minWidth: '120' ,   sortable: true, },
+        {
+            title: '触发类型',
+            field: 'eventType',
+            minWidth: '100',
+            formatter: (row: any) => {
+                return eventTypeOptions.find(item => item.id === row.cellValue)?.name || '/'
+            }
+        },
+        { title: '暂降原因', field: 'advanceReason', minWidth: '130' },
+        { title: '变电站名称', field: 'subName', minWidth: '140' },
+        { title: '监测点名称', field: 'lineName', minWidth: '130' },
+        { title: '网络参数', field: 'ip', width: '120px' },
+        { title: '电压等级(kV)', field: 'voltageScale', width: '120' },
+
+        // { title: '触发类型', field: 'advanceType', minWidth: '130' },
+
         // { title: '严重度', field: 'severity', minWidth: '80' },
         {
-             title: '操作',fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             width: '180',
             render: 'buttons',
-            
+
             buttons: [
                 {
                     name: 'edit',
@@ -127,7 +130,6 @@ const tableStore = new TableStore({
     ],
     beforeSearchFun: () => {
         tableStore.table.params.lineId = monitoringPoint.state.lineId
-       
     },
     loadCallback: () => {}
 })
@@ -174,6 +176,7 @@ const download = () => {
         document.body.appendChild(link)
         link.click() //执行下载
         document.body.removeChild(link) //释放标签
+           ElMessage.success('波形下载成功')
     })
 }
 </script>

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

@@ -3,21 +3,21 @@
         <div style="height: 40vh">
             <vxe-table v-loading="loading" height="auto" auto-resize :data="tableData" v-bind="defaultAttribute">
                 <vxe-column type="seq" title="序号" width="80px"></vxe-column>
-                <vxe-column field="startTime" title="发生时间" width="180"></vxe-column>
-                <vxe-column field="duration" title="持续时间(s)" width="100"></vxe-column>
-                <vxe-column field="gdName" title="供电公司"  min-width="150"></vxe-column>
-                <vxe-column field="subName" title="变电站" min-width="150"></vxe-column>
-                <vxe-column field="lineName" title="监测点"  min-width="150"></vxe-column>
+                <vxe-column field="startTime" title="暂降发生时刻" width="200" sortable></vxe-column>
+                <vxe-column field="featureAmplitude" title="暂降(骤升)幅值(%)" width="160" sortable>
+                    <template #default="{ row }">
+                        {{ (row.featureAmplitude * 100).toFixed(2) }}
+                    </template>
+                </vxe-column>
+                <vxe-column field="duration" title="持续时间(s)" width="120" sortable></vxe-column>
                 <vxe-column field="advanceType" title="触发类型" width="100">
                     <template #default="{ row }">
                         {{ type.find(item => item.id === row.advanceType)?.name }}
                     </template>
                 </vxe-column>
-                <vxe-column field="featureAmplitude" title="暂降(骤升)幅值(%)" width="150">
-                    <template #default="{ row }">
-                        {{ (row.featureAmplitude * 100).toFixed(2) }}
-                    </template>
-                </vxe-column>
+                <vxe-column field="gdName" title="供电公司" min-width="140"></vxe-column>
+                <vxe-column field="subName" title="变电站" min-width="140"></vxe-column>
+                <vxe-column field="lineName" title="监测点名称" min-width="140"></vxe-column>
             </vxe-table>
         </div>
     </el-dialog>

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

@@ -23,14 +23,15 @@
             <div style="flex: 1; overflow: hidden">
                 <vxe-table height="auto" auto-resize :data="tableData" v-bind="defaultAttribute">
                     <vxe-column type="seq" title="序号" width="70px"></vxe-column>
-                    <vxe-column field="startTime" title="发生时刻" width="200"></vxe-column>
-                    <vxe-column field="lineName" title="监测点" width="120"></vxe-column>
-                    <vxe-column field="featureAmplitude" title="暂降(骤升)幅值(%)">
+                    <vxe-column field="startTime" title="暂降发生时刻" width="200" sortable></vxe-column>
+                    <vxe-column field="featureAmplitude" title="暂降(骤升)幅值(%)" width="160" sortable>
                         <template #default="{ row }">
                             {{ row.featureAmplitude.toFixed(2) }}
                         </template>
                     </vxe-column>
-                    <vxe-column field="duration" title="持续时间(s)"></vxe-column>
+                    <vxe-column field="duration" title="持续时间(s)" sortable width="120"></vxe-column>
+                    <vxe-column field="lineName" title="监测点" width="120"></vxe-column>
+                    
                 </vxe-table>
             </div>
         </div>

src/views/pqs/voltageSags/report/eventReports/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker area >
+        <TableHeader date-picker area>
             <template v-slot:select>
                 <el-form-item label="统计类型">
                     <el-radio-group v-model="tableStore.table.params.comFlag">
@@ -48,10 +48,12 @@
                 </el-form-item>
             </template>
             <template #operation>
-                <el-button icon="el-icon-Download" type="primary" @click="exportEvent" :loading="loading">导出</el-button>
+                <el-button icon="el-icon-Download" type="primary" @click="exportEvent" :loading="loading">
+                    报告生成
+                </el-button>
             </template>
         </TableHeader>
-        <Table ref="tableRef" />
+        <Table ref="tableRef"  :checkboxConfig="checkboxConfig" />
     </div>
 </template>
 <script setup lang="tsx">
@@ -64,7 +66,7 @@ import { getEventReport } from '@/api/event-boot/report'
 import { ElMessage } from 'element-plus'
 
 defineOptions({
-    name: 'Operationmanagement/terminalmanagement'
+    name: 'TransientReport/eventreports'
 })
 const dictData = useDictData()
 const triggerType = dictData.getBasicData('Event_Statis')
@@ -82,6 +84,7 @@ const tableStore = new TableStore({
     url: '/event-boot/report/getEventReport',
     method: 'POST',
     column: [
+        { width: '60', type: 'checkbox' },
         {
             title: '序号',
 
@@ -93,19 +96,34 @@ const tableStore = new TableStore({
         },
         {
             field: 'startTime',
-            title: '发生时刻',
+            title: '暂降发生时刻',
             width: '180',
+            sortable: true,
             formatter: (row: any) => {
                 return row.cellValue ? row.cellValue.replace('T', ' ') : '/'
             }
         },
-        { field: 'gdName', title: '供电公司', minWidth: '120' },
-        { field: 'subName', title: '变电站', minWidth: '120' },
-        { field: 'ip', title: '网络参数', width: '120px' },
-        { field: 'lineName', title: '监测点', minWidth: '120' },
+        {
+            field: 'featureAmplitude',
+            title: '暂降(骤升)幅值(%)',
+            width: '160',
+            sortable: true,
+            formatter: (row: any) => {
+                // return (row.cellValue * 100).toFixed(0)
+
+                return Math.floor(row.cellValue * 10000) / 100
+            }
+        },
+        {
+            field: 'duration',
+            title: '持续时间(s)',
+            width: '120',
+            sortable: true
+        },
         {
             field: 'eventType',
-            title: '触发类型',minWidth: '100' ,
+            title: '触发类型',
+            minWidth: '100',
             formatter: (row: any) => {
                 return triggerType.filter(item => item.id === row.cellValue)[0].name
             }
@@ -113,33 +131,30 @@ const tableStore = new TableStore({
         {
             field: 'advanceType',
             title: '暂态类型',
-            minWidth: '100'
+            minWidth: '100',
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
         },
         {
             field: 'advanceReason',
             title: '暂态原因',
-            minWidth: '100'
+            minWidth: '100',
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
         },
+        { field: 'gdName', title: '供电公司', minWidth: '120' },
+        { field: 'subName', title: '变电站', minWidth: '120' },
+        { field: 'lineName', title: '监测点', minWidth: '120' },
+        { field: 'ip', title: '网络参数', width: '120px' },
+
         {
             field: 'voltageScale',
             title: '电压等级',
             minWidth: '100'
-        },
-        {
-            field: 'featureAmplitude',
-            title: '暂降(骤升)幅值(%)',
-            width: '140',
-            formatter: (row: any) => {
-                // return (row.cellValue * 100).toFixed(0)
-                
-                return Math.floor(row.cellValue * 10000) / 100
-            }
-        },
-        {
-            field: 'duration',
-            title: '持续时间(s)',
-            width: '100'
         }
+
         // { field: 'severity', title: '严重度' }
     ]
 })
@@ -156,7 +171,11 @@ tableStore.table.params.statisticalType = dictData.getBasicData('Statistical_Typ
     'Voltage_Level',
     'Load_Type'
 ])[0]
-
+const checkboxConfig = reactive<VxeTablePropTypes.CheckboxConfig<any>>({
+    checkMethod: ({ row }) => {
+        return row.fileFlag === 1
+    }
+})
 provide('tableStore', tableStore)
 
 onMounted(() => {
@@ -178,15 +197,17 @@ const exportEvent = () => {
     //         }
     //     })
     // })
-
-
-    const ids = tableStore.table.data.map((item: any) => item.eventId);
+    if (!tableStore.table.selection.length) {
+        ElMessage.warning('请选择数据')
+        return
+    }
+    const ids = tableStore.table.selection.map((item: any) => item.eventId)
     loading.value = true
 
     ElMessage('生成报告中,请稍等!')
     getEventReport(ids)
         .then((res: any) => {
-             if (res == undefined) {
+            if (res == undefined) {
                 loading.value = false
                 return
             }
@@ -197,14 +218,14 @@ const exportEvent = () => {
             const url = window.URL.createObjectURL(blob)
             const link = document.createElement('a') // 创建a标签
             link.href = url
-            link.download = '事件报告'  // 设置下载的文件名
+            link.download = '事件报告' // 设置下载的文件名
             document.body.appendChild(link)
             link.click() //执行下载
             document.body.removeChild(link)
             loading.value = false
-        }) .catch(() => {
+        })
+        .catch(() => {
             loading.value = false
         })
-        
 }
 </script>

src/views/pqs/voltageSags/report/weekly/index.vue

@@ -56,19 +56,20 @@ const list = ref([
                             )
                         }
                     },
-                    { field: 'startTime', title: '暂态事件发生时刻', width: '200' },
-                    { field: 'gdName', title: '供电公司' },
-                    { field: 'subName', title: '变电站' },
-                    { field: 'lineName', title: '监测点' },
-                    { field: 'voltageScale', title: '监测点电压等级' },
-                    { field: 'loadType', title: '干扰源类型' },
+                    { field: 'startTime', title: '暂态发生时刻', width: '200',sortable: true, },
                     {
                         field: 'featureAmplitude',
-                        title: '暂降(骤升)幅值(%)',
+                        title: '暂降(骤升)幅值(%)',sortable: true,width: '160',
                         formatter: ({ row }: any) => (row.featureAmplitude * 100).toFixed(2)
                     },
-                    { field: 'duration', title: '持续时间(s)' },
-                    { field: 'severity', title: '暂态事件严重度' }
+                    { field: 'duration', title: '持续时间(s)',sortable: true,width: '120', },
+                    { field: 'gdName', title: '供电公司' ,minWidth: '120'},
+                    { field: 'subName', title: '变电站' ,minWidth: '120'},
+                    { field: 'lineName', title: '监测点' ,minWidth: '120'},
+                    { field: 'voltageScale', title: '监测点电压等级' ,minWidth: '120'},
+                    { field: 'loadType', title: '干扰源类型' ,minWidth: '120'},
+
+                    { field: 'severity', title: '暂态事件严重度' ,minWidth: '120'}
                 ]
             }
         ]
@@ -86,7 +87,16 @@ const list = ref([
                     return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
                 }
             },
-            { field: 'startTime', title: '暂降事件发生时刻', width: '200' },
+            { field: 'startTime', title: '暂降发生时刻', width: '200',sortable: true, },
+             {
+                field: 'featureAmplitude',
+                title: '暂降(骤升)幅值(%)',
+                width: '160',sortable: true,
+                formatter: (row: any) => {
+                    return Math.floor(row.cellValue * 10000) / 100
+                }
+            },
+            { field: 'duration', title: '持续时间(s)', width: '120',sortable: true, },
             { field: 'gdName', title: '供电公司', width: '150' },
             { field: 'subName', title: '变电站', minWidth: '150' },
             { field: 'lineName', title: '监测点', minWidth: '150' },
@@ -99,15 +109,7 @@ const list = ref([
             { field: 'voltageScale', title: '电压等级', width: '80' },
             { field: 'loadType', title: '干扰源类型', width: '150' },
 
-            {
-                field: 'featureAmplitude',
-                title: '暂降(骤升)幅值(%)',
-                width: '150',
-                formatter: (row: any) => {
-                    return Math.floor(row.cellValue * 10000) / 100
-                }
-            },
-            { field: 'duration', title: '持续时间(s)', width: '120' },
+           
             { field: 'advanceType', title: '暂降类型(机器判断)', width: '150' }
         ]
     },

src/views/user/login.vue

@@ -1,5 +1,5 @@
 <template>
-    <div @keyup.enter="onSubmit(formRef)">
+    <div v-if="!VITE_FLAG" @keyup.enter="onSubmit(formRef)">
         <div @contextmenu.stop="" id="bubble" class="bubble">
             <canvas id="bubble-canvas" class="bubble-canvas"></canvas>
         </div>
@@ -67,7 +67,6 @@
 <script setup lang="ts">
 import { onMounted, onBeforeUnmount, reactive, ref, nextTick } from 'vue'
 import * as pageBubble from '@/utils/pageBubble'
-import { ElMessage } from 'element-plus'
 import { gongkey, login, getSysConfig, loginLNqr } from '@/api/user-boot/user'
 import { useAdminInfo } from '@/stores/adminInfo'
 import type { FormInstance, InputInstance, FormRules } from 'element-plus'
@@ -78,6 +77,7 @@ import { getTheme } from '@/api/systerm'
 import { useConfig } from '@/stores/config'
 import PopupUpdatePwd from './popupUpdatePwd.vue'
 const VITE_FLAG = import.meta.env.VITE_NAME == 'LNqr'
+
 const router = useRouter()
 let timer: number
 const configStore = useConfig()
@@ -115,8 +115,20 @@ const focusInput = () => {
         passwordRef.value!.focus()
     }
 }
+const fetchMqttUrl = async () => {
+    const response = await fetch('/')
+    const WebSocketUrl: any = response.headers.get('X-WebSocket-Url')
+    const WebSocketUrl2: any = response.headers.get('X-WebSocket-Url2')
+    const WebSocketUrl3: any = response.headers.get('X-WebSocket-Url3')
+    const MqttUrl: any = response.headers.get('X-MqttUrl-Url')
+    localStorage.setItem('WebSocketUrl', WebSocketUrl)
+    localStorage.setItem('WebSocketUrl2', WebSocketUrl2)
+    localStorage.setItem('WebSocketUrl3', WebSocketUrl3)
+    localStorage.setItem('MqttUrl', MqttUrl)
+}
 
 onMounted(() => {
+    fetchMqttUrl()
     if (VITE_FLAG) {
         LNonSubmit()
     }
@@ -185,12 +197,63 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
         }
     })
 }
-const LNonSubmit = async () => {
+/*const LNonSubmit = async () => {
     state.submitLoading = true
-    loginLNqr()
-        .then(res => {
-            //返回 a
+    lnToken().then(res => {
+        console.log(555)
+        loginLNqr().then(res => {
+            //拿到token了，可以正常操作页面
+            userInfo.dataFill(res.data)
+            state.submitLoading = false
+            getSysConfig().then(res => {
+                window.localStorage.setItem('sysdata', JSON.stringify(res.data))
+            })
+            router.push({
+                path: '/'
+            })
+        }).catch(err => {
+                console.log("---------")
+                console.log(err)
+                //
+                //window.location.href = "http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/login"
+            })
+    })
+    setTimeout(() => {
+        state.submitLoading = false
+    }, 500)
+}*/
 
+// ========== 修改：CAS 无感登录 ==========
+const LNonSubmit = async () => {
+    // 先检查是否是 CAS 回调
+    if (handleCasCallback()) {
+        console.log('进入回调')
+        return
+    }
+    // 没有 token，触发 CAS 登录流程
+    console.log('无 token，触发 CAS 登录')
+    // 跳转到后端 CAS 认证入口
+    window.location.href = '/api/pqs-auth/oauth/lnCheck'
+}
+// ========== 新增：处理 CAS 回调 ==========
+const handleCasCallback = () => {
+    const hash = window.location.hash
+    const queryIndex = hash.indexOf('?')
+    if (queryIndex === -1) return false
+
+    console.log(hash)
+
+    const hashParams = new URLSearchParams(hash.substring(queryIndex + 1))
+    if (hashParams.get('flag') !== '1') return false
+
+    // 清理 URL 中的 flag 参数，防止刷新重复触发
+    const cleanHash = hash.substring(0, queryIndex)
+    window.history.replaceState(null, '', cleanHash)
+    if (hashParams && hashParams.get('flag') == 1) {
+        state.submitLoading = true
+        let data = { clientId: 'njcn', clientSecret: 'njcnpqs' }
+        loginLNqr(data)
+            .then(res => {
                 //拿到token了，可以正常操作页面
                 userInfo.dataFill(res.data)
                 state.submitLoading = false
@@ -200,18 +263,19 @@ const LNonSubmit = async () => {
                 router.push({
                     path: '/'
                 })
-
-        })
-        .catch(err => {
-            console.log("---------")
-            console.log(err)
-            //
-            window.location.href = "http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/login"
-        })
-    setTimeout(() => {
-        state.submitLoading = false
-    }, 500)
+            })
+            .catch(err => {
+                console.log('---------')
+                console.log(err)
+                state.submitLoading = false
+            })
+    } else {
+        return false
+    }
+    return true
 }
+
+defineExpose({ VITE_FLAG })
 </script>
 
 <style scoped lang="scss">