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

src/api/advance-boot/bearingCapacity.ts

@@ -0,0 +1,58 @@
+import createAxios from '@/utils/request'
+
+//承载能力评估用户新增
+export function addUse(data) {
+    return createAxios({
+        url: '/advance-boot/carrycapacityuser/add',
+        method: 'post',
+        data
+    })
+}
+//承载能力评估用户编辑
+export function updateUse(data) {
+    return createAxios({
+        url: '/advance-boot/carrycapacityuser/update',
+        method: 'post',
+         data
+    })
+}
+//承载能力评估用户批量删除
+export function removeUse(data) {
+    return createAxios({
+        url: '/advance-boot/carrycapacityuser/remove',
+        method: 'POST',
+        params: data
+    })
+}
+//承载能力评估-台账树
+export function carryCapacityTree() {
+    return createAxios({
+        url: '/advance-boot/carrycapacity/carryCapacityTree',
+        method: 'get',
+      
+    })
+}
+//承载能力评估策略初始化查询
+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',
+      
+    })
+}

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() {
@@ -30,10 +37,3 @@ export function analyseWave(params:string) {
         method: 'get'
     })
 }
-// // 123
-// export function queyDetailUser(params:string) {
-//     return createAxios({
-//         url: '/cs-harmonic-boot/event/analyseWave?eventId=' + params,
-//         method: 'get'
-//     })
-// }

src/components/tree/pqs/loadBearingTree.vue

@@ -0,0 +1,54 @@
+<template>
+    <div class="point-tree">
+        <div style="flex: 1; overflow: hidden">
+            <Tree ref="treeRef" :data="tree" style="width: 100%; height: 100%" :canExpand="false" v-bind="$attrs" />
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { nextTick, onMounted, ref, useAttrs } from 'vue'
+import Tree from '../index.vue'
+
+import { useDictData } from '@/stores/dictData'
+import { carryCapacityTree } from '@/api/advance-boot/bearingCapacity'
+import { useConfig } from '@/stores/config'
+
+defineOptions({
+    name: 'pms/pointTree'
+})
+const emit = defineEmits(['init'])
+const attrs = useAttrs()
+
+const dictData = useDictData()
+const config = useConfig()
+const tree = ref()
+const treeRef = ref()
+
+const loadData = () => {
+    let nodeKey = ''
+    carryCapacityTree().then(res => {
+        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[0].children[0].children
+        if (nodeKey) {
+            nextTick(() => {
+                treeRef.value.treeRef.setCurrentKey(nodeKey)
+                // treeRef.value.treeRef.setExpandedKeys(nodeKey)
+            })
+        }
+    })
+}
+loadData()
+</script>
+<style lang="scss">
+.point-tree {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    border: 1px solid var(--el-border-color);
+}
+</style>

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) {

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
         }
     },
     {

src/stores/interface/index.ts

@@ -79,6 +79,7 @@ export interface AdminInfo {
 export interface DictData {
     basic: BasicDictData[]
     area: BasicDictData[]
+    areaTree: BasicDictData[]
 }
 
 export interface BasicDictData {

src/utils/request.ts

@@ -55,9 +55,6 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
     // 请求拦截
     Axios.interceptors.request.use(
         config => {
-          
-
-           
             // 取消重复请求
             removePending(config)
             options.CancelDuplicateRequest && addPending(config)
@@ -77,10 +74,7 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                     config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
                 }
             }
-            if(config.url?.substring(0, 4)=='/hzj'){
+
-                config.url=config.url?.slice(4)
-                config.baseURL='/hzj'
-            }
             return config
         },
         error => {

src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue

@@ -85,10 +85,10 @@
 import { onMounted, ref, provide } from 'vue'
 import 'splitpanes/dist/splitpanes.css'
 import { Splitpanes, Pane } from 'splitpanes'
-import PointTree from '@/components/tree/pms/pointTree.vue'
+import PointTree from '@/components/tree/pqs/loadBearingTree.vue'
 import DatePicker from '@/components/form/datePicker/index.vue'
 import { mainHeight } from '@/utils/layout'
-import { text } from './text'
+import { text } from '../text'
 import MyEChart from '@/components/echarts/MyEchart.vue'
 import { useMonitoringPoint } from '@/stores/monitoringPoint'
 import { defaultAttribute } from '@/components/table/defaultAttribute'

src/views/pqs/bearingCapacity/evaluationList/components/policy.vue

@@ -0,0 +1,174 @@
+<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" @click="restores">一键还原</el-button>
+        </div>
+        <el-divider content-position="left">光伏电站承载能力评估策略</el-divider>
+        <vxe-table
+            v-bind="defaultAttribute"
+            ref="xTable"
+            :loading="loading"
+            :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="结果"></vxe-column>
+            </vxe-colgroup>
+            <vxe-column field="count1" title="安全(个)">
+                <template #default="{ row }">
+                    {{ 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" :loading="loading" :data="tableData">
+            <vxe-colgroup field="group0" title="等级" align="right">
+                <vxe-column field="name" width="180" title="结果"></vxe-column>
+            </vxe-colgroup>
+
+            <vxe-column field="role" title="THD(%)"></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>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive } from 'vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { mainHeight } from '@/utils/layout'
+import { queyDetail, addCarryc, restore } from '@/api/advance-boot/bearingCapacity'
+import { ElMessage, ElMessageBox } from 'element-plus'
+defineOptions({
+    name: 'Advancedanalysis/eventcorrelation'
+})
+const emit = defineEmits(['View'])
+const view = ref(false)
+const policyView = ref(true)
+
+const xTable = ref()
+const loading = ref(false)
+const photovoltaicData: any = ref([])
+const tableData = ref([
+    {
+        id: 10001,
+        name: '安全',
+        role: '0',
+        num6: '0',
+        date12: '0',
+        date13: '0'
+    },
+    {
+        id: 10002,
+        name: 'III级预警',
+        role: '0',
+        num6: '0',
+        date12: '0',
+        date13: '0'
+    },
+    {
+        id: 10003,
+        name: 'II级预警',
+        role: 'Test',
+        date12: '0',
+        num6: '0',
+        date13: '0'
+    },
+    {
+        id: 10004,
+        name: 'I级预警',
+        role: '0',
+        date12: '0',
+        num6: '0',
+        date13: '0'
+    }
+])
+const form = ref({
+    id: '',
+    name: '',
+    role: '',
+    num6: '',
+    date12: '',
+    date13: ''
+})
+
+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 restores = () => {
+    restore().then(res => {
+        ElMessage.success('还原成功!')
+    })
+}
+
+// 取消
+const handleClose = () => {
+    emit('View')
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .vxe-table--header thead tr:first-of-type th:first-of-type {
+    background: #f8f8f9;
+}
+::v-deep .vxe-table--header thead tr:first-of-type th:first-of-type:before {
+    content: '';
+    position: absolute;
+    width: 1px;
+    height: 98px; /*这里需要自己调整，根据td的宽度和高度*/
+    top: 0;
+    left: 0;
+    background-color: grey;
+    opacity: 0.3;
+    display: block;
+    transform: rotate(-66deg); /*这里需要自己调整，根据线的位置*/
+    transform-origin: top;
+}
+::v-deep .vxe-table--header thead tr:last-of-type th:first-of-type:before {
+    content: '';
+    position: absolute;
+    width: 1px;
+    height: 98px; /*这里需要自己调整，根据td的宽度和高度*/
+    bottom: 0;
+    right: 0;
+    background-color: grey;
+    opacity: 0.3;
+    display: block;
+    transform: rotate(-66deg); /*这里需要自己调整，根据线的位置*/
+    transform-origin: bottom;
+}
+</style>

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-select
-                            <el-option
+                            v-model="tableStore.table.params.userType"
-                                v-for="item in userTypeList"
+                            clearable
-                                :key="item.id"
+                            collapse-tagsplaceholder="请选择用户类型"
-                                :label="item.label"
+                        >
-                                :value="item.id"
+                            <el-option v-for="item in uesrList" :key="item.id" :label="item.name" :value="item.id" />
-                            />
                         </el-select>
                     </el-form-item>
                 </template>
@@ -78,9 +77,9 @@ 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 policy from './policy.vue'
+import policy from './components/policy.vue'
-import photovoltaic from './photovoltaic.vue'
+import photovoltaic from './components/photovoltaic.vue'
-import charge from './charge.vue'
+import charge from './components/charge.vue'
 
 import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
@@ -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: '',
@@ -123,7 +121,7 @@ const rules = {
 
 const ruleFormRef = ref()
 const tableStore = new TableStore({
-    url: '/advance-boot/process/querySagEventsPage',
+    url: '/advance-boot/carrycapacity/queryCarryCapacityData',
     method: 'POST',
     column: [
         { width: '60', type: 'checkbox' },
@@ -197,13 +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 = () => {

src/views/pqs/bearingCapacity/evaluationList/policy.vue

@@ -1,231 +0,0 @@
-<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>
-        <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-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-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">
-                <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-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-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-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="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-table>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, reactive } from 'vue'
-import { defaultAttribute } from '@/components/table/defaultAttribute'
-import { mainHeight } from '@/utils/layout'
-import { json } from 'stream/consumers'
-defineOptions({
-    name: 'Advancedanalysis/eventcorrelation'
-})
-const emit = defineEmits(['View'])
-const view = ref(false)
-const policyView = ref(true)
-
-const xTable = ref()
-const loading = ref(false)
-
-const tableData = ref([
-    {
-        id: 10001,
-        name: '安全',
-        role: '0',
-        num6: '0',
-        date12: '0',
-        date13: '0'
-    },
-    {
-        id: 10002,
-        name: 'III级预警',
-        role: '0',
-        num6: '0',
-        date12: '0',
-        date13: '0'
-    },
-    {
-        id: 10003,
-        name: 'II级预警',
-        role: 'Test',
-        date12: '0',
-        num6: '0',
-        date13: '0'
-    },
-    {
-        id: 10004,
-        name: 'I级预警',
-        role: '0',
-        date12: '0',
-        num6: '0',
-        date13: '0'
-    }
-])
-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)
-    })
-}
-// 取消配置
-const cancelRowEvent = row => {
-    xTable.value.clearEdit().then(() => {
-        // 还原行数据
-        xTable.value.revertData(row)
-    })
-}
-
-// 取消
-const handleClose = () => {
-    emit('View')
-}
-</script>
-
-<style lang="scss" scoped>
-::v-deep .vxe-table--header thead tr:first-of-type th:first-of-type {
-    background: #f8f8f9;
-}
-::v-deep .vxe-table--header thead tr:first-of-type th:first-of-type:before {
-    content: '';
-    position: absolute;
-    width: 1px;
-    height: 98px; /*这里需要自己调整，根据td的宽度和高度*/
-    top: 0;
-    left: 0;
-    background-color: grey;
-    opacity: 0.3;
-    display: block;
-    transform: rotate(-66deg); /*这里需要自己调整，根据线的位置*/
-    transform-origin: top;
-}
-::v-deep .vxe-table--header thead tr:last-of-type th:first-of-type:before {
-    content: '';
-    position: absolute;
-    width: 1px;
-    height: 98px; /*这里需要自己调整，根据td的宽度和高度*/
-    bottom: 0;
-    right: 0;
-    background-color: grey;
-    opacity: 0.3;
-    display: block;
-    transform: rotate(-66deg); /*这里需要自己调整，根据线的位置*/
-    transform-origin: bottom;
-}
-</style>

src/views/pqs/bearingCapacity/userManagement/index.vue

@@ -4,47 +4,60 @@
             <TableHeader datePicker ref="TableHeaderRef">
                 <template #select>
                     <el-form-item label="用户类型">
-                        <el-input
+                        <el-select
-                            v-model="tableStore.table.params.searchValue"
+                            v-model="tableStore.table.params.userType"
                             clearable
-                            placeholder="输入关键字筛选"
+                            collapse-tagsplaceholder="请选择用户类型"
-                        />
+                        >
+                            <el-option v-for="item in uesrList" :key="item.id" :label="item.name" :value="item.id" />
+                        </el-select>
                     </el-form-item>
                 </template>
                 <template #operation>
                     <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-                   
                 </template>
             </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="name">
+                    <el-form-item label="用户名称：" prop="userName">
-                        <el-input v-model="form.name" clearable placeholder="请输入用户名称" />
+                        <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>
-                    <el-form-item label="电压等级：" prop="level">
+                    <el-form-item label="电压等级：" prop="voltage">
-                        <el-select v-model="form.level" clearable collapse-tags placeholder="请选择电压等级">
+                        <el-select v-model="form.voltage" clearable collapse-tags placeholder="请选择电压等级">
                             <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-form-item
-                        <el-input v-model="form.mav1" clearable placeholder="请输入用户协议容量" />
+                        :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="区域">
+                    <el-form-item label="详细地址：" prop="area">
-                        <Area v-model="form.deptIndex" style="width: 100%" />
-                    </el-form-item>
-                    <el-form-item label="详细地址：" prop="detailed">
                         <el-input
                             clearable
-                            v-model="form.detailed"
+                            v-model="form.area"
                             :autosize="{ minRows: 2, maxRows: 4 }"
                             type="textarea"
                             placeholder="请输入详细地址"
@@ -63,62 +76,64 @@
     </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'
+import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
 defineOptions({
     name: 'estimate/userManagement'
 })
 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 {
-    name: string
+    area: string
-    level: string
+    city: string
-    deptIndex: string
+    province: string
+    region: string
+    regionList: any
+    protocolCapacity: number
+    userName: string
     userType: string
-    type: string
+    voltage: string
-    mav1: string
-    mav2: string
-    user: string
-    time: string
-    detailed: string
 }
 const form = ref<RuleForm>({
-    name: '',
+    area: '',
-    level: '',
+    city: '',
-    deptIndex: dictData.state.area[0].id,
+    province: '',
-    userType: '光伏电站',
+    protocolCapacity: 0,
-    type: '光伏电站',
+    region: '',
-    mav1: '100',
+    userName: '',
-    mav2: '100',
+    userType: '',
-    user: 'Admin',
+    voltage: '',
-    time: '2024-01-03',
+    regionList: []
-    detailed: '详细地址'
 })
 const rules = {
-    name: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
+    userName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
     userType: [{ required: true, message: '请选择用户类型', trigger: 'change' }],
-    level: [{ 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: '/hzj/carrycapacityuser/queyDetailUser',
+    url: '/advance-boot/carrycapacityuser/queyDetailUser',
     method: 'POST',
     column: [
-        { width: '60', type: 'checkbox' },
+        // { width: '60', type: 'checkbox' },
 
         {
             field: 'index',
@@ -128,16 +143,44 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'name', title: '用户名称' },
+        { field: 'userName', title: '用户名称' },
-        { field: 'type', 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: 'voltage',
-        { field: 'mav2', title: '拟接入容量(MVA)' },
+            title: '电压等级(V)',
-        { field: 'detailed', title: '详细地址' },
+            formatter: (row: any) => {
-        { field: 'user', title: '创建者' },
+                return levelList.filter(item => item.id == row.cellValue)[0].name
-        { field: 'time', title: '创建日期' },
+            }
+        },
+        {
+            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',
@@ -151,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]
                     }
                 },
                 {
@@ -165,12 +208,13 @@ const tableStore = new TableStore({
                     type: '',
                     icon: 'el-icon-Plus',
                     render: 'basicButton',
-                    click: row => {
+                    click: async row => {
-                        if (ruleFormRef.value) ruleFormRef.value.resetFields()
                         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]
                     }
                 },
                 {
@@ -186,59 +230,35 @@ const tableStore = new TableStore({
                         title: '确定删除？'
                     },
                     click: row => {
-                       
+                        removeUse({ userIds: row.userId }).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
                     }
                 }
             ]
         }
     ],
 
-    loadCallback: () => {
+    loadCallback: () => {}
-        tableStore.table.data = [
-            {
-                name: '光伏电站用户1',
-                type: '光伏电站',
-                Area: '中国',
-                level: '220',
-                mav1: '100',
-                mav2: '100',
-                detailed: '详情',
-                user: 'Admin',
-                time: '2024-01-03'
-            }
-        ]
-    }
 })
-// "area": "",
+
-//   "city": "",
-//   "endTime": "",
-//   "pageNum": {},
-//   "pageSize": {},
-//   "protocolCapacity": 0,
-//   "province": "",
-//   "region": "",
-//   "startTime": "",
-//   "userId": "",
-//   "userName": "",
-//   "userType": "",
-//   "voltage": ""
-tableStore.table.params.searchValue = ''
-tableStore.table.params.area = ''
-tableStore.table.params.city = ''
-tableStore.table.params.protocolCapacity = 0
-tableStore.table.params.province = ''
-tableStore.table.params.region = ''
-tableStore.table.params.userId = ''
-tableStore.table.params.userName = ''
 tableStore.table.params.userType = ''
-tableStore.table.params.voltage = ''
 
 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
@@ -249,8 +269,21 @@ 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()
+                })
             }
         }
     })
@@ -258,7 +291,7 @@ const onSubmit = () => {
 
 // 取消
 const handleClose = () => {
-    ruleFormRef.value.resetFields()
+    ruleFormRef.value?.resetFields()
     dialogVisible.value = false
 }
 </script>

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

@@ -1430,7 +1430,7 @@ defineOptions({
     name: 'device-boot/deviceter'
 })
 import { LocationInformation } from '@element-plus/icons-vue'
-import Terminal from '@/components/tree/pms/Terminal.vue'
+import Terminal from '@/components/tree/pqs/Terminal.vue'
 import { mainHeight } from '@/utils/layout'
 import { areaTree } from '@/api/system-boot/dicData'
 import { queryTerminal, nodeAllList, delTerminal, updateTerminal, addTerminal } from '@/api/device-boot/Business.ts'

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

@@ -54,7 +54,7 @@
 import { defineOptions, watch, onMounted, ref, nextTick } from 'vue'
 import 'splitpanes/dist/splitpanes.css'
 import { Splitpanes, Pane } from 'splitpanes'
-import PointTree from '@/components/tree/pms/pointTree.vue'
+import PointTree from '@/components/tree/pqs/pointTree.vue'
 import { useMonitoringPoint } from '@/stores/monitoringPoint'
 import { mainHeight } from '@/utils/layout'
 import Wentaizonghepinggu from './wentaizonghepinggu/index.vue'

src/views/pqs/voltageSags/Region/statistics/index.vue

@@ -13,7 +13,14 @@
         </el-tabs>
     </div>
 </template>
-
+<!-- "area": "",
+  "city": "",
+  "protocolCapacity": 0,
+  "province": "",
+  "region": "",
+  "userName": "",
+  "userType": "",
+  "voltage": "" -->
 <script setup lang="ts">
 import TableHeader from '@/components/table/header/index.vue'
 

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 = () => {

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

@@ -1,23 +1,24 @@
 <template>
-    <splitpanes style='height: 100%;' class='default-theme' id='navigation-splitpanes'>
+    <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
-        <pane :size='size'>
+        <pane :size="size">
-            <PointTree :default-expand-all='false'
+            <PointTree
-                       :default-expanded-keys='monitoringPoint.state.lineId?[monitoringPoint.state.lineId]:[]'
+                :default-expand-all="false"
-                       :current-node-key='monitoringPoint.state.lineId'
+                :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
-                       @node-click='handleNodeClick'
+                :current-node-key="monitoringPoint.state.lineId"
-                       @init='handleNodeClick'
+                @node-click="handleNodeClick"
+                @init="handleNodeClick"
             ></PointTree>
         </pane>
         <pane>
-            <Map v-bind='$attrs'></Map>
+            <Map v-bind="$attrs"></Map>
         </pane>
     </splitpanes>
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { onMounted, ref } from 'vue'
 import 'splitpanes/dist/splitpanes.css'
 import { Splitpanes, Pane } from 'splitpanes'
-import PointTree from '@/components/tree/pms/pointTree.vue'
+import PointTree from '@/components/tree/pqs/pointTree.vue'
 import Map from './map.vue'
 import Tree from '@/components/tree/index.vue'
 import { useMonitoringPoint } from '@/stores/monitoringPoint'
@@ -27,7 +28,7 @@ const size = ref(0)
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
-        size.value = Math.round(280 / dom.offsetHeight * 100)
+        size.value = Math.round((280 / dom.offsetHeight) * 100)
     }
 })
 const handleNodeClick = (data: any, node: any) => {
@@ -36,7 +37,7 @@ const handleNodeClick = (data: any, node: any) => {
     }
 }
 </script>
-<style lang='scss'>
+<style lang="scss">
 .splitpanes.default-theme .splitpanes__pane {
     background: #eaeef1;
 }

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

@@ -134,7 +134,7 @@ import { onMounted, ref, provide } from 'vue'
 import 'splitpanes/dist/splitpanes.css'
 import { Splitpanes, Pane } from 'splitpanes'
 import TableStore from '@/utils/tableStore'
-import PointTree from '@/components/tree/pms/pointTree.vue'
+import PointTree from '@/components/tree/pqs/pointTree.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { mainHeight } from '@/utils/layout'
 import { getLineExport, getList, selectReleation } from '@/api/event-boot/report'
@@ -146,12 +146,11 @@ const size = ref(0)
 const value = ref('')
 const TableHeaderRef = ref()
 const dotList: any = ref({
-    name:monitoringPoint.state.lineName.split('>')[3],
+    name: monitoringPoint.state.lineName.split('>')[3],
-    id:monitoringPoint.state.lineId,
+    id: monitoringPoint.state.lineId,
-    level:6
+    level: 6
 })
 
-
 const formd: any = ref({
     xq: false,
     lb: false,
@@ -170,7 +169,6 @@ const formd: any = ref({
     type: 0
 })
 
-
 const templatePolicy: any = ref([])
 const tableStore = new TableStore({
     url: '',
@@ -191,10 +189,10 @@ getList({
 }).then(res => {
     templatePolicy.value = res.data.records
 })
-const handleNodeClick = (data: any, node: any) => {  
+const handleNodeClick = (data: any, node: any) => {
     dotList.value = data
 }
-const changeFn = (val:any) => {
+const changeFn = (val: any) => {
     formd.value = {
         xq: false,
         lb: false,
@@ -217,7 +215,7 @@ const changeFn = (val:any) => {
     }
 
     selectReleation(data).then(res => {
-        res.data.forEach((item:any) => {
+        res.data.forEach((item: any) => {
             for (let k in formd.value) {
                 if (item.name == k) {
                     formd.value[k] = true
@@ -242,7 +240,7 @@ const exportEvent = () => {
     formd.value.searchEndTime = tableStore.table.params.searchEndTime
     formd.value.flag = TableHeaderRef.value.datePickerRef.interval
     ElMessage('生成报告中,请稍等!')
-    getLineExport(formd.value).then((res:any) => {
+    getLineExport(formd.value).then((res: any) => {
         let blob = new Blob([res], {
             type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
         })

vite.config.ts

@@ -11,7 +11,8 @@ export default defineConfig({
         host: '0.0.0.0',
         proxy: {
             '/api': {
-                target: 'http://192.168.1.81:10215', //数据中心
+                // target: 'http://192.168.1.81:10215', //数据中心
+                target: 'http://192.168.1.31:10215', //数据中心
                 changeOrigin: true,
                 rewrite: path => path.replace(/^\/api/, '') //路径重写，把'/api'替换为''
             },
@@ -19,11 +20,7 @@ export default defineConfig({
                 target: 'http://192.168.1.81:8088', //数据中心
                 changeOrigin: true,
             },
-            '/hzj': {
+          
-                target: 'http://550fa81d.nat123.fun', //黄正剑
-                changeOrigin: true,
-                rewrite: path => path.replace(/^\/hzj/, '')
-            }
         }
     },
     resolve: {