联调 试运行 编辑功能 修改 在线监测页面

src/api/supervision-boot/lineRunTest/index.ts

@@ -10,18 +10,31 @@ export const addRunTest = (data: any) => {
         data: data
     })
 }
-
+export const update = (data: any) => {
+    return createAxios({
+        url: '/supervision-boot/supervisionTempLineRunTest/update',
+        method: 'POST',
+        data: data
+    })
+}
+export const cancel = (data: any) => {
+    return createAxios({
+        url: '/supervision-boot/supervisionTempLineRunTest/cancel',
+        method: 'POST',
+        data: data
+    })
+}
 
 export const getRunTestById = (id: string) => {
     return createAxios({
         url: '/supervision-boot/supervisionTempLineRunTest/getRunTestById?id=' + id,
-        method: 'get',
+        method: 'get'
+    })
+}
+export const initiateWarningLeaflet = (data: any) => {
+    return createAxios({
+        url: '/supervision-boot/lineRunTestProblem/initiateWarningLeaflet',
+        method: 'POST',
+        data
     })
 }
-
-
-
-
-
-
-

src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue

@@ -120,7 +120,7 @@ const open = (row: any) => {
     dialogVisible.value = true
     List.value = row.row
     title.value = row.text
-    form.value = { ...row.form, ...form.value }
+    form.value = { ...form.value, ...row.form }
 }
 
 const handleClose = () => {

src/views/pqs/supervise/electricalEnergy/components1/online.vue

@@ -90,7 +90,7 @@ const dictData = useDictData()
 import { useRouter } from 'vue-router'
 const router = useRouter() // 路由对象
 //字典获取超标指标
-const exceeded = dictData.getBasicData('Indicator_Type')
+const exceeded = dictData.getBasicData('Steady_Statis')
 const tableRef = ref()
 const industry = dictData.getBasicData('Business_Type')
 const TableHeaderRef = ref()
@@ -281,6 +281,7 @@ const tableStore = new TableStore({
     beforeSearchFun: () => {
         tableStore.table.params.currentPage = tableStore.table.params.pageNum
         list.value.deptId = tableStore.table.params.deptId
+       
         list.value.searchBeginTime = tableStore.table.params.searchBeginTime
         list.value.searchEndTime = tableStore.table.params.searchEndTime
         list.value.alertThreshold = tableStore.table.params.alertThreshold
@@ -352,6 +353,7 @@ const launch = (title: string) => {
         form: list.value,
         row: tableStore.table.selection
     })
+        console.log("🚀 ~ launch ~ list.value:", list.value)
 }
 const changeArea = e => {
     level.value = e.data.level

src/views/pqs/supervise/electricalEnergy/components1/testRun.vue

@@ -0,0 +1,245 @@
+<!---试运行列表-->
+<template>
+    <div>
+        <TableHeader area datePicker nextFlag theCurrentTime 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>
+        </TableHeader>
+        <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+    </div>
+</template>
+<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'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { addRunTest, initiateWarningLeaflet } from '@/api/supervision-boot/lineRunTest'
+import { formatDate } from '@/utils/formatTime'
+import { VxeTablePropTypes } from 'vxe-table'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { getFileNameAndFilePath } from '@/api/system-boot/file'
+const dictData = useDictData()
+const statusSelect = dictData.statusSelect()
+const { push } = useRouter()
+const adminInfo = useAdminInfo()
+const TableHeaderRef = ref()
+const tableRef = ref()
+
+const tableStore = new TableStore({
+    url: '/supervision-boot/lineRunTestProblem/pageProblem',
+    method: 'POST',
+    publicHeight: 65,
+    column: [
+        { field: 'lineName', title: '监测点名称', minWidth: 160 },
+        { field: 'connectedBus', title: '接入母线', minWidth: 160 },
+        // { field: 'monitoringTerminalCode', title: '终端编号', minWidth: 140 },
+        { field: 'monitoringTerminalName', title: '终端名称', minWidth: 140 },
+        { field: 'powerSubstationName', title: '变电站', minWidth: 160 },
+        { field: 'reason', title: '调试原因', minWidth: 160 },
+
+        {
+            field: 'testRunState',
+            title: '试运行状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'primary',
+                2: 'success',
+                3: 'danger',
+                1: 'warning'
+            },
+            replaceValue: {
+                0: '待试运行',
+                1: '试运行中',
+                2: '试运行成功',
+                3: '试运行失败',
+                null: '待试运行'
+            }
+        },
+        {
+            field: 'testRunTime',
+            title: '试运行时间范围',
+            minWidth: 200,
+            formatter: row => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        { field: 'problemReason', title: '试运行评估问题', minWidth: 200 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 100,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+            title: '操作',
+            minWidth: 230,
+            fixed: 'right',
+            render: 'buttons',
+            buttons: [
+                // {
+                //     name: 'productSetting',
+                //     title: '流程详情',
+                //     type: 'primary',
+                //     icon: 'el-icon-EditPen',
+                //     render: 'basicButton',
+                //     click: row => {
+                //         handleAudit(row.processInstanceId, row.historyInstanceId)
+                //     },
+                //     disabled: row => {
+                //         return row.testRunState != 2 || !row.processInstanceId
+                //     }
+                // },
+                {
+                    name: 'productSetting',
+                    title: '下载报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        downloadTheReport(row.testRunReport)
+                    },
+                    disabled: row => {
+                        return row.testRunReport == null || row.testRunReport.length == 0
+                    }
+                },
+
+                {
+                    name: 'edit',
+                    title: '发起告警单',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.problemType != null
+                    },
+
+                    click: async row => {
+                        const { value } = await ElMessageBox.prompt('', '整改意见', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+
+                            inputType: 'textarea',
+                            inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+                            inputErrorMessage: '请输入整改意见'
+                        })
+                        initiateWarningLeaflet({
+                            id: row.id,
+                            problemId: row.problemId,
+                            reformAdvice: value,
+                            type: 2,
+                            issueDetail: row.problemReason
+                        }).then(res => {
+                            ElMessage.success('发起告警单成功！')
+                            tableStore.index()
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '查看告警单',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.problemType == null
+                    },
+                    click: row => {
+                        push({
+                            name: 'supervision/supervision/manage',
+                            state: {
+                                type: 1
+                            }
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.statveList = [2]
+        // tableStore.table.params.relationUserName = tableStore.table.params.userName
+    }
+})
+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) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+
+// 下载报告
+const downloadTheReport = (url: string) => {
+    getFileNameAndFilePath({ filePath: url }).then((res: any) => {
+        const link = document.createElement('a')
+        link.href = res.data.url
+        link.download = res.data.name
+        document.body.appendChild(link)
+        link.click()
+        document.body.removeChild(link)
+    })
+}
+
+const runTestSubmit = (type: number) => {
+    const start = new Date()
+    start.setDate(start.getDate() + 1)
+    start.setHours(0, 0, 0)
+
+    const end = new Date()
+    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 data = {
+        startTime: startString,
+        endTime: endString,
+        lineIds: monitorIds,
+        operateType: type
+    }
+    addRunTest(data).then((res: any) => {
+        if (res.code === 'A0000') {
+            ElMessage({
+                message: '发起试运行成功',
+                type: 'success'
+            })
+            tableStore.index()
+        }
+    })
+}
+</script>
+
+<style scoped lang="scss"></style>

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

@@ -10,6 +10,9 @@
             <el-tab-pane label="计划问题" name="3">
                 <testQuestions v-if="activeName == '3'" />
             </el-tab-pane>
+            <el-tab-pane label="试运行评估问题" name="4">
+                <testRun v-if="activeName == '4'" />
+            </el-tab-pane>
             <!-- <el-tabs v-model="activeName" type="border-card">
             <el-tab-pane label="电能质量问题查询维护" name="1">
                 <maintenance />
@@ -26,6 +29,7 @@ import { onMounted, reactive, ref, provide } from 'vue'
 import online from './components1/online.vue'
 import complaints from './components1/complaints.vue'
 import testQuestions from './components1/testQuestions.vue'
+import testRun from './components1/testRun.vue'
 // import maintenance from './components/maintenance.vue'
 // import audit from './components/audit.vue'
 import { mainHeight } from '@/utils/layout'

src/views/pqs/supervise/technology/components/alarm.vue

@@ -74,13 +74,13 @@ const tableStore = new TableStore({
                 1: '技术监督计划',
                 2: '在线监测超标问题',
                 3: '用户投诉问题',
-                4: '现场测试超标问题'
+                4: '试运行监测点问题'
             }
         },
         { field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
-        { field: 'reformAdvice', title: '整改意见', minWidth: '150' },
         { field: 'leafletName', title: '单据名称', minWidth: '150' },
         { field: 'issueDetail', title: '告警内容', minWidth: '150' },
+        { field: 'reformAdvice', title: '整改意见', minWidth: '150' },
         {
             field: 'status',
             title: '流程状态',

src/views/pqs/supervise/technology/components/earlyWarn.vue

@@ -58,7 +58,7 @@ const tableStore = new TableStore({
                 1: '技术监督计划',
                 2: '在线监测超标问题',
                 3: '用户投诉问题',
-                4: '现场测试超标问题'
+                4: '试运行监测点问题'
             }
         },
         { field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
@@ -130,6 +130,7 @@ const tableStore = new TableStore({
                             row.status,
                             row.issueDetail,
                             row.problemPath,
+                            row.reportPath,
                             row.reformAdvice
                         )
                     }
@@ -166,7 +167,7 @@ const tableStore = new TableStore({
                             row.status,
                             row.issueDetail,
                             row.problemPath,
-
+                            row.reportPath,
                             row.reformAdvice,
                             row.takeStep,
                             row.reportPath
@@ -190,6 +191,7 @@ const tableStore = new TableStore({
                             row.status,
                             row.issueDetail,
                             row.problemPath,
+                            row.reportPath,
                             row.reformAdvice,
                             row.takeStep,
                             row.reportPath

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

@@ -63,9 +63,9 @@ const getProblemType = (type: number) => {
         return '用户投诉问题'
     }
     if (type === 4) {
-        return '现场测试超标问题'
+        return '试运行监测点问题'
     }
-    return '现场测试超标问题'
+    return '试运行监测点问题'
 }
 
 /** 获得数据 */

src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/form.vue

@@ -1,6 +1,17 @@
 <template>
     <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title" width="550px" top="20vh">
         <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
+            <el-form-item for="-" label="本次定检时间："  prop="nowCheckTime">
+                <el-date-picker
+                    v-model="form.nowCheckTime"
+                    placeholder="选择日期"
+                    format="YYYY-MM-DD"
+                    style="width: 100%"
+                    value-format="YYYY-MM-DD"
+                    type="date"
+                />
+            </el-form-item>
+
             <el-form-item for="-" label="报告文件：" class="uploadFile" prop="reportPath">
                 <el-upload
                     v-model:file-list="form.reportPath"
@@ -56,12 +67,14 @@ const dialogVisible = ref(false)
 const form: any = ref({
     id: '',
     reportPath: [],
-    description: ''
+    description: '',
+    nowCheckTime: ''
 })
 
 //form表单校验规则
 const rules = {
     reportPath: [{ required: true, message: '请上传文件', trigger: 'change' }],
+    nowCheckTime: [{ required: true, message: '请选择定检时间', trigger: 'change' }],
     description: [{ required: true, message: '请输入描述', trigger: 'blur' }]
 }
 
@@ -77,6 +90,7 @@ const open = async (text: string, tempData?: any) => {
         } else {
             form.value.reportPath = [{ name: tempData.checkFilePath.split('/')[2] }]
             form.value.description = tempData.description
+            form.value.nowCheckTime = tempData.nowCheckTime
         }
     }
 

src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue

@@ -19,6 +19,16 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item label="处理状态">
+                <el-select v-model="tableStore.table.params.state" clearable placeholder="请选处理状态">
+                    <el-option
+                        v-for="item in stateSelect"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
         </template>
     </TableHeader>
     <Table ref="tableRef" />
@@ -45,6 +55,16 @@ const TableHeaderRef = ref()
 const tableRef = ref()
 const FormRef = ref()
 const statusSelect = dictData.statusSelect()
+const stateSelect = [
+    {
+        id: 0,
+        name: '未处理'
+    },
+    {
+        id: 1,
+        name: '已处理'
+    }
+]
 //申请联调
 const debugForms = ref()
 const tableStore = new TableStore({
@@ -60,14 +80,27 @@ const tableStore = new TableStore({
             field: 'deviceName',
             title: '终端名称'
         },
+        {
+            field: 'thisTimeCheck',
+            title: '本次定检时间'
+        },
+        {
+            field: 'nextTimeCheck',
+            title: '下次定检时间'
+        },
         {
             field: 'overdueDay',
             title: '逾期天数',
             type: 'html',
             formatter: (row: any) => {
-                return `<span style='color: ${
+
-                    row.row.overdueDay > 10 ? 'red' : row.row.overdueDay > 3 ? 'yellow' : ''
+                let text = row.row.status == 2
-                };text-decoration: none'>${row.row.overdueDay}</span>`
+                    ? '/'
+                    : `<span style='color: ${
+                          row.row.overdueDay > 10 ? 'red' : row.row.overdueDay > 3 ? 'yellow' : ''
+                      };text-decoration: none'>${row.row.overdueDay}</span>`
+                
+                return text
             }
         },
 
@@ -113,7 +146,7 @@ const tableStore = new TableStore({
                         return !row.processInstanceId
                     }
                 },
-               
+
                 {
                     name: 'edit',
                     title: '报告上传',
@@ -182,6 +215,7 @@ const tableStore = new TableStore({
     }
 })
 tableStore.table.params.status = ''
+tableStore.table.params.state = ''
 tableStore.table.params.searchValue = ''
 
 provide('tableStore', tableStore)

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

@@ -53,7 +53,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import { useRouter } from 'vue-router'
 import { useDictData } from '@/stores/dictData'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { addRunTest } from '@/api/supervision-boot/lineRunTest'
+import { addRunTest, update, cancel } from '@/api/supervision-boot/lineRunTest'
 import { formatDate } from '@/utils/formatTime'
 import { VxeTablePropTypes } from 'vxe-table'
 import { useAdminInfo } from '@/stores/adminInfo'
@@ -149,7 +149,7 @@ const tableStore = new TableStore({
                         handleAudit(row.processInstanceId, row.historyInstanceId)
                     },
                     disabled: row => {
-                        return row.testRunState != 2 || !row.processInstanceId
+                        return !row.processInstanceId
                     }
                 },
                 {
@@ -174,10 +174,49 @@ const tableStore = new TableStore({
                     click: row => {
                         monitorIds = []
                         monitorIds.push(row.id)
-                        runTestSubmit(1)
+                        monitorIds = []
+                        monitorIds.push(row.id)
+                        const start = new Date()
+                        start.setDate(start.getDate() + 1)
+                        start.setHours(0, 0, 0)
+
+                        const end = new Date()
+                        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 data = {
+                            startTime: startString,
+                            endTime: endString,
+                            lineIds: monitorIds,
+                            operateType: 1,
+                            id: row.id
+                        }
+                        update(data).then((res: any) => {
+                            if (res.code === 'A0000') {
+                                ElMessage({
+                                    message: '发起试运行成功',
+                                    type: 'success'
+                                })
+                                tableStore.index()
+                            }
+                        })
                     },
                     disabled: row => {
-                        return row.status != 3
+                        return !(row.status == 3 || row.status == 4)
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
                     }
                 }
             ]
@@ -213,6 +252,28 @@ const handleAudit = (instanceId: any, historyInstanceId: any) => {
         }
     })
 }
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancel(data).then(res => {
+        ElMessage.success('取消成功')
+        // 加载数据
+        tableStore.index()
+    })
+}
 //试运行
 let monitorIds: any = []
 
@@ -256,7 +317,6 @@ const startRunTest = () => {
 // 下载报告
 const downloadTheReport = (url: string) => {
     getFileNameAndFilePath({ filePath: url }).then((res: any) => {
-
         const link = document.createElement('a')
         link.href = res.data.url
         link.download = res.data.name