From 5b296d9203be4b93cc122dbe204b01f337e8e597 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 7 Mar 2024 19:02:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=20=E6=89=BF=E8=BD=BD?=
 =?UTF-8?q?=E8=83=BD=E5=8A=9B=E8=AF=84=E4=BC=B0=2040%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/advance-boot/bearingCapacity.ts       |  28 ++-
 src/api/common.ts                             |   7 +
 src/components/tree/pqs/loadBearingTree.vue   |   2 +-
 src/layouts/admin/index.vue                   |  18 +-
 src/stores/dictData.ts                        |  12 +-
 src/stores/interface/index.ts                 |   1 +
 .../evaluationList/components/policy.vue      | 163 ++++++------------
 .../bearingCapacity/evaluationList/index.vue  |  24 +--
 .../bearingCapacity/userManagement/index.vue  | 155 +++++++++++------
 .../Region/transientList/index.vue            |   7 +-
 10 files changed, 227 insertions(+), 190 deletions(-)

diff --git a/src/api/advance-boot/bearingCapacity.ts b/src/api/advance-boot/bearingCapacity.ts
index 9ca48c90..1d52906c 100644
--- a/src/api/advance-boot/bearingCapacity.ts
+++ b/src/api/advance-boot/bearingCapacity.ts
@@ -13,14 +13,14 @@ export function updateUse(data) {
     return createAxios({
         url: '/advance-boot/carrycapacityuser/update',
         method: 'post',
-        params: data
+         data
     })
 }
 //承载能力评估用户批量删除
 export function removeUse(data) {
     return createAxios({
         url: '/advance-boot/carrycapacityuser/remove',
-        method: 'post',
+        method: 'POST',
         params: data
     })
 }
@@ -32,3 +32,27 @@ export function carryCapacityTree() {
       
     })
 }
+//承载能力评估策略初始化查询
+export function queyDetail() {
+    return createAxios({
+        url: '/advance-boot/carrycapacity/queyDetail',
+        method: 'post',
+      
+    })
+}
+//承载能力评估策略初始化查询
+export function addCarryc() {
+    return createAxios({
+        url: '/advance-boot/carrycapacity/add',
+        method: 'post',
+      
+    })
+}
+//承载能力评估策略一键还原
+export function restore() {
+    return createAxios({
+        url: '/advance-boot/carrycapacity/restore',
+        method: 'post',
+      
+    })
+}
diff --git a/src/api/common.ts b/src/api/common.ts
index df0d4904..2ed918a1 100644
--- a/src/api/common.ts
+++ b/src/api/common.ts
@@ -15,6 +15,13 @@ export function getAreaList() {
         method: 'POST'
     })
 }
+// 获取省市区下拉框
+export function areaSelect() {
+    return createAxios({
+        url: '/system-boot/area/areaSelect',
+        method: 'POST'
+    })
+}
 
 // 设备列表
 export function getDeviceTree() {
diff --git a/src/components/tree/pqs/loadBearingTree.vue b/src/components/tree/pqs/loadBearingTree.vue
index bbab82c7..0c67a8a5 100644
--- a/src/components/tree/pqs/loadBearingTree.vue
+++ b/src/components/tree/pqs/loadBearingTree.vue
@@ -31,7 +31,7 @@ const loadData = () => {
         console.log(res)
         nodeKey = res.data[0].children[0].children[0].children[0].children[0].children[0].id
         emit('init', res.data[0].children[0].children[0].children[0].children[0].children[0])
-        tree.value = res.data
+        tree.value =  res.data[0].children[0].children
         if (nodeKey) {
             nextTick(() => {
                 treeRef.value.treeRef.setCurrentKey(nodeKey)
diff --git a/src/layouts/admin/index.vue b/src/layouts/admin/index.vue
index 0614dcb3..e95cef4f 100644
--- a/src/layouts/admin/index.vue
+++ b/src/layouts/admin/index.vue
@@ -1,8 +1,8 @@
 <template>
-    <component :is='config.layout.layoutMode'></component>
+    <component :is="config.layout.layoutMode"></component>
 </template>
 
-<script setup lang='ts'>
+<script setup lang="ts">
 import { reactive } from 'vue'
 import { useConfig } from '@/stores/config'
 import { useNavTabs } from '@/stores/navTabs'
@@ -21,7 +21,7 @@ import { isEmpty } from 'lodash-es'
 import { setNavTabsWidth } from '@/utils/layout'
 import { adminBaseRoutePath } from '@/router/static'
 import { getRouteMenu, dictDataCache } from '@/api/auth'
-import { getAreaList } from '@/api/common'
+import { getAreaList, areaSelect } from '@/api/common'
 import { BasicDictData } from '@/stores/interface'
 import { getUserById } from '@/api/user-boot/user'
 
@@ -51,10 +51,11 @@ onBeforeMount(() => {
 })
 
 const init = async () => {
-    await Promise.all([getAreaList(), dictDataCache(), getUserById()]).then(res => {
+    await Promise.all([getAreaList(), dictDataCache(), getUserById(), areaSelect()]).then(res => {
         dictData.state.area = res[0].data
         dictData.state.basic = res[1].data
         adminInfo.dataFill(res[2].data)
+        dictData.state.areaTree = res[3].data
     })
     /**
      * 后台初始化请求，获取站点配置，动态路由等信息
@@ -62,11 +63,16 @@ const init = async () => {
     getRouteMenu().then((res: any) => {
         const handlerMenu = (data: any) => {
             data.forEach((item: any) => {
-                item.routePath = item.routePath[0] == '/' ? item.routePath.substring(1, item.routePath.length) : item.routePath
+                item.routePath =
+                    item.routePath[0] == '/' ? item.routePath.substring(1, item.routePath.length) : item.routePath
                 item.path = item.routePath
                 item.name = item.routePath
                 item.keepalive = item.routePath
-                item.component = item.routeName ? item.routeName.indexOf('/src/views/') > -1 ? item.routeName : `/src/views/${item.routeName}/index.vue` : ''
+                item.component = item.routeName
+                    ? item.routeName.indexOf('/src/views/') > -1
+                        ? item.routeName
+                        : `/src/views/${item.routeName}/index.vue`
+                    : ''
                 item.type = item.children && item.children.length > 0 ? 'menu_dir' : 'menu'
                 item.menu_type = item.children && item.children.length > 0 ? null : 'tab'
                 if (item.children) {
diff --git a/src/stores/dictData.ts b/src/stores/dictData.ts
index 2a8a93ab..34d1524c 100644
--- a/src/stores/dictData.ts
+++ b/src/stores/dictData.ts
@@ -2,13 +2,16 @@ import { defineStore } from 'pinia'
 import { DICT_DATA } from '@/stores/constant/cacheKey'
 import type { DictData, BasicDictData } from '@/stores/interface/index'
 import { reactive } from 'vue'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
+import { log } from 'console'
 
 export const useDictData = defineStore(
     'dictData',
     () => {
         const state: DictData = reactive({
             basic: [],
-            area: []
+            area: [],
+            areaTree: []
             // 其他接口获取的字典，比如区域
         })
         const getBasicData = (code: string, arr?: string[]) => {
@@ -19,9 +22,14 @@ export const useDictData = defineStore(
             }
             return list
         }
+        const areaSelect = () => {           
+            return state.areaTree.filter(item => item.id == state.area[0]?.area)
+        }
+
         return {
             state,
-            getBasicData
+            getBasicData,
+            areaSelect
         }
     },
     {
diff --git a/src/stores/interface/index.ts b/src/stores/interface/index.ts
index 95f557b9..aa3c7619 100644
--- a/src/stores/interface/index.ts
+++ b/src/stores/interface/index.ts
@@ -79,6 +79,7 @@ export interface AdminInfo {
 export interface DictData {
     basic: BasicDictData[]
     area: BasicDictData[]
+    areaTree: BasicDictData[]
 }
 
 export interface BasicDictData {
diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/policy.vue b/src/views/pqs/bearingCapacity/evaluationList/components/policy.vue
index 4e6b3d10..259a3bed 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/components/policy.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/components/policy.vue
@@ -1,109 +1,52 @@
 <template>
     <el-dialog v-model="policyView" title="承载能力评估策略" width="1400" :before-close="handleClose">
-        <div style="display: flex; justify-content:end">
-            <el-button icon="el-icon-Refresh" type="primary" >一键还原</el-button>
+        <div style="display: flex; justify-content: end">
+            <el-button icon="el-icon-Refresh" type="primary" @click="restores">一键还原</el-button>
         </div>
         <el-divider content-position="left">光伏电站承载能力评估策略</el-divider>
         <vxe-table
             v-bind="defaultAttribute"
             ref="xTable"
-            :column-config="{ resizable: true }"
             :loading="loading"
-            :data="tableData"
-            :edit-config="{ trigger: 'manual', mode: 'row', autoClear: false, showIcon: false }"
+            :data="photovoltaicData"
+            :column-config="{ resizable: true }"
+            :mouse-config="{ area: true, extension: false }"
         >
             <vxe-colgroup field="group0" title="等级" align="right">
-                <vxe-column field="name" width="180" title="结果" :edit-render="{}">
-                    <template #edit="{ row }">
-                        <vxe-input v-model="form.name" type="text"></vxe-input>
-                    </template>
-                </vxe-column>
+                <vxe-column field="name" width="180" title="结果"></vxe-column>
             </vxe-colgroup>
-
-            <vxe-column field="role" title="安全(个)" :edit-render="{}">
-                <template #edit="{ row }">
-                    <vxe-input v-model="form.role" type="text" placeholder="请输入昵称"></vxe-input>
-                </template>
-            </vxe-column>
-
-            <vxe-column field="num6" title="III级预警(个)" :edit-render="{}">
-                <template #edit="{ row }">
-                    <vxe-input v-model="form.num6" type="text"></vxe-input>
-                </template>
-            </vxe-column>
-            <vxe-column field="date12" title="II级预警(个)" :edit-render="{}">
-                <template #edit="{ row }">
-                    <vxe-input v-model="form.date12" type="text"></vxe-input>
-                </template>
-            </vxe-column>
-            <vxe-column field="date13" title="I级预警(个)" :edit-render="{}">
-                <template #edit="{ row }">
-                    <vxe-input v-model="form.date13" type="text"></vxe-input>
-                </template>
-            </vxe-column>
-
-            <vxe-column title="操作" width="160">
+            <vxe-column field="count1" title="安全(个)">
                 <template #default="{ row }">
-                    <template v-if="isActiveStatus(row)">
-                        <el-button type="primary" size="small" @click="saveRowEvent(row)" link>保存</el-button>
-                        <el-button type="primary" size="small" @click="cancelRowEvent(row)" link>取消</el-button>
-                    </template>
-                    <template v-else>
-                        <el-button size="small" @click="editRowEvent(row)" link>编辑</el-button>
-                    </template>
+                    {{ row.comparisonOperators1 }}{{ row.comparisonOperators1 == '/' ? '' : row.count1 }}
+                </template>
+            </vxe-column>
+            <vxe-column field="count2" title="III级预警(个)">
+                <template #default="{ row }">
+                    {{ row.comparisonOperators2 }}{{ row.comparisonOperators2 == '/' ? '' : row.count2 }}
+                </template>
+            </vxe-column>
+            <vxe-column field="count3" title="II级预警(个)">
+                <template #default="{ row }">
+                    {{ row.comparisonOperators3 }}{{ row.comparisonOperators3 == '/' ? '' : row.count3 }}
+                </template>
+            </vxe-column>
+            <vxe-column field="count4" title="I级预警(个)">
+                <template #default="{ row }">
+                    {{ row.comparisonOperators4 }}{{ row.comparisonOperators4 == '/' ? '' : row.count4 }}
                 </template>
             </vxe-column>
         </vxe-table>
         <el-divider content-position="left">充电站、电加热负荷、电气化铁路承载能力评估</el-divider>
-        <vxe-table
-            v-bind="defaultAttribute"
-            ref="xTable"
-            :column-config="{ resizable: true }"
-            :loading="loading"
-            :data="tableData"
-            :edit-config="{ trigger: 'manual', mode: 'row', autoClear: false, showIcon: false }"
-        >
+        <vxe-table v-bind="defaultAttribute" ref="xTable" :loading="loading" :data="tableData">
             <vxe-colgroup field="group0" title="等级" align="right">
-                <vxe-column field="name" width="180" title="结果" :edit-render="{}">
-                    <template #edit="{ row }">
-                        <vxe-input v-model="form.name" type="text"></vxe-input>
-                    </template>
-                </vxe-column>
+                <vxe-column field="name" width="180" title="结果"></vxe-column>
             </vxe-colgroup>
 
-            <vxe-column field="role" title="THD(%)" :edit-render="{}">
-                <template #edit="{ row }">
-                    <vxe-input v-model="form.role" type="text" placeholder="请输入昵称"></vxe-input>
-                </template>
-            </vxe-column>
+            <vxe-column field="role" title="THD(%)"></vxe-column>
 
-            <vxe-column field="num6" title="2~25次谐波合格个数" :edit-render="{}">
-                <template #edit="{ row }">
-                    <vxe-input v-model="form.num6" type="text"></vxe-input>
-                </template>
-            </vxe-column>
-            <vxe-column field="date12" title="畸次谐波合格个数" :edit-render="{}">
-                <template #edit="{ row }">
-                    <vxe-input v-model="form.date12" type="text"></vxe-input>
-                </template>
-            </vxe-column>
-            <vxe-column field="date13" title="偶次谐波合格个数" :edit-render="{}">
-                <template #edit="{ row }">
-                    <vxe-input v-model="form.date13" type="text"></vxe-input>
-                </template>
-            </vxe-column>
-
-            <vxe-column title="操作" width="160">
-                <template #default="{ row }">
-                    <template v-if="isActiveStatus(row)">
-                        <el-button type="primary" size="small" @click="saveRowEvent(row)" link>保存</el-button>
-                        <el-button type="primary" size="small" @click="cancelRowEvent(row)" link>取消</el-button>
-                    </template>
-                    <template v-else>
-                        <el-button size="small" @click="editRowEvent(row)" link>编辑</el-button>
-                    </template>
-                </template>
-            </vxe-column>
+            <vxe-column field="num6" title="2~25次谐波合格个数"></vxe-column>
+            <vxe-column field="date12" title="畸次谐波合格个数"></vxe-column>
+            <vxe-column field="date13" title="偶次谐波合格个数"></vxe-column>
         </vxe-table>
     </el-dialog>
 </template>
@@ -111,7 +54,8 @@
 import { ref, onMounted, provide, reactive } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { mainHeight } from '@/utils/layout'
-import { json } from 'stream/consumers'
+import { queyDetail, addCarryc, restore } from '@/api/advance-boot/bearingCapacity'
+import { ElMessage, ElMessageBox } from 'element-plus'
 defineOptions({
     name: 'Advancedanalysis/eventcorrelation'
 })
@@ -121,7 +65,7 @@ const policyView = ref(true)
 
 const xTable = ref()
 const loading = ref(false)
-
+const photovoltaicData: any = ref([])
 const tableData = ref([
     {
         id: 10001,
@@ -160,35 +104,34 @@ const form = ref({
     id: '',
     name: '',
     role: '',
-
     num6: '',
     date12: '',
     date13: ''
 })
 
-const isActiveStatus = row => {
-    return xTable.value.isEditByRow(row)
-}
-// 编辑配置
-const editRowEvent = row => {
-    form.value = JSON.parse(JSON.stringify(row))
-    xTable.value.setEditRow(row)
-}
-// 保存配置
-const saveRowEvent = row => {
-    xTable.value.clearEdit().then(() => {
-        loading.value = true
-        setTimeout(() => {
-            loading.value = false
-            console.log('🚀 ~ saveRowEvent ~ row:', form.value)
-        }, 300)
+queyDetail().then(res => {
+    photovoltaicData.value = []
+    let title = ['安全', 'III级预警', 'II级预警', 'I级预警']
+    // photovoltaicData.value = res.data
+    for (let i: number = 1; i < 5; i++) {
+        photovoltaicData.value.push({ ...setData(res.data.filter(item => item.indexResult == i)), name: title[i - 1] })
+    }
+    console.log('🚀 ~ queyDetail ~ res.data.filter(item=>item.indexResult==1):', photovoltaicData.value)
+})
+
+const setData = (row: any) => {
+    let data = {}
+    row.forEach((item: any) => {
+        data[`comparisonOperators${item.result}`] = item.comparisonOperators
+        data[`count${item.result}`] = item.count
     })
+    return data
 }
-// 取消配置
-const cancelRowEvent = row => {
-    xTable.value.clearEdit().then(() => {
-        // 还原行数据
-        xTable.value.revertData(row)
+
+// 还原
+const restores = () => {
+    restore().then(res => {
+        ElMessage.success('还原成功!')
     })
 }
 
diff --git a/src/views/pqs/bearingCapacity/evaluationList/index.vue b/src/views/pqs/bearingCapacity/evaluationList/index.vue
index 325e441b..40c0dc55 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/index.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/index.vue
@@ -4,13 +4,12 @@
             <TableHeader datePicker ref="TableHeaderRef">
                 <template #select>
                     <el-form-item label="用户类型">
-                        <el-select v-model="tableStore.table.params.searchValue" placeholder="请选择用户类型">
-                            <el-option
-                                v-for="item in userTypeList"
-                                :key="item.id"
-                                :label="item.label"
-                                :value="item.id"
-                            />
+                        <el-select
+                            v-model="tableStore.table.params.userType"
+                            clearable
+                            collapse-tagsplaceholder="请选择用户类型"
+                        >
+                            <el-option v-for="item in uesrList" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
                     </el-form-item>
                 </template>
@@ -90,7 +89,7 @@ defineOptions({
 const height = mainHeight(20).height
 const dictData = useDictData()
 const levelList = dictData.getBasicData('Dev_Voltage_Stand')
-const uesrList = dictData.getBasicData('Interference_Source')
+const uesrList = dictData.getBasicData('CARRY_CAPCITY_USER_TYPE')
 const view = ref(false)
 const activeName = ref('1')
 const disabled = ref(false)
@@ -98,7 +97,6 @@ const policyView = ref(false)
 const addedShow = ref(true)
 const TableHeaderRef = ref()
 const title = ref('')
-const userTypeList: any = ref([])
 
 const form = ref({
     name: '',
@@ -197,14 +195,18 @@ const tableStore = new TableStore({
         ]
     }
 })
-tableStore.table.params.searchValue = ''
+tableStore.table.params.userType = ''
 tableStore.table.params.userId = dictData.state.area[0].id
 
 provide('tableStore', tableStore)
 onMounted(() => {
     TableHeaderRef.value.setDatePicker([{ label: '周', value: 4 }])
     TableHeaderRef.value.setInterval(4)
-    tableStore.index()
+    setTimeout(() => {
+        tableStore.table.params.startTime = TableHeaderRef.value.datePickerRef.timeValue[0]
+        tableStore.table.params.endTime = TableHeaderRef.value.datePickerRef.timeValue[1]
+        tableStore.index()
+    }, 100)
 })
 // 配置
 const configuration = () => {
diff --git a/src/views/pqs/bearingCapacity/userManagement/index.vue b/src/views/pqs/bearingCapacity/userManagement/index.vue
index 2f6a94a2..29652721 100644
--- a/src/views/pqs/bearingCapacity/userManagement/index.vue
+++ b/src/views/pqs/bearingCapacity/userManagement/index.vue
@@ -5,7 +5,7 @@
                 <template #select>
                     <el-form-item label="用户类型">
                         <el-select
-                            v-model="tableStore.table.params.searchValue"
+                            v-model="tableStore.table.params.userType"
                             clearable
                             collapse-tagsplaceholder="请选择用户类型"
                         >
@@ -19,12 +19,17 @@
             </TableHeader>
             <Table ref="tableRef" />
             <el-dialog v-model="dialogVisible" :title="title" width="600" :before-close="handleClose">
-                <el-form ref="ruleFormRef" :model="form" label-width="auto" :disabled="disabled" :rules="rules">
+                <el-form ref="ruleFormRef" :model="form" label-width="180px" :disabled="disabled" :rules="rules">
                     <el-form-item label="用户名称：" prop="userName">
                         <el-input v-model="form.userName" clearable placeholder="请输入用户名称" />
                     </el-form-item>
                     <el-form-item label="用户类型：" prop="userType">
-                        <el-select v-model="form.userType" clearable collapse-tagsplaceholder="请选择用户类型">
+                        <el-select
+                            v-model="form.userType"
+                            clearable
+                            collapse-tagsplaceholder="请选择用户类型"
+                            @change="useChange"
+                        >
                             <el-option v-for="item in uesrList" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
                     </el-form-item>
@@ -33,19 +38,26 @@
                             <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="用户协议容量(MVA)：" prop="mav1">
-                        <el-input v-model="form.mav1" clearable placeholder="请输入用户协议容量" />
+                    <el-form-item
+                        :label="userShow == 'Power_Station_Users' ? '用户协议容量(MVA)：' : '拟接入容量(MVA)：'"
+                        prop="protocolCapacity"
+                    >
+                        <!-- <el-input v-model="form.protocolCapacity" clearable placeholder="请输入用户协议容量" /> -->
+                        <el-input-number
+                            style="width: 100%"
+                            v-model="form.protocolCapacity"
+                            :min="0"
+                            placeholder="请输入用容量"
+                        />
                     </el-form-item>
-                    <el-form-item label="拟接入容量(MVA)：" prop="mav2">
-                        <el-input v-model="form.mav2" clearable placeholder="请输入拟接入容量" />
+
+                    <el-form-item label="区域" prop="regionList">
+                        <el-cascader v-model="form.regionList" style="width: 100%" :props="props" :options="areaList" />
                     </el-form-item>
-                    <el-form-item label="区域">
-                        <Area v-model="form.deptIndex" style="width: 100%" />
-                    </el-form-item>
-                    <el-form-item label="详细地址：" prop="detailed">
+                    <el-form-item label="详细地址：" prop="area">
                         <el-input
                             clearable
-                            v-model="form.detailed"
+                            v-model="form.area"
                             :autosize="{ minRows: 2, maxRows: 4 }"
                             type="textarea"
                             placeholder="请输入详细地址"
@@ -64,11 +76,10 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, reactive } from 'vue'
+import { ref, onMounted, provide, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import Area from '@/components/form/area/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
@@ -78,16 +89,20 @@ defineOptions({
 })
 const dictData = useDictData()
 const levelList = dictData.getBasicData('Dev_Voltage_Stand')
-const uesrList = dictData.getBasicData('Interference_Source')
+const uesrList = dictData.getBasicData('CARRY_CAPCITY_USER_TYPE')
 const dialogVisible = ref(false)
 const disabled = ref(false)
 const TableHeaderRef = ref()
 const title = ref('')
+const areaList: any = dictData.areaSelect()
+const userShow: any = ref('Power_Station_Users')
 interface RuleForm {
     area: string
     city: string
     province: string
     region: string
+    regionList: any
+    protocolCapacity: number
     userName: string
     userType: string
     voltage: string
@@ -96,25 +111,29 @@ const form = ref<RuleForm>({
     area: '',
     city: '',
     province: '',
+    protocolCapacity: 0,
     region: '',
     userName: '',
     userType: '',
-    voltage: ''
+    voltage: '',
+    regionList: []
 })
 const rules = {
     userName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
     userType: [{ required: true, message: '请选择用户类型', trigger: 'change' }],
     voltage: [{ required: true, message: '请选择电压等级', trigger: 'change' }],
-    mav1: [{ required: true, message: '请输入用户协议容量', trigger: 'blur' }],
+    protocolCapacity: [{ required: true, message: '请输入容量', trigger: 'change' }],
+    regionList: [{ required: true, message: '请选择区域', trigger: 'change' }],
     mav2: [{ required: true, message: '请输入拟接入容量', trigger: 'blur' }],
-    detailed: [{ required: true, message: '请输入详细地址', trigger: 'blur' }]
+    area: [{ required: true, message: '请输入详细地址', trigger: 'blur' }]
 }
+const props = { label: 'name', value: 'id' }
 const ruleFormRef = ref()
 const tableStore = new TableStore({
     url: '/advance-boot/carrycapacityuser/queyDetailUser',
     method: 'POST',
     column: [
-        { width: '60', type: 'checkbox' },
+        // { width: '60', type: 'checkbox' },
 
         {
             field: 'index',
@@ -124,16 +143,44 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'name', title: '用户名称' },
-        { field: 'type', title: '用户类型' },
+        { field: 'userName', title: '用户名称' },
+        {
+            field: 'userType',
+            title: '用户类型',
+            formatter: (row: any) => {
+                return uesrList.filter(item => item.id == row.cellValue)[0].name
+            }
+        },
 
         { field: 'Area', title: '所属区域' },
-        { field: 'level', title: '电压等级(V)' },
-        { field: 'mav1', title: '用户协议容量(MVA)' },
-        { field: 'mav2', title: '拟接入容量(MVA)' },
-        { field: 'detailed', title: '详细地址' },
-        { field: 'user', title: '创建者' },
-        { field: 'time', title: '创建日期' },
+        {
+            field: 'voltage',
+            title: '电压等级(V)',
+            formatter: (row: any) => {
+                return levelList.filter(item => item.id == row.cellValue)[0].name
+            }
+        },
+        {
+            field: 'protocolCapacity',
+            title: '用户协议容量(MVA)',
+            formatter: (row: any) => {
+                return uesrList.filter(item => item.id == row.row.userType)[0].code == 'Power_Station_Users'
+                    ? row.cellValue
+                    : '/'
+            }
+        },
+        {
+            field: 'protocolCapacity',
+            title: '拟接入容量(MVA)',
+            formatter: (row: any) => {
+                return uesrList.filter(item => item.id == row.row.userType)[0].code != 'Power_Station_Users'
+                    ? row.cellValue
+                    : '/'
+            }
+        },
+        { field: 'area', title: '详细地址' },
+        { field: 'createBy', title: '创建者' },
+        { field: 'createTime', title: '创建日期' },
         {
             title: '操作',
             width: '180',
@@ -147,12 +194,12 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Plus',
                     render: 'basicButton',
                     click: row => {
-                        if (ruleFormRef.value) ruleFormRef.value.resetFields()
-
                         disabled.value = true
+                        dialogVisible.value = true
+                        dialogVisible.value = true
                         title.value = '查看承载能力预评估用户'
                         form.value = JSON.parse(JSON.stringify(row))
-                        dialogVisible.value = true
+                        form.value.regionList = [form.value.province, form.value.city, form.value.region]
                     }
                 },
                 {
@@ -161,12 +208,13 @@ const tableStore = new TableStore({
                     type: '',
                     icon: 'el-icon-Plus',
                     render: 'basicButton',
-                    click: row => {
-                        if (ruleFormRef.value) ruleFormRef.value.resetFields()
+                    click: async row => {
                         disabled.value = false
+                        dialogVisible.value = true
+                        await nextTick
                         title.value = '编辑承载能力预评估用户'
                         form.value = JSON.parse(JSON.stringify(row))
-                        dialogVisible.value = true
+                        form.value.regionList = [form.value.province, form.value.city, form.value.region]
                     }
                 },
                 {
@@ -182,8 +230,9 @@ const tableStore = new TableStore({
                         title: '确定删除？'
                     },
                     click: row => {
-                        removeUse({ userIds: row.id }).then(res => {
+                        removeUse({ userIds: row.userId }).then(res => {
                             ElMessage.success('删除成功')
+                            tableStore.index()
                         })
                     }
                 }
@@ -191,32 +240,25 @@ const tableStore = new TableStore({
         }
     ],
 
-    loadCallback: () => {
-        tableStore.table.data = [
-            {
-                id: '123',
-                name: '光伏电站用户1',
-                type: '光伏电站',
-                Area: '中国',
-                level: '220',
-                mav1: '100',
-                mav2: '100',
-                detailed: '详情',
-                user: 'Admin',
-                time: '2024-01-03'
-            }
-        ]
-    }
+    loadCallback: () => {}
 })
 
-// tableStore.table.params.searchValue = ''
+tableStore.table.params.userType = ''
 
 provide('tableStore', tableStore)
 onMounted(() => {
     TableHeaderRef.value.setDatePicker([{ label: '周', value: 4 }])
     TableHeaderRef.value.setInterval(4)
-    tableStore.index()
+
+    setTimeout(() => {
+        tableStore.table.params.startTime = TableHeaderRef.value.datePickerRef.timeValue[0]
+        tableStore.table.params.endTime = TableHeaderRef.value.datePickerRef.timeValue[1]
+        tableStore.index()
+    }, 100)
 })
+const useChange = (e: string) => {
+    userShow.value = uesrList.filter(item => item.id == e)[0].code
+}
 // 新增
 const add = () => {
     disabled.value = false
@@ -227,12 +269,19 @@ const add = () => {
 const onSubmit = () => {
     ruleFormRef.value.validate((valid: boolean) => {
         if (valid) {
+            form.value.province = form.value.regionList[0] || ''
+            form.value.city = form.value.regionList[1] || ''
+            form.value.region = form.value.regionList[2] || ''
             if (title.value == '新增承载能力预评估用户') {
                 addUse(form.value).then(res => {
+                    ElMessage.success('新增成功!')
+                    dialogVisible.value = false
                     tableStore.index()
                 })
             } else if (title.value == '编辑承载能力预评估用户') {
                 updateUse(form.value).then(res => {
+                    ElMessage.success('修改成功!')
+                    dialogVisible.value = false
                     tableStore.index()
                 })
             }
@@ -242,7 +291,7 @@ const onSubmit = () => {
 
 // 取消
 const handleClose = () => {
-    ruleFormRef.value.resetFields()
+    ruleFormRef.value?.resetFields()
     dialogVisible.value = false
 }
 </script>
diff --git a/src/views/pqs/voltageSags/Region/transientList/index.vue b/src/views/pqs/voltageSags/Region/transientList/index.vue
index 6b299bed..0575c5cf 100644
--- a/src/views/pqs/voltageSags/Region/transientList/index.vue
+++ b/src/views/pqs/voltageSags/Region/transientList/index.vue
@@ -126,7 +126,7 @@
             </TableHeader>
             <Table ref="tableRef" />
         </div>
-        <div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="view2">
+        <div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
             <waveForm senior :boxoList="boxoList" :wp="wp" @backbxlb="backbxlb" />
         </div>
     </div>
@@ -142,14 +142,13 @@ import { ElMessageBox, ElMessage } from 'element-plus'
 import { getTransientValue } from '@/api/event-boot/report'
 
 import waveForm from '@/components/echarts/waveForm.vue'
-import { getMonitorEventAnalyseWave ,downloadWaveFile} from '@/api/event-boot/transient'
+import { getMonitorEventAnalyseWave, downloadWaveFile } from '@/api/event-boot/transient'
 defineOptions({
     name: 'Region/transientlist'
 })
 const dictData = useDictData()
 const pageHeight = mainHeight(20)
 const view = ref(true)
-const view2 = ref(false)
 
 const typeoptions = dictData.getBasicData('Event_Type')
 const tableRef = ref()
@@ -231,7 +230,6 @@ const tableStore = new TableStore({
                                 if (res != undefined) {
                                     wp.value = res.data
                                     view.value = false
-                                    view2.value = true
                                 }
                             })
                             .catch(() => {
@@ -283,7 +281,6 @@ onMounted(() => {
 })
 const backbxlb = () => {
     view.value = true
-    view2.value = false
 }
 // 导出列表
 const exportEvent = () => {