From 7429e2270beb28fe570fc1236c87f6bca0cf4bb0 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Wed, 13 Mar 2024 20:33:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=98=E5=88=B6=E6=8A=80=E6=9C=AF=E7=9B=91?=
 =?UTF-8?q?=E7=9D=A3=E9=A1=B5=E9=9D=A2=20=20=E8=81=94=E8=B0=83=E6=89=BF?=
 =?UTF-8?q?=E8=BD=BD=E8=83=BD=E5=8A=9B=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/advance-boot/bearingCapacity.ts       |   9 +
 src/layouts/admin/components/logo.vue         |  21 +-
 .../admin/components/navBar/classic.vue       |  26 +-
 .../evaluationList/components/charge.vue      |  72 ++-
 .../components/photovoltaic.vue               | 111 ++--
 .../bearingCapacity/evaluationList/index.vue  |  27 +-
 .../bearingCapacity/userManagement/index.vue  |   6 +-
 .../electricalEnergy/components/NewlyAdd.vue  | 486 ++++++++++++++++++
 .../components/maintenance.vue                |  22 +-
 .../harmonicSurvey/components/planManage.vue  | 168 +++++-
 .../interfere/components/undocumented.vue     | 126 +++--
 .../technology/components/overview.vue        | 218 ++++++++
 src/views/pqs/supervise/technology/index.vue  |   3 +-
 src/views/user/login.vue                      |   1 +
 14 files changed, 1137 insertions(+), 159 deletions(-)
 create mode 100644 src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue
 create mode 100644 src/views/pqs/supervise/technology/components/overview.vue

diff --git a/src/api/advance-boot/bearingCapacity.ts b/src/api/advance-boot/bearingCapacity.ts
index 10f8b07b..25babf16 100644
--- a/src/api/advance-boot/bearingCapacity.ts
+++ b/src/api/advance-boot/bearingCapacity.ts
@@ -114,3 +114,12 @@ export function uploadExcel(file: any, data: any) {
         data: form
     })
 }
+
+// 查询用户额定容量
+export function getLineDetailData(data) {
+    return createAxios({
+        url: '/device-boot/line/getLineDetailData',
+        method: 'POST',
+        params: data
+    })
+}
diff --git a/src/layouts/admin/components/logo.vue b/src/layouts/admin/components/logo.vue
index 172370bc..05f1caa9 100644
--- a/src/layouts/admin/components/logo.vue
+++ b/src/layouts/admin/components/logo.vue
@@ -1,13 +1,13 @@
 <template>
     <div class="layout-logo">
-        <img v-if="!config.layout.menuCollapse" class="logo-img" src="data:image/png;base64,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" alt="logo" />
-<!--        <div-->
-<!--            v-if="!config.layout.menuCollapse"-->
-<!--            :style="{ color: config.getColorVal('menuActiveColor') }"-->
-<!--            class="website-name"-->
-<!--        >-->
-<!--            灿能-->
-<!--        </div>-->
+        <img v-if="!config.layout.menuCollapse" class="logo-img" :src="getTheme.logoUrl" />
+        <!--        <div-->
+        <!--            v-if="!config.layout.menuCollapse"-->
+        <!--            :style="{ color: config.getColorVal('menuActiveColor') }"-->
+        <!--            class="website-name"-->
+        <!--        >-->
+        <!--            灿能-->
+        <!--        </div>-->
         <Icon
             v-if="config.layout.layoutMode != 'Streamline'"
             @click="onMenuCollapse"
@@ -27,7 +27,7 @@ import { Session } from '@/utils/storage'
 import { setNavTabsWidth } from '@/utils/layout'
 
 const config = useConfig()
-
+const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
 const onMenuCollapse = function () {
     if (config.layout.shrink && !config.layout.menuCollapse) {
         closeShade()
@@ -49,7 +49,7 @@ const onMenuCollapse = function () {
     align-items: center;
     justify-content: center;
     box-sizing: border-box;
-    padding:15px 10px;
+    padding: 15px 10px;
     background: v-bind(
         'config.layout.layoutMode != "Streamline" ?  config.getColorVal("menuTopBarBackground"):"transparent"'
     );
@@ -57,6 +57,7 @@ const onMenuCollapse = function () {
 .logo-img {
     height: 40px;
     object-fit: cover;
+    margin: auto;
 }
 .website-name {
     display: block;
diff --git a/src/layouts/admin/components/navBar/classic.vue b/src/layouts/admin/components/navBar/classic.vue
index 6a8933d2..113c4c0a 100644
--- a/src/layouts/admin/components/navBar/classic.vue
+++ b/src/layouts/admin/components/navBar/classic.vue
@@ -1,22 +1,26 @@
 <template>
-    <div class='nav-bar'>
-        <div v-if='config.layout.shrink && config.layout.menuCollapse' class='unfold'>
-            <Icon @click='onMenuCollapse' name='fa fa-indent' :color="config.getColorVal('menuActiveColor')"
-                  size='18' />
+    <div class="nav-bar">
+        <div v-if="config.layout.shrink && config.layout.menuCollapse" class="unfold">
+            <Icon
+                @click="onMenuCollapse"
+                name="fa fa-indent"
+                :color="config.getColorVal('menuActiveColor')"
+                size="18"
+            />
         </div>
-        <span class='nav-bar-title'>电能质量数据监测云平台</span>
+        <span class="nav-bar-title">{{ getTheme.name }}</span>
         <NavMenus />
     </div>
 </template>
 
-<script setup lang='ts'>
+<script setup lang="ts">
 import { useConfig } from '@/stores/config'
 import NavTabs from '@/layouts/admin/components/navBar/tabs.vue'
 import NavMenus from '../navMenus.vue'
 import { showShade } from '@/utils/pageShade'
 
 const config = useConfig()
-
+const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
 const onMenuCollapse = () => {
     showShade('ba-aside-menu-shade', () => {
         config.setLayout('menuCollapse', true)
@@ -25,7 +29,7 @@ const onMenuCollapse = () => {
 }
 </script>
 
-<style scoped lang='scss'>
+<style scoped lang="scss">
 .nav-bar {
     display: flex;
     align-items: center;
@@ -37,7 +41,7 @@ const onMenuCollapse = () => {
         color: v-bind('config.getColorVal("headerBarTabColor")');
         font-size: 24px;
         margin-left: 10px;
-        font-weight: 700
+        font-weight: 700;
     }
 
     :deep(.nav-tabs) {
@@ -68,7 +72,7 @@ const onMenuCollapse = () => {
                 color: v-bind('config.getColorVal("headerBarTabActiveColor")');
 
                 .close-icon {
-                    color: v-bind('config.getColorVal("headerBarTabActiveColor")') !important;;
+                    color: v-bind('config.getColorVal("headerBarTabActiveColor")') !important;
                 }
             }
 
@@ -77,7 +81,7 @@ const onMenuCollapse = () => {
                 background-color: v-bind('config.getColorVal("headerBarHoverBackground")');
 
                 .close-icon {
-                    color: v-bind('config.getColorVal("headerBarTabActiveColor")') !important;;
+                    color: v-bind('config.getColorVal("headerBarTabActiveColor")') !important;
                 }
             }
         }
diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue b/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue
index 5a816986..2865d4f8 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue
@@ -8,12 +8,34 @@
                     </div>
                 </template>
                 <div :style="`height: calc(${height} / 2 - 117px);overflow-y: auto`">
-                    <el-form :model="form" label-width="auto" style="max-width: 500px; margin: auto">
-                        <el-form-item label="变压器接线方式">
-                            <el-input v-model="form.name" />
+                    <el-form :model="form" label-width="150px" style="max-width: 500px; margin: auto">
+                        <el-form-item label="接线类型">
+                            <el-select v-model="form.ptType" collapse-tags placeholder="请选择接线类型">
+                                <el-option
+                                    v-for="item in connection"
+                                    :key="item.value"
+                                    :label="item.name"
+                                    :value="item.value"
+                                />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="连接方式" v-if="form.ptType == 0">
+                            <el-select
+                                v-model="form.connectionMode"
+                                clearable
+                                collapse-tags
+                                placeholder="请选择连接方式"
+                            >
+                                <el-option v-for="item in method" :key="item.id" :label="item.name" :value="item.id" />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="功率因数">
+                            <el-select v-model="form.k" clearable collapse-tags placeholder="请选择功率因数">
+                                <el-option v-for="item in factor" :key="item.id" :label="item.name" :value="item.id" />
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="电压等级">
-                            <el-select v-model="form.level" clearable collapse-tags placeholder="请选择电压等级">
+                            <el-select v-model="form.scale" clearable collapse-tags placeholder="请选择电压等级">
                                 <el-option
                                     v-for="item in levelList"
                                     :key="item.id"
@@ -23,10 +45,10 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="供电设备容量(MVA)">
-                            <el-input v-model="form.name" />
+                            <el-input-number v-model="form.deviceCapacity" style="width: 100%;" :min="0" placeholder="请填入供电设备容量" />
                         </el-form-item>
                         <el-form-item label="最小短路容量(MVA)">
-                            <el-input v-model="form.name" />
+                            <el-input-number v-model="form.shortCapacity" style="width: 100%;" :min="0" placeholder="请填入最小短路容量" />
                         </el-form-item>
                     </el-form>
                 </div>
@@ -86,6 +108,35 @@ import { mainHeight } from '@/utils/layout'
 const dictData = useDictData()
 const height = mainHeight(80).height
 const levelList = dictData.getBasicData('Dev_Voltage_Stand')
+const connection: any = dictData.getBasicData('Dev_Connect')
+const method = dictData.getBasicData('Connet_Group_Way')
+const factor = [
+    {
+        name: 0.95,
+        id: 0.95
+    },
+    {
+        name: 0.96,
+        id: 0.96
+    },
+    {
+        name: 0.97,
+        id: 0.97
+    },
+    {
+        name: 0.98,
+        id: 0.98
+    },
+    {
+        name: 0.99,
+        id: 0.99
+    },
+    {
+        name: 1.0,
+        id: 1.0
+    }
+]
+
 const tableData = ref([
     {
         name: '谐波电流幅值(A)',
@@ -231,7 +282,14 @@ const column = ref([
         width: '80px'
     }
 ])
-const form: any = ref({})
+const form: any = ref({
+    ptType: '0',
+    connectionMode: '',
+    k: '1',
+    scale: '',
+    shortCapacity: '',
+    deviceCapacity: ''
+})
 const pieCharts = ref({})
 // 承载能力评估
 const assess = () => {
diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
index dfe32e18..c1fe5ee8 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
@@ -27,18 +27,11 @@
 
                 <div v-loading="loading">
                     <el-descriptions class="mb10" title="基础数据" :column="2" size="" border>
-                        <el-descriptions-item label="电压等级" label-align="center" width="25%">
-                            12
-                        </el-descriptions-item>
-                        <el-descriptions-item label="额定容量" label-align="center" width="25%">
-                            12
-                        </el-descriptions-item>
                         <el-descriptions-item label="待评估用户" label-align="center" width="25%">
                             <el-select
                                 v-model="user"
                                 placeholder="请选择待评估用户"
                                 size="small"
-                                clearable
                                 filterable
                                 style="width: 240px"
                                 value-key="id"
@@ -55,24 +48,25 @@
                         <el-descriptions-item label="拟接入光伏容量(MVA)" label-align="center" width="25%">
                             {{ userData?.protocolCapacity }}
                         </el-descriptions-item>
+                        <el-descriptions-item label="电压等级" label-align="center" width="25%">
+                            {{ voltageLevelArr.filter(item => item.id === userData?.voltage)[0]?.name }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="额定容量(MVA)" label-align="center" width="25%">
+                            {{ lineList?.standardCapacity }}
+                        </el-descriptions-item>
                     </el-descriptions>
                     <el-tabs v-model="activeName" class="mb10" :style="`height: calc(${tabsHeight} / 2 + 100px)`">
                         <el-tab-pane label="有功功率" name="1" class="mt10">
-                            <MyEChart v-if="activeName == '1'" :options="options1" />
+                            <MyEChart :options="options1" />
                         </el-tab-pane>
                         <el-tab-pane label="无功功率" name="2">
-                            <MyEChart v-if="activeName == '2'" :options="options2" />
+                            <MyEChart :options="options2" />
                         </el-tab-pane>
                         <el-tab-pane label="谐波电流幅值" name="3">
-                            <MyEChart v-if="activeName == '3'" :options="options3" />
+                            <MyEChart :options="options3" />
                         </el-tab-pane>
                         <el-tab-pane label="首端电压模型参数" name="4">
-                            <vxe-table
-                                v-if="activeName == '4'"
-                                height="auto"
-                                v-bind="defaultAttribute"
-                                :data="voltageList"
-                            >
+                            <vxe-table height="auto" v-bind="defaultAttribute" :data="voltageList">
                                 <vxe-column field="name" title="项别模型参数"></vxe-column>
                                 <vxe-column field="c" title="C"></vxe-column>
                                 <vxe-column field="a" title="a"></vxe-column>
@@ -82,7 +76,7 @@
                     </el-tabs>
                     <div class="bottomBox">
                         <el-row v-if="showAssess">
-                            <el-col :span="16" :style="`height: calc(${tabsHeight} / 2 - 105px)`">
+                            <el-col :span="16" :style="`height: calc(${tabsHeight} / 2 - 107px)`">
                                 <vxe-table
                                     style="flex: 1.5"
                                     v-bind="defaultAttribute"
@@ -124,7 +118,7 @@
                             </el-col>
                         </el-row>
 
-                        <el-button type="primary" icon="el-icon-Document" @click="assess" v-show="!loading">
+                        <el-button type="primary" icon="el-icon-Document" @click="assess" v-show="showBtn">
                             承载能力评估
                         </el-button>
                     </div>
@@ -153,7 +147,8 @@ import {
     queryCarryCapacityQData,
     queryCarryCapacityIData,
     carryCapacityCal,
-    getExcelTemplate
+    getExcelTemplate,
+    getLineDetailData
 } from '@/api/advance-boot/bearingCapacity'
 import { useDictData } from '@/stores/dictData'
 const monitoringPoint = useMonitoringPoint()
@@ -163,6 +158,7 @@ const dictData = useDictData()
 const datePickerRef = ref()
 const height = mainHeight(80).height
 const tabsHeight = mainHeight(260).height
+const voltageLevelArr = dictData.getBasicData('Dev_Voltage_Stand')
 const tableData = ref([
     {
         name: '配变首端电压',
@@ -195,9 +191,12 @@ const tableData = ref([
 ])
 const voltageList: any = ref([])
 const showAssess = ref(false)
-const loading = ref(false)
+const showBtn = ref(false)
+const flag = ref(true)
+const loading = ref(true)
 const user = ref('')
 const userList: any = ref([])
+const lineList: any = ref([])
 const options1 = ref({})
 const options2 = ref({})
 const options3 = ref({})
@@ -233,34 +232,33 @@ const info = () => {
         ])[0]?.id
     }).then(res => {
         userList.value = res.data.records
+        user.value = userList.value[0] || {}
+        userData.value = res.data.records[0] || {}
     })
-    setTimeout(() => {
-        onSubmit()
-    }, 100)
 }
 
 // 查询
 const onSubmit = async () => {
     if (dotList.value.level != 6) {
-        return ElMessage.error('请选择线路')
+        return ElMessage.warning('请选择线路')
     }
     loading.value = true
-    let data: any = []
 
     let form = {
-        // endTime: datePickerRef.value.timeValue[1],
-        // lineId: dotList.value.id,
-        // startTime: datePickerRef.value.timeValue[0],
-        lineId: '086c7774e30839d30fdfb0544bf776de',
-        startTime: '2024-02-05',
-        endTime: '2024-02-11',
+        endTime: datePickerRef.value.timeValue[1],
+        lineId: dotList.value.id,
+        startTime: datePickerRef.value.timeValue[0],
         userId: dictData.state.area[0].id
     }
-
-    Promise.all([queryCarryCapacityData(form), queryCarryCapacityQData(form), queryCarryCapacityIData(form)]).then(
-        res => {
+    options1.value = {}
+    options2.value = {}
+    options3.value = {}
+    voltageList.value = []
+    showBtn.value = false
+    Promise.all([queryCarryCapacityData(form), queryCarryCapacityQData(form), queryCarryCapacityIData(form)])
+        .then(res => {
             // 有功功率
-            voltageList.value = []
+
             stringMap.value = res[0].data.stringMap
             p_βminMap.value = res[0].data.p_βminMap
             q_βminMap.value = res[1].data.q_βminMap
@@ -276,10 +274,12 @@ const onSubmit = async () => {
             setEChart(1, res[0].data.data)
             setEChart(2, res[1].data.data)
             setEChart(3, res[2].data.data)
-
+            showBtn.value = true
             loading.value = false
-        }
-    )
+        })
+        .catch(err => {
+            loading.value = false
+        })
 }
 // 用户变化
 const userChange = e => {
@@ -348,6 +348,9 @@ const setEChart = (val: any, data: any) => {
 
 // 承载能力评估
 const assess = () => {
+    if (dotList.value.level != 6) {
+        return ElMessage.warning('请选择线路')
+    }
     let ChartsList = [
         {
             name: '安全',
@@ -371,17 +374,17 @@ const assess = () => {
         }
     ]
     carryCapacityCal({
-        startTime: '2024-02-05', //修改
-        endTime: '2024-02-11', //修改
+        endTime: datePickerRef.value.timeValue[1],
+        lineId: dotList.value.id,
+        startTime: datePickerRef.value.timeValue[0],
+        userId: userData.value.userId, //dictData.state.area[0].id,
         i_βmax: i_βmax.value,
-        lineId: '086c7774e30839d30fdfb0544bf776de', //修改
         p_βminMap: p_βminMap.value,
         q_βminMap: q_βminMap.value,
-        s_T: 200, //修改
-        s_pv: 200, //修改
-        scale: '220', //修改
-        stringMap: stringMap.value,
-        userId: '49d45dc6390690874b5df064deec56c7'
+        s_T: lineList.value.standardCapacity,
+        s_pv: userData.value.protocolCapacity,
+        scale: userData.value.voltage,
+        stringMap: stringMap.value
     }).then(res => {
         tableData.value[0][`level` + res.data.utlevel] = 1
         tableData.value[1][`level` + res.data.pfTLevel] = 1
@@ -434,7 +437,7 @@ const assess = () => {
 const exportTemplate = () => {
     getExcelTemplate().then(res => {
         let blob = new Blob([res], {
-            type: "application/vnd.ms-excel;charset=UTF-8",
+            type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         })
 
         const url = window.URL.createObjectURL(blob)
@@ -450,7 +453,7 @@ const exportTemplate = () => {
 // 离线导入
 const choose = (e: any) => {
     if (dotList.value.level != 6) {
-        return ElMessage.error('请选择线路')
+        return ElMessage.warning('请选择线路')
     }
     let form = {
         endTime: datePickerRef.value.timeValue[1],
@@ -463,8 +466,18 @@ const choose = (e: any) => {
     })
 }
 const handleNodeClick = (data: any, node: any) => {
-    console.log('🚀 ~ handleNodeClick ~ data:', data)
+    lineList.value = {}
     dotList.value = data
+
+    if (data.level == 6) {
+        getLineDetailData({ id: data.id }).then((res: any) => {
+            lineList.value = res.data
+        })
+    }
+    if (flag.value) {
+        onSubmit()
+        flag.value = false
+    }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/pqs/bearingCapacity/evaluationList/index.vue b/src/views/pqs/bearingCapacity/evaluationList/index.vue
index f60f8001..ad1a92d2 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/index.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/index.vue
@@ -3,11 +3,11 @@
         <div v-show="addedShow">
             <TableHeader datePicker ref="TableHeaderRef">
                 <template #select>
-                    <el-form-item label="用户类型">
+                    <el-form-item label="评估类型">
                         <el-select
-                            v-model="tableStore.table.params.userType"
+                            v-model="tableStore.table.params.evaluateType"
                             clearable
-                            collapse-tagsplaceholder="请选择用户类型"
+                            placeholder="请选择评估类型"
                         >
                             <el-option v-for="item in uesrList" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
@@ -135,7 +135,13 @@ const tableStore = new TableStore({
             }
         },
         { field: 'lineName', title: '配变台区' },
-        { field: 'evaluateType', title: '评估类型' },
+        {
+            field: 'evaluateType',
+            title: '评估类型',
+            formatter: (row: any) => {
+                return uesrList.filter(item => item.id == row.cellValue)[0].name
+            }
+        },
 
         { field: 'userName', title: '预评估用户' },
         {
@@ -143,15 +149,16 @@ const tableStore = new TableStore({
             title: '评估结果',
             formatter: (row: any) => {
                 // 1-安全，2-III级预警，3-II级预警，4-I 级预警,5-禁止接入
-                return row.reslutLevel == 1
+
+                return row.cellValue == 1
                     ? '合格'
-                    : row.reslutLevel == 2
+                    : row.cellValue == 2
                     ? 'III级预警'
-                    : row.reslutLevel == 3
+                    : row.cellValue == 3
                     ? 'II级预警'
-                    : row.reslutLevel == 4
+                    : row.cellValue == 4
                     ? 'I 级预警'
-                    : row.reslutLevel == 5
+                    : row.cellValue == 5
                     ? '禁止接入'
                     : ''
             }
@@ -198,7 +205,7 @@ const tableStore = new TableStore({
 
     loadCallback: () => {}
 })
-tableStore.table.params.userType = ''
+tableStore.table.params.evaluateType = ''
 tableStore.table.params.userId = dictData.state.area[0].id
 
 provide('tableStore', tableStore)
diff --git a/src/views/pqs/bearingCapacity/userManagement/index.vue b/src/views/pqs/bearingCapacity/userManagement/index.vue
index 52c2d5f5..7f60b03d 100644
--- a/src/views/pqs/bearingCapacity/userManagement/index.vue
+++ b/src/views/pqs/bearingCapacity/userManagement/index.vue
@@ -7,7 +7,7 @@
                         <el-select
                             v-model="tableStore.table.params.userType"
                             clearable
-                            collapse-tagsplaceholder="请选择用户类型"
+                           placeholder="请选择用户类型"
                         >
                             <el-option v-for="item in uesrList" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
@@ -27,7 +27,7 @@
                         <el-select
                             v-model="form.userType"
                             clearable
-                            collapse-tagsplaceholder="请选择用户类型"
+                           placeholder="请选择用户类型"
                             @change="useChange"
                         >
                             <el-option v-for="item in uesrList" :key="item.id" :label="item.name" :value="item.id" />
@@ -153,7 +153,7 @@ const tableStore = new TableStore({
             }
         },
 
-        { field: 'Area', title: '所属区域' },
+        { field: 'area', title: '所属区域' },
         {
             field: 'voltage',
             title: '电压等级(V)',
diff --git a/src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue b/src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue
new file mode 100644
index 00000000..13005b58
--- /dev/null
+++ b/src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue
@@ -0,0 +1,486 @@
+<template>
+    <el-dialog v-model="add" title="问题新增" width="50%" :before-close="handleClose">
+        <el-divider content-position="left">第一步 基本信息填报</el-divider>
+        <el-form :inline="true" ref="ruleForm" :rules="rules" :model="addData">
+            <el-form-item label="所属单位">
+                <Area ref="areaRef" v-model="addData.orgName" disabled />
+            </el-form-item>
+
+            <el-form-item label="问题来源" prop="problemSources">
+                <el-select v-model="addData.problemSources" clearable placeholder="请选择问题来源">
+                    <el-option
+                        v-for="item in problemData"
+                        :key="item.code"
+                        :label="item.name"
+                        :value="item.code"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="问题名称" prop="problemName">
+                <el-input v-model="addData.problemName" clearable placeholder="请填写问题名称"></el-input>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="handleClose">取消</el-button>
+                <el-button type="primary" @click="nextStep">下一步</el-button>
+            </div>
+        </template>
+    </el-dialog>
+    <!-- 新增第二步(在线监测超标问题新增) -->
+    <el-dialog title="在线监测超标问题新增" v-model="onlineAdd" width="70%" :before-close="handleClose">
+        <el-divider content-position="left">第二步 选择问题测点(请选择需要生成问题的告警监测点)</el-divider>
+        <el-form :inline="true" class="form">
+            <el-form-item label="告警时间">
+                <DatePicker ref="DateRef" />
+            </el-form-item>
+
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-Search" @click="searchOnLine">查询</el-button>
+            </el-form-item>
+        </el-form>
+        <vxe-table v-bind="defaultAttribute" v-loading="isLoading1" height="350" ref="xTableRef" :data="onlineAddData">
+            <vxe-column type="checkbox" width="60"></vxe-column>
+            <vxe-column field="measurementPointName" title="监测点名称"></vxe-column>
+            <vxe-column field="alarmType" title="告警类型" :formatter="formatter"></vxe-column>
+            <vxe-column field="alarmLastTime" title="告警持续时间(s)"></vxe-column>
+        </vxe-table>
+
+        <div style="display: flex; justify-content: center; margin-top: 10px">
+            <el-button type="primary" class="ml20" @click="previouStep">上一步</el-button>
+            <el-button type="primary" class="ml20" @click="OnlineMonitoring">生成问题</el-button>
+            <el-button type="primary" class="ml20" @click="handleClose">取消</el-button>
+        </div>
+    </el-dialog>
+
+    <!-- 新增第二步(普测超标问题新增) -->
+    <el-dialog title="普测超标问题新增" v-model="ordinaryAdd" width="70%" :before-close="handleClose">
+        <el-divider content-position="left">
+            第二步 选择普测计划及问题类型(请查找需要生成问题的普测计划并选择一条需要生成问题的测试线路)
+        </el-divider>
+        <el-form :model="ordinaryA" :inline="true" class="form">
+            <el-form-item>
+                <Area v-model="ordinaryA.orgNo"></Area>
+            </el-form-item>
+
+            <el-form-item label="普测结果上传时间">
+                <el-date-picker
+                    v-model="ordinaryA.planStartTime"
+                    type="month"
+                    format="YYYY-MM"
+                    value-format="YYYY-MM-DD"
+                    placeholder="选择月"
+                    @change="queryPlanName"
+                ></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="普测计划名称">
+                <el-select v-model="ordinaryA.planName" clearable placeholder="请选择">
+                    <el-option
+                        v-for="item in planNameList"
+                        :key="item.planName"
+                        :label="item.planName"
+                        :value="item.planName"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-Search" @click="searchFnExcessive">查询</el-button>
+            </el-form-item>
+        </el-form>
+        <vxe-table
+            v-bind="defaultAttribute"
+            v-loading="isLoading2"
+            height="350"
+            ref="xTableRef"
+            :data="ordinaryAddData"
+        >
+            <vxe-column type="checkbox" width="60"></vxe-column>
+            <vxe-column field="voltageLevel" title="变电站电压等级(kV)"></vxe-column>
+            <vxe-column field="subName" title="变电站名称" :formatter="formatter"></vxe-column>
+        </vxe-table>
+
+        <el-divider content-position="left">第三步 选择问题指标</el-divider>
+        <el-form :model="ordinaryA" :rules="rules" ref="GeneralSurvey" :inline="true" class="form">
+            <el-form-item label="稳态指标" prop="steadyState">
+                <el-checkbox-group v-model="ordinaryA.steadyState">
+                    <el-checkbox v-for="(item, ind) in steadyStateList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <br />
+            <el-form-item label="暂态指标" prop="transientIndicators">
+                <el-checkbox-group v-model="ordinaryA.transientIndicators">
+                    <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+        </el-form>
+
+        <div style="display: flex; justify-content: center; margin-top: 10px">
+            <el-button type="primary" class="ml20" @click="previouStep">上一步</el-button>
+            <el-button type="primary" class="ml20" @click="GeneralSurvey">生成问题</el-button>
+            <el-button type="primary" class="ml20" @click="handleClose">取消</el-button>
+        </div>
+    </el-dialog>
+    <!-- 新增第二步(运维异常问题新增) -->
+    <el-dialog title="运维异常问题新增" v-model="operationAdd" width="70%" :before-close="handleClose">
+        <el-divider content-position="left">
+            第二步 选择普测计划及问题类型(请查找需要生成问题的普测计划并选择一条需要生成问题的测试线路)
+        </el-divider>
+        <el-form :model="operationAdddata" :inline="true" :rules="rules">
+            <el-form-item label="异常设备名称:" prop="abnormalDevName">
+                <el-input
+                    v-model="operationAdddata.abnormalDevName"
+                    clearable
+                    placeholder="请填写异常设备名称"
+                ></el-input>
+            </el-form-item>
+
+            <el-form-item label="发现异常时间:" prop="abnormalDevTime">
+                <el-date-picker
+                    v-model="operationAdddata.abnormalDevTime"
+                    type="date"
+                    placeholder="请选择发现异常时间"
+                    value-format="YYYY-MM-DD"
+                ></el-date-picker>
+            </el-form-item>
+            <br />
+            <el-form-item label="设备异常描述:" style="margin-top: 10px" prop="eventDescription">
+                <el-input
+                    type="textarea"
+                    style="width: 400px"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                    placeholder="请填写设备异常描述"
+                    v-model="operationAdddata.eventDescription"
+                ></el-input>
+            </el-form-item>
+
+            <el-divider content-position="left">第三步 选择问题指标</el-divider>
+            <el-form-item label="稳态指标:" prop="steadyState">
+                <el-checkbox-group v-model="operationAdddata.steadyState">
+                    <el-checkbox v-for="(item, ind) in steadyStateList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <br />
+            <el-form-item label="暂态指标:" prop="transientIndicators">
+                <el-checkbox-group v-model="operationAdddata.transientIndicators">
+                    <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+        </el-form>
+
+        <div style="display: flex; justify-content: center; margin-top: 10px">
+            <el-button type="primary" class="ml20" @click="previouStep">上一步</el-button>
+            <el-button type="primary" class="ml20" @click="generateAbnormal">生成问题</el-button>
+            <el-button type="primary" class="ml20" @click="handleClose">取消</el-button>
+        </div>
+    </el-dialog>
+
+    <!-- 新增第二步(用户投诉问题新增) -->
+    <el-dialog title="用户投诉问题新增" v-model="userAdd" width="70%" :before-close="handleClose">
+        <el-divider content-position="left">第二步 选择投诉用户(请精确查找用户户号并选中投诉用户)</el-divider>
+        <el-form :model="userA" :inline="true" :rules="rules">
+            <el-form-item label="用户类型:">
+                <el-select v-model="userA.userType" placeholder="请选择用户类型">
+                    <el-option
+                        v-for="item in userTypeData"
+                        :key="item.code"
+                        :label="item.name"
+                        :value="item.code"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="用户编号:">
+                <el-input v-model="userA.id" clearable placeholder="请输入用户编号"></el-input>
+            </el-form-item>
+
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-Search" @click="searchFnComplain">查询</el-button>
+            </el-form-item>
+
+            <vxe-table
+                v-bind="userAddDataList"
+                v-loading="isLoading3"
+                height="350"
+                ref="xTableRef"
+                :data="ordinaryAddData"
+            >
+                <vxe-column type="checkbox" width="60"></vxe-column>
+                <vxe-column field="id" title="用户编号"></vxe-column>
+                <vxe-column field="name" title="用户名称"></vxe-column>
+                <vxe-column
+                    v-if="showUserType"
+                    field="electricityType"
+                    title="用电类别/电源类别"
+                    :formatter="formatter"
+                ></vxe-column>
+                <vxe-column v-else field="powerCategory" title="用电类别/电源类别" :formatter="formatter"></vxe-column>
+            </vxe-table>
+
+            <el-divider content-position="left">第三步 填写投诉详情</el-divider>
+
+            <el-form-item label="投诉内容:" style="margin-top: 10px" prop="complaintContent">
+                <el-input
+                    type="textarea"
+                    style="width: 400px"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                    placeholder="请输入内容"
+                    v-model="userAdddata.complaintContent"
+                ></el-input>
+            </el-form-item>
+            <br />
+            <el-form-item label="投诉时间:" style="margin-top: 10px" prop="complaintTime">
+                <el-date-picker
+                    v-model="userAdddata.complaintTime"
+                    type="date"
+                    placeholder="选择日期"
+                    value-format="yyyy-MM-dd"
+                ></el-date-picker>
+            </el-form-item>
+
+            <el-divider content-position="left">第四步 选择问题指标</el-divider>
+
+            <el-form-item label="稳态指标:" prop="steadyState">
+                <el-checkbox-group v-model="userAdddata.steadyState">
+                    <el-checkbox v-for="(item, ind) in steadyStateList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <br />
+            <el-form-item label="暂态指标:" prop="transientIndicators">
+                <el-checkbox-group v-model="userAdddata.transientIndicators">
+                    <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+        </el-form>
+
+        <div style="display: flex; justify-content: center; margin-top: 10px">
+            <el-button type="primary" class="ml20" @click="previouStep">上一步</el-button>
+            <el-button type="primary" class="ml20" @click="userAddProblem">生成问题</el-button>
+            <el-button type="primary" class="ml20" @click="handleClose">取消</el-button>
+        </div>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, reactive, onMounted } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import Area from '@/components/form/area/index.vue'
+import DatePicker from '@/components/form/datePicker/index.vue'
+const emit = defineEmits(['handleClose', 'onSubmit'])
+const dictData = useDictData()
+const problemData = dictData.getBasicData('Problem_Sources')
+const alarmList = dictData.getBasicData('alarm_Type')
+const Voltage = dictData.getBasicData('Dev_Voltage')
+const userTypeData = dictData.getBasicData('User_Category')
+// const steadyStateList = dictData.getBasicData('Steady_Indicator')
+// const transientIndicatorsList = dictData.getBasicData('Transient_Indicators')
+
+const steadyStateList = [
+    {
+        name: '负序电压不平衡度',
+        id: '137d08f4f29d4f781b0d2a8fabbd3c5c',
+        code: 'Negative_Voltage',
+        value: null,
+        sort: 5
+    },
+    {
+        name: '间谐波电压',
+        id: '218da5cb747413d4cf92e2b37651e13f',
+        code: 'Interhar_Voltage',
+        value: null,
+        sort: 4
+    },
+    { name: '负序电流', id: '396c27f91281fbd41f93fe034038aa52', code: 'Neg_Current', value: null, sort: 6 },
+    { name: '频率偏差', id: '74a3943e802ed7fa4252887788682818', code: 'Fre_Deviation', value: null, sort: 0 },
+    { name: '电压偏差', id: '8ff1545d3bacee9c0f834901cebcbd23', code: 'Voltage_Dev', value: null, sort: 1 },
+    { name: '谐波电流', id: '9177bf292f22f8c27f1ceeeceaea7000', code: 'Har_Current', value: null, sort: 3 },
+    {
+        name: '电压波动与闪变',
+        id: '9267dfbe8a6eac561e29d8377e159c3c',
+        code: 'Voltage_Fluc',
+        value: null,
+        sort: 7
+    },
+    { name: '谐波电压', id: 'ef42e7cb71b667bb06a5c10e1bdb27de', code: 'Har_Voltage', value: null, sort: 2 }
+]
+const transientIndicatorsList = [
+    { name: '电压暂降', id: '2eee1cb8c62b8e1bef3992e3f4d0c95b', code: 'Voltage_Sag', value: null, sort: 0 },
+    { name: '短时中断', id: '9ab8c44a757f3c5e86f4ac10905496a8', code: 'Interruptions', value: null, sort: 2 },
+    { name: '电压暂升', id: 'a25ff36c30155699288256960bc22eb9', code: 'Voltage_Rises', value: null, sort: 1 }
+]
+const add = ref(true)
+const onlineAdd = ref(false)
+const isLoading1 = ref(false)
+const isLoading2 = ref(false)
+const isLoading3 = ref(false)
+const showUserType = ref(false)
+const ordinaryAdd = ref(false)
+const userAdd = ref(false)
+const operationAdd = ref(false)
+const ruleForm = ref()
+const DateRef = ref()
+const xTableRef = ref()
+
+const addData = ref({
+    orgName: dictData.state.area[0].id,
+    problemSources: '',
+    problemName: '',
+    orgNo: ''
+})
+const ordinaryA = ref({
+    orgNo: '',
+    planName: '',
+    planStartTime: '',
+    uploadTime: '',
+    name: '',
+    steadyState: [],
+    transientIndicators: []
+})
+const operationAdddata = ref({
+    abnormalDevName: '',
+    eventDescription: '',
+    abnormalDevTime: '',
+    steadyState: [],
+    transientIndicators: []
+})
+const userA = ref({
+    userType: 'Elec_User',
+    id: ''
+})
+const userAdddata = ref({
+    complaintContent: '',
+    complaintTime: '',
+    steadyState: [],
+    transientIndicators: []
+})
+const planNameList: any = ref([])
+const onlineAddData = ref([])
+const userAddDataList = ref([])
+const ordinaryAddData = ref([])
+const rules = {
+    problemName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }],
+    complaintContent: [{ required: true, message: '请输入投诉内容', trigger: 'blur' }],
+    complaintTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
+    problemSources: [{ required: true, message: '情选择问题来源', trigger: 'change' }],
+    abnormalDevTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
+    transientIndicators: [{ required: true, message: '请选择暂态指标', trigger: 'change' }],
+    steadyState: [{ required: true, message: '请选择稳态指标', trigger: 'change' }],
+    eventDescription: [{ required: true, message: '请输入设备异常描述', trigger: 'blur' }],
+    abnormalDevName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }]
+}
+
+// 关闭
+const handleClose = () => {
+    emit('handleClose')
+    emit('onSubmit')
+}
+// 下一步
+const nextStep = () => {
+    ruleForm.value.validate((valid: any) => {
+        if (valid) {
+            if (addData.value.problemSources == 'Online') {
+                add.value = false
+
+                onlineAdd.value = true
+                setTimeout(() => {
+                    DateRef.value.setTimeOptions([{ label: '月份', value: 3 }])
+                    searchOnLine()
+                }, 0)
+            } else if (addData.value.problemSources == 'General') {
+                ordinaryA.value.orgNo = dictData.state.area[0].id
+
+                add.value = false
+                ordinaryAdd.value = true
+                ordinaryA.value.planStartTime = window.XEUtils.toDateString(new Date().getTime(), 'yyyy-MM') + '-01'
+
+                queryPlanName()
+                setTimeout(() => {
+                    searchFnExcessive()
+                }, 0)
+            } else if (addData.value.problemSources == 'User_Complaints') {
+                add.value = false
+                userAdd.value = true
+                searchFnComplain()
+            } else if (addData.value.problemSources == 'Dev_Exception') {
+                add.value = false
+                operationAdd.value = true
+            }
+        }
+    })
+}
+// 上一步
+const previouStep = () => {
+    onlineAdd.value = false
+    ordinaryAdd.value = false
+    userAdd.value = false
+    operationAdd.value = false
+    add.value = true
+}
+
+// 在线监测超标问题新增
+const OnlineMonitoring = () => {
+    // xTableRef.value.getCheckboxRecords()
+}
+// 在线监测告警查询
+const searchOnLine = () => {
+    // isLoading1.value = true
+}
+// 普通监测超标问题新增
+const queryPlanName = () => {}
+const searchFnExcessive = () => {}
+// 普测超标生成问题
+const GeneralSurvey = () => {}
+const formatter = (row: any) => {
+    if (row.column.field == 'alarmType') {
+        return alarmList.filter((item: any) => item.id == row.cellValue)[0]?.name
+    } else if (row.column.field == 'voltageLevel') {
+        return Voltage.filter((item: any) => item.id == row.cellValue)[0]?.name
+    } else if (row.column.field == 'electricityType') {
+        return dictData.getBasicData('Ele_Class').filter((item: any) => item.id == row.cellValue)[0]?.name
+    } else if (row.column.field == 'powerCategory') {
+        return dictData.getBasicData('Power_Category').filter((item: any) => item.id == row.cellValue)[0]?.name
+    } else {
+        return row.cellValue
+    }
+}
+// 运维异常问题新增
+const generateAbnormal = () => {}
+
+//用户投诉问题
+const searchFnComplain = () => {
+    // isLoading3.value = true
+    // userAddDataList.value=[]
+    // if (userA.value.userType == 'Elec_User') {
+    //     // 发电用户
+    //     showUserType.value = false
+    //     getGenerateElectricityUserList({ id: userA.value.id }).then(res => {
+    //         this.userAddDataList = res.data
+    //     })
+    // } else {
+    //     showUserType.value = true
+    //     // 用电用户
+    //     getPowerUtilizationUserList({ id: userA.value.id }).then(res => {
+    //         this.userAddDataList = res.data
+    //     })
+    // }
+    // this.isLoading3 = false
+}
+// 用户投诉新增
+const userAddProblem = () => {}
+onMounted(() => {})
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue b/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue
index 0f6b8b7a..8d77fc37 100644
--- a/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue
@@ -43,7 +43,7 @@
             </el-form-item>
         </template>
         <template #operation>
-            <el-button icon="el-icon-Plus" type="primary">新增</el-button>
+            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
             <el-button icon="el-icon-EditPen" type="primary">填报</el-button>
             <el-button icon="el-icon-Delete" type="primary">删除</el-button>
             <el-button icon="el-icon-SuccessFilled" type="primary">归档</el-button>
@@ -51,6 +51,8 @@
         </template>
     </TableHeader>
     <Table ref="tableRef" />
+    <!-- 新增 -->
+    <NewlyAdd v-if="showNewlyAdded" @handleClose="handleClose" @onSubmit="onSubmit"  />
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -60,7 +62,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
-
+import NewlyAdd from './NewlyAdd.vue'
 const dictData = useDictData()
 const uploadData = [
     {
@@ -75,11 +77,10 @@ const uploadData = [
     }
 ]
 
-const dialogVisible = ref(false)
-const title = ref('')
+const showNewlyAdded = ref(false)
 const TableHeaderRef = ref()
 const ruleFormRef = ref()
-const tableStore = new TableStore({
+const tableStore:any = new TableStore({
     url: '/system-boot/area/areaSelect',
     publicHeight: 65,
     method: 'POST',
@@ -141,4 +142,15 @@ provide('tableStore', tableStore)
 onMounted(() => {
     tableStore.index()
 })
+// 新增
+const add = () => {
+    showNewlyAdded.value = true
+}
+const onSubmit = () => {
+    console.log(123)
+}
+// 关闭弹框
+const handleClose = () => {
+    showNewlyAdded.value = false
+}
 </script>
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
index f725fd87..4ecacb97 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
@@ -1,28 +1,118 @@
 <template>
-    <div>
-        <div>
-            <TableHeader area datePicker ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label=" 计划状态">
-                        <el-select v-model="tableStore.table.params.searchState" placeholder="请选择 计划状态">
-                            <el-option
-                                v-for="item in planstatus"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
+    <TableHeader area datePicker ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label=" 计划状态">
+                <el-select v-model="tableStore.table.params.searchState" placeholder="请选择 计划状态">
+                    <el-option
+                        v-for="item in planstatus"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon="el-icon-Plus" type="primary" @click="add">新增计划</el-button>
+            <el-button icon="el-icon-Stamp" type="primary">提交审核</el-button>
+            <el-button icon="el-icon-Download" type="primary">导出</el-button>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" />
+    <!-- 新增弹窗 -->
+    <el-dialog :title="title" v-model="planAddition" width="950px" :before-close="cancelFn">
+        <el-row :gutter="20">
+            <el-col :span="10">
+                <el-divider content-position="left">基本信息</el-divider>
+                <el-form :inline="true" :model="formdata" :disabled="viewDetails" label-width="120px">
+                    <el-form-item label="普测负责单位:">
+                        <el-input v-model="formdata.orgName" class="formW" disabled></el-input>
                     </el-form-item>
-                </template>
-                <template #operation>
-                    <el-button icon="el-icon-Plus" type="primary">新增计划</el-button>
-                    <el-button icon="el-icon-Stamp" type="primary">提交审核</el-button>
-                    <el-button icon="el-icon-Download" type="primary">导出</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
+                    <el-form-item label="计划开始时间:">
+                        <el-date-picker
+                            v-model.trim="formdata.planStartTime"
+                            type="date"
+                            style="width: 240px"
+                            placeholder="选择计划开始时间"
+                            value-format="yyyy-MM-dd"
+                        ></el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="计划结束时间:">
+                        <el-date-picker
+                            v-model.trim="formdata.planEndTime"
+                            type="date"
+                            style="width: 240px"
+                            placeholder="选择计划结束时间"
+                            value-format="yyyy-MM-dd"
+                        ></el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="普测计划编号:">
+                        <el-input
+                            :disabled="title == '普测计划修改'"
+                            v-model="formdata.planNo"
+                            class="formW"
+                            placeholder="请输入普测计划编号"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="计划名称:">
+                        <el-input v-model="formdata.planName" placeholder="请输入计划名称" class="formW"></el-input>
+                    </el-form-item>
+                    <el-form-item label="测试负责人:">
+                        <el-input v-model="formdata.leader" placeholder="请输入测试负责人" class="formW"></el-input>
+                    </el-form-item>
+                </el-form>
+            </el-col>
+            <el-col :span="14">
+                <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">添加电站</el-divider>
+                <!-- <div class="mb10" style="display: flex" v-if="!viewDetails">
+                        <el-input
+                            v-model="input"
+                            placeholder="请输入电站数"
+                            class="formW"
+                            @input="handleEdit"
+                            class="mr10"
+                        ></el-input>
+                        <el-button
+                            type="primary"
+                            :disabled="!input.length > 0"
+                            icon="el-icon-circle-check"
+                            size="small"
+                            @click="Tick"
+                        >
+                            按配置勾选
+                        </el-button>
+                    </div>
+                    <el-tree
+                        :data="treeData"
+                        show-checkbox
+                        node-key="id"
+                        style="overflow-y: auto; height: 490px"
+                        default-expand-all
+                        :props="defaultProps"
+                        :check-strictly="true"
+                        ref="tree"
+                    ></el-tree> -->
+            </el-col>
+        </el-row>
+        <!-- <el-divider
+            v-if="title == '计划详情' && formdata.status == 2 && formdata.status == 3"
+            content-position="left"
+            style="font-size: 18px; font-weight: bolder"
+        >
+            审核意见
+        </el-divider>
+        <el-input
+            v-if="title == '计划详情' && formdata.status == 2 && formdata.status == 3"
+            disabled
+            type="textarea"
+            :rows="2"
+            v-model="textarea"
+        ></el-input> -->
+        <div slot="footer" style="display: flex; justify-content: center" v-if="!viewDetails">
+            <el-button type="primary" size="small" class="ml20" @click="submitFn">提交</el-button>
+            <el-button type="primary" size="small" class="ml20" @click="cancelFn">取消</el-button>
         </div>
-    </div>
+    </el-dialog>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -57,8 +147,21 @@ const planstatus = [
         label: '已发布'
     }
 ]
+const formdata = ref({
+    orgName: '',
+    orgNo: '',
+    planStartTime: '',
+    planEndTime: '',
+    planNo: '',
+    planName: '',
+    leader: '',
+    rgeneralSurveyPlanDetailAddParm: [],
+    subCount: '',
+    busCount: ''
+})
 
-const dialogVisible = ref(false)
+const planAddition = ref(false)
+const viewDetails = ref(false)
 const TableHeaderRef = ref()
 const title = ref('')
 
@@ -123,7 +226,26 @@ tableStore.table.params.searchValue = ''
 tableStore.table.params.type = ''
 
 provide('tableStore', tableStore)
+// 新增计划
+const add = () => {
+    title.value = '普测计划新增'
+    planAddition.value = true
+}
+// 提交
+const submitFn = () => {}
+// 取消
+const cancelFn = () => {
+    planAddition.value = false
+    viewDetails.value = false
+}
+
 onMounted(() => {
     tableStore.index()
 })
 </script>
+
+<style scoped lang="scss">
+.formW {
+    width: 240px;
+}
+</style>
diff --git a/src/views/pqs/supervise/interfere/components/undocumented.vue b/src/views/pqs/supervise/interfere/components/undocumented.vue
index 4dc36367..b62af1a1 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented.vue
@@ -1,45 +1,77 @@
 <template>
-    <div>
-        <div>
-            <TableHeader area ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="干扰源类型">
-                        <el-input
-                            v-model="tableStore.table.params.searchValue"
-                            clearable
-                            placeholder="请选择干扰源类型"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item label="干扰源用户名称">
-                        <el-input
-                            v-model="tableStore.table.params.searchValue"
-                            clearable
-                            placeholder="请选择干扰源用户名称"
-                        ></el-input>
-                    </el-form-item>
+    <TableHeader area ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="干扰源类型">
+                <el-input
+                    v-model="tableStore.table.params.searchValue"
+                    clearable
+                    placeholder="请选择干扰源类型"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="干扰源用户名称">
+                <el-input
+                    v-model="tableStore.table.params.searchValue"
+                    clearable
+                    placeholder="请选择干扰源用户名称"
+                ></el-input>
+            </el-form-item>
 
-                    <el-form-item label="是否上传报告:">
-                        <el-select v-model="tableStore.table.params.searchState" placeholder="请选择是否上传报告">
-                            <el-option
-                                v-for="item in process"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </template>
-                <template #operation>
-                    <el-button icon="el-icon-Plus" type="primary">新增</el-button>
-                    <el-button icon="el-icon-Upload" type="primary">上传</el-button>
-                    <el-button icon="el-icon-Sort" type="primary">关联</el-button>
-                    <el-button icon="el-icon-Download" type="primary">导出</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
+            <el-form-item label="是否上传报告:">
+                <el-select v-model="tableStore.table.params.searchState" placeholder="请选择是否上传报告">
+                    <el-option v-for="item in process" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+            <el-button icon="el-icon-Upload" type="primary">上传</el-button>
+            <el-button icon="el-icon-Sort" type="primary">关联</el-button>
+            <el-button icon="el-icon-Download" type="primary">导出</el-button>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" />
+    <!-- 新增 -->
+    <el-dialog title="未建档干扰用户新增" v-model="userAdd" width="50%">
+        <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">基本信息</el-divider>
+        <el-form :inline="true" label-width="120px">
+            <el-form-item label="区域:">
+                <Area ref="areaRef" v-model="addData.orgNo" style="width: 240px" />
+            </el-form-item>
+            <el-form-item label="干扰源类型:">
+                <el-select v-model="addData.loadType" clearable collapse-tags style="width: 240px" placeholder="请选择">
+                    <el-option
+                        v-for="item in interferenceType"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="干扰源用户名称:">
+                <el-input
+                    v-model="addData.userName"
+                    clearable
+                    style="width: 240px"
+                    placeholder="请输入关键字"
+                ></el-input>
+            </el-form-item>
+
+            <el-form-item label="建档时间:">
+                <el-date-picker
+                    style="width: 240px"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    v-model="addData.recordTime"
+                    type="datetime"
+                    placeholder="选择日期时间"
+                ></el-date-picker>
+            </el-form-item>
+        </el-form>
+        <div style="display: flex; justify-content: center; margin-top: 30px">
+            <el-button type="primary" class="ml20" @click="config">确定</el-button>
+            <el-button type="primary" class="ml20" @click="userAdd = false">取消</el-button>
         </div>
-    </div>
-    
+    </el-dialog>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -47,11 +79,14 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import Area from '@/components/form/area/index.vue'
+
 import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
 import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
 
 const dictData = useDictData()
+const userAdd = ref(false)
 const process = [
     {
         name: '是',
@@ -65,7 +100,13 @@ const process = [
 
 const dialogVisible = ref(false)
 const TableHeaderRef = ref()
-const title = ref('')
+const interferenceType = dictData.getBasicData('Interference_Source')
+const addData = ref({
+    orgNo: dictData.state.area[0].id,
+    loadType: '',
+    userName: '',
+    recordTime: ''
+})
 
 const ruleFormRef = ref()
 const tableStore = new TableStore({
@@ -142,6 +183,11 @@ tableStore.table.params.searchValue = ''
 tableStore.table.params.type = ''
 
 provide('tableStore', tableStore)
+// 新增
+const add = () => {
+    userAdd.value = true
+}
+
 onMounted(() => {
     tableStore.index()
 })
diff --git a/src/views/pqs/supervise/technology/components/overview.vue b/src/views/pqs/supervise/technology/components/overview.vue
new file mode 100644
index 00000000..446e809d
--- /dev/null
+++ b/src/views/pqs/supervise/technology/components/overview.vue
@@ -0,0 +1,218 @@
+<template>
+    <div>
+        <div>
+            <TableHeader datePicker ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="筛选数据">
+                        <el-input
+                            v-model="tableStore.table.params.searchValue"
+                            clearable
+                            placeholder="请选择筛选数据"
+                        ></el-input>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <div class="box">
+                <MyEChart :options="options1" />
+                <MyEChart :options="options2" />
+            </div>
+            <Table ref="tableRef" />
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+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 { ElMessage, ElMessageBox } from 'element-plus'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import MyEChart from '@/components/echarts/MyEchart.vue'
+import { info } from 'console'
+
+const dictData = useDictData()
+
+const dialogVisible = ref(false)
+const TableHeaderRef = ref()
+const title = ref('')
+const options1 = ref({})
+const options2 = ref({})
+
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/system-boot/area/areaSelect',
+    publicHeight: 345,
+    method: 'POST',
+    column: [
+        { field: 'name', title: '事务名称' },
+        { field: 'type', title: '事务类型' },
+        { field: 'createUser', title: '创建人员' },
+        { field: 'companyName', title: '创建部门' },
+        { field: 'modifyUser', title: '处理人员' },
+        { field: 'modifyTime', title: '处理时间' },
+        { field: 'progressTime', title: '进行时间(天)' },
+        { field: 'progress', title: '流程状态' },
+        { field: 'alertType', title: '预警类型' },
+
+        {
+            title: '操作',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '上传',
+                    type: 'primary',
+
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {}
+                },
+                {
+                    name: 'edit',
+                    title: '查看',
+                    type: '',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: async row => {}
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data = [
+            {
+                state: 2
+            }
+        ]
+    }
+})
+
+tableStore.table.params.searchState = ''
+tableStore.table.params.searchValue = ''
+tableStore.table.params.type = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+    info()
+})
+//渲染图表
+const info = () => {
+    options1.value = {
+        title: {
+            text: '商务类型',
+            x: 'center',
+            textStyle: {
+                fontWeight: 'normal'
+            }
+        },
+        xAxis: [
+            {
+                data: ['全部', '预警单', '告警单']
+            }
+        ],
+        yAxis: [{}],
+        series: [
+            {
+                name: '数量',
+                type: 'bar',
+                barMaxWidth: 30, //最大宽度
+                data: [
+                    {
+                        value: 9,
+                        id: ''
+                    },
+                    {
+                        value: 4,
+                        id: '0'
+                    },
+                    {
+                        value: 5,
+                        id: '1'
+                    }
+                ]
+            }
+        ]
+    }
+    options2.value = {
+        title: {
+            text: '事务流程',
+            x: 'center',
+            textStyle: {
+                fontWeight: 'normal'
+            }
+        },
+        xAxis: [
+            {
+                data: [
+                    '全部',
+                    '开始',
+                    '预/告警单下发',
+                    '预/告警单反馈',
+                    '现场测试',
+                    '整改通知单下发',
+                    '整改通知单反馈',
+                    '完结'
+                ]
+            }
+        ],
+        yAxis: [{}],
+        series: [
+            {
+                name: '数量',
+                type: 'bar',
+                barMaxWidth: 30, //最大宽度
+                data: [
+                    {
+                        value: 9,
+                        id: ''
+                    },
+                    {
+                        value: 4,
+                        id: '0'
+                    },
+                    {
+                        value: 5,
+                        id: '1'
+                    },
+                    {
+                        value: 5,
+                        id: '2'
+                    },
+                    {
+                        value: 5,
+                        id: '3'
+                    },
+                    {
+                        value: 5,
+                        id: '4'
+                    },
+                    {
+                        value: 5,
+                        id: '5'
+                    },
+                    {
+                        value: 5,
+                        id: '6'
+                    }
+                ]
+            }
+        ]
+    }
+}
+// 新增
+const add = () => {
+    title.value = '新增告警单'
+    dialogVisible.value = true
+}
+</script>
+<style lang="scss" scoped>
+.box {
+    height: 280px;
+    display: flex;
+    justify-content: space-between;
+}
+</style>
diff --git a/src/views/pqs/supervise/technology/index.vue b/src/views/pqs/supervise/technology/index.vue
index aab931d1..eb4a4ea9 100644
--- a/src/views/pqs/supervise/technology/index.vue
+++ b/src/views/pqs/supervise/technology/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
-            <el-tab-pane label="概览" name="1"></el-tab-pane>
+            <el-tab-pane label="概览" name="1"><overview v-if="activeName == '1'"/></el-tab-pane>
             <el-tab-pane label="技术监督管理" name="2"><technology  v-if="activeName == '2'"/></el-tab-pane>
             <el-tab-pane label="告警单策略管理" name="3">
                 <earlyWarning  v-if="activeName == '3'"/>
@@ -12,6 +12,7 @@
 </template>
 
 <script setup lang="ts">
+import overview from './components/overview.vue'
 import technology from './components/technology.vue'
 import earlyWarning from './components/earlyWarning.vue'
 import { onMounted, reactive, ref, provide } from 'vue'
diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index c9553152..b129c8df 100644
--- a/src/views/user/login.vue
+++ b/src/views/user/login.vue
@@ -125,6 +125,7 @@ onBeforeUnmount(() => {
 })
 getTheme().then(res => {
     getThemeList.value = res.data
+    window.localStorage.setItem('getTheme', JSON.stringify(res.data))
 })
 const onSubmit = async (formEl: FormInstance | undefined) => {
     if (!formEl) return