Merge branch 'master' of http://192.168.1.22:3000/Web/admin-sjzx

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

src/stores/config.ts

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

src/utils/mqtt.ts

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

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

@@ -744,7 +744,8 @@ const initEcharts = (color: string, key: number, name: string) => {
 }
 //渲染echarts
 const init = () => {
-    const url = localStorage.getItem('WebSocketUrl') || 'ws://192.168.1.68:10407/api/pushMessage/'
+    loading.value = true
+    const url = localStorage.getItem('WebSocketUrl') || 'ws://192.168.1.67:10407/api/pushMessage/'
     echartsDataV1.value = initEcharts('#DAA520', 0, 'A相')
     echartsDataV2.value = initEcharts('#2E8B57', 0, 'B相')
     echartsDataV3.value = initEcharts('#A52a2a', 0, 'C相')
@@ -758,6 +759,7 @@ const init = () => {
         return
     }
     if (monitoringPoint.state.comFlag == 0) {
+        loading.value = false
         return ElMessage({
             message: '所选监测点离线!',
             type: 'warning'
@@ -826,7 +828,7 @@ const init = () => {
         ]
         spectrumRef.value?.init(data)
         trendRef.value?.init(data)
-
+        loading.value = false
         // console.log('🚀 ~ dataSocket.socketServe.registerCallBack ~ webMsgSend.value:', data)
         setRealData()
     })

src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/spectrum.vue

@@ -92,9 +92,10 @@ const tabsList: any = ref([
         thdDataTdVODatas: null,
         unit: '%',
         title: [
-            0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5, 18.5,
+            0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 
-            19.5, 20.5, 21.5, 22.5, 23.5, 24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 32.5, 33.5, 34.5, 35.5, 36.5,
+            // 16.5, 17.5, 18.5,
-            37.5, 38.5, 39.5, 40.5, 41.5, 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 48.5, 49.5
+            // 19.5, 20.5, 21.5, 22.5, 23.5, 24.5, 25.5, 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 32.5, 33.5, 34.5, 35.5, 36.5,
+            // 37.5, 38.5, 39.5, 40.5, 41.5, 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 48.5, 49.5
         ],
         data: {},
         echartsData: {}

src/views/pqs/panorama/components/details/temporaryState.vue

@@ -32,7 +32,7 @@
                 <div class="statistics-box">
                     <MyEChart style="height: 250px" :options="picEChart1" />
                     <el-table size="small" height="250px" :data="resembleData">
-                        <el-table-column prop="name" label="触发类型" width="80px" align="center" />
+                        <el-table-column prop="name" label="暂降类型" width="80px" align="center" />
                         <el-table-column prop="value" label="暂降次数" width="80px" align="center" />
                     </el-table>
                 </div>

src/views/pqs/voltageSags/Region/components/TypeStatistics.vue

@@ -1,5 +1,5 @@
 <template>
-    <span style="color: red; font-size: 12px">注:触发类型仅统计暂降原因为短路故障事件</span>
+    <span style="color: red; font-size: 12px">注:暂降类型仅统计暂降原因为短路故障事件</span>
 
     <div class="statistics-main">
         <template v-if="flag">
@@ -17,7 +17,7 @@
             </div>
             <div>
                 <vxe-table height="auto" auto-resize :data="resembleData" v-bind="defaultAttribute">
-                    <vxe-column field="name" title="触发类型"></vxe-column>
+                    <vxe-column field="name" title="暂降类型"></vxe-column>
                     <vxe-column field="value" title="暂降次数"></vxe-column>
                 </vxe-table>
             </div>
@@ -86,7 +86,7 @@ const info = (res: any) => {
     }
     resemble.value = {
         title: {
-            text: '触发类型'
+            text: '暂降类型'
         },
         legend: {
             type: 'scroll',
@@ -109,7 +109,7 @@ const info = (res: any) => {
         options: {
             series: [
                 {
-                    name: '触发类型',
+                    name: '暂降类型',
                     type: 'pie',
                     center: ['50%', '50%'],
                     selectedOffset: 30,

src/views/pqs/voltageSags/Region/components/echart.vue

@@ -22,11 +22,11 @@ const Processing = (list: any) => {
     let echartsArr: string[] = []
     list.areaCalculation.forEach((item: any) => {
         echartsndArr.push(item.areaName)
-        if (item.frequency == 0) {
+        // if (item.frequency == 0) {
-            item.frequency = 1.1
+        //     item.frequency = 1.1
-        } else if (item.frequency == 1) {
+        // } else if (item.frequency == 1) {
-            item.frequency = 1.3
+        //     item.frequency = 1.3
-        }
+        // }
         echartsArr.push(item.frequency)
     })
     areaStatistics.value = {
@@ -68,7 +68,7 @@ const Processing = (list: any) => {
                         normal: {
                             //这里是颜色
                             color: function (params: any) {
-                                if (params.data == 1.1) {
+                                if (params.data == 0) {
                                     return '#B3B3B3'
                                 } else {
                                     return '#07CCCA '
@@ -90,12 +90,11 @@ const Grade = (list: any) => {
     let echartsArr: string[] = []
     list.voltageLevelCalculation.forEach((item: any) => {
         echartsndArr.push(item.voltageLevel)
-        if (item.frequency == 0) {
+        // if (item.frequency == 0) {
-      
+        //     item.frequency = 1.1
-            item.frequency = 1.1
+        // } else if (item.frequency == 1) {
-        } else if (item.frequency == 1) {
+        //     item.frequency = 1.3
-            item.frequency = 1.3
+        // }
-        }
         echartsArr.push(item.frequency)
     })
 
@@ -138,7 +137,7 @@ const Grade = (list: any) => {
                         normal: {
                             //这里是颜色
                             color: function (params: any) {
-                                if (params.data == 1.1) {
+                                if (params.data == 0) {
                                     return '#B3B3B3'
                                 } else {
                                     return '#07CCCA '
@@ -175,17 +174,17 @@ const Relation = (list: any, interval: number) => {
         //   item.linked = 3.14159;
         //   item.notAssociated = 3.14159;
         // }
-        if (item.linked == 0) {
+        // if (item.linked == 0) {
-            item.linked = 1.1
+        //     item.linked = 1.1
-        } else if (item.linked == 1) {
+        // } else if (item.linked == 1) {
-            item.linked = 1.3
+        //     item.linked = 1.3
-        }
+        // }
         echartsArr.push(item.linked)
-        if (item.notAssociated == 0) {
+        // if (item.notAssociated == 0) {
-            item.notAssociated = 1.1
+        //     item.notAssociated = 1.1
-        } else if (item.notAssociated == 1) {
+        // } else if (item.notAssociated == 1) {
-            item.notAssociated = 1.3
+        //     item.notAssociated = 1.3
-        }
+        // }
         echartswArr.push(item.notAssociated)
     })
     monthlyStatistics.value = {
@@ -239,7 +238,7 @@ const Relation = (list: any, interval: number) => {
                                 }
                             },
                             color: function (params: any) {
-                                if (params.data == 1.1) {
+                                if (params.data == 0) {
                                     return '#B3B3B3'
                                 } else {
                                     return '#07CCCA '
@@ -265,7 +264,7 @@ const Relation = (list: any, interval: number) => {
                                 }
                             },
                             color: function (params: any) {
-                                if (params.data == 1.1) {
+                                if (params.data == 0) {
                                     return '#B3B3B3'
                                 } else {
                                     return '#Ff6600'
@@ -292,3 +291,4 @@ const layout = mainHeight(150) as any
     display: flex;
 }
 </style>
+>>>>>>> c902dabb73a92b43a23970969d750508558b5400

src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfenbutongji/index.vue

@@ -249,7 +249,7 @@ const initThird = () => {
         backgroundColor: '#fff', //背景色,
         animation: false,
         title: {
-            text: '触发类型',
+            text: '暂降类型',
             x: 'center'
         },
 
@@ -277,7 +277,7 @@ const initThird = () => {
         },
         series: [
             {
-                name: '触发类型',
+                name: '暂降类型',
                 type: 'pie',
                 radius: '65%',
                 center: ['50%', '60%'],

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

@@ -109,7 +109,7 @@
                     <el-row>
                         <el-col :span="12" class="mTop">
                             <div class="grid-content">
-                                <div class="divBox">触发类型</div>
+                                <div class="divBox">暂降类型</div>
                             </div>
                         </el-col>
                         <el-col :span="12" class="mTop">

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

@@ -117,7 +117,7 @@
                     <el-row>
                         <el-col :span="12" class="mTop">
                             <div class="grid-content">
-                                <div class="divBox">触发类型</div>
+                                <div class="divBox">暂降类型</div>
                             </div>
                         </el-col>
                         <el-col :span="12" class="mTop">

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

@@ -124,7 +124,7 @@
                     <el-row>
                         <el-col :span="12">
                             <div class="grid-content">
-                                <div class="divBox">触发类型</div>
+                                <div class="divBox">暂降类型</div>
                             </div>
                         </el-col>
                         <el-col :span="12">

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

@@ -108,7 +108,7 @@ const list = ref([
                 }
             },
             { field: 'duration', title: '持续时间(s)', width: '120' },
-            { field: 'advanceType', title: '触发类型(机器判断)', width: '150' }
+            { field: 'advanceType', title: '暂降类型(机器判断)', width: '150' }
         ]
     },
     {