From 4da7fe44070ee8fc80e4af64f5dd8e889273cef4 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 4 Jun 2024 14:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=99=AE=E6=B5=8B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=B8=A6=E6=9D=A5=E7=9A=84=E5=85=B6=E4=BB=96=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/supervision-boot/survey/index.ts      | 17 ----------
 src/api/supervision-boot/survey/test.ts       | 11 +++++++
 .../components1/testQuestions.vue             | 31 ++++++++++++-------
 .../system/bpm/task/myInstance/index.vue      |  9 ++++--
 4 files changed, 37 insertions(+), 31 deletions(-)
 delete mode 100644 src/api/supervision-boot/survey/index.ts

diff --git a/src/api/supervision-boot/survey/index.ts b/src/api/supervision-boot/survey/index.ts
deleted file mode 100644
index 4f330553..00000000
--- a/src/api/supervision-boot/survey/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import createAxios from '@/utils/request'
-
-import { SUPERVISION_BOOT } from '@/utils/constantRequest'
-
-const MAPPING_PATH = SUPERVISION_BOOT + '/generalSurvey'
-
-
-/**
- * 针对有问题的现场测试发起告警单
- */
-export const initiateWarningLeaflet = (id: string, subId: string) => {
-    return createAxios({
-        url: MAPPING_PATH + '/initiateWarningLeaflet?id=' + id + '&subId=' + subId,
-        method: 'GET'
-    })
-}
-
diff --git a/src/api/supervision-boot/survey/test.ts b/src/api/supervision-boot/survey/test.ts
index b11a4f7e..4664ffb9 100644
--- a/src/api/supervision-boot/survey/test.ts
+++ b/src/api/supervision-boot/survey/test.ts
@@ -26,4 +26,15 @@ export const addSurveyTest = (data: any) => {
     })
 }
 
+/**
+ * 针对有问题的现场测试发起告警单
+ */
+export const initiateWarningLeaflet = (id: string) => {
+    return createAxios({
+        url: MAPPING_PATH + '/initiateWarningLeaflet?id=' + id,
+        method: 'GET'
+    })
+}
+
+
 
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
index 07b03734..9f77f208 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
@@ -1,6 +1,14 @@
 <template>
     <!--     <div> 普测结果 发起预告警单</div> -->
     <TableHeader datePicker ref='TableHeaderRef'>
+      <template v-slot:select>
+        <el-form-item label='计划名称'>
+          <el-input
+              v-model='tableStore.table.params.searchValue'
+              placeholder='请输入计划名称'
+          ></el-input>
+        </el-form-item>
+      </template>
     </TableHeader>
     <Table ref='tableRef' />
     <testQuestionsForm ref='testQuestionsFormRef' />
@@ -11,7 +19,7 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import testQuestionsForm from './form/testQuestionsForm.vue'
-import { initiateWarningLeaflet } from '@/api/supervision-boot/survey'
+import { initiateWarningLeaflet } from '@/api/supervision-boot/survey/test'
 import { ElMessage } from 'element-plus'
 import { useRouter } from 'vue-router'
 const { push } = useRouter()
@@ -21,7 +29,7 @@ const TableHeaderRef = ref()
 const testQuestionsFormRef = ref()
 
 const tableStore = new TableStore({
-    url: '/supervision-boot/generalSurvey/pageProblemSubstationBySurvey',
+    url: '/supervision-boot/surveyTest/pageProblemSurvey',
     publicHeight: 65,
     method: 'POST',
     column: [
@@ -34,14 +42,13 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'orgName', title: '单位', minWidth: 120 },
-        { field: 'subName', title: '变电站', minWidth: 120 },
-        { field: 'planName', title: '普测计划名称', minWidth: 120 },
-        { field: 'planCreateTime', title: '计划生成时间', minWidth: 100 },
+        { field: 'planName', title: '普测计划', minWidth: 120 },
+        { field: 'deptName', title: '负责单位', minWidth: 120 },
+        { field: 'substationName', title: '变电站', minWidth: 120 },
         { field: 'planStartTime', title: '计划开始时间', minWidth: 100 },
         { field: 'planEndTime', title: '计划结束时间', minWidth: 100 },
-        { field: 'planComplateTime', title: '实际完成时间', minWidth: 100 },
-        { field: 'leader', title: '测试负责人', minWidth: 120 },
+        { field: 'completeTime', title: '实际完成时间', minWidth: 100 },
+        { field: 'completeBy', title: '测试负责人', minWidth: 120 },
         {
             title: '操作',
             minWidth: '180',
@@ -65,7 +72,7 @@ const tableStore = new TableStore({
                         title: '请确认发起发起告警单!'
                     },
                     click: row => {
-                        initiateAlarm(row.planNo,row.subId)
+                        initiateAlarm(row.id)
                     }
                 },
                 {
@@ -91,7 +98,7 @@ const tableStore = new TableStore({
         tableStore.table.params.currentPage = tableStore.table.params.pageNum
     }
 })
-
+tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 
 onMounted(() => {
@@ -101,8 +108,8 @@ onMounted(() => {
 /**
  * 发起告警单
  */
-const initiateAlarm = async (id: string,subId:string) => {
-    await initiateWarningLeaflet(id,subId)
+const initiateAlarm = async (id: string) => {
+    await initiateWarningLeaflet(id)
     ElMessage.success('发起告警成功！')
     // 加载数据
     tableStore.index()
diff --git a/src/views/system/bpm/task/myInstance/index.vue b/src/views/system/bpm/task/myInstance/index.vue
index c9cce684..86b982e5 100644
--- a/src/views/system/bpm/task/myInstance/index.vue
+++ b/src/views/system/bpm/task/myInstance/index.vue
@@ -24,7 +24,9 @@ import TableHeader from '@/components/table/header/index.vue'
 import { onMounted, provide, ref } from 'vue'
 import { formatDate, formatPast2 } from '@/utils/formatTime'
 import { useRouter } from 'vue-router'
-
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const categoryOptionList = dictData.getBasicData('flow_category')
 
 defineOptions({
   name: 'businessUser'
@@ -47,7 +49,10 @@ const tableStore = new TableStore({
       }
     },
     { title: '任务名称', field: 'name', minWidth: 130 },
-    { title: '流程分类', field: 'category', minWidth: 130 },
+    { title: '流程分类', field: 'category', minWidth: 130 ,
+      formatter: (row: any) => {
+        return categoryOptionList.filter(item => item.id === row.cellValue)[0]?.name
+      }},
     {
       field: 'status',
       title: '流程状态',