调整云南曲靖问题

src/components/echarts/analytics.vue

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

src/layouts/admin/components/globalPopUp.vue

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

src/router/index.ts

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

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

@@ -83,7 +83,7 @@
                                     v-else
                                     class="box-item"
                                     title="确定重启吗？"
-                                    placement="bottom"
+                                    placement="left"
                                     @confirm="restart(data)"
                                 >
                                     <template #actions="{ confirm, cancel }">

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

@@ -131,7 +131,7 @@ const tableStore = new TableStore({
         { field: 'scale', title: '电压等级', minWidth: '110' },
         // {
         //     field: 'advanceType',
-        //     title: '暂降类型',
+        //     title: '触发类型',
         //     minWidth: '90',
         //     formatter: (row: any) => {
         //         return row.cellValue || '其他'
@@ -147,7 +147,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'eventType',
-            title: '暂态统计类型',
+            title: '触发类型',
             minWidth: '120',
             formatter: (row: any) => {
                 return eventList.filter(item => item.id === row.cellValue)[0]?.name

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

@@ -109,9 +109,10 @@ const handleNodeClick = (data: any, node: any) => {
 }
 // 上传
 const choose = (files: any) => {
-    const isJPG = files.raw.type === 'image/jpeg'
+    const isJPG = files.raw.type === 'image/jpg'
+    const isJPEG = files.raw.type === 'image/jpeg'
     const isPNG = files.raw.type === 'image/png'
-    if (!isJPG && !isPNG) {
+    if (!isJPG && !isPNG && !isJPEG) {
         ElMessage.warning('上传文件只能是 jpg/png 格式!')
         return false
     }

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/qualityInspeection/panorama/components/details/temporaryState.vue

@@ -53,7 +53,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/transientList/index.vue

@@ -85,8 +85,8 @@
                         ></el-input>
                     </el-form-item>
 
-                    <!-- <el-form-item label="暂降类型:">
+                    <!-- <el-form-item label="触发类型:">
-                        <el-select v-model="tableStore.table.params.eventType" placeholder="请选择暂降类型" clearable multiple
+                        <el-select v-model="tableStore.table.params.eventType" placeholder="请选择触发类型" clearable multiple
                             collapse-tags style="width: 100%">
                             <el-option v-for="item in typeoptions" :key="item.id" :label="item.name"
                                 :value="item.id"></el-option>
@@ -251,7 +251,7 @@ const tableStore = new TableStore({
                 return triggeroptions.filter(item => item.id == row.eventType)[0]?.name
             }
         },
-        // { field: 'advanceType', title: '暂降类型', minWidth: '100', },
+        // { field: 'advanceType', title: '触发类型', minWidth: '100', },
         { field: 'advanceReason', title: '暂态原因', minWidth: '100' },
         {
             field: 'depth',

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

@@ -56,7 +56,7 @@
                 <vxe-table-column field="duration" title="持续时间(s)" align="center" width="120"></vxe-table-column>
                 <vxe-table-column
                     field="advanceType"
-                    title="暂降类型"
+                    title="触发类型"
                     align="center"
                     width="120"
                     :formatter="formFilter"

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

@@ -39,7 +39,7 @@
                     </template>
                 </vxe-table-column>
                 <vxe-table-column field="duration" title="持续时间(s)" align="center" width="120"></vxe-table-column>
-                <vxe-table-column field="advanceType" title="暂降类型" align="center" width="120"
+                <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>

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/eventStudy/index.vue

@@ -61,7 +61,7 @@ const tableStore = new TableStore({
         { title: '网络参数', field: 'ip', width: '120px' },
         { title: '电压等级(kV)', field: 'voltageScale', width: '120' },
         { title: '暂降发生时刻', field: 'startTime', width: '200' },
-        // { title: '暂降类型', field: 'advanceType', minWidth: '130' },
+        // { title: '触发类型', field: 'advanceType', minWidth: '130' },
         { title: '暂降原因', field: 'advanceReason', minWidth: '130' },
         {
             title: '触发类型',

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/monitoringPoint/transientList/index.vue

@@ -10,7 +10,7 @@
                             placeholder="请输入监测点名称"
                         />
                     </el-form-item>
-                    <el-form-item label="暂降类型">
+                    <el-form-item label="触发类型">
                         <el-select v-model.trim="tableStore.table.params.dicData" placeholder="请选择" clearable>
                             <el-option
                                 v-for="item in triggerType"
@@ -79,7 +79,7 @@ const tableStore: any = new TableStore({
         { field: 'objName', title: '监测对象', minWidth: '170' },
         // {
         //     field: 'advanceType',
-        //     title: '暂降类型',
+        //     title: '触发类型',
         //     minWidth: '90',
         //     formatter: (row: any) => {
         //         return row.cellValue || '其他'
@@ -95,7 +95,7 @@ const tableStore: any = new TableStore({
         },
         {
             field: 'eventType',
-            title: '暂态统计类型',
+            title: '触发类型',
             minWidth: '120',
             formatter: (row: any) => {
                 return triggerType.filter(item => item.id === row.cellValue)[0]?.name

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

@@ -8,7 +8,7 @@
                 <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="advanceType" title="暂降类型" width="100">
+                <vxe-column field="advanceType" title="触发类型" width="100">
                     <template #default="{ row }">
                         {{ type.find(item => item.id === row.advanceType)?.name }}
                     </template>

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

@@ -122,7 +122,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

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