From 8233b13927f3dfd2d18464227a4ced307b88917d Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Fri, 14 Jun 2024 16:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=8A=95?=
 =?UTF-8?q?=E8=AF=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/header/index.vue         |  2 +-
 .../components1/form/complaintsForm.vue       | 24 ++++++++++++++++---
 .../supervise/technology/components/alarm.vue |  3 +++
 .../technology/components/earlyWarn.vue       |  3 +++
 .../components/cycleDetection/index.vue       | 15 ++++++------
 .../components/jointDebugList/index.vue       | 10 +++++++-
 .../components/monitorpoint/index.vue         | 10 +++++++-
 .../components/terminainal/index.vue          | 12 ++++++++--
 8 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index f732c0a4..a02fa3fb 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -9,7 +9,7 @@
                 label-position="left"
                 :inline="true"
             >
-                <el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 600px">
+                <el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 570px">
                     <DatePicker ref="datePickerRef" :nextFlag="nextFlag"></DatePicker>
                 </el-form-item>
 
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue b/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue
index a54585a5..68a2ac50 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog draggable v-model="dialogVisible" :title="title" style="width: 65%" :before-close="handleClose">
+    <el-dialog draggable v-model="dialogVisible" :title="title" style="width: 800px" :before-close="handleClose">
         <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" :scroll-to-error="true">
             <el-row>
                 <el-col :span="12">
@@ -32,6 +32,19 @@
                         </el-radio-group>
                     </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                    <el-form-item for="-" label="负责单位:" prop="dutyOrgId">
+                        <Area ref="areaRef" v-model="form.dutyOrgId" style="width: 100%" />
+                        <!-- <el-select v-model="form.dutyOrgId" clearable placeholder="请选择负责单位">
+                            <el-option
+                                v-for="item in areaOptionList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select> -->
+                    </el-form-item>
+                </el-col>
                 <el-col v-if="form.detectionFlag == '1'" :span="12">
                     <!-- <el-form-item for="-" label="监测点名称:" prop="monitorName">
                         <el-input
@@ -122,6 +135,7 @@ import { useDictData } from '@/stores/dictData'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { genFileId, ElMessage } from 'element-plus'
 import { addComplaintsData, getLineDetailByDeptId } from '@/api/process-boot/electricitymanagement'
+import Area from '@/components/form/area/index.vue'
 const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
 const dialogVisible = ref(false)
@@ -149,9 +163,12 @@ const resetForm = () => {
         userNumber: '', //用户编号
         userCategory: '', //用户类别
         monitorName: '', //监测点名称
-        monitorNumber: '' //监测点编号
+        monitorNumber: '', //监测点编号
+        dutyOrgId: ''
     }
 }
+//字典获取所在地市
+const areaOptionList = dictData.getBasicData('jibei_area')
 resetForm()
 const rules = {
     userName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
@@ -162,7 +179,8 @@ const rules = {
     transientIndicators: [{ required: true, message: '请选择暂态指标', trigger: 'change' }],
     steadyIndicator: [{ required: true, message: '请选择稳态指标', trigger: 'change' }],
     monitorName: [{ required: true, message: '请输入监测点名称', trigger: 'blur' }],
-    monitorNumber: [{ required: true, message: '请选择监测点', trigger: 'change' }]
+    monitorNumber: [{ required: true, message: '请选择监测点', trigger: 'change' }],
+    dutyOrgId: [{ required: true, message: '请选择负责单位', trigger: 'change' }]
 }
 const formRef = ref(null)
 const submit = () => {
diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue
index 8c35311b..ee60ce18 100644
--- a/src/views/pqs/supervise/technology/components/alarm.vue
+++ b/src/views/pqs/supervise/technology/components/alarm.vue
@@ -76,6 +76,8 @@ const tableStore = new TableStore({
                 4: '现场测试超标问题'
             }
         },
+        { field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
+
         { field: 'leafletName', title: '单据名称', minWidth: '150' },
         { field: 'issueDetail', title: '告警内容', minWidth: '150' },
         {
@@ -98,6 +100,7 @@ const tableStore = new TableStore({
                 5: '新增'
             }
         },
+     
         { field: 'createTime', title: '创建时间', minWidth: '150' },
         {
             field: 'createBy',
diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue
index 05fe501a..6e46c435 100644
--- a/src/views/pqs/supervise/technology/components/earlyWarn.vue
+++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue
@@ -41,6 +41,7 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
+      
         {
             field: 'problemType', title: '预警单问题来源', minWidth: '150',
             render: 'tag',
@@ -57,6 +58,7 @@ const tableStore = new TableStore({
                 4: '现场测试超标问题'
             }
         },
+        { field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
         { field: 'leafletName', title: '单据名称', minWidth: '150' },
         {
             field: 'status', title: '流程状态', minWidth: '150',
@@ -76,6 +78,7 @@ const tableStore = new TableStore({
                 5: '新增'
             }
         },
+
         { field: 'createTime', title: '创建时间', minWidth: '150' },
         {
             field: 'createBy',
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
index f380c7ad..40df0358 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
@@ -2,6 +2,13 @@
 <template>
     <TableHeader area ref="TableHeaderRef">
         <template #select>
+            <el-form-item label="搜索">
+                <el-input
+                    v-model="tableStore.table.params.searchValue"
+                    placeholder="输入变电站.终端名称"
+                    clearable
+                ></el-input>
+            </el-form-item>
             <el-form-item label="流程状态">
                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                     <el-option
@@ -12,13 +19,7 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="终端名称">
-                <el-input
-                    v-model="tableStore.table.params.searchValue"
-                    placeholder="请输入终端名称"
-                    clearable
-                ></el-input>
-            </el-form-item>
+           
         </template>
     </TableHeader>
     <Table ref="tableRef" />
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
index 9af1a21e..89d3cd64 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
@@ -1,7 +1,14 @@
 <!---终端入网检测-->
 <template>
-    <TableHeader area datePicker ref="TableHeaderRef">
+    <TableHeader area datePicker nextFlag ref="TableHeaderRef">
          <template #select>
+            <el-form-item label="搜索">
+                <el-input
+                    v-model="tableStore.table.params.searchValue"
+                    placeholder="输入变电站.终端.监测点名称"
+                    clearable
+                ></el-input>
+            </el-form-item>
              <el-form-item label="流程状态">
                  <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                      <el-option
@@ -194,6 +201,7 @@ const tableStore = new TableStore({
     }
 })
 tableStore.table.params.status=''
+tableStore.table.params.searchValue = ''
 // tableStore.table.params.loadType = ''
 // tableStore.table.params.userName = ''
 // tableStore.table.params.fileUploadflag = ''
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
index 20d9c085..51128ba8 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
@@ -1,7 +1,14 @@
 <!---终端入网检测-->
 <template>
-    <TableHeader area datePicker ref="TableHeaderRef">
+    <TableHeader area datePicker nextFlag ref="TableHeaderRef">
          <template #select>
+            <el-form-item label="搜索">
+                <el-input
+                    v-model="tableStore.table.params.searchValue"
+                    placeholder="输入变电站.终端.监测点名称"
+                    clearable
+                ></el-input>
+            </el-form-item>
              <el-form-item label="流程状态">
                  <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                      <el-option
@@ -150,6 +157,7 @@ const tableStore = new TableStore({
     }
 })
 tableStore.table.params.status=''
+tableStore.table.params.searchValue = ''
 // tableStore.table.params.loadType = ''
 // tableStore.table.params.userName = ''
 // tableStore.table.params.fileUploadflag = ''
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
index 62390c3c..387a8b76 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -1,7 +1,14 @@
 <!---终端入网检测-->
 <template>
-    <TableHeader area datePicker nextFlag  ref="TableHeaderRef">
+    <TableHeader area datePicker nextFlag ref="TableHeaderRef">
         <template #select>
+            <el-form-item label="搜索">
+                <el-input
+                    v-model="tableStore.table.params.searchValue"
+                    placeholder="输入变电站.终端.监测点名称"
+                    clearable
+                ></el-input>
+            </el-form-item>
             <el-form-item label="流程状态">
                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
                     <el-option
@@ -193,7 +200,8 @@ const tableStore = new TableStore({
         // tableStore.table.params.relationUserName = tableStore.table.params.userName
     }
 })
-tableStore.table.params.status=''
+tableStore.table.params.status = ''
+tableStore.table.params.searchValue = ''
 // tableStore.table.params.loadType = ''
 // tableStore.table.params.userName = ''
 // tableStore.table.params.fileUploadflag = ''