From de3e42282e5962e8c27022c9346b0c861800a3fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Fri, 29 Dec 2023 16:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/index.vue                |   5 +-
 src/layouts/admin/index.vue                   |  14 +-
 src/layouts/admin/router-view/main.vue        |   1 +
 src/utils/tableStore.ts                       |   1 +
 src/views/comptroller/list.vue                |   6 +-
 .../sags/operationsManagement/index.vue       | 100 ++++----
 .../sags/operationsManagement/point.vue       | 234 +++++++-----------
 7 files changed, 162 insertions(+), 199 deletions(-)

diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 08a9c05..ef688ce 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -39,7 +39,7 @@
                             :row='scope.row'
                             :column='scope.column'
                             :index='scope.rowIndex'
-                            :key='child.field+scope.rowIndex'
+                            :key=" key + '-' + child.render + '-' + (child.field ? '-' + child.field + '-' + scope.row[child.field] : '')"
                         />
                     </template>
                 </Column>
@@ -59,8 +59,7 @@
                         :row='scope.row'
                         :column='scope.column'
                         :index='scope.rowIndex'
-                        :key='item.field+scope.rowIndex'
-                    />
+                        :key=" key + '-' +item.render +'-' +(item.field ? '-' + item.field + '-' + scope.row[item.field] : '')" />
                 </template>
             </Column>
 
diff --git a/src/layouts/admin/index.vue b/src/layouts/admin/index.vue
index a60a218..3ab2266 100644
--- a/src/layouts/admin/index.vue
+++ b/src/layouts/admin/index.vue
@@ -50,13 +50,13 @@ onBeforeMount(() => {
 })
 
 const init = async () => {
-    // await Promise.all([
-    //     getAreaList(),
-    //     dictDataCache()
-    // ]).then(res => {
-    //     dictData.state.area = res[0].data
-    //     dictData.state.basic = res[1].data
-    // })
+    await Promise.all([
+        getAreaList(),
+        dictDataCache()
+    ]).then(res => {
+        dictData.state.area = res[0].data
+        dictData.state.basic = res[1].data
+    })
     /**
      * 后台初始化请求，获取站点配置，动态路由等信息
      */
diff --git a/src/layouts/admin/router-view/main.vue b/src/layouts/admin/router-view/main.vue
index d90299d..7ab63da 100644
--- a/src/layouts/admin/router-view/main.vue
+++ b/src/layouts/admin/router-view/main.vue
@@ -74,6 +74,7 @@ onMounted(() => {
     if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
         addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
     }
+    console.log(state.keepAliveComponentNameList)
 })
 
 watch(
diff --git a/src/utils/tableStore.ts b/src/utils/tableStore.ts
index be23c56..6c6ce0e 100644
--- a/src/utils/tableStore.ts
+++ b/src/utils/tableStore.ts
@@ -48,6 +48,7 @@ export default class TableStore {
     }
 
     index() {
+        this.table.loading = true
         // 重置用的数据数据
         if (!this.initData) {
             this.initData = JSON.parse(JSON.stringify(this.table.params))
diff --git a/src/views/comptroller/list.vue b/src/views/comptroller/list.vue
index 96fd194..a8e52ea 100644
--- a/src/views/comptroller/list.vue
+++ b/src/views/comptroller/list.vue
@@ -49,9 +49,9 @@ tableStore.table.params.type = ''
 tableStore.table.params.pageSize = 100
 provide('tableStore', tableStore)
 
-saveLogParam().then(res => {
-    console.log(res)
-})
+// saveLogParam().then(res => {
+//     console.log(res)
+// })
 
 onMounted(() => {
     // tableStore.index()
diff --git a/src/views/voltage/sags/operationsManagement/index.vue b/src/views/voltage/sags/operationsManagement/index.vue
index 95218ae..025bdd9 100644
--- a/src/views/voltage/sags/operationsManagement/index.vue
+++ b/src/views/voltage/sags/operationsManagement/index.vue
@@ -1,46 +1,60 @@
 <template>
-    <div class='default-main'>
-        <TableHeader date-picker :showOperation='false'>
+    <div class="default-main">
+        <TableHeader date-picker :showOperation="false">
             <template v-slot:select>
-                <el-form-item label='区域'>
-                    <Area v-model='tableStore.table.params.deptIndex' />
+                <el-form-item label="区域">
+                    <Area v-model="tableStore.table.params.deptIndex" />
                 </el-form-item>
-                <el-form-item label='终端状态'>
-                    <el-select multiple clearable collapse-tags v-model='tableStore.table.params.runFlag'
-                               placeholder='请选择'>
-                        <el-option label='投运' value='0' />
-                        <el-option label='热备用' value='1' />
-                        <el-option label='停运' value='2' />
+                <el-form-item label="终端状态">
+                    <el-select
+                        multiple
+                        clearable
+                        collapse-tags
+                        v-model="tableStore.table.params.runFlag"
+                        placeholder="请选择"
+                    >
+                        <el-option label="投运" value="0" />
+                        <el-option label="热备用" value="1" />
+                        <el-option label="停运" value="2" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label='通讯状态'>
-                    <el-select multiple clearable collapse-tags v-model='tableStore.table.params.comFlag'
-                               placeholder='请选择'>
-                        <el-option label='正常' value='1' />
-                        <el-option label='中断' value='0' />
+                <el-form-item label="通讯状态">
+                    <el-select
+                        multiple
+                        clearable
+                        collapse-tags
+                        v-model="tableStore.table.params.comFlag"
+                        placeholder="请选择"
+                    >
+                        <el-option label="正常" value="1" />
+                        <el-option label="中断" value="0" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label='厂家'>
-                    <el-select multiple clearable collapse-tags v-model='manufacturerForm' placeholder='请选择'
-                               @change='onManufacturerChange'>
-                        <el-option
-                            v-for='item in manufacturer'
-                            :key='item.id'
-                            :label='item.name'
-                            :value='item.id'
-                        />
+                <el-form-item label="厂家">
+                    <el-select
+                        multiple
+                        clearable
+                        collapse-tags
+                        v-model="manufacturerForm"
+                        placeholder="请选择"
+                        @change="onManufacturerChange"
+                    >
+                        <el-option v-for="item in manufacturer" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label='筛选数据'>
-                    <el-input v-model='tableStore.table.params.searchValue'
-                              placeholder='根据变电站,终端编号,型号或网络参数查询' style='width:300px' />
+                <el-form-item label="筛选数据">
+                    <el-input
+                        v-model="tableStore.table.params.searchValue"
+                        placeholder="根据变电站,终端编号,型号或网络参数查询"
+                        style="width: 300px"
+                    />
                 </el-form-item>
             </template>
         </TableHeader>
-        <Table ref='tableRef' />
+        <Table ref="tableRef" />
     </div>
 </template>
-<script setup lang='tsx'>
+<script setup lang="tsx">
 import { ref, onMounted, provide, reactive } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -49,7 +63,7 @@ import { useDictData } from '@/stores/dictData'
 import Area from '@/components/form/area/index.vue'
 
 defineOptions({
-    name: 'comptroller/list'
+    name: 'voltage/sags/operationsManagement/index'
 })
 const dictData = useDictData()
 const manufacturer = dictData.getBasicData('Dev_Manufacturers')
@@ -83,19 +97,19 @@ const tableStore = new TableStore({
                     return <span></span>
                 } else if (props.renderValue * 100 > 90) {
                     return (
-                        <el-tag effect='dark' type='success'>
+                        <el-tag effect="dark" type="success">
                             优
                         </el-tag>
                     )
                 } else if (props.renderValue * 100 > 60) {
                     return (
-                        <el-tag effect='dark' type='warning'>
+                        <el-tag effect="dark" type="warning">
                             良
                         </el-tag>
                     )
                 } else {
                     return (
-                        <el-tag effect='dark' type='danger'>
+                        <el-tag effect="dark" type="danger">
                             差
                         </el-tag>
                     )
@@ -121,14 +135,16 @@ onMounted(() => {
 })
 
 const onManufacturerChange = () => {
-    tableStore.table.params.manufacturer = manufacturer.filter(item => {
-        return manufacturerForm.value.includes(item.id)
-    }).map(item => {
-        return {
-            ...item,
-            label: item.name,
-            value: item.id
-        }
-    })
+    tableStore.table.params.manufacturer = manufacturer
+        .filter(item => {
+            return manufacturerForm.value.includes(item.id)
+        })
+        .map(item => {
+            return {
+                ...item,
+                label: item.name,
+                value: item.id
+            }
+        })
 }
 </script>
diff --git a/src/views/voltage/sags/operationsManagement/point.vue b/src/views/voltage/sags/operationsManagement/point.vue
index aba6f2e..7f5e3df 100644
--- a/src/views/voltage/sags/operationsManagement/point.vue
+++ b/src/views/voltage/sags/operationsManagement/point.vue
@@ -1,50 +1,62 @@
 <template>
-    <div class='default-main'>
-        <TableHeader date-picker :showOperation='false'>
+    <div class="default-main">
+        <TableHeader date-picker :showOperation="false">
             <template v-slot:select>
-                <el-form-item label='区域'>
-                    <Area v-model='tableStore.table.params.deptIndex' />
-                </el-form-item>
-                <el-form-item label='干扰源类型'>
-                    <el-select multiple clearable collapse-tags v-model='interferenceSourceForm' placeholder='请选择'
-                               @change='onLoadTypeChange'>
-                        <el-option
-                            v-for='item in interferenceSource'
-                            :key='item.id'
-                            :label='item.name'
-                            :value='item.id'
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label='电压等级'>
-                    <el-select multiple clearable collapse-tags v-model='scaleForm' placeholder='请选择'
-                               @change='onScaleChange'
+                <el-form-item label="区域"><Area v-model="tableStore.table.params.deptIndex" /></el-form-item>
+                <el-form-item label="干扰源类型">
+                    <el-select
+                        multiple
+                        clearable
+                        collapse-tags
+                        v-model="interferenceSourceForm"
+                        placeholder="请选择"
+                        @change="onLoadTypeChange"
                     >
                         <el-option
-                            v-for='item in level'
-                            :key='item.id'
-                            :label='item.name'
-                            :value='item.id'
+                            v-for="item in interferenceSource"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
                         />
                     </el-select>
                 </el-form-item>
-                <el-form-item label='通讯状态'>
-                    <el-select multiple clearable collapse-tags v-model='tableStore.table.params.comFlag'
-                               placeholder='请选择'>
-                        <el-option label='正常' value='1' />
-                        <el-option label='中断' value='0' />
+                <el-form-item label="电压等级">
+                    <el-select
+                        multiple
+                        clearable
+                        collapse-tags
+                        v-model="scaleForm"
+                        placeholder="请选择"
+                        @change="onScaleChange"
+                    >
+                        <el-option v-for="item in level" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label='筛选数据'>
-                    <el-input v-model='tableStore.table.params.searchValue'
-                              placeholder='根据变电站,终端编号,型号或网络参数查询' style='width:300px' />
+                <el-form-item label="通讯状态">
+                    <el-select
+                        multiple
+                        clearable
+                        collapse-tags
+                        v-model="tableStore.table.params.comFlag"
+                        placeholder="请选择"
+                    >
+                        <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"
+                        placeholder="根据变电站,终端编号,型号或网络参数查询"
+                        style="width: 300px"
+                    />
                 </el-form-item>
             </template>
         </TableHeader>
-        <Table isGroup ref='tableRef' />
+        <Table isGroup ref="tableRef" />
     </div>
 </template>
-<script setup lang='tsx'>
+<script setup lang="tsx">
 import { ref, onMounted, provide, reactive } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -53,7 +65,7 @@ import { useDictData } from '@/stores/dictData'
 import Area from '@/components/form/area/index.vue'
 
 defineOptions({
-    name: 'comptroller/list'
+    name: 'voltage/sags/operationsManagement/point'
 })
 const dictData = useDictData()
 const interferenceSource = dictData.getBasicData('Interference_Source')
@@ -72,54 +84,26 @@ const tableStore = new TableStore({
         { field: 'bdName', title: '所属变电站', width: 120 },
         { field: 'loadType', title: '干扰源类型', width: 120 },
         { field: 'objName', title: '监测对象名称', width: 180 },
-        {
-            field: 'shortCapacity', title: '最小短路容量(MVA)', width: 190
-        },
-        {
-            field: 'devCapacity', title: '供电设备容量(MVA )', width: 190
-        },
-        {
-            field: 'dealCapacity', title: '用户协议容量(MVA)', width: 190
-        },
+        { field: 'shortCapacity', title: '最小短路容量(MVA)', width: 190 },
+        { field: 'devCapacity', title: '供电设备容量(MVA )', width: 190 },
+        { field: 'dealCapacity', title: '用户协议容量(MVA)', width: 190 },
         { field: 'comFlag', title: '通讯状态 ', width: 120 },
         { field: 'id', title: '监测点序号', width: 120 },
         { field: 'devName', title: '监测终端编号 ', width: 140 },
         { field: 'ptType', title: '监测终端接线方式', width: 160 },
-        {
-            field: 'voltageDev', title: '电压偏差上限(%)', width: 160
-        },
-        {
-            field: 'uvoltageDev', title: '电压偏差下限(%)', width: 160
-        },
+        { field: 'voltageDev', title: '电压偏差上限(%)', width: 160 },
+        { field: 'uvoltageDev', title: '电压偏差下限(%)', width: 160 },
         {
             field: 'limitValue',
             title: '限值',
-            children: [{ field: 'freqDev', title: '频率(Hz)', width: 120 }, {
-                field: 'ubalance',
-                title: '三相电压不平衡度(%)',
-                width: 190
-
-            }, { field: 'ineg', title: '负序电流(A)', width: 120 }, {
-                field: 'flicker',
-                title: '长时间闪变',
-                width: 120
-
-            }, {
-                field: 'uaberrance', title: '电压总谐波畸变率(%)', width: 190
-
-            },
-                {
-                    field: 'oddHarm',
-                    title: '奇数次谐波电压(%)',
-                    width: 180
-
-                },
-                {
-                    field: 'evenHarm',
-                    title: '偶数次谐波电压(%)',
-                    width: 180
-
-                }
+            children: [
+                { field: 'freqDev', title: '频率(Hz)', width: 120 },
+                { field: 'ubalance', title: '三相电压不平衡度(%)', width: 190 },
+                { field: 'ineg', title: '负序电流(A)', width: 120 },
+                { field: 'flicker', title: '长时间闪变', width: 120 },
+                { field: 'uaberrance', title: '电压总谐波畸变率(%)', width: 190 },
+                { field: 'oddHarm', title: '奇数次谐波电压(%)', width: 180 },
+                { field: 'evenHarm', title: '偶数次谐波电压(%)', width: 180 }
             ]
         },
         {
@@ -135,57 +119,23 @@ const tableStore = new TableStore({
                 { field: 'iharm8', title: '8次谐波(A)', width: 120 },
                 { field: 'iharm9', title: '9次谐波(A)', width: 120 },
                 { field: 'iharm10', title: '10次谐波(A)', width: 140 },
-                {
-                    field: 'iharm11', title: '11次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm12', title: '12次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm13', title: '13次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm14', title: '14次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm15', title: '15次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm16', title: '16次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm17', title: '17次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm18', title: '18次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm19', title: '19次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm10', title: '20次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm21', title: '21次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm22', title: '22次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm23', title: '23次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm24', title: '24次谐波(A)', width: 140
-                },
-                {
-                    field: 'iharm25', title: '25次谐波(A)', width: 140
-                },
-                {
-                    field: 'inUharm', title: '0.5-1.5次间谐波(A)', width: 180
-                },
-                {
-                    field: 'inUharm16', title: '2.5-15.5次间谐波(A)', width: 190
-                }
+                { field: 'iharm11', title: '11次谐波(A)', width: 140 },
+                { field: 'iharm12', title: '12次谐波(A)', width: 140 },
+                { field: 'iharm13', title: '13次谐波(A)', width: 140 },
+                { field: 'iharm14', title: '14次谐波(A)', width: 140 },
+                { field: 'iharm15', title: '15次谐波(A)', width: 140 },
+                { field: 'iharm16', title: '16次谐波(A)', width: 140 },
+                { field: 'iharm17', title: '17次谐波(A)', width: 140 },
+                { field: 'iharm18', title: '18次谐波(A)', width: 140 },
+                { field: 'iharm19', title: '19次谐波(A)', width: 140 },
+                { field: 'iharm10', title: '20次谐波(A)', width: 140 },
+                { field: 'iharm21', title: '21次谐波(A)', width: 140 },
+                { field: 'iharm22', title: '22次谐波(A)', width: 140 },
+                { field: 'iharm23', title: '23次谐波(A)', width: 140 },
+                { field: 'iharm24', title: '24次谐波(A)', width: 140 },
+                { field: 'iharm25', title: '25次谐波(A)', width: 140 },
+                { field: 'inUharm', title: '0.5-1.5次间谐波(A)', width: 180 },
+                { field: 'inUharm16', title: '2.5-15.5次间谐波(A)', width: 190 }
             ]
         }
     ],
@@ -208,25 +158,21 @@ onMounted(() => {
 })
 
 const onLoadTypeChange = () => {
-    tableStore.table.params.loadType = interferenceSource.filter(item => {
-        return interferenceSourceForm.value.includes(item.id)
-    }).map(item => {
-        return {
-            ...item,
-            label: item.name,
-            value: item.id
-        }
-    })
+    tableStore.table.params.loadType = interferenceSource
+        .filter(item => {
+            return interferenceSourceForm.value.includes(item.id)
+        })
+        .map(item => {
+            return { ...item, label: item.name, value: item.id }
+        })
 }
 const onScaleChange = () => {
-    tableStore.table.params.scale = level.filter(item => {
-        return scaleForm.value.includes(item.id)
-    }).map(item => {
-        return {
-            ...item,
-            label: item.name,
-            value: item.id
-        }
-    })
+    tableStore.table.params.scale = level
+        .filter(item => {
+            return scaleForm.value.includes(item.id)
+        })
+        .map(item => {
+            return { ...item, label: item.name, value: item.id }
+        })
 }
 </script>