From 2e499ea6b88f5181336e6a3a834ad2c82e2a05e3 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 6 Jun 2024 20:15:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=9B=91?=
 =?UTF-8?q?=E7=9D=A3=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pqs/supervise/electricalEnergy/index.vue  |   2 +-
 .../harmonicSurvey/components/planAdd.vue     |  20 +-
 .../harmonicSurvey/components/planManage.vue  | 363 +++++++++--------
 .../harmonicSurvey/components/planTest.vue    | 366 +++++++++---------
 .../harmonicSurvey/components/testManage.vue  |  20 +-
 .../pqs/supervise/harmonicSurvey/index.vue    |   4 +-
 .../supervise/harmonicSurvey/plan/detail.vue  | 161 ++++----
 .../supervise/harmonicSurvey/test/detail.vue  |  18 +-
 8 files changed, 519 insertions(+), 435 deletions(-)

diff --git a/src/views/pqs/supervise/electricalEnergy/index.vue b/src/views/pqs/supervise/electricalEnergy/index.vue
index 6b407df6..fda25b1b 100644
--- a/src/views/pqs/supervise/electricalEnergy/index.vue
+++ b/src/views/pqs/supervise/electricalEnergy/index.vue
@@ -7,7 +7,7 @@
             <el-tab-pane label="用户投诉" name="2">
                 <complaints v-if="activeName == '2'" />
             </el-tab-pane>
-            <el-tab-pane label="普测问题" name="3">
+            <el-tab-pane label="计划问题" name="3">
                 <testQuestions v-if="activeName == '3'" />
             </el-tab-pane>
             <!-- <el-tabs v-model="activeName" type="border-card">
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
index 95e19cf7..b2a31577 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
@@ -1,12 +1,25 @@
 <template>
     <el-dialog draggable :title="title" v-model="planAddition" width="500px" :before-close="cancelFn">
         <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" scroll-to-error  :validate-on-rule-change="false" class="form-one">
-            <el-form-item for="-" label="普测负责单位:">
+            <el-form-item for="-" label="计划负责单位:">
                 <Area v-model="form.deptId" />
             </el-form-item>
             <el-form-item for="-" label="计划名称:" prop="planName">
                 <el-input v-model="form.planName" placeholder="请输入计划名称"></el-input>
             </el-form-item>
+            <el-form-item label="监督类型:" prop="supvType" >
+                <el-select v-model="form.supvType" placeholder="请选择监督类型" style="width: 100%">
+                    <el-option
+                        v-for="item in supvTypeOptionList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="监督对象名称:" prop="supvObjectName">
+                <el-input v-model="form.supvObjectName" placeholder="请输入监督对象名称"></el-input>
+            </el-form-item>
             <el-form-item for="-" label="计划开始时间:" prop="planStartTime">
                 <el-date-picker
                     v-model="form.planStartTime"
@@ -129,6 +142,7 @@ import { useDictData } from '@/stores/dictData'
 const emit = defineEmits(['onsubmit'])
 
 const dictData = useDictData()
+const supvTypeOptionList = dictData.getBasicData('supv_type')
 const title = ref('')
 const planAddition = ref(false)
 const defaultProps = ref({
@@ -161,7 +175,9 @@ const treeRef = ref()
 const rules = ref({
     planStartTime: [{ required: true, message: '选择计划开始时间', trigger: 'change' }],
     planEndTime: [{ required: true, message: '选择计划结束时间', trigger: 'change' }],
+    supvType: [{ required: true, message: '请选择监督类型', trigger: 'change' }],
     planComplateTime: [{ required: true, message: '选择实际完成时间	', trigger: 'change' }],
+    supvObjectName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
     planName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
     leader: [{ required: true, message: '请输入测试负责人', trigger: 'blur' }],
     substation: [{ required: true, message: '请选择关联电站', trigger: 'change' }]
@@ -214,7 +230,7 @@ const audit = (filePath: any) => {
     if (form.value.customSubstationFlag == 0) {
         addForm.substation = addForm.substation.join(',')
     }
-    if(title.value == '普测计划新增'){
+    if(title.value == '计划新增'){
         addSurveyPlan(addForm).then(res => {
             cancelFn()
             emit('onsubmit')
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
index 1272bf0c..b262af3d 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
@@ -1,27 +1,27 @@
 <template>
-    <TableHeader area datePicker ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="审核状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
-                    <el-option
-                        v-for="item in statusSelect"
-                        :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-Download" type="primary" @click="exportFn">导出</el-button> -->
-        </template>
-    </TableHeader>
-    <Table ref="tableRef" />
-    <!-- 新增 -->
-    <planAdd ref="planAddRef" @onsubmit="tableStore.index()" :openType="openType" />
+  <TableHeader area datePicker ref='TableHeaderRef'>
+    <template #select>
+      <el-form-item label='审核状态'>
+        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择审核状态'>
+          <el-option
+              v-for='item in statusSelect'
+              :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-Download" type="primary" @click="exportFn">导出</el-button> -->
+    </template>
+  </TableHeader>
+  <Table ref='tableRef' />
+  <!-- 新增 -->
+  <planAdd ref='planAddRef' @onsubmit='tableStore.index()' :openType='openType' />
 </template>
-<script setup lang="ts">
+<script setup lang='ts'>
 import { useAdminInfo } from '@/stores/adminInfo'
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
@@ -36,7 +36,9 @@ import { useRouter } from 'vue-router'
 import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
 import { getUserByRoleType } from '@/api/user-boot/user'
 import { useDictData } from '@/stores/dictData'
+
 const dictData = useDictData()
+const supvTypeOptionList = dictData.getBasicData('supv_type')
 const statusSelect = dictData.statusSelect()
 const { push, options, currentRoute } = useRouter()
 const dialogVisible = ref(false)
@@ -48,193 +50,212 @@ const auditUser = ref('')
 const flag = ref(false)
 const openType = ref('create')
 const tableStore = new TableStore({
-    url: '/supervision-boot/surveyPlan/surveyPlanPage',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
+  url: '/supervision-boot/surveyPlan/surveyPlanPage',
+  publicHeight: 65,
+  method: 'POST',
+  column: [
+    {
+      title: '序号',
+      width: 60,
+      formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      }
+    },
+    {
+      field: 'planName',
+      title: '计划名称',
+      minWidth: 130
+    },
+    {
+      field: 'supvType',
+      title: '监督类型',
+      minWidth: 130,
+      formatter: (row: any) => {
+        return supvTypeOptionList.filter(item => item.id === row.cellValue)[0]?.name
+      }
+    },
+    {
+      field: 'supvObjectName',
+      minWidth: 130,
+      title: '监督对象名称'
+    },
+    {
+      field: 'deptName',
+      minWidth: 130,
+      title: '负责单位'
+    },
+    {
+      field: 'substation',
+      title: '变电站',
+      minWidth: 110,
+      formatter: (row: any) => {
+        return row.cellValue
+      }
+    },
+
+    { field: 'planStartTime', minWidth: 130,title: '计划开始时间' },
+    { field: 'planEndTime', minWidth: 130,title: '计划结束时间' },
+    {
+      field: 'status',
+      title: '计划状态',
+      render: 'tag',
+      minWidth: 80,
+      custom: {
+        1: 'primary',
+        2: 'success',
+        3: 'danger',
+        4: 'warning'
+      },
+      replaceValue: {
+        1: '审批中',
+        2: '审批通过',
+        3: '审批不通过',
+        4: '已取消'
+      }
+    },
+    {
+      field: 'createBy',
+      title: '填报人',
+      minWidth: 80,
+      formatter: (row: any) => {
+        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+      }
+    },
+    {
+      title: '操作',
+      minWidth: '180',
+      fixed:'right',
+      render: 'buttons',
+      buttons: [
         {
-            title: '序号',
-            width: 60,
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
+          name: 'productSetting',
+          title: '流程详情',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          click: row => {
+            flag.value = true
+            handleAudit(row.processInstanceId, row.historyInstanceId)
+          }
         },
         {
-            field: 'deptName',
-            title: '负责单位'
+          name: 'edit',
+          title: '重新发起',
+          type: 'warning',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || row.status == 1 || row.status == 2
+          },
+          click: row => {
+            // deviceQuitPopup.value.open('重新发起退运', row)
+            planAddRef.value.open('重新发起计划', row.id)
+          }
         },
         {
-            field: 'substation',
-            title: '变电站',
-            formatter: (row: any) => {
-                return row.cellValue
-            }
-        },
-        {
-            field: 'planName',
-            title: '普测计划'
-        },
-        { field: 'planStartTime', title: '计划开始时间' },
-        { field: 'planEndTime', title: '计划结束时间' },
-        {
-            field: 'status',
-            title: '计划状态',
-            render: 'tag',
-            custom: {
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning'
-            },
-            replaceValue: {
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消'
-            }
-        },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        flag.value = true
-                        handleAudit(row.processInstanceId,row.historyInstanceId)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status == 1 || row.status == 2
-                    },
-                    click: row => {
-                        // deviceQuitPopup.value.open('重新发起退运', row)
-                        planAddRef.value.open('重新发起计划', row.id)
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status == 3 || row.status == 2 || row.status == 4
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
+          name: 'cancel',
+          title: '取消',
+          type: 'danger',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || row.status == 3 || row.status == 2 || row.status == 4
+          },
+          click: row => {
+            cancelLeave(row)
+          }
         }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.currentPage = tableStore.table.params.pageNum
+      ]
     }
+  ],
+  beforeSearchFun: () => {
+    tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+    tableStore.table.params.currentPage = tableStore.table.params.pageNum
+  }
 })
 
 tableStore.table.params.status = ''
 provide('tableStore', tableStore)
 // 新增计划
 const add = () => {
-    // title.value = '普测计划新增'
-    planAddRef.value.open('普测计划新增')
+  // title.value = '普测计划新增'
+  planAddRef.value.open('计划新增')
 }
 
 const exportFn = () => {
-    let form = JSON.parse(JSON.stringify(tableStore.table.params))
-    form.pageNum = 1
-    form.pageSize = tableStore.table.total
-    queryPlan(form).then(res => {
-        tableRef.value.getRef().exportData({
-            filename: '普测计划', // 文件名字
-            sheetName: 'Sheet1',
-            type: 'xlsx', //导出文件类型 xlsx 和 csv
-            useStyle: true,
-            data: res.data.records, // 数据源 // 过滤那个字段导出
-            columnFilterMethod: function (column: any) {
-                return !(column.$columnIndex === 0)
-            }
-        })
+  let form = JSON.parse(JSON.stringify(tableStore.table.params))
+  form.pageNum = 1
+  form.pageSize = tableStore.table.total
+  queryPlan(form).then(res => {
+    tableRef.value.getRef().exportData({
+      filename: '计划', // 文件名字
+      sheetName: 'Sheet1',
+      type: 'xlsx', //导出文件类型 xlsx 和 csv
+      useStyle: true,
+      data: res.data.records, // 数据源 // 过滤那个字段导出
+      columnFilterMethod: function(column: any) {
+        return !(column.$columnIndex === 0)
+      }
     })
+  })
 }
 
 /**取消流程操作*/
 const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancel(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
+  // 二次确认
+  const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+    inputErrorMessage: '取消原因不能为空'
+  })
+  // 发起取消
+  let data = {
+    id: row.id,
+    processInstanceId: row.processInstanceId,
+    reason: value
+  }
+  await cancel(data)
+  ElMessage.success('取消成功')
+  // 加载数据
+  tableStore.index()
 }
 
 const handleClose = () => {
-    dialogVisible.value = false
-    auditUser.value = ''
+  dialogVisible.value = false
+  auditUser.value = ''
 }
 
 /** 处理审批按钮 */
-const handleAudit = (instanceId: string,historyInstanceId:string) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
+const handleAudit = (instanceId: string, historyInstanceId: string) => {
+  push({
+    name: 'BpmProcessInstanceDetail',
+    state: {
+      id: instanceId,
+      historyInstanceId
+    }
+  })
 }
 // 取消
 
 onMounted(() => {
-    tableStore.index()
-    getUserByRoleType(3).then(res => {
-        auditList.value = res.data
-    })
+  tableStore.index()
+  getUserByRoleType(3).then(res => {
+    auditList.value = res.data
+  })
 })
 watch(
     () => currentRoute.value.path,
     () => {
-        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-            tableStore.index()
-            flag.value = false
-        }
+      if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+        tableStore.index()
+        flag.value = false
+      }
     },
     {
-        deep: true
+      deep: true
     }
 )
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang='scss'></style>
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
index 44e07535..c0c73340 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
@@ -1,76 +1,82 @@
 <template>
-    <el-dialog draggable :title="title" v-model="planAddition" width="500px" :before-close="cancelFn">
-        <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" class="form-one" scroll-to-error>
-            <el-form-item label="普测负责单位:">
-                <el-input v-model="form.deptName" disabled></el-input>
-            </el-form-item>
-            <el-form-item label="计划名称:" prop="planName">
-                <el-input v-model="form.planName" disabled></el-input>
-            </el-form-item>
-            <el-form-item label="计划开始时间:" prop="planStartTime">
-                <el-input v-model="form.planStartTime" disabled></el-input>
-            </el-form-item>
-            <el-form-item label="计划结束时间:" prop="planEndTime">
-                <el-input v-model="form.planEndTime" disabled></el-input>
-            </el-form-item>
-            <el-form-item for="-" label="测试变电站:" prop="subIds" style="display: flex; align-items: center">
-                <el-input v-model="form.substationName" disabled />
-            </el-form-item>
-            <el-form-item label="实际完成时间:" prop="completeTime">
-                <el-date-picker
-                    v-model="form.completeTime"
-                    type="date"
-                    placeholder="选择实际完成时间"
-                    value-format="YYYY-MM-DD"
-                ></el-date-picker>
-            </el-form-item>
-            <el-form-item for="-" label="测试负责人:" prop="leader">
-                <el-input v-model="form.completeBy" placeholder="请输入测试负责人"></el-input>
-            </el-form-item>
-            <el-form-item for="-" class="uploadFile" label="普测报告:" prop="testReport">
-                <el-upload
-                    ref="uploadRef"
-                    v-model:file-list="form.testReport"
-                    action=""
-                    :accept="acceptType"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :on-change="choose"
-                    :auto-upload="false"
-                    :on-progress="uploadFileName('testReport')"
-                >
-                    <template #trigger>
-                        <el-button type="primary">上传文件</el-button>
-                    </template>
-                </el-upload>
-            </el-form-item>
-            <el-form-item for="-" label="测试是否有问题：" prop="problemFlag">
-                <!-- 默认值 否 -->
-                <el-radio-group v-model="form.problemFlag">
-                    <el-radio :value="1">是</el-radio>
-                    <el-radio :value="0">否</el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item
-                style="width: 100%"
-                for="-"
-                label="问题描述:"
-                prop="problemDetail"
-                v-if="form.problemFlag == '1'"
-            >
-                <el-input type="textarea" v-model="form.problemDetail" placeholder="请输入问题描述"></el-input>
-            </el-form-item>
-            <!-- </el-form> -->
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="cancelFn">取消</el-button>
-                <el-button type="primary" @click="submitFn">确定</el-button>
-            </div>
-        </template>
-    </el-dialog>
+  <el-dialog draggable :title='title' v-model='planAddition' :before-close='cancelFn'>
+    <el-form :model='form' ref='formRef' :rules='rules' label-width='auto' class='form-two' scroll-to-error>
+      <el-form-item label='计划负责单位:'>
+        <el-input v-model='form.deptName' disabled></el-input>
+      </el-form-item>
+      <el-form-item label='计划名称:' prop='planName'>
+        <el-input v-model='form.planName' disabled></el-input>
+      </el-form-item>
+      <el-form-item label='监督类型:'>
+        <el-input v-model='form.supvType' disabled></el-input>
+      </el-form-item>
+      <el-form-item label='监督对象名称:'>
+        <el-input v-model='form.supvObjectName' disabled></el-input>
+      </el-form-item>
+      <el-form-item label='计划开始时间:' prop='planStartTime'>
+        <el-input v-model='form.planStartTime' disabled></el-input>
+      </el-form-item>
+      <el-form-item label='计划结束时间:' prop='planEndTime'>
+        <el-input v-model='form.planEndTime' disabled></el-input>
+      </el-form-item>
+      <el-form-item for='-' label='测试变电站:' prop='subIds' style='display: flex; align-items: center'>
+        <el-input v-model='form.substationName' disabled />
+      </el-form-item>
+      <el-form-item label='实际完成时间:' prop='completeTime'>
+        <el-date-picker
+            v-model='form.completeTime'
+            type='date'
+            placeholder='选择实际完成时间'
+            value-format='YYYY-MM-DD'
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item for='-' label='测试负责人:' prop='leader'>
+        <el-input v-model='form.completeBy' placeholder='请输入测试负责人'></el-input>
+      </el-form-item>
+      <el-form-item for='-' class='uploadFile' label='计划测试报告:' prop='testReport'>
+        <el-upload
+            ref='uploadRef'
+            v-model:file-list='form.testReport'
+            action=''
+            :accept='acceptType'
+            :limit='1'
+            :on-exceed='handleExceed'
+            :on-change='choose'
+            :auto-upload='false'
+            :on-progress="uploadFileName('testReport')"
+        >
+          <template #trigger>
+            <el-button type='primary'>上传文件</el-button>
+          </template>
+        </el-upload>
+      </el-form-item>
+      <el-form-item for='-' label='测试是否有问题：' prop='problemFlag'>
+        <!-- 默认值 否 -->
+        <el-radio-group v-model='form.problemFlag'>
+          <el-radio :value='1'>是</el-radio>
+          <el-radio :value='0'>否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+          style='width: 100%'
+          for='-'
+          label='问题描述:'
+          prop='problemDetail'
+          v-if="form.problemFlag == '1'"
+      >
+        <el-input type='textarea' v-model='form.problemDetail' placeholder='请输入问题描述'></el-input>
+      </el-form-item>
+      <!-- </el-form> -->
+    </el-form>
+    <template #footer>
+      <div class='dialog-footer'>
+        <el-button @click='cancelFn'>取消</el-button>
+        <el-button type='primary' @click='submitFn'>确定</el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
-<script setup lang="ts">
+<script setup lang='ts'>
 import { ref, inject, nextTick } from 'vue'
 import { addSurvey, auditSurvey } from '@/api/process-boot/generalTest'
 import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
@@ -78,6 +84,7 @@ import { ElMessage, genFileId, UploadProps, UploadRawFile, UploadUserFile } from
 import { uploadFile, getFileNameAndFilePath } from '@/api/system-boot/file'
 import { useDictData } from '@/stores/dictData'
 import { addSurveyTest, updateSurveyTest, getTestById } from '@/api/supervision-boot/survey/test'
+
 const acceptType = ref('')
 const tableStore = inject('tableStore') as TableStore
 let uploadName = ref('')
@@ -86,21 +93,22 @@ const uploadRef = ref()
 const fileList = ref<UploadUserFile[]>([])
 const emit = defineEmits(['onsubmit'])
 const dictData = useDictData()
+const supvTypeOptionList = dictData.getBasicData('supv_type')
 const addFlagRef = ref(true)
 const title = ref('')
 const planAddition = ref(false)
 const form: any = ref({
-    id: '',
-    deptName: '',
-    planStartTime: '',
-    planEndTime: '',
-    planName: '',
-    substationName: '',
-    completeTime: '',
-    completeBy: '',
-    testReport: [],
-    problemDetail: '', //测试问题
-    problemFlag: 0 //是否有问题
+  id: '',
+  deptName: '',
+  planStartTime: '',
+  planEndTime: '',
+  planName: '',
+  substationName: '',
+  completeTime: '',
+  completeBy: '',
+  testReport: [],
+  problemDetail: '', //测试问题
+  problemFlag: 0 //是否有问题
 })
 
 /**
@@ -108,47 +116,49 @@ const form: any = ref({
  * 为false，则为修改测试数据，重新发起流程
  */
 const open = async (text: string, id: string, addFlag: boolean) => {
-    title.value = text
-    formRef.value?.resetFields()
-    addFlagRef.value = addFlag
-    console.log(addFlag, '8888888888')
-    //根据测试id获取数据
-    await getTestById(id).then(res => {
-        //如果是新增，则只需将计划的一些信息回显即可
-        form.value.id = id
-        form.value.deptName = res.data.deptName
-        form.value.planStartTime = res.data.planStartTime
-        form.value.planEndTime = res.data.planEndTime
-        form.value.planName = res.data.planName
-        form.value.substationName = res.data.substationName
-        //部分清空
-        // uploadRef.value?.clearFiles()
-        form.value.completeTime = ''
-        form.value.completeBy = ''
-        form.value.testReport = []
-        form.value.problemDetail = ''
-        form.value.problemFlag = '0'
-        fileList.value = []
-        if (!addFlag) {
-            //还需回显上次填报的测试数据 todo...,待重新发起的时候去做
-            console.log(res, '999999999')
-            form.value = {
-                ...form.value,
-                completeTime: res.data.completeTime,
-                completeBy: res.data.completeBy,
-                problemFlag: res.data.problemFlag,
-                testReport: [
-                    {
-                        name: res.data.testReport.split('/')[2]
-                    }
-                ],
-                problemDetail:res.data.problemDetail
-            }
-            testReport.value=res.data.testReport;
-        }
-    })
+  title.value = text
+  formRef.value?.resetFields()
+  addFlagRef.value = addFlag
+  //根据测试id获取数据
+  await getTestById(id).then(res => {
+    //如果是新增，则只需将计划的一些信息回显即可
+    form.value.id = id
+    form.value.deptName = res.data.deptName
+    form.value.planStartTime = res.data.planStartTime
+    form.value.planEndTime = res.data.planEndTime
+    form.value.planName = res.data.planName
+    form.value.supvType = supvTypeOptionList.find(item => {
+      return item.id == res.data.supvType
+    })?.name
+    form.value.supvObjectName = res.data.supvObjectName
+    form.value.substationName = res.data.substationName
+    //部分清空
+    // uploadRef.value?.clearFiles()
+    form.value.completeTime = ''
+    form.value.completeBy = ''
+    form.value.testReport = []
+    form.value.problemDetail = ''
+    form.value.problemFlag = 0
+    fileList.value = []
+    if (!addFlag) {
+      //还需回显上次填报的测试数据 todo...,待重新发起的时候去做
+      form.value = {
+        ...form.value,
+        completeTime: res.data.completeTime,
+        completeBy: res.data.completeBy,
+        problemFlag: res.data.problemFlag,
+        testReport: [
+          {
+            name: res.data.testReport.split('/')[2]
+          }
+        ],
+        problemDetail: res.data.problemDetail
+      }
+      testReport.value = res.data.testReport
+    }
+  })
 
-    planAddition.value = true
+  planAddition.value = true
 }
 
 //处理成效报告
@@ -156,84 +166,84 @@ const testReport = ref('')
 
 const formRef = ref()
 const rules = {
-    completeTime: [{ required: true, message: '选择实际完成时间	', trigger: 'change' }],
-    completeBy: [{ required: true, message: '请输入测试负责人', trigger: 'blur' }],
-    testReport: [{ required: true, message: '请上传文件', trigger: 'change' }],
-    problemFlag: [{ required: true, message: '请选择测试是否有问题', trigger: 'change' }],
-    problemDetail: [{ required: true, message: '请输入测试问题', trigger: 'blur' }]
+  completeTime: [{ required: true, message: '选择实际完成时间	', trigger: 'change' }],
+  completeBy: [{ required: true, message: '请输入测试负责人', trigger: 'blur' }],
+  testReport: [{ required: true, message: '请上传文件', trigger: 'change' }],
+  problemFlag: [{ required: true, message: '请选择测试是否有问题', trigger: 'change' }],
+  problemDetail: [{ required: true, message: '请输入测试问题', trigger: 'blur' }]
 }
 const cancelFn = () => {
-    formRef.value.resetFields()
-    planAddition.value = false
+  formRef.value.resetFields()
+  planAddition.value = false
 }
 
 // 提交
 const submitFn = () => {
-    formRef.value.validate(async (valid: any) => {
-        if (!testReport.value) {
-            return ElMessage({
-                message: '请上传处理成效报告',
-                type: 'warning'
-            })
-        }
-        if (valid) {
-            const subForm = JSON.parse(JSON.stringify(form.value))
-            subForm.testReport = testReport.value
-            if (addFlagRef) {
-                //新增，则组装业务数据提交后台
-                await addSurveyTest(subForm)
-                //查询进线数据，避免一直处于loading状态
-                ElMessage.success('申请成功')
-                tableStore.index()
-                planAddition.value = false
-            } else {
-                await updateSurveyTest(subForm)
-                //查询进线数据，避免一直处于loading状态
-                ElMessage.success('重新申请成功')
-                tableStore.index()
-                planAddition.value = false
-            }
-        }
-    })
+  formRef.value.validate(async (valid: any) => {
+    if (!testReport.value) {
+      return ElMessage({
+        message: '请上传处理成效报告',
+        type: 'warning'
+      })
+    }
+    if (valid) {
+      const subForm = JSON.parse(JSON.stringify(form.value))
+      subForm.testReport = testReport.value
+      if (addFlagRef) {
+        //新增，则组装业务数据提交后台
+        await addSurveyTest(subForm)
+        //查询进线数据，避免一直处于loading状态
+        ElMessage.success('申请成功')
+        tableStore.index()
+        planAddition.value = false
+      } else {
+        await updateSurveyTest(subForm)
+        //查询进线数据，避免一直处于loading状态
+        ElMessage.success('重新申请成功')
+        tableStore.index()
+        planAddition.value = false
+      }
+    }
+  })
 }
 const audit = (filePath: any) => {
-    if (title.value == '普测计划新增') {
-        addSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
-            ElMessage.success('新增成功!')
-            cancelFn()
-            emit('onsubmit')
-        })
-    } else if (title.value == '重新发起计划') {
-        auditSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
-            ElMessage.success('重新发起计划成功!')
-            cancelFn()
-            emit('onsubmit')
-        })
-    }
+  if (title.value == '计划测试填报') {
+    addSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
+      ElMessage.success('新增成功!')
+      cancelFn()
+      emit('onsubmit')
+    })
+  } else if (title.value == '重新发起计划') {
+    auditSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
+      ElMessage.success('重新发起计划成功!')
+      cancelFn()
+      emit('onsubmit')
+    })
+  }
 }
 
 defineExpose({ open })
 
 const choose = (e: any) => {
-    uploadFile(e.raw, '/supervision/').then(res => {
-        testReport.value = res.data.name
-        // form.value.testReport = res.data.name
-    })
+  uploadFile(e.raw, '/supervision/').then(res => {
+    testReport.value = res.data.name
+    // form.value.testReport = res.data.name
+  })
 }
 
 const handleExceed: UploadProps['onExceed'] = files => {
-    uploadRef.value!.clearFiles()
-    const file = files[0] as UploadRawFile
-    file.uid = genFileId()
-    uploadRef.value!.handleStart(file)
+  uploadRef.value!.clearFiles()
+  const file = files[0] as UploadRawFile
+  file.uid = genFileId()
+  uploadRef.value!.handleStart(file)
 }
 
 //上传报告改变
 const uploadFileName = val => {
-    uploadName.value = val
+  uploadName.value = val
 }
 </script>
-<style lang="scss" scoped>
+<style lang='scss' scoped>
 // :deep(.el-upload-list__item-info) {
 //     width: 250px;
 // }
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
index e1db5fe3..3c76c919 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
@@ -40,6 +40,7 @@ const { push } = useRouter()
 const tableRef = ref()
 import { useDictData } from '@/stores/dictData'
 const dictData = useDictData()
+const supvTypeOptionList = dictData.getBasicData('supv_type')
 const statusSelect = dictData.statusSelect()
 
 const planTestRef = ref()
@@ -58,7 +59,20 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'planName', title: '普测计划', minWidth: 140 },
+        { field: 'planName', title: '计划名称', minWidth: 140 },
+      {
+        field: 'supvType',
+        title: '监督类型',
+        minWidth: 130,
+        formatter: (row: any) => {
+          return supvTypeOptionList.filter(item => item.id === row.cellValue)[0]?.name
+        }
+      },
+      {
+        field: 'supvObjectName',
+        minWidth: 130,
+        title: '监督对象名称'
+      },
         { field: 'substationName', title: '变电站', minWidth: 140 },
         { field: 'planStartTime', title: '计划开始时间', minWidth: 140 },
         { field: 'planEndTime', title: '计划结束时间', minWidth: 140 },
@@ -180,7 +194,7 @@ tableStore.table.params.status = ''
 provide('tableStore', tableStore)
 // 新增计划
 const add = (id: string) => {
-    planTestRef.value.open('普测计划测试填报',id,true)
+    planTestRef.value.open('计划测试填报',id,true)
 }
 
 
@@ -190,7 +204,7 @@ const exportFn = () => {
     form.pageSize = tableStore.table.total
     queryPlan(form).then(res => {
         tableRef.value.getRef().exportData({
-            filename: '普测计划', // 文件名字
+            filename: '计划', // 文件名字
             sheetName: 'Sheet1',
             type: 'xlsx', //导出文件类型 xlsx 和 csv
             useStyle: true,
diff --git a/src/views/pqs/supervise/harmonicSurvey/index.vue b/src/views/pqs/supervise/harmonicSurvey/index.vue
index faec93a9..c9c27826 100644
--- a/src/views/pqs/supervise/harmonicSurvey/index.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/index.vue
@@ -1,10 +1,10 @@
 <template>
     <div class='default-main'>
         <el-tabs v-model='activeName' type='border-card'>
-            <el-tab-pane label='普测计划管理' name='1'>
+            <el-tab-pane label='技术监督计划管理' name='1'>
                 <plan-manage v-if="activeName == '1'" />
             </el-tab-pane>
-            <el-tab-pane label='普测测试管理' name='2'>
+            <el-tab-pane label='技术监督测试管理' name='2'>
                 <test-manage v-if="activeName == '2'" />
             </el-tab-pane>
         </el-tabs>
diff --git a/src/views/pqs/supervise/harmonicSurvey/plan/detail.vue b/src/views/pqs/supervise/harmonicSurvey/plan/detail.vue
index 27513574..1af6d0c1 100644
--- a/src/views/pqs/supervise/harmonicSurvey/plan/detail.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/plan/detail.vue
@@ -1,38 +1,49 @@
 <template>
-    <div class='default-main'>
-        <el-descriptions :column='2' border>
-            <el-descriptions-item label='普测计划名称'>
-                {{ detailData?.planName }}
-            </el-descriptions-item>
-            <el-descriptions-item label='普测负责单位'>
-                {{ detailData?.deptName }}
-            </el-descriptions-item>
-            <el-descriptions-item label='计划开始时间'>
-                {{ detailData?.planStartTime }}
-            </el-descriptions-item>
-            <el-descriptions-item label='计划结束时间'>
-                {{ detailData?.planEndTime }}
-            </el-descriptions-item>
-            <el-descriptions-item label='审核状态'>
-                <el-tag :type='getDeviceStatusType(detailData?.status)'>
-                    {{ getDeviceStatus(detailData?.status) }}
-                </el-tag>
-            </el-descriptions-item>
-        </el-descriptions>
-        <div style='height: 300px'>
-            <vxe-table
-                v-bind='defaultAttribute'
-                ref='vxeRef'
-                class='mt10'
-                height='auto'
-                :data='detailData?.surveySubstationList'
-            >
-                <vxe-column field='substationName' title='变电站名称'></vxe-column>
-                <vxe-column field='voltageLevel' title='变电站电压等级' ></vxe-column>
-                <vxe-column field='dataSource' title='变电站来源' :formatter='formatterSource'></vxe-column>
-            </vxe-table>
-        </div>
+  <div class='default-main'>
+    <el-descriptions :column='2' border>
+      <el-descriptions-item label='技术监督计划名称'>
+        {{ detailData?.planName }}
+      </el-descriptions-item>
+      <el-descriptions-item label='普测负责单位'>
+        {{ detailData?.deptName }}
+      </el-descriptions-item>
+      <el-descriptions-item label='监督类型'>
+        {{
+          supvTypeList.find(item => {
+            return item.id == detailData?.supvType
+          })?.name
+        }}
+      </el-descriptions-item>
+      <el-descriptions-item label='监督对象名称'>
+        {{ detailData?.supvObjectName }}
+      </el-descriptions-item>
+
+      <el-descriptions-item label='计划开始时间'>
+        {{ detailData?.planStartTime }}
+      </el-descriptions-item>
+      <el-descriptions-item label='计划结束时间'>
+        {{ detailData?.planEndTime }}
+      </el-descriptions-item>
+      <el-descriptions-item label='审核状态'>
+        <el-tag :type='getDeviceStatusType(detailData?.status)'>
+          {{ getDeviceStatus(detailData?.status) }}
+        </el-tag>
+      </el-descriptions-item>
+    </el-descriptions>
+    <div style='height: 300px'>
+      <vxe-table
+          v-bind='defaultAttribute'
+          ref='vxeRef'
+          class='mt10'
+          height='auto'
+          :data='detailData?.surveySubstationList'
+      >
+        <vxe-column field='substationName' title='变电站名称'></vxe-column>
+        <vxe-column field='voltageLevel' title='变电站电压等级'></vxe-column>
+        <vxe-column field='dataSource' title='变电站来源' :formatter='formatterSource'></vxe-column>
+      </vxe-table>
     </div>
+  </div>
 </template>
 <script setup lang='ts'>
 import { onMounted, ref } from 'vue'
@@ -45,69 +56,69 @@ import { getPlanById } from '@/api/supervision-boot/survey/plan'
 
 const { query } = useRoute() // 查询参数
 const props = defineProps({
-    id: propTypes.string.def(undefined)
+  id: propTypes.string.def(undefined)
 })
 const dictData = useDictData()
 const detailLoading = ref(false) // 表单的加载中
 const detailData: any = ref({}) // 详情数据
-const levelList = dictData.getBasicData('Dev_Voltage_Stand')
+const supvTypeList = dictData.getBasicData('supv_type')
 const queryId = query.id // 从 URL 传递过来的 id 编号
 
 /** 获得数据 */
 const getInfo = async () => {
-    detailLoading.value = true
-    try {
-        await getPlanById(props.id || queryId).then(res => {
-            detailData.value = res.data
-        })
-    } finally {
-        detailLoading.value = false
-    }
+  detailLoading.value = true
+  try {
+    await getPlanById(props.id || queryId).then(res => {
+      detailData.value = res.data
+    })
+  } finally {
+    detailLoading.value = false
+  }
 }
 
 const getDeviceStatus = (status: number) => {
-    if (status === 1) {
-        return '审批中'
-    }
-    if (status === 2) {
-        return '审批通过'
-    }
-    if (status === 3) {
-        return '审批不通过'
-    }
-    if (status === 4) {
-        return '已取消'
-    }
+  if (status === 1) {
+    return '审批中'
+  }
+  if (status === 2) {
     return '审批通过'
+  }
+  if (status === 3) {
+    return '审批不通过'
+  }
+  if (status === 4) {
+    return '已取消'
+  }
+  return '审批通过'
 }
 
 const getDeviceStatusType = (status: number) => {
-    if (status === 1) {
-        return 'primary'
-    }
-    if (status === 2) {
-        return 'success'
-    }
-    if (status === 3) {
-        return 'danger'
-    }
-    if (status === 4) {
-        return 'warning'
-    }
+  if (status === 1) {
+    return 'primary'
+  }
+  if (status === 2) {
     return 'success'
+  }
+  if (status === 3) {
+    return 'danger'
+  }
+  if (status === 4) {
+    return 'warning'
+  }
+  return 'success'
 }
 
 
 const formatterSource = (row: any) => {
-    if (row.column.field == 'dataSource') {
-        if (row.cellValue == 0) {
-            return '系统内台账变电站'
-        } else {
-            return '自定义变电站'
-        }
+  if (row.column.field == 'dataSource') {
+    if (row.cellValue == 0) {
+      return '系统内台账变电站'
     } else {
-        return row.cellValue
+      return '自定义变电站'
     }
+  } else {
+    return row.cellValue
+  }
 }
 
 
@@ -115,6 +126,6 @@ defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
 
 /** 初始化 **/
 onMounted(() => {
-    getInfo()
+  getInfo()
 })
 </script>
diff --git a/src/views/pqs/supervise/harmonicSurvey/test/detail.vue b/src/views/pqs/supervise/harmonicSurvey/test/detail.vue
index 997c812a..0153c7e7 100644
--- a/src/views/pqs/supervise/harmonicSurvey/test/detail.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/test/detail.vue
@@ -1,12 +1,22 @@
 <template>
   <div class='default-main'>
     <el-descriptions :column='2' border>
-      <el-descriptions-item label='普测计划名称'>
+      <el-descriptions-item label='技术监督计划名称'>
         {{ detailData?.planName }}
       </el-descriptions-item>
-      <el-descriptions-item label='普测负责单位'>
+      <el-descriptions-item label='计划负责单位'>
         {{ detailData?.deptName }}
       </el-descriptions-item>
+      <el-descriptions-item label='监督类型'>
+        {{
+          supvTypeList.find(item => {
+            return item.id == detailData?.supvType
+          })?.name
+        }}
+      </el-descriptions-item>
+      <el-descriptions-item label='监督对象名称'>
+        {{ detailData?.supvObjectName }}
+      </el-descriptions-item>
       <el-descriptions-item label='计划开始时间'>
         {{ detailData?.planStartTime }}
       </el-descriptions-item>
@@ -54,7 +64,9 @@
 </template>
 <script setup lang='ts'>
 import { onMounted, ref } from 'vue'
-
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const supvTypeList = dictData.getBasicData('supv_type')
 defineOptions({ name: 'QuitRunningDeviceDetail' })
 import { propTypes } from '@/utils/propTypes'
 import { defaultAttribute } from '@/components/table/defaultAttribute'