From 609489a4c5e8f6509caaecc900917ad89dc1e410 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Tue, 9 Jul 2024 13:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=20=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/process-boot/electricitymanagement.ts |  8 ++++
 .../components1/form/detail.vue               | 41 +++++++------------
 .../electricalEnergy/components1/online.vue   | 14 ++++---
 .../interferenceUserTable.vue                 |  7 +++-
 .../components/undocumented/addForm.vue       |  5 +++
 5 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/src/api/process-boot/electricitymanagement.ts b/src/api/process-boot/electricitymanagement.ts
index 061774e9..278634f3 100644
--- a/src/api/process-boot/electricitymanagement.ts
+++ b/src/api/process-boot/electricitymanagement.ts
@@ -237,3 +237,11 @@ export function getLineDetailByDeptId(obj: any) {
         data: form
     })
 }
+//查看越限详情
+export function overLimitDetail(data: any) {
+    return createAxios({
+        url: '/supervision-boot/onlineMonitor/overLimitDetail',
+        method: 'POST',
+        data
+    })
+}
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue b/src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue
index a67f1151..ce1c70f1 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/form/detail.vue
@@ -1,27 +1,9 @@
 <template>
-    <el-dialog draggable v-model="dialogVisible" :title="title" width="80%" :before-close="handleClose">
+    <el-dialog draggable v-model="dialogVisible" :title="title" width="800px" :before-close="handleClose">
         <div style="height: 45vh">
             <vxe-table height="auto" v-bind="defaultAttribute" :data="List">
-                <vxe-column field="dept" title="负责单位"></vxe-column>
-                <vxe-column field="substation" title="变电站名称"></vxe-column>
-                <vxe-column field="deviceName" title="终端名称"></vxe-column>
-                <vxe-column field="lineName" title="监测点名称"></vxe-column>
-                <vxe-column
-                    field="businessType"
-                    title="监测对象类型"
-                    :formatter="row => industry.find((item: any) => item.id == row.cellValue)?.name || '/'"
-                ></vxe-column>
-                <vxe-column field="objectName" title="监测对象名称"></vxe-column>
-                <vxe-column
-                    field="targetType"
-                    title="指标类型"
-                    :formatter="row => exceeded.find((item: any) => item.id == row.cellValue)?.name || '/'"
-                ></vxe-column>
-                <vxe-column
-                    field="overLimitDay"
-                    title="累计超标天数"
-                    :formatter="row => (row.cellValue != null ? row.cellValue : '/')"
-                ></vxe-column>
+                <vxe-column field="time" title="日期" width="250px"></vxe-column>
+                <vxe-column field="overLimitInfo" title="越限详情"></vxe-column>
             </vxe-table>
         </div>
     </el-dialog>
@@ -30,20 +12,25 @@
 import { ref, defineEmits } from 'vue'
 import { useDictData } from '@/stores/dictData'
 import { ElMessage } from 'element-plus'
-import { report } from '@/api/process-boot/electricitymanagement'
-
+import { overLimitDetail } from '@/api/process-boot/electricitymanagement'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
-const dialogVisible = ref(false)
+const dialogVisible = ref(true)
 const title: any = ref('')
-const industry = dictData.getBasicData('Business_Type')
-
-const exceeded = dictData.getBasicData('Indicator_Type')
+const List: any = ref([])
 
 const open = (row: any) => {
     dialogVisible.value = true
     title.value = row.text
+    overLimitDetail({
+        lineId: row.row.lineId,
+        targetId: row.row.targetId,
+        searchBeginTime: row.list.searchBeginTime,
+        searchEndTime: row.list.searchEndTime
+    }).then(res => {
+        List.value = res.data
+    })
 }
 
 const handleClose = () => {
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/online.vue b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
index ce0847fe..95f194a9 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
@@ -8,7 +8,7 @@
             </el-form-item>
             <el-form-item label="监测点性质">
                 <el-select v-model="tableStore.table.params.lineType" clearable>
-                    <el-option label="电网侧"   value="0" />
+                    <el-option label="电网侧" value="0" />
                     <el-option label="非电网侧" value="1" />
                 </el-select>
             </el-form-item>
@@ -175,7 +175,8 @@ const tableStore = new TableStore({
                     click: row => {
                         detailRef.value.open({
                             text: '详情',
-                            form: list.value
+                            row: row.row,
+                            list: list.value
                         })
                     }
                 },
@@ -281,10 +282,13 @@ const tableStore = new TableStore({
     beforeSearchFun: () => {
         tableStore.table.params.currentPage = tableStore.table.params.pageNum
         list.value.deptId = tableStore.table.params.deptId
-       
+
         list.value.searchBeginTime = tableStore.table.params.searchBeginTime
         list.value.searchEndTime = tableStore.table.params.searchEndTime
-        list.value.alertThreshold = tableStore.table.params.alertThreshold
+        if (tableStore.table.params.alertThreshold != '') {
+            list.value.alertThreshold = tableStore.table.params.alertThreshold
+        }
+        list.value.lineType = tableStore.table.params.lineType
         list.value.alarmThreshold = tableStore.table.params.alarmThreshold
         flag.value = level.value
         flagTime.value = tableStore.table.params.dataType == 0 ? true : false
@@ -353,7 +357,7 @@ const launch = (title: string) => {
         form: list.value,
         row: tableStore.table.selection
     })
-        console.log("🚀 ~ launch ~ list.value:", list.value)
+    console.log('🚀 ~ launch ~ list.value:', list.value)
 }
 const changeArea = e => {
     level.value = e.data.level
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
index de65d826..29bc2909 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
@@ -207,10 +207,13 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     showDisabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 0 || row.status == null)
+                        return (
+                            row.createBy != adminInfo.$state.id ||
+                            !(row.status == 0 || row.status == 2 || row.status == null)
+                        )
                     },
                     disabled: row => {
-                        return !(row.status == 0 || row.status == null)
+                        return !(row.status == 0 || row.status == 2 || row.status == null)
                     },
                     click: row => {
                         update.value = row.status == null ? false : true
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index b21ad83f..0005f3c0 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -939,11 +939,14 @@ watch(
     }
 )
 const resendId = ref('')
+const status = ref('')
 const open = async (row: any) => {
     title.value = row.title
     dialogFormVisible.value = true
     if (row.row) {
         resendId.value = row.row.id
+        status.value = row.row.status
+
         if (props.update) {
             await getUserReportUpdateById(row.row.id).then(res => {
                 handleResponse(res.data.userReportMessageJson)
@@ -1361,8 +1364,10 @@ const confirmForm = (flag: boolean) => {
                     })
                 } else {
                     confirmFormData.id = resendId.value
+
                     if (props.normalizedControl) {
                         if (title.value == '编辑') {
+                            if (status.value != '') confirmFormData.status = status.value
                             addEditor(confirmFormData).then(res => {
                                 ElMessage({
                                     message: '发起成功',