修改技术监督bug

src/views/pqs/supervise/retire/detail.vue

@@ -27,7 +27,7 @@
             <!--          {{ getDeviceStatus(detailData.deviceStatus) }}-->
             <!--        </el-tag>-->
             <!--      </el-descriptions-item>-->
-            <el-descriptions-item label='变更前前状态'>
+            <el-descriptions-item label='变更前状态'>
                 <el-tag :type='getDeviceStatusType(detailData.devOriginalStatus)'>
                     {{ getDeviceStatus(detailData.devOriginalStatus) }}
                 </el-tag>

src/views/pqs/supervise/retire/deviceQuitPopup.vue

@@ -1,57 +1,59 @@
 <template>
-  <el-dialog
-      draggable
-      class='cn-operate-dialog'
-      v-model='dialogVisible'
-      :title='title'
-      width='450px'
-      top='20vh'
-  >
-    <el-scrollbar>
-      <el-form :inline='false' :model='form' label-width='120px' :rules='rules' ref='formRef'>
-        <el-form-item label='终端' prop='deviceId'>
-          <el-tree-select
-              v-model='form.deviceId'
-              :data='data'
-              filterable
-              style='width: 100%'
-              @change='changeDevStatus'
-              clearable
-          />
-        </el-form-item>
+    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title" width="450px" top="20vh">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
+                <el-form-item label="终端" prop="deviceId">
+                    <el-tree-select
+                        v-model="form.deviceId"
+                        :data="data"
+                        filterable
+                        style="width: 100%"
+                        @change="changeDevStatus"
+                        clearable
+                    />
+                </el-form-item>
+                <el-form-item label="终端当前状态:">
+                    <el-select v-model="runFlag" disabled placeholder="请选择终端" clearable class="select">
+                        <el-option
+                            v-for="item in devStatusList"
+                            :key="item.value"
+                            :label="item.name"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="变更状态:" prop="devStatus">
+                    <el-select v-model="form.devStatus" placeholder="请选择终端状态" clearable class="select">
+                        <el-option
+                            v-for="item in devStatuData"
+                            :key="item.value"
+                            :label="item.name"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
 
-        <el-form-item label='状态选择:' prop='devStatus'>
-          <el-select v-model='form.devStatus' placeholder='请选择终端状态' clearable class='select'>
-            <el-option
-                v-for='item in devStatusList'
-                :key='item.value'
-                :label='item.name'
-                :value='item.value'
-            ></el-option>
-          </el-select>
-        </el-form-item>
+                <el-form-item label="变更原因" prop="propertyNo">
+                    <el-input
+                        type="textarea"
+                        clearable
+                        :autosize="{ minRows: 2, maxRows: 4 }"
+                        placeholder="请输入变更原因"
+                        v-model="form.propertyNo"
+                    ></el-input>
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
 
-        <el-form-item label='变更原因' prop='propertyNo'>
-          <el-input
-              type='textarea'
-              clearable
-              :autosize='{ minRows: 2, maxRows: 4 }'
-              placeholder='请输入变更原因'
-              v-model='form.propertyNo'
-          ></el-input>
-        </el-form-item>
-      </el-form>
-    </el-scrollbar>
-
-    <template #footer>
-            <span class='dialog-footer'>
-                <el-button @click='dialogVisible = false'>取消</el-button>
-                <el-button type='primary' @click='submit'>确认</el-button>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
             </span>
-    </template>
-  </el-dialog>
+        </template>
+    </el-dialog>
 </template>
-<script lang='ts' setup>
+<script lang="ts" setup>
 import { ref, inject } from 'vue'
 import { ElMessage } from 'element-plus'
 import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
@@ -60,9 +62,9 @@ import { addRunningDevice, quitRunningDeviceUpdate } from '@/api/supervision-boo
 import { getDeviceDetailData } from '@/api/device-boot/line'
 import { defaultProps } from '@/utils/tree'
 const devStatusList = ref([
-  { 'name': '运行', 'value': '0' },
-  { 'name': '检修', 'value': '1' },
-  { 'name': '退运', 'value': '4' }
+    { name: '运行', value: '0' },
+    { name: '检修', value: '1' },
+    { name: '退运', value: '4' }
 ])
 //下拉数据源
 const sourceData = ref()
@@ -71,89 +73,93 @@ const data = ref()
 const title = ref('')
 const tableStore = inject('tableStore') as TableStore
 const formRef = ref()
+const devStatuData: any = ref([])
 
 const dialogVisible = ref(false)
-
+const runFlag = ref('')
 // 注意不要和表单ref的命名冲突
 const form = ref({
-  id: '',
-  deviceId: '',
-  deviceType: '1',
-  devOriginalStatus: '0',
-  devStatus: '0',
-  propertyNo: ''
+    id: '',
+    deviceId: '',
+    deviceType: '1',
+    devOriginalStatus: '0',
+    devStatus: '',
+    propertyNo: ''
 })
 
 //form表单校验规则
 const rules = {
-  deviceId: [{ required: true, message: '终端不能为空', trigger: 'change' }],
-  devStatus: [{ required: true, message: '状态不能为空', trigger: 'change' }],
-  propertyNo: [{ required: true, message: '请输入退役原因', trigger: 'blur' }]
+    deviceId: [{ required: true, message: '终端不能为空', trigger: 'change' }],
+    devStatus: [{ required: true, message: '请选择状态', trigger: 'change' }],
+    propertyNo: [{ required: true, message: '请输入退役原因', trigger: 'blur' }]
 }
 const resetForm = () => {
-  if (formRef.value) {
-    formRef.value.resetFields()
-  }
+    if (formRef.value) {
+        formRef.value.resetFields()
+    }
 }
 
 const open = async (text: string, tempData?: any) => {
-  title.value = text
-  //终端
-  await getTerminalSelectTree(4).then(res => {
-    deviceList.value = res.data
-  })
-  sourceData.value = deviceList.value
-  data.value = deviceList.value
-  if (tempData) {
-    // 表单赋值
-    for (let key in form.value) {
-      form.value[key] = tempData[key]
-    }
-    form.value.deviceType = form.value.deviceType + ''
-  } else {
-    resetForm()
-    // 在此处恢复默认表单
-    for (let key in form.value) {
-      form.value[key] = ''
+    title.value = text
+    //终端
+    await getTerminalSelectTree(4).then(res => {
+        deviceList.value = res.data
+    })
+    sourceData.value = deviceList.value
+    data.value = deviceList.value
+    if (tempData) {
+        // 表单赋值
+        for (let key in form.value) {
+            form.value[key] = tempData[key]
+        }
+        form.value.deviceType = form.value.deviceType + ''
+        changeDevStatus(form.value.deviceId, true)
+        form.value.devStatus = form.value.devStatus + ''
+    } else {
+        resetForm()
+        // 在此处恢复默认表单
+        for (let key in form.value) {
+            form.value[key] = ''
+        }
+        runFlag.value = ''
+        form.value.deviceType = '1'
     }
     form.value.deviceType = '1'
-  }
-  form.value.deviceType = '1'
-  form.value.devStatus = '0'
-  // changeType(form.value.deviceType)
-  dialogVisible.value = true
+
+    // changeType(form.value.deviceType)
+    dialogVisible.value = true
 }
 
 /**
  * 提交用户表单数据
  */
 const submit = () => {
-  formRef.value.validate(async (valid: any) => {
-    if (valid) {
-      if (form.value.devOriginalStatus == form.value.devStatus) {
-        if (form.value.devOriginalStatus == '0') {
-          ElMessage.warning('终端当前状态就是运行，无需变更!')
-        } else if (form.value.devOriginalStatus == '1') {
-          ElMessage.warning('终端当前状态就是检修，无需变更!')
-        } else {
-          ElMessage.warning('终端当前状态就是退运，无需变更!')
+    formRef.value.validate(async (valid: any) => {
+        if (valid) {
+            if (form.value.devOriginalStatus == form.value.devStatus) {
+                if (form.value.devOriginalStatus == '0') {
+                    ElMessage.warning('终端当前状态就是运行，无需变更!')
+                } else if (form.value.devOriginalStatus == '1') {
+                    ElMessage.warning('终端当前状态就是检修，无需变更!')
+                } else {
+                    ElMessage.warning('终端当前状态就是退运，无需变更!')
+                }
+            } else {
+                if (form.value.id) {
+                    await quitRunningDeviceUpdate(form.value)
+                    ElMessage.success('重新发起成功')
+                    tableStore.index()
+                    dialogVisible.value = false
+                } else {
+                    await addRunningDevice(form.value)
+                    //查询进线数据，避免一直处于loading状态
+                    ElMessage.success('申请成功')
+                    tableStore.index()
+                    dialogVisible.value = false
+                }
+            }
         }
-      } else {
-        if (form.value.id) {
-          await quitRunningDeviceUpdate(form.value)
-          ElMessage.success('重新发起成功')
-          tableStore.index()
-          dialogVisible.value = false
-        } else {
-          await addRunningDevice(form.value)
-          //查询进线数据，避免一直处于loading状态
-          ElMessage.success('申请成功')
-          tableStore.index()
-          dialogVisible.value = false
-        }
-      }
-    }
-  })
+    })
 }
 
 /**
@@ -161,16 +167,18 @@ const submit = () => {
  */
 
 const changeType = (event: any) => {
-  sourceData.value = deviceList.value
-  form.value.deviceId = ''
-  data.value = sourceData.value
+    sourceData.value = deviceList.value
+    form.value.deviceId = ''
+    data.value = sourceData.value
 }
 
-const changeDevStatus = async (event: any) => {
-  await getDeviceDetailData(event).then(res => {
-    //给当前终端赋值初始运行状态
-    form.value.devOriginalStatus = res.data.runFlag
-  })
+const changeDevStatus = async (event: any, flag?: boolean) => {
+    await getDeviceDetailData(event).then(res => {
+        //给当前终端赋值初始运行状态
+        runFlag.value = res.data.runFlag + ''
+        if (!flag) form.value.devStatus = ''
+        devStatuData.value = devStatusList.value.filter(item => item.value != res.data.runFlag)
+    })
 }
 
 defineExpose({ open })
@@ -178,14 +186,13 @@ defineExpose({ open })
 
 <style scoped lang="scss">
 .el-upload-list__item {
-  transition: none !important;
+    transition: none !important;
 }
 
 .el-select {
-  min-width: 180px;
+    min-width: 180px;
 }
-::v-deep .el-tree-node__children>div{
+::v-deep .el-tree-node__children > div {
     display: block !important;
 }
-
 </style>

src/views/pqs/supervise/retire/index.vue

@@ -4,7 +4,7 @@
       <el-tab-pane label='终端状态管理' name='0'>
         <terminal v-if="activeName == '0'" />
       </el-tab-pane>
-      <el-tab-pane label='监测点退运' name='1'>
+      <el-tab-pane label='监测点状态管理' name='1'>
         <monitor v-if="activeName == '1'" />
       </el-tab-pane>
     </el-tabs>

src/views/pqs/supervise/retire/monitor.vue

@@ -1,7 +1,7 @@
 <!--待办事项列表-->
 <template>
   <div >
-    <TableHeader date-picker>
+    <TableHeader date-picker nextFlag>
       <template #select>
           <el-form-item label="流程状态">
               <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
@@ -133,10 +133,10 @@ const tableStore = new TableStore({
           icon: 'el-icon-Open',
           render: 'basicButton',
           disabled: row => {
-            return !(row.createBy == adminInfo.$state.id||  row.status == 3 || row.status == 4)
+            return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
           },
           click: row => {
-            deviceQuitPopup.value.open('重新发起退运', row)
+            deviceQuitPopup.value.open('重新发起', row)
           }
         },
         {
@@ -171,7 +171,7 @@ provide('tableStore', tableStore)
 
 //新增退运终端信息
 const add = () => {
-  deviceQuitPopup.value.open('监测点退运')
+  deviceQuitPopup.value.open('新增监测点状态变更')
 }
 
 /** 流程实例详情 */

src/views/pqs/supervise/retire/monitorQuitPopup.vue

@@ -19,7 +19,26 @@
                         clearable
                     />
                 </el-form-item>
-
+                <el-form-item label="监测点当前状态:">
+                    <el-select v-model="runFlag" disabled placeholder="请选择监测点" clearable class="select">
+                        <el-option
+                            v-for="item in runFlagData"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.name"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="变更状态:" prop="devStatus">
+                    <el-select v-model="form.devStatus" placeholder="请选择监测点变更状态" clearable class="select">
+                        <el-option
+                            v-for="item in runFlagList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="退运原因" prop="propertyNo">
                     <!-- <el-input
               v-model='form.propertyNo'
@@ -60,7 +79,9 @@ const data = ref()
 const title = ref('')
 const tableStore = inject('tableStore') as TableStore
 const formRef = ref()
+const runFlag = ref('')
 
+const runFlagData: any = ref([])
 const dialogVisible = ref(false)
 // 注意不要和表单ref的命名冲突
 const form = ref({
@@ -68,13 +89,22 @@ const form = ref({
     deviceId: '',
     deviceType: '2',
     devOriginalStatus: '0',
+    devStatus: '',
     propertyNo: ''
 })
+const runFlagList = [
+    { id: 0, name: '投运' },
+    { id: 1, name: '检修' },
+    { id: 2, name: '停运' },
+    { id: 3, name: '调试' },
+    { id: 4, name: '退运' }
+]
 
 //form表单校验规则
 const rules = {
     deviceId: [{ required: true, message: '终端不能为空', trigger: 'change' }],
-    propertyNo: [{ required: true, message: '请输入退役原因', trigger: 'blur' }]
+    propertyNo: [{ required: true, message: '请输入退役原因', trigger: 'blur' }],
+    devStatus: [{ required: true, message: '亲选择变更状态', trigger: 'blur' }]
 }
 const resetForm = () => {
     if (formRef.value) {
@@ -97,6 +127,8 @@ const open = async (text: string, tempData?: any) => {
             form.value[key] = tempData[key]
         }
         form.value.deviceType = form.value.deviceType + ''
+        changeDevStatus(form.value.deviceId, true)
+        form.value.devStatus = form.value.devStatus 
     } else {
         resetForm()
         // 在此处恢复默认表单
@@ -104,6 +136,7 @@ const open = async (text: string, tempData?: any) => {
             form.value[key] = ''
         }
         form.value.deviceType = '1'
+        runFlag.value = ''
     }
     form.value.deviceType = '2'
     dialogVisible.value = true
@@ -144,26 +177,30 @@ const changeType = (event: any) => {
     form.value.deviceId = ''
     data.value = sourceData.value
 }
-const changeDevStatus = async (event: any) => {
+const changeDevStatus = async (event: any, flag?: any) => {
     await getLineDetailData(event).then(res => {
-        //给当前终端赋值初始运行状态
-        switch (res.data.runFlag) {
-            case '投运':
-                form.value.devOriginalStatus = '0'
-                break
-            case '检修':
-                form.value.devOriginalStatus = '1'
-                break
-            case '停运':
-                form.value.devOriginalStatus = '2'
-                break
-            case '调试':
-                form.value.devOriginalStatus = '3'
-                break
-            default:
-                form.value.devOriginalStatus = '4'
-                break
-        }
+        //给当前终端赋值初始投运状态
+        // switch (res.data.runFlag) {
+
+        //     case '投运':
+        //         form.value.devOriginalStatus = '0'
+        //         break
+        //     case '检修':
+        //         form.value.devOriginalStatus = '1'
+        //         break
+        //     case '停运':
+        //         form.value.devOriginalStatus = '2'
+        //         break
+        //     case '调试':
+        //         form.value.devOriginalStatus = '3'
+        //         break
+        //     default:
+        //         form.value.devOriginalStatus = '4'
+        //         break
+        // }
+        runFlag.value = res.data.runFlag
+        if (!flag) form.value.devStatus = ''
+        runFlagData.value = runFlagList.filter(item => item.name != res.data.runFlag)
     })
 }
 

src/views/pqs/supervise/retire/terminal.vue

@@ -1,7 +1,7 @@
 <!--待办事项列表-->
 <template>
     <div >
-        <TableHeader date-picker>
+        <TableHeader date-picker nextFlag>
             <template v-slot:select>
                 <el-form-item label="流程状态">
                     <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
@@ -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 || row.status == 4)
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
                     },
                     click: row => {
                         deviceQuitPopup.value.open('重新发起终端状态变更', row)