From 16f0a9fa5a81a6e546ca2efb437cc7593450b0f0 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Tue, 18 Jun 2024 13:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=20=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/app.scss                           |  2 +-
 .../harmonicSurvey/components/planManage.vue  |  2 +-
 .../harmonicSurvey/components/testManage.vue  |  4 +-
 .../components/detailsItem.vue                |  2 +-
 .../components/undocumented/index.vue         |  2 +-
 src/views/pqs/supervise/plan/index.vue        | 34 +++++-----
 src/views/pqs/supervise/retire/monitor.vue    |  2 +-
 src/views/pqs/supervise/retire/terminal.vue   |  2 +-
 .../supervise/technology/components/alarm.vue |  2 +-
 .../technology/components/earlyWarn.vue       |  2 +-
 .../components/cycleDetection/index.vue       |  2 +-
 .../components/jointDebugList/index.vue       |  2 +-
 .../components/monitorpoint/index.vue         | 26 ++++----
 .../components/terminainal/index.vue          |  2 +-
 src/views/pqs/supervise/testRun/index.vue     | 63 +++++++++----------
 15 files changed, 71 insertions(+), 78 deletions(-)

diff --git a/src/styles/app.scss b/src/styles/app.scss
index 3d1f574a..363910ce 100644
--- a/src/styles/app.scss
+++ b/src/styles/app.scss
@@ -381,7 +381,7 @@ body,
     height: 100%;
     width: 100%;
     background: #fff;
-    z-index: 2;
+    // z-index: 2;
 }
 .bjs-powered-by {
     display: none;
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
index 6617c8fe..8d9b99a3 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
@@ -145,7 +145,7 @@ const tableStore = new TableStore({
           icon: 'el-icon-Open',
           render: 'basicButton',
           disabled: row => {
-            return row.createBy != adminInfo.$state.id || row.status == 1 || row.status == 2
+            return !(row.createBy == adminInfo.$state.id || row.status == 3 || row.status == 4)
           },
           click: row => {
             // deviceQuitPopup.value.open('重新发起退运', row)
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
index be97744a..1d9ae25d 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
@@ -162,7 +162,7 @@ const tableStore = new TableStore({
           icon: 'el-icon-Open',
           render: 'basicButton',
           disabled: row => {
-            return row.createBy != adminInfo.$state.id || row.status == 6 || row.status == 1 || row.status == 2
+            return !(row.createBy == adminInfo.$state.id|| row.status == 6 || row.status == 3 || row.status == 4)
           },
           click: row => {
             planTestRef.value.open('重新发起计划测试', row.id, false)
@@ -175,7 +175,7 @@ const tableStore = new TableStore({
           icon: 'el-icon-Open',
           render: 'basicButton',
           disabled: row => {
-            return row.createBy != adminInfo.$state.id || row.status == 6 || row.status == 2 || row.status == 3 || row.status == 4
+            return !(row.createBy == adminInfo.$state.id|| row.status == 1 )
           },
           click: row => {
             cancelLeave(row)
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/components/detailsItem.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/components/detailsItem.vue
index 6d9c7e1f..763f9677 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/components/detailsItem.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/components/detailsItem.vue
@@ -16,7 +16,7 @@ onMounted(() => {
 </script>
 <style lang="less" scoped>
 .details_item {
-    width: 50%;
+    width: 48%;
     height: 40px;
     display: flex;
     .left_title {
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
index 77cc8569..2dadf06c 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
@@ -165,7 +165,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 3
+                        return !(row.createBy == adminInfo.$state.id|| row.status == 3 || row.status == 4)
                     },
                     click: row => {
                         addForms.value.open({
diff --git a/src/views/pqs/supervise/plan/index.vue b/src/views/pqs/supervise/plan/index.vue
index 2d1b99a1..5ac43b89 100644
--- a/src/views/pqs/supervise/plan/index.vue
+++ b/src/views/pqs/supervise/plan/index.vue
@@ -2,18 +2,18 @@
 <template>
     <div class="default-main">
         <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 #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="addFormModel">新增</el-button>
                 <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
@@ -195,7 +195,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id ||row.status!=3
+                        return row.createBy != adminInfo.$state.id || row.status != 3
                     },
                     click: row => {
                         handleEffectProblem(row)
@@ -221,7 +221,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 3
+                        return !(row.createBy == adminInfo.$state.id || row.status == 3 || row.status == 4)
                     },
                     click: row => {
                         addForms.value.open({
@@ -237,7 +237,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1||!row.processInstanceId
+                        return row.createBy != adminInfo.$state.id || row.status != 1 || !row.processInstanceId
                     },
                     click: row => {
                         cancelLeave(row)
@@ -268,8 +268,8 @@ const tableStore = new TableStore({
                     click: row => {
                         router.push({
                             name: 'supervision/supervision/manage',
-                            state:{
-                                type:1
+                            state: {
+                                type: 1
                             }
                         })
                     }
diff --git a/src/views/pqs/supervise/retire/monitor.vue b/src/views/pqs/supervise/retire/monitor.vue
index a8bf96ed..b659755d 100644
--- a/src/views/pqs/supervise/retire/monitor.vue
+++ b/src/views/pqs/supervise/retire/monitor.vue
@@ -133,7 +133,7 @@ const tableStore = new TableStore({
           icon: 'el-icon-Open',
           render: 'basicButton',
           disabled: row => {
-            return row.createBy != adminInfo.$state.id || row.status !== 3
+            return !(row.createBy == adminInfo.$state.id||  row.status == 3 || row.status == 4)
           },
           click: row => {
             deviceQuitPopup.value.open('重新发起退运', row)
diff --git a/src/views/pqs/supervise/retire/terminal.vue b/src/views/pqs/supervise/retire/terminal.vue
index a89157be..9aa4895c 100644
--- a/src/views/pqs/supervise/retire/terminal.vue
+++ b/src/views/pqs/supervise/retire/terminal.vue
@@ -157,7 +157,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status !== 3
+                        return !(row.createBy == adminInfo.$state.id||  row.status == 3 || row.status == 4)
                     },
                     click: row => {
                         deviceQuitPopup.value.open('重新发起终端状态变更', row)
diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue
index ee60ce18..0b42afb6 100644
--- a/src/views/pqs/supervise/technology/components/alarm.vue
+++ b/src/views/pqs/supervise/technology/components/alarm.vue
@@ -162,7 +162,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 3
+                        return !(row.createBy == adminInfo.$state.id||  row.status == 3 || row.status == 4)
                     },
                     click: row => {
                         // deviceQuitPopup.value.open('重新发起', row)
diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue
index 6e46c435..fd884a60 100644
--- a/src/views/pqs/supervise/technology/components/earlyWarn.vue
+++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue
@@ -139,7 +139,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 3
+                        return !(row.createBy == adminInfo.$state.id||  row.status == 3 || row.status == 4)
                     },
                     click: row => {
                         // deviceQuitPopup.value.open('重新发起', row)
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
index 40df0358..3aab5430 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
@@ -133,7 +133,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return !(row.status == 3 || row.status == 4)
+                        return !(row.createBy == adminInfo.$state.id||  row.status == 3 || row.status == 4)
                     },
                     click: row => {
                         FormRef.value.open('重新发起', row)
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
index 89d3cd64..7cbcb5fe 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
@@ -150,7 +150,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 3
+                        return !(row.createBy == adminInfo.$state.id||  row.status == 3 || row.status == 4)
                     },
                     click: row => {
                         debugForms.value.open('重新发起', row)
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
index 51128ba8..e324ceae 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
@@ -1,7 +1,7 @@
 <!---终端入网检测-->
 <template>
     <TableHeader area datePicker nextFlag ref="TableHeaderRef">
-         <template #select>
+        <template #select>
             <el-form-item label="搜索">
                 <el-input
                     v-model="tableStore.table.params.searchValue"
@@ -9,16 +9,16 @@
                     clearable
                 ></el-input>
             </el-form-item>
-             <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>
+            <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="addFormModel">新增</el-button>
@@ -125,7 +125,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 3
+                        return !(row.createBy == adminInfo.$state.id || row.status == 3 || row.status == 4)
                     },
                     click: row => {
                         addForms.value.open({
@@ -156,7 +156,7 @@ 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 = ''
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
index 387a8b76..f6403db9 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -169,7 +169,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 3
+                        return !(row.createBy == adminInfo.$state.id || row.status == 3 || row.status == 4)
                     },
                     click: row => {
                         addForms.value.open({
diff --git a/src/views/pqs/supervise/testRun/index.vue b/src/views/pqs/supervise/testRun/index.vue
index 6bb26fba..c21841bf 100644
--- a/src/views/pqs/supervise/testRun/index.vue
+++ b/src/views/pqs/supervise/testRun/index.vue
@@ -1,7 +1,7 @@
 <!---试运行列表-->
 <template>
     <div class="default-main">
-        <TableHeader area datePicker ref='TableHeaderRef'>
+        <TableHeader area datePicker ref="TableHeaderRef">
             <template #select>
                 <el-form-item label="流程状态">
                     <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
@@ -15,10 +15,10 @@
                 </el-form-item>
             </template>
             <template #operation>
-                <el-button icon='el-icon-Plus' type='primary' @click='startRunTest'>试运行</el-button>
+                <el-button icon="el-icon-Plus" type="primary" @click="startRunTest">试运行</el-button>
             </template>
         </TableHeader>
-        <Table ref='tableRef' />
+        <Table ref="tableRef" :checkbox-config="checkboxConfig" />
 
         <!--        <el-dialog
                     v-model='timeDialog'
@@ -33,7 +33,7 @@
                             format="YYYY-MM-DD HH:mm:ss"
                             value-format="YYYY-MM-DD HH:mm:ss"
                             type="datetimerange"
-                            range-separator="至"
+                            range-separator="至" 
                             start-placeholder="开始日期"
                             end-placeholder="结束日期">
                         </el-date-picker>
@@ -45,8 +45,8 @@
                 </el-dialog>-->
     </div>
 </template>
-<script setup lang='ts'>
-import { ref, onMounted, provide, nextTick } from 'vue'
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
@@ -55,9 +55,7 @@ import { useDictData } from '@/stores/dictData'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { addRunTest } from '@/api/supervision-boot/lineRunTest'
 import { formatDate } from '@/utils/formatTime'
-
-
-
+import { VxeTablePropTypes } from 'vxe-table'
 const dictData = useDictData()
 const statusSelect = dictData.statusSelect()
 const { push } = useRouter()
@@ -95,12 +93,12 @@ const tableStore = new TableStore({
                 null: '待试运行'
             }
         },
-        { 
-            field: 'testRunTime', 
-            title: '试运行时间范围', 
+        {
+            field: 'testRunTime',
+            title: '试运行时间范围',
             minWidth: 260,
-            formatter:(row)=>{
-                return row.cellValue?row.cellValue:'/'
+            formatter: row => {
+                return row.cellValue ? row.cellValue : '/'
             }
         },
         {
@@ -138,14 +136,13 @@ const tableStore = new TableStore({
             render: 'buttons',
             buttons: [
                 {
-
                     name: 'productSetting',
                     title: '流程详情',
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
-                        handleAudit(row.processInstanceId,row.historyInstanceId)
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
                     },
                     disabled: row => {
                         return row.testRunState != 2
@@ -153,7 +150,6 @@ const tableStore = new TableStore({
                 },
 
                 {
-
                     name: 'productSetting',
                     title: '重新试运行',
                     type: 'primary',
@@ -168,7 +164,6 @@ const tableStore = new TableStore({
                         return row.status != 3
                     }
                 }
-
             ]
         }
     ],
@@ -179,18 +174,21 @@ const tableStore = new TableStore({
         // tableStore.table.params.relationUserName = tableStore.table.params.userName
     }
 })
-tableStore.table.params.status=''
+tableStore.table.params.status = ''
 
 provide('tableStore', tableStore)
 
-
 onMounted(() => {
     tableStore.index()
 })
-
-
+const checkboxConfig = reactive<VxeTablePropTypes.CheckboxConfig>({
+    labelField: '',
+    checkMethod: ({ row }) => {
+        return !(row.testRunState == 1 || row.testRunState == 2)
+    }
+})
 /** 处理审批按钮 */
-const handleAudit = (instanceId: any,historyInstanceId:any) => {
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
     push({
         name: 'BpmProcessInstanceDetail',
         state: {
@@ -221,7 +219,6 @@ const startRunTest = () => {
         }
     })
 
-
     if (!flag) {
         return ElMessage({
             message: '请选择未试运行的监测点进行试运行',
@@ -233,14 +230,14 @@ const startRunTest = () => {
     ElMessageBox.confirm('是否确认执行72小时监测点试运行？', '试运行', {
         confirmButtonText: '确 认',
         cancelButtonText: '取 消'
-    }).then(() => {
-        runTestSubmit(0)
     })
+        .then(() => {
+            runTestSubmit(0)
+        })
         .catch(() => console.info('操作取消'))
-
 }
 
-const runTestSubmit = (type:number) => {
+const runTestSubmit = (type: number) => {
     const start = new Date()
     start.setDate(start.getDate() + 1)
     start.setHours(0, 0, 0)
@@ -249,12 +246,12 @@ const runTestSubmit = (type:number) => {
     end.setDate(end.getDate() + 3)
     end.setHours(23, 59, 59)
     const startString = formatDate(start, 'YYYY-MM-DD') // 转换为 YYYY-MM-DD  格式
-    const endString = formatDate(end,'YYYY-MM-DD')
+    const endString = formatDate(end, 'YYYY-MM-DD')
     const data = {
         startTime: startString,
         endTime: endString,
         lineIds: monitorIds,
-        operateType:type
+        operateType: type
     }
     addRunTest(data).then((res: any) => {
         if (res.code === 'A0000') {
@@ -266,10 +263,6 @@ const runTestSubmit = (type:number) => {
         }
     })
 }
-
-
 </script>
 
-<style scoped lang='scss'>
-
-</style>
+<style scoped lang="scss"></style>