From 260bd0580e6007c08ef3906ae3e3da1467732333 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Mon, 27 May 2024 19:07:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=94=B5=E7=BD=91=E4=B8=80?=
 =?UTF-8?q?=E5=BC=A0=E5=9B=BE=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panorama/components/city/statistics.vue   | 10 +++----
 .../panorama/components/cityMapR.vue          |  6 +++--
 .../panorama/components/details/evaluate.vue  | 26 +++++++++---------
 .../panorama/components/details/point.vue     | 10 +++----
 .../panorama/components/details/stand.vue     | 14 +++++-----
 .../panorama/components/details/terminal.vue  | 10 +++----
 .../panorama/components/map.vue               |  6 +++--
 .../electricalEnergy/components1/online.vue   |  1 +
 .../pqs/supervise/retire/deviceQuitPopup.vue  |  2 +-
 .../supervise/technology/feedbackPopup.vue    |  2 +-
 src/views/system/bpm/task/done/index.vue      | 27 ++++++++-----------
 src/views/system/bpm/task/todo/index.vue      |  2 +-
 12 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/views/pqs/qualityInspeection/panorama/components/city/statistics.vue b/src/views/pqs/qualityInspeection/panorama/components/city/statistics.vue
index 055fefd8..153975af 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/city/statistics.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/city/statistics.vue
@@ -6,11 +6,11 @@
                 <vxe-column field="substationName" title="变电站名称" />
                 <vxe-column field="lineName" title="监测点名称" />
                 <vxe-colgroup title="各指标合格率">
-                    <vxe-column field="freqDev" title="	频率偏差" :formatter="formatter" />
-                    <vxe-column field="plt" title="闪变" :formatter="formatter" />
-                    <vxe-column field="ubalance" title="三相电压不平衡度" :formatter="formatter" />
-                    <vxe-column field="vdev" title="电压偏差" :formatter="formatter" />
-                    <vxe-column field="vthd" title="电压总谐波畸变率" :formatter="formatter" />
+                    <vxe-column field="freqDev" sortable title="	频率偏差" :formatter="formatter" />
+                    <vxe-column field="plt" sortable title="闪变" :formatter="formatter" />
+                    <vxe-column field="ubalance" sortable title="三相电压不平衡度" :formatter="formatter" />
+                    <vxe-column field="vdev" sortable title="电压偏差" :formatter="formatter" />
+                    <vxe-column field="vthd" sortable title="电压总谐波畸变率" :formatter="formatter" />
                 </vxe-colgroup>
             </vxe-table>
         </div>
diff --git a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue
index 2ff6fd2b..d04f6362 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue
@@ -593,9 +593,11 @@ defineExpose({ info, show })
     font-size: 0.8rem !important    ;
 }
 .monitoringPoints {
-    display: grid;
+    // display: grid;
     font-size: 12px;
-    grid-template-columns: 1fr 1fr 1fr;
+    display: flex;
+    justify-content: space-between;
+    // grid-template-columns: 1fr 1fr 1fr;
     margin-top: 10px;
     margin-bottom: 10px;
     .line {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
index e2202d89..73229a3b 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
@@ -4,28 +4,28 @@
         <div>
             <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="300px" :data="tableData">
                 <vxe-column field="deptName" title="地市" />
-                <vxe-column field="assessData" title="综合评估得分" :formatter="formatter" />
-                <vxe-column field="qualifyData" title="指标合格率(%)" :formatter="formatter" />
+                <vxe-column field="assessData" title="综合评估得分"   :formatter="formatter" />
+                <vxe-column field="qualifyData" title="指标合格率(%)"   :formatter="formatter" />
 
                 <vxe-colgroup title="电压偏差">
-                    <vxe-column field="vdevAssessData" title="评估得分" :formatter="formatter" />
-                    <vxe-column field="vdevQualifyData" title="指标合格率(%)" :formatter="formatter" />
+                    <vxe-column field="vdevAssessData" title="评估得分"   :formatter="formatter" />
+                    <vxe-column field="vdevQualifyData" title="指标合格率(%)"   :formatter="formatter" />
                 </vxe-colgroup>
                 <vxe-colgroup title="频率偏差">
-                    <vxe-column field="freqAssessData" title="评估得分" :formatter="formatter" />
-                    <vxe-column field="freqQualifyData" title="指标合格率(%)" :formatter="formatter" />
+                    <vxe-column field="freqAssessData" title="评估得分"   :formatter="formatter" />
+                    <vxe-column field="freqQualifyData" title="指标合格率(%)"   :formatter="formatter" />
                 </vxe-colgroup>
-                <vxe-colgroup title="电压总谐波畸变率">
-                    <vxe-column field="harmAssessData" title="评估得分" :formatter="formatter" />
-                    <vxe-column field="harmQualifyData" title="指标合格率(%)" :formatter="formatter" />
+                <vxe-colgroup title="电压总谐波畸变率" >
+                    <vxe-column field="harmAssessData" title="评估得分"   :formatter="formatter" />
+                    <vxe-column field="harmQualifyData" title="指标合格率(%)"   :formatter="formatter" />
                 </vxe-colgroup>
                 <vxe-colgroup title="电压闪变">
-                    <vxe-column field="flickerAssessData" title="评估得分" :formatter="formatter" />
-                    <vxe-column field="flickerQualifyData" title="指标合格率(%)" :formatter="formatter" />
+                    <vxe-column field="flickerAssessData" title="评估得分"   :formatter="formatter" />
+                    <vxe-column field="flickerQualifyData" title="指标合格率(%)"   :formatter="formatter" />
                 </vxe-colgroup>
                 <vxe-colgroup title="三相电压不平衡度">
-                    <vxe-column field="unbalanceAssessData" title="评估得分" :formatter="formatter" />
-                    <vxe-column field="unbalanceQualifyData" title="指标合格率(%)" :formatter="formatter" />
+                    <vxe-column field="unbalanceAssessData" title="评估得分"   :formatter="formatter" />
+                    <vxe-column field="unbalanceQualifyData" title="指标合格率(%)"   :formatter="formatter" />
                 </vxe-colgroup>
             </vxe-table>
         </div>
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/point.vue b/src/views/pqs/qualityInspeection/panorama/components/details/point.vue
index ba4502f7..b1f6e41c 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/point.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/point.vue
@@ -33,12 +33,12 @@
             <div class="title">
                 <span>区域监测点统计</span>
             </div>
-            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="320px" :data="tableData">
+            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="325px" :data="tableData">
                 <vxe-column field="orgName" title="区域" :formatter="formatter" />
-                <vxe-column field="num" title="监测点个数" :formatter="formatter" />
-                <vxe-column field="integrityRate" title="完整率(%)" />
-                <vxe-column field="onLineRate" title="在线率(%)" />
-                <vxe-column field="outOfStandardRate" title="超标监测点占比(%)" />
+                <vxe-column field="num" title="监测点个数" sortable :formatter="formatter" />
+                <vxe-column field="integrityRate" sortable title="完整率(%)" />
+                <vxe-column field="onLineRate" sortable title="在线率(%)" />
+                <vxe-column field="outOfStandardRate" sortable  title="超标监测点占比(%)" />
             </vxe-table>
         </div>
     </el-dialog>
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
index 46be3d3d..2785b779 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
@@ -52,14 +52,14 @@
             <div class="title mb10">
                 <span>区域变电站统计</span>
             </div>
-            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="320px" :data="tableData">
+            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="325px" :data="tableData">
                 <vxe-column field="name" title="区域" />
-                <vxe-column field="num" title="变电站总数" />
-                <vxe-column field="num1" title="无污染数量" :formatter="formatter" />
-                <vxe-column field="num2" title="轻微污染数量" :formatter="formatter" />
-                <vxe-column field="num3" title="轻度污染数量" :formatter="formatter" />
-                <vxe-column field="num4" title="中度污染数量" :formatter="formatter" />
-                <vxe-column field="num5" title="重度污染数量" :formatter="formatter" />
+                <vxe-column field="num" sortable title="变电站总数" />
+                <vxe-column field="num1" sortable title="无污染数量" :formatter="formatter" />
+                <vxe-column field="num2" sortable title="轻微污染数量" :formatter="formatter" />
+                <vxe-column field="num3" sortable title="轻度污染数量" :formatter="formatter" />
+                <vxe-column field="num4" sortable title="中度污染数量" :formatter="formatter" />
+                <vxe-column field="num5" sortable title="重度污染数量" :formatter="formatter" />
             </vxe-table>
         </div>
     </el-dialog>
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue b/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
index d26c327b..6f25daed 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
@@ -52,12 +52,12 @@
             <div class="title">
                 <span>区域终端统计</span>
             </div>
-            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="320px" :data="tableData">
+            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="325px" :data="tableData">
                 <vxe-column field="orgName" title="区域" />
-                <vxe-column field="runNum" title="运行个数	" />
-                <vxe-column field="overhaulNum" title="检修个数	" />
-                <vxe-column field="refundNum" title="退役个数" />
-                <vxe-column field="onLineRate" title="终端在线率(%)" />
+                <vxe-column field="runNum" sortable title="运行个数	" />
+                <vxe-column field="overhaulNum" sortable title="检修个数	" />
+                <vxe-column field="refundNum" sortable title="退役个数" />
+                <vxe-column field="onLineRate" sortable title="终端在线率(%)" />
             </vxe-table>
         </div>
     </el-dialog>
diff --git a/src/views/pqs/qualityInspeection/panorama/components/map.vue b/src/views/pqs/qualityInspeection/panorama/components/map.vue
index f366125a..1af95e59 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/map.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/map.vue
@@ -226,9 +226,11 @@ const addLine = () => {
         orgId: orgId.value == '1100F3DE20806FADE050007F01006CBE' ? '' : orgId.value
     })
     psrmap.addPSR()
-    psrmap.filterByDomain(1)
-    initDeviceCard()
 
+    initDeviceCard()
+    setTimeout(() => {
+        psrmap.filterByDomain(1)
+    }, 0)
     //添加电网要素点击事件
     psrmap.on('click', (features: any) => {
         console.log(features)
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/online.vue b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
index f9b5d372..d746381d 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
@@ -40,6 +40,7 @@ const tableStore = new TableStore({
     url: '/harmonic-boot/rmppartharmonicdetail/getRMpPartHarmonicDetail',
     publicHeight: 65,
     method: 'POST',
+    isWebPaging:true,
     column: [
         {
             title: '序号',
diff --git a/src/views/pqs/supervise/retire/deviceQuitPopup.vue b/src/views/pqs/supervise/retire/deviceQuitPopup.vue
index d46800c0..68d7d925 100644
--- a/src/views/pqs/supervise/retire/deviceQuitPopup.vue
+++ b/src/views/pqs/supervise/retire/deviceQuitPopup.vue
@@ -4,7 +4,7 @@
         class="cn-operate-dialog"
         v-model="dialogVisible"
         :title="title"
-        style="max-width: 450px; height: 320px"
+        style="max-width: 450px; "
         top="30vh"
     >
         <el-scrollbar>
diff --git a/src/views/pqs/supervise/technology/feedbackPopup.vue b/src/views/pqs/supervise/technology/feedbackPopup.vue
index 6637011b..677a5d00 100644
--- a/src/views/pqs/supervise/technology/feedbackPopup.vue
+++ b/src/views/pqs/supervise/technology/feedbackPopup.vue
@@ -4,7 +4,7 @@
       class='cn-operate-dialog'
       v-model='dialogVisible'
       :title='title'
-      style='max-width: 450px; height: 320px'
+     width="450px"
       top='30vh'
   >
     <el-scrollbar>
diff --git a/src/views/system/bpm/task/done/index.vue b/src/views/system/bpm/task/done/index.vue
index e164cb52..4ea437f5 100644
--- a/src/views/system/bpm/task/done/index.vue
+++ b/src/views/system/bpm/task/done/index.vue
@@ -1,24 +1,19 @@
 <!--待办事项列表-->
 <template>
-    <div class='default-main'>
+    <div>
         <TableHeader date-picker>
             <template v-slot:select>
-                <el-form-item label='任务名称'>
-                    <el-input
-                        v-model='tableStore.table.params.searchValue'
-                        clearable
-                        placeholder='请输入任务名称'
-                    />
+                <el-form-item label="任务名称">
+                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入任务名称" />
                 </el-form-item>
             </template>
-
         </TableHeader>
         <!--表格-->
-        <Table ref='tableRef'></Table>
+        <Table ref="tableRef"></Table>
     </div>
 </template>
 
-<script setup lang='ts'>
+<script setup lang="ts">
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
@@ -26,14 +21,12 @@ import { onMounted, provide, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { dateFormatter, formatPast2 } from '@/utils/formatTime'
 
-
 defineOptions({
     name: 'businessUser'
 })
 
 const { push } = useRouter()
 
-
 const tableStore = new TableStore({
     url: '/bpm-boot/bpm/task/doneList',
     method: 'POST',
@@ -47,7 +40,9 @@ const tableStore = new TableStore({
         { title: '发起时间', field: 'createTime', minWidth: 170 },
         { title: '结束时间', field: 'endTime', minWidth: 170 },
         {
-            title: '审批状态', field: 'status', minWidth: 130,
+            title: '审批状态',
+            field: 'status',
+            minWidth: 130,
             render: 'tag',
             custom: {
                 1: 'primary',
@@ -64,7 +59,9 @@ const tableStore = new TableStore({
         },
         { title: '审批建议', field: 'reason', minWidth: 150 },
         {
-            title: '耗时', field: 'durationInMillis', minWidth: 150,
+            title: '耗时',
+            field: 'durationInMillis',
+            minWidth: 150,
             formatter: (obj: any) => {
                 return formatPast2(obj.row.durationInMillis)
             }
@@ -95,7 +92,6 @@ const tableStore = new TableStore({
                 delete tableStore.table.params[key]
             }
         }
-
     }
 })
 
@@ -115,5 +111,4 @@ const handleAudit = (instanceId: any) => {
         }
     })
 }
-
 </script>
diff --git a/src/views/system/bpm/task/todo/index.vue b/src/views/system/bpm/task/todo/index.vue
index 03fd4a33..b1a707db 100644
--- a/src/views/system/bpm/task/todo/index.vue
+++ b/src/views/system/bpm/task/todo/index.vue
@@ -1,6 +1,6 @@
 <!--待办事项列表-->
 <template>
-    <div class='default-main'>
+    <div >
         <TableHeader date-picker>
             <template v-slot:select>
                 <el-form-item label='任务名称'>