修改技术监督问题

2024-07-18 14:25:53 +08:00
parent 4a6eaf50e8
commit 049d0c1132
11 changed files with 373 additions and 18 deletions
--- a/index.html
+++ b/index.html
@@ -17,7 +17,6 @@

    <!-- 冀北地图 -->
 <!--引入样式文件-->
-<!-- <link rel="stylesheet" href="http://24.43.102.201:30080/powermap.min.css"/> -->
 <!-- <script  src="http://25.42.182.218/narimap/libs/narimap.umd.min.js"></script>
 <script  src="http://25.42.182.218/narimap/libs/nrgis-common/libs/index.min.js"></script> -->
    <body>
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -169,7 +169,7 @@ const setInterval = (val: any) => {
    datePickerRef.value.setInterval(val)
 }

-defineExpose({ onComSearch, areaRef, setDatePicker, setInterval, datePickerRef })
+defineExpose({ onComSearch, areaRef, setDatePicker, setInterval, datePickerRef, showSelectChange})
 </script>

 <style scoped lang="scss">
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -65,6 +65,7 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                !(
                    config.url == '/system-boot/file/upload' ||
                    config.url == '/harmonic-boot/grid/getAssessOverview' ||
+                    config.url == '/system-boot/file/getFileVO' ||
                    config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData'
                )
            )
--- a/src/views/pqs/qualityInspeection/panorama/components/details/point.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/point.vue
@@ -96,14 +96,16 @@ const analysis = (e: any) => {
    getGridDiagramLineTendency({ ...rowList.value, searchBeginTime: time, type: e }).then(res => {
        let name = []
        let data = []
+        let num = 0
        for (let k in res.data) {
            name.push(k)
-            data.push(res.data[k])
+            num = num + res.data[k]
+            data.push(num)
        }

        trendEChart.value = {
            title: {
-                text: '在线监测点数量'
+                text: '在线监测点总数量'
            },
            xAxis: {
                name: '时间',
--- a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
@@ -286,14 +286,16 @@ const analysis = (e: any) => {
    getGridDiagramSubTendency({ ...rowList.value, searchBeginTime: time, type: e }).then(res => {
        let name = []
        let data = []
+        let num = 0
        for (let k in res.data) {
            name.push(k)
-            data.push(res.data[k])
+            num = num + res.data[k]
+            data.push(num)
        }

        trendEChart.value = {
            title: {
-                text: '变电站接入数量'
+                text: '变电站接入总数量'
            },
            xAxis: {
                name: '时间',
--- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
@@ -323,9 +323,11 @@ tableStore.table.params.lineType = ''
 tableStore.table.params.dataType = '1'
 tableStore.table.params.deptId = dictData.state.area[0].id
 provide('tableStore', tableStore)
-
 onMounted(() => {
    tableStore.index()
+    setTimeout(() => {
+        TableHeaderRef.value.showSelectChange()
+    }, 10)
 })

 const changeAlert = e => {
--- a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
@@ -309,6 +309,27 @@
                    {{ proviteData?.additionalAttachments?.name }}
                </a>
            </el-descriptions-item>
+
+            <el-descriptions-item label="入网评估报告">
+                <div v-for="item in netInReportList">
+                    <el-icon class="elView" v-if="item.name">
+                        <View @click="openFile(item.name)" />
+                    </el-icon>
+                    <a target="_blank" :href="item.url">
+                        {{ item.name }}
+                    </a>
+                </div>
+            </el-descriptions-item>
+            <el-descriptions-item label="治理评估告">
+                <div v-for="item in governReportList">
+                    <el-icon class="elView" v-if="item.name">
+                        <View @click="openFile(item.name)" />
+                    </el-icon>
+                    <a target="_blank" :href="item.url">
+                        {{ item.name }}
+                    </a>
+                </div>
+            </el-descriptions-item>
        </el-descriptions>
    </div>
 </template>
@@ -340,6 +361,8 @@ const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编
 const openFile = (name: any) => {
    window.open(window.location.origin + '/#/previewFile?' + name)
 }
+const netInReportList: any = ref([])
+const governReportList: any = ref([])
 //用户性质数组
 const userTypeList = reactive([
    {
@@ -409,18 +432,17 @@ const powerSupplyInfoOptionList = dictData.getBasicData('supply_condition')
 const getInfo = async () => {
    detailLoading.value = true
    try {
-        if(props.update){
+        if (props.update) {
            await getUserReportUpdateById(props.id || queryId).then(res => {
-            detailData.value = res.data.userReportMessageJson
-            getProviteData()
-        })
-        }else{
+                detailData.value = res.data.userReportMessageJson
+                getProviteData()
+            })
+        } else {
            await getUserReportById(props.id || queryId).then(res => {
-            detailData.value = res.data
-            getProviteData()
-        })
+                detailData.value = res.data
+                getProviteData()
+            })
        }
-       
    } finally {
        detailLoading.value = false
    }
@@ -552,6 +574,21 @@ const getProviteData = async () => {
    if (proviteData.value.additionalAttachments) {
        getFileNamePath(proviteData.value.additionalAttachments, 'additionalAttachments')
    }
+
+    // 入网评估报告
+    if (detailData.value.netInReport.length > 0) {
+        netInReportList.value = []
+        detailData.value.netInReport.forEach((item: any) => {
+            getFileNamePath(item, 'netInReport')
+        })
+    }
+    // 治理评估告"
+    if (detailData.value.governReport.length > 0) {
+        governReportList.value = []
+        detailData.value.governReport.forEach((item: any) => {
+            getFileNamePath(item, 'governReport')
+        })
+    }
 }
 //根据文件名请求
 const getFileNamePath = async (val: any, pathName: any) => {
@@ -623,6 +660,18 @@ const getFileNamePath = async (val: any, pathName: any) => {
                    url: res.data.url
                }
            }
+
+            if (pathName == 'netInReport') {
+                netInReportList.value.push({
+                    name: res.data.fileName,
+                    url: res.data.url
+                })
+            } else if (pathName == 'governReport') {
+                governReportList.value.push({
+                    name: res.data.fileName,
+                    url: res.data.url
+                })
+            }
        }
    })
 }
@@ -658,5 +707,4 @@ onMounted(() => {
    cursor: pointer;
    margin-right: 10px;
 }
-
 </style>
--- a/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue
+++ b/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue
@@ -49,7 +49,7 @@
                    :icon="View"
                    style="margin-left: 10px;"
                    @click='handleFormDetail(item)'
-                    v-if="item.formId && item.status!=3"
+                    v-if="item.formId "
                >
                  <Icon icon='ep:document'/>
                  查看表单
--- a/src/views/system/bpm/processInstance/detail/index.vue
+++ b/src/views/system/bpm/processInstance/detail/index.vue
@@ -251,6 +251,11 @@ const handleAudit = async (task, pass) => {
        tab.value = '审批记录'
        ElMessage.success('审批通过成功')
    } else {
+        const formCreateApi = approveFormFApis.value[index]
+        if (formCreateApi) {
+            await formCreateApi.validate()
+            data.variables = approveForms.value[index].value
+        }
        await rejectTask(data)
        tab.value = '审批记录'
        ElMessage.success('审批不通过成功')
--- a/src/views/system/bpm/task/alarmTask/index.vue
+++ b/src/views/system/bpm/task/alarmTask/index.vue
@@ -0,0 +1,292 @@
+<template>
+    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+        <!--        <template #operation>-->
+        <!--            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>-->
+        <!--            <el-button icon="el-icon-Delete" type="primary">删除</el-button>-->
+        <!--        </template>-->
+    </TableHeader>
+    <Table ref="tableRef" />
+    <!--弹框-->
+    <feedback-popup ref="feedbackPopup" />
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import FeedbackPopup from '@/views/pqs/supervise/technology/feedbackPopup.vue'
+import { useRouter } from 'vue-router'
+import { cancelFeedback } from '@/api/supervision-boot/leaflet'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { getFileNameAndFilePath } from '@/api/system-boot/file'
+const dictData = useDictData()
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const { push } = useRouter()
+const tableRef = ref()
+const TableHeaderRef = ref()
+const feedbackPopup = ref()
+const tableStore = new TableStore({
+    url: '/supervision-boot/warningLeaflet/allPageData',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        {
+            title: '序号',
+            type: 'seq',
+            align: 'center',
+            width: 60,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+
+        {
+            field: 'problemType',
+            title: '预告警单问题来源',
+            minWidth: '150',
+            render: 'tag',
+            custom: {
+                1: 'warning',
+                2: 'warning',
+                3: 'warning',
+                4: 'warning'
+            },
+            replaceValue: {
+                1: '技术监督计划',
+                2: '在线监测超标问题',
+                3: '用户投诉问题',
+                4: '试运行监测点问题'
+            }
+        },
+        { field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
+        {
+            field: 'leafletType',
+            title: '告警类型',
+            render: 'tag',
+            minWidth: '150',
+            custom: {
+                1: 'warning',
+                2: 'danger'
+            },
+            replaceValue: {
+                1: '预警单',
+                2: '告警单'
+            }
+            // formatter: (row: any) => {
+            //     return row.row.leafletType == 1 ? '预警单' : '告警单'
+            // }
+        },
+        { field: 'reformAdvice', title: '整改意见', minWidth: '200' },
+        { field: 'leafletName', title: '单据名称', minWidth: '200' },
+        {
+            field: 'status',
+            title: '流程状态',
+            minWidth: '150',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning',
+                5: 'primary'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消',
+                5: '新增'
+            }
+        },
+
+        { field: 'createTime', title: '创建时间', minWidth: '150' },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+            title: '操作',
+            minWidth: '220',
+            align: 'center',
+            render: 'buttons',
+            fixed: 'right',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '发送督办单',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        // handleAudit(row.processInstanceId)
+                        ElMessage.warning('待打通生成管理系统接口！')
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '问题反馈',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.dutyOrgId != adminInfo.$state.deptId || row.status !== 5
+                    },
+                    click: row => {
+                        feedbackPopup.value.open(
+                            '填报反馈单',
+                            row.id,
+                            row.status,
+                            row.issueDetail,
+                            row.problemPath,
+                            row.supervisionReport,
+                            row.reformAdvice
+                        )
+                    }
+                },
+
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !row.processInstanceId
+                    },
+                    click: row => {
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return row.dutyOrgId != adminInfo.$state.deptId || !(row.status == 0)
+                    },
+                    disabled: row => {
+                        return !(row.status == 0)
+                    },
+                    click: row => {
+                        feedbackPopup.value.open(
+                            '编辑',
+                            row.id,
+                            row.status,
+                            row.issueDetail,
+                            row.problemPath,
+                            row.supervisionReport,
+                            row.reformAdvice,
+                            row.takeStep,
+                            row.reportPath
+                        )
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        // deviceQuitPopup.value.open('重新发起', row)
+                        feedbackPopup.value.open(
+                            '重新发起告警单',
+                            row.id,
+                            row.status,
+                            row.issueDetail,
+                            row.problemPath,
+                            row.supervisionReport,
+                            row.reformAdvice,
+                            row.takeStep,
+                            row.reportPath,
+                            row.reformAdvice
+                        )
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '报告下载',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.problemType != 2
+                    },
+                    click: row => {
+                        window.open(row.filePath)
+                    }
+                },
+                {
+                    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)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.currentPage = tableStore.table.params.pageNum
+    }
+})
+
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+/**取消流程操作*/
+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 cancelFeedback(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+/** 流程实例详情 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        query: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+</script>
+
+<style scoped lang="scss"></style>
--- a/src/views/system/bpm/task/index.vue
+++ b/src/views/system/bpm/task/index.vue
@@ -10,6 +10,9 @@
      <el-tab-pane label='我发起的' name='3'>
        <MyInstance v-if="activeName == '3'" />
      </el-tab-pane>
+      <el-tab-pane label='预告警单任务' name='4'>
+        <AlarmTask v-if="activeName == '4'" />
+      </el-tab-pane>
    </el-tabs>
  </div>
 </template>
@@ -19,6 +22,7 @@ import { ref } from 'vue'
 import TodoTask from './todo/index.vue'
 import DoneTask from './done/index.vue'
 import MyInstance from './myInstance/index.vue'
+import AlarmTask from './alarmTask/index.vue'
 import { mainHeight } from '@/utils/layout'

 defineOptions({