修改 冀北现场问题

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

@@ -3,7 +3,7 @@
         <Terminal ref="TerminalRef" @node-click="nodeClick" @init="nodeClick"></Terminal>
         <div class="device-manage-right">
             <el-form :inline="true" class="demo-form-inline">
-                <el-form-item>
+                <el-form-item style="position: relative; z-index: 2">
                     <el-button icon="el-icon-Plus" type="primary" @click="add">新 增</el-button>
                     <el-button icon="el-icon-Edit" type="primary" @click="update">修 改</el-button>
                     <el-button icon="el-icon-Close" type="danger" @click="remove">删 除</el-button>
@@ -1315,11 +1315,7 @@
                                             ></el-option>
                                         </el-select>
                                     </el-form-item>
-                                    <el-form-item
+                                    <el-form-item class="form-item" label="监测点拥有者:">
-                                        class="form-item"
-                                        label="监测点拥有者:"
-                                       
-                                    >
                                         <!-- :prop="
                                             'deviceParam.' +
                                             [deviceIndex] +
@@ -1336,11 +1332,7 @@
                                             placeholder="请输入监测点拥有者"
                                         ></el-input>
                                     </el-form-item>
-                                    <el-form-item
+                                    <el-form-item class="form-item" label="拥有者职务:">
-                                        class="form-item"
-                                        label="拥有者职务:"
-                                        
-                                    >
                                         <!-- :prop="
                                             'deviceParam.' +
                                             [deviceIndex] +
@@ -1377,11 +1369,7 @@
                                             placeholder="请输入电网侧变电站"
                                         ></el-input>
                                     </el-form-item>
-                                    <el-form-item
+                                    <el-form-item class="form-item" label="上级变电站:">
-                                        class="form-item"
-                                        label="上级变电站:"
-                                      
-                                    >
                                         <!-- :prop="
                                             'deviceParam.' +
                                             [deviceIndex] +

src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue

@@ -68,8 +68,19 @@
                 </el-select>
             </el-form-item>
         </template>
+        <template #operation>
+            <!-- <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> -->
+            <el-button icon="el-icon-Download" @click="exportEvent" type="primary">下载报告</el-button>
+        </template>
     </TableHeader>
-    <Table ref="tableRef" :tree-config="{ transform: true, parentField: 'pid' }" :scroll-y="{ enabled: true }" />
+    <Table
+        ref="tableRef"
+        :column-config="{ resizable: true }"
+        :checkbox-config="{ labelField: 'name', highlight: true }"
+        
+        :tree-config="{ transform: true, parentField: 'pid' }"
+        :scroll-y="{ enabled: true }"
+    />
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -92,7 +103,8 @@ const tableStore = new TableStore({
     showPage: false,
     method: 'POST',
     column: [
-        { field: 'name', title: '电网拓扑', minWidth: '180px', align: 'left', treeNode: true },
+        // { width: '60', title: '111',  },
+        { field: 'name', title: '电网拓扑', minWidth: '180px', type: 'checkbox', align: 'left', treeNode: true },
         {
             field: 'ip',
             title: '网络参数',
@@ -214,6 +226,9 @@ const tree2List = (list: any, pid?: string) => {
 onMounted(() => {
     tableStore.index()
 })
+const exportEvent = () => {
+    console.log(tableRef.value.getRef().getCheckboxRecords())
+}
 </script>
 
 <style scoped lang="scss"></style>

src/views/pqs/qualityInspeection/panorama/components/city/exceeded.vue

@@ -1,11 +1,11 @@
 <!-- 稳态 -->
 <template>
     <!-- 终端 -->
-    <el-dialog draggable title="稳态指标超标占比统计" v-model="dialogVisible" width="800">
+    <el-dialog draggable title="稳态指标超标水平评估统计" v-model="dialogVisible" width="800">
         <el-row style="height: 330px" :gutter="20">
             <el-col :span="23">
                 <div class="title">
-                    <span>稳态指标超标占比</span>
+                    <span>稳态指标超标水平评估统计</span>
                 </div>
                 <div class="boxSteps">
                     <el-steps>
@@ -80,7 +80,7 @@ const tableData: any = ref([])
 const echart = (row: any) => {
     let chart = echarts.init(chartRef.value as HTMLDivElement)
 
-    let dataname = ['频率偏差', '电压偏差', '电压总谐波畸变率', '三相电压不平衡度', '闪变']
+    let dataname = ['频率偏差(Hz)', '电压偏差(%)', '电压总谐波畸变率(%)', '三相电压不平衡度(%)', '闪变']
     let datamax = [100, 100, 100, 100, 100, 100]
     let indicator = []
     for (let i = 0; i < dataname.length; i++) {

src/views/pqs/qualityInspeection/panorama/components/city/statistics.vue

@@ -1,16 +1,20 @@
 <template>
     <!-- 综合评估详情 -->
-    <el-dialog draggable title="指标合格率统计" v-model="dialogVisible" width="1400px">
+    <el-dialog draggable title="指标合格率统计" v-model="dialogVisible" width="1500px">
         <div>
             <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="600px" :data="tableData">
                 <vxe-column field="substationName" title="变电站名称" />
                 <vxe-column field="lineName" title="监测点名称" />
                 <vxe-colgroup title="各指标合格率">
                     <vxe-column field="freqDev" sortable title="	频率偏差" :formatter="formatter" />
-                    <vxe-column field="plt" sortable title="闪变" :formatter="formatter" />
-                    <vxe-column field="ubalance" sortable title="三相电压不平衡度" :formatter="formatter" />
                     <vxe-column field="vdev" sortable title="电压偏差"  :formatter="formatter" />
-                    <vxe-column field="vthd" sortable title="电压总谐波畸变率" :formatter="formatter" />
+                    <vxe-column field="vthd" sortable title="电压总谐波畸变率" width="180" :formatter="formatter" />
+                    <vxe-column field="ubalance" sortable title="三相电压不平衡度" width="180" :formatter="formatter" />
+                    <vxe-column field="plt" sortable title="闪变" :formatter="formatter" />
+                    <vxe-column field="uharm" sortable title="谐波电压(%)" :formatter="formatter" />
+                    <vxe-column field="iharm" sortable title="谐波电流(%)" :formatter="formatter" />
+                    <vxe-column field="inuHarm" sortable title="间谐波电压(%)" width="180" :formatter="formatter" />
+                    <vxe-column field="ineg" sortable title="负序电流(A)" :formatter="formatter" />
                 </vxe-colgroup>
             </vxe-table>
         </div>

src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue

@@ -168,7 +168,7 @@ const Voltage: any = [
     {
         label: '试运行问题',
         value: 'trialRun'
-    },
+    }
 ]
 
 const active: any = ref(Voltage[0].value)
@@ -356,8 +356,7 @@ const info = (row: any) => {
                 }),
                 axisLabel: {
                     color: '#000',
-                    fontSize: 12,
+                    fontSize: 12
-                    interval: 0
                 }
             },
             grid: {
@@ -367,7 +366,7 @@ const info = (row: any) => {
             },
 
             options: {
-                dataZoom: null,
+                // dataZoom: null,
                 series: [
                     {
                         name: '超标监测点数',

src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue

@@ -39,7 +39,7 @@
             </el-col>
             <el-col :span="12">
                 <div class="title">
-                    <span>稳态电能质量水平评估环比变化</span>
+                    <span>稳态电能质量超标占比环比变化</span>
                 </div>
                 <div class="pie">
                     <div style="height: 250px; width: 100%" ref="chartRef"></div>
@@ -111,7 +111,15 @@ const echart = (row: any) => {
 
     let chart = echarts.init(chartRef.value as HTMLDivElement)
 
-    let dataname = ['频率偏差', '电压偏差', '电压总谐波畸变率', '三相电压不平衡度', '闪变']
+    let dataname = [ '频率偏差(Hz)',
+        '电压偏差(%)',
+        '电压总谐波畸变率(%)',
+        '三相电压不平衡度(%)',
+        '闪变',
+        '谐波电压(%)',
+        '谐波电流(%)',
+        '间谐波电压(%)',
+        '负序电流(A)']
     // let datamax = [100, 100, 100, 100, 100, 100]
     let indicator = []
     for (let i = 0; i < dataname.length; i++) {
@@ -157,7 +165,7 @@ const echart = (row: any) => {
         },
         radar: {
             center: ['50%', '60%'],
-            radius: '75%',
+            radius: '60%',
             startAngle: 90,
             splitNumber: 5,
             splitArea: {

src/views/pqs/qualityInspeection/panorama/components/line/info.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="default-main lineInfo" :style="height">
-        <DatePicker ref="datePickerRef" style="display: none" theCurrentTime/>
+        <DatePicker ref="datePickerRef" style="display: none" theCurrentTime />
         <el-page-header :icon="ArrowLeft" @back="emit('back')">
             <template #content>
                 <span style="font-size: 16px">{{ dropList.lineName }}详情　</span>
@@ -385,22 +385,22 @@ const open = async (id: string) => {
         dropList.value.assessData = res.data.assessLevel
         evaluationData.value = [
             {
-                targetName: '频率偏差',
+                targetName: '频率偏差(Hz)',
                 avg: res.data.freqAssessLevel,
                 sd: res.data.freqQualifyData
             },
             {
-                targetName: '电压偏差',
+                targetName: '电压偏差(%)',
                 avg: res.data.vdevAssessLevel,
                 sd: res.data.vdevQualifyData
             },
             {
-                targetName: '电压总谐波畸变率',
+                targetName: '电压总谐波畸变率(%)',
                 avg: res.data.harmAssessLevel,
                 sd: res.data.harmQualifyData
             },
             {
-                targetName: '三相电压不平衡度',
+                targetName: '三相电压不平衡度(%)',
                 avg: res.data.unbalanceAssessLevel,
                 sd: res.data.unbalanceQualifyData
             },
@@ -421,13 +421,28 @@ const open = async (id: string) => {
         echart([
             {
                 time: datePickerRef.value.timeValue[0].substring(0, 7),
-                targetList: ['频率偏差', '电压偏差', '电压总谐波畸变率', '三相电压不平衡度', '闪变'],
+                targetList: [
+                    '频率偏差(Hz)',
+                    '电压偏差(%)',
+                    '电压总谐波畸变率(%)',
+                    '三相电压不平衡度(%)',
+                    '闪变',
+                    '谐波电压(%)',
+                    '谐波电流(%)',
+                    '间谐波电压(%)',
+                    '负序电流(A)'
+                ],
                 ratioList: [
                     res.data.freqDev == 3.14159 ? null : res.data.freqDev,
                     res.data.vdev == 3.14159 ? null : res.data.vdev,
                     res.data.vthd == 3.14159 ? null : res.data.vthd,
                     res.data.ubalance == 3.14159 ? null : res.data.ubalance,
-                    res.data.plt == 3.14159 ? null : res.data.plt
+                    res.data.plt == 3.14159 ? null : res.data.plt,
+
+                    res.data.uharm == 3.14159 ? null : res.data.uharm,
+                    res.data.iharm == 3.14159 ? null : res.data.iharm,
+                    res.data.inuHarm == 3.14159 ? null : res.data.inuHarm,
+                    res.data.ineg == 3.14159 ? null : res.data.ineg
                 ]
             }
         ])
@@ -462,7 +477,7 @@ const open = async (id: string) => {
                 textStyle: {
                     // fontWeight: 600,
                     fontSize: 12
-                },
+                }
                 // subtext: '总数',
                 // subtextStyle: {
                 //     fontWeight: 550,
@@ -537,8 +552,18 @@ const open = async (id: string) => {
 const echart = (row: any) => {
     let chart = echarts.init(chartRef.value as HTMLDivElement)
 
-    let dataname = ['频率偏差', '电压偏差', '电压总谐波畸变率', '三相电压不平衡度', '闪变']
+    let dataname = [
-    let datamax = [100, 100, 100, 100, 100, 100]
+        '频率偏差(Hz)',
+        '电压偏差(%)',
+        '电压总谐波畸变率(%)',
+        '三相电压不平衡度(%)',
+        '闪变',
+        '谐波电压(%)',
+        '谐波电流(%)',
+        '间谐波电压(%)',
+        '负序电流(A)'
+    ]
+    let datamax = [100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100]
     let indicator = []
     for (let i = 0; i < dataname.length; i++) {
         indicator.push({

src/views/pqs/qualityInspeection/panorama/components/mapR.vue

@@ -298,7 +298,24 @@ const options = ref([
     {
         label: '三相电压不平衡度',
         value: '5'
-    }
+    },
+    {
+        label: '谐波电压',
+        value: '6'
+    },
+    {
+        label: '谐波电流',
+        value: '7'
+    },
+    {
+        label: '间谐波电压',
+        value: '8'
+    },
+    {
+        label: '负序电流',
+        value: '9'
+    },
+  
 ])
 const technology: any = ref({})
 const harmonicType = ref('0')

src/views/pqs/supervise/terminal/components/substationLedger.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <TableHeader datePicker area ref="TableHeaderRef">
+        <TableHeader datePicker area nextFlag theCurrentTime ref="TableHeaderRef">
             <template #select>
                 <el-form-item label="信息查询">
                     <el-input
@@ -34,6 +34,7 @@ const tableStore = new TableStore({
     paramsPOST: true,
     column: [
         { field: 'substationName', title: '变电站名称', minWidth: 100 },
+        { field: 'deptName', title: '所在地市', minWidth: 100 },
         {
             field: 'dwLineList',
             title: '电网侧监测点名称',

src/views/pqs/supervise/terminal/index.vue

@@ -30,7 +30,7 @@ import monitorLedgerTable from './components/monitorLedgerTable.vue'
 import { mainHeight } from '@/utils/layout'
 
 defineOptions({
-    name: 'Processsupervision/Terminaldetection'
+    name: 'Supervision/Terminaldetection'
 })
 const activeName = ref('1')
 const network = ref('1')

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue

@@ -140,12 +140,12 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item for="-" v-if="form.customSubstationFlag == 0" label="所属变电站：" prop="substation">
+            <el-form-item for="-" v-if="form.customSubstationFlag == 0" label="并网变电站：" prop="substation">
                 <el-select
                     v-model="form.substation"
                     clearable
                     style="width: 100%"
-                    placeholder="请选择所属变电站"
+                    placeholder="请选择并网变电站"
                     filterable
                     @change="changeSubstation"
                 >
@@ -157,8 +157,8 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item for="-" v-if="form.customSubstationFlag == 1" label="所属变电站：" prop="substationName">
+            <el-form-item for="-" v-if="form.customSubstationFlag == 1" label="并网变电站：" prop="substationName">
-                <el-input v-model="form.substationName" autocomplete="off" placeholder="请输入所属变电站" />
+                <el-input v-model="form.substationName" autocomplete="off" placeholder="请输入并网变电站" />
             </el-form-item>
             <el-form-item for="-" label="变电站电压等级：" prop="substationVoltageLevel">
                 <el-select
@@ -773,7 +773,7 @@ const getFrontEndMachineList = () => {
     })
 }
 const changeSubstationFlag = () => {
-    //处理所属变电站手都输入/下拉数据
+    //处理并网变电站手都输入/下拉数据
     if (form.value.customSubstationFlag == 0) {
         form.value.substationName = substationList.value.find((item: any) => {
             return form.value.substation == item.id
@@ -803,6 +803,8 @@ getFrontEndMachineList()
 const powerCompanyList: any = ref([])
 //获取所属供电公司，区域列表第三层数据
 const getPowerCompanyList = async (flag: any) => {
+   
+    
     getAllDeptList().then(res => {
         powerCompanyList.value = res.data[0].children[0].children
         if (flag) {
@@ -829,7 +831,8 @@ const getPowerCompanyList = async (flag: any) => {
 const findSubstationVoltageLevel = async () => {
     getSubstationVoltageLevel({ orgIds: [form.value.powerCompany] }).then(res => {
         substationList.value = res.data
-
+        form.value.latitude = substationList.value[0]?.lat
+        form.value.longitude = substationList.value[0]?.lng
         form.value.substation = substationList.value[0]?.id
         form.value.substationVoltageLevel = substationList.value[0]?.voltageLevel
     })
@@ -883,7 +886,7 @@ const resetForm: any = async () => {
         nextTerminalInspectionTime: new Date().getTime() + 365 * 5 * 24 * 3600 * 1000, //	下次终端定检时间
         powerCompany: powerCompanyList[0]?.value.id, //所属供电公司
         simCardNumber: '', //SIM卡号
-        substation: '', //	所属变电站
+        substation: '', //	并网变电站
         substationVoltageLevel: voltageLevelList[0].id, //	变电站电压等级
         summonFlag: summonFlagList[0].id, //	召唤标志
         terminalIp: '', //终端IP
@@ -922,7 +925,7 @@ const devReportForm: any = ref({
     //终端信息实体
     supervisionTempDeviceReportParam: {
         customSubstationFlag: 0, //电站类型
-        substationName: '', //所属变电站名称
+        substationName: '', //并网变电站名称
         alarmFunction: '0', //告警功能
         commissioningTime: '', //投运时间
         communicationStatus: communicationStatusList[0].id, //	通讯状态
@@ -945,7 +948,7 @@ const devReportForm: any = ref({
         nextTerminalInspectionTime: '', //	下次终端定检时间
         powerCompany: powerCompanyList.value[0]?.id, //所属供电公司
         simCardNumber: '', //SIM卡号
-        substation: '', //	所属变电站
+        substation: '', //	并网变电站
         substationVoltageLevel: voltageLevelList[0].id, //	变电站电压等级
         summonFlag: summonFlagList[0].id, //	召唤标志
         terminalIp: '', //终端IP
@@ -1033,14 +1036,14 @@ const rules = ref({
     substation: [
         {
             required: true,
-            message: '请选择所属变电站',
+            message: '请选择并网变电站',
             trigger: 'change'
         }
     ],
     substationName: [
         {
             required: true,
-            message: '请输入所属变电站',
+            message: '请输入并网变电站',
             trigger: 'blur'
         }
     ],

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue

@@ -26,7 +26,7 @@
         <el-descriptions-item label="所属供电公司">
             {{ detailData.supervisionTempDeviceReport?.powerCompany }}
         </el-descriptions-item>
-        <el-descriptions-item label="所属变电站">
+        <el-descriptions-item label="并网变电站">
             {{ detailData.supervisionTempDeviceReport?.substationName }}
         </el-descriptions-item>
         <el-descriptions-item label="变电站电压等级">

src/views/system/auth/userList/popupEdit.vue

@@ -111,7 +111,7 @@ const tableStore = inject('tableStore') as TableStore
 const form = reactive({
     id: '',
     name: '',
-    password: '123456',
+    password: 'Jbdnzl@123',
     email: '',
     limitIpStart: '',
     deptId: '',
@@ -233,7 +233,7 @@ const open = (text: string, data?: anyObj) => {
         form.id = ''
         form.limitIpStart = '0.0.0.0'
         form.limitIpEnd = '255.255.255.255'
-        form.password = '123456'
+        form.password = 'Jbdnzl@123'
     }
     form.type = adminInfo.$state.userType + 1
 }