微调

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">

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

@@ -1,17 +1,12 @@
 <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">
                 <undocumented v-if="activeName == '1'" />
             </el-tab-pane>
-            <!--            <el-tab-pane label="入网评估报告审核" name="2"><network v-if="activeName == '2'" /></el-tab-pane>-->
             <el-tab-pane label="常态化干扰源用户管理" name="3">
                 <interferenceUserTable v-if="activeName == '3'" />
             </el-tab-pane>
-            <!--            <el-tab-pane label="实测报告审核" name="4"><report v-if="activeName == '4'" /></el-tab-pane>-->
-            <!-- <el-tab-pane label="终端入网检测" name="5">
-              <terminalNetworkDetection v-if="activeName == '5'"></terminalNetworkDetection>
-            </el-tab-pane> -->
         </el-tabs>
     </div>
 </template>

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

@@ -81,11 +81,22 @@ const tableStore = new TableStore({
         { field: 'createTime', title: '创建时间', minWidth: '150' },
         {
             title: '操作',
-            width: '180',
+            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: '问题反馈',
@@ -99,6 +110,7 @@ const tableStore = new TableStore({
                         feedbackPopup.value.open('填报反馈单',row.id,row.status)
                     }
                 },
+
                 {
                     name: 'productSetting',
                     title: '流程详情',

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

@@ -1,15 +1,15 @@
 <template>
-    <TableHeader  datePicker ref="TableHeaderRef">
+    <TableHeader datePicker ref='TableHeaderRef'>
-<!--        <template #operation>-->
+        <!--        <template #operation>-->
-<!--            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>-->
+        <!--            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>-->
-<!--            <el-button icon="el-icon-Delete" type="primary">删除</el-button>-->
+        <!--            <el-button icon="el-icon-Delete" type="primary">删除</el-button>-->
-<!--        </template>-->
+        <!--        </template>-->
     </TableHeader>
-    <Table ref="tableRef" />
+    <Table ref='tableRef' />
     <!--弹框-->
     <feedback-popup ref='feedbackPopup' />
 </template>
-<script setup lang="ts">
+<script setup lang='ts'>
 import { ref, onMounted, provide, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -17,6 +17,7 @@ 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'
+
 const { push } = useRouter()
 const tableRef = ref()
 const TableHeaderRef = ref()
@@ -35,7 +36,8 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'problemType', title: '告警单问题来源', minWidth: '150',
+        {
+            field: 'problemType', title: '告警单问题来源', minWidth: '150',
             render: 'tag',
             custom: {
                 1: 'warning',
@@ -51,14 +53,15 @@ const tableStore = new TableStore({
             }
         },
         { field: 'leafletName', title: '单据名称', minWidth: '150' },
-        { field: 'status', title: '告警单状态', minWidth: '150',
+        {
+            field: 'status', title: '告警单状态', minWidth: '150',
             render: 'tag',
             custom: {
                 1: 'primary',
                 2: 'success',
                 3: 'danger',
                 4: 'warning',
-                5: 'primary',
+                5: 'primary'
             },
             replaceValue: {
                 1: '审批中',
@@ -71,11 +74,22 @@ const tableStore = new TableStore({
         { field: 'createTime', title: '创建时间', minWidth: '150' },
         {
             title: '操作',
-            width: '180',
+            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: '问题反馈',
@@ -86,7 +100,7 @@ const tableStore = new TableStore({
                         return row.status !== 5
                     },
                     click: row => {
-                    feedbackPopup.value.open('填报反馈单',row.id,row.status)
+                        feedbackPopup.value.open('填报反馈单', row.id, row.status)
                     }
                 },
                 {
@@ -154,4 +168,4 @@ const handleAudit = (instanceId: any) => {
 }
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang='scss'></style>

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

@@ -15,10 +15,11 @@
               v-model='formData.takeStep'
               autocomplete='off'
               placeholder='请输入采取的措施'
+              type='textarea'
           />
         </el-form-item>
 
-        <el-form-item label='处理成效报告：' prop='reportPath'>
+        <el-form-item label='反馈报告：' prop='reportPath'>
           <el-upload
               ref='uploadRef'
               action=''

src/views/system/bpm/task/done/index.vue

@@ -37,9 +37,10 @@ const { push } = useRouter()
 const tableStore = new TableStore({
     url: '/bpm-boot/bpm/task/doneList',
     method: 'POST',
+    publicHeight: 65,
     column: [
         { title: '序号', type: 'seq', width: 80 },
-    { title: '流程名称', field: 'processInstance.name', minWidth: 130 },
+        { title: '任务名称', field: 'processInstance.name', minWidth: 130 },
         { title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 },
         { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
         { title: '当前任务', field: 'name', minWidth: 130 },
@@ -62,10 +63,12 @@ const tableStore = new TableStore({
             }
         },
         { title: '审批建议', field: 'reason', minWidth: 150 },
-    { title: '耗时', field: 'durationInMillis', minWidth: 150,
+        {
+            title: '耗时', field: 'durationInMillis', minWidth: 150,
             formatter: (obj: any) => {
                 return formatPast2(obj.row.durationInMillis)
-      } },
+            }
+        },
         {
             title: '操作',
             align: 'center',
@@ -75,7 +78,7 @@ const tableStore = new TableStore({
             buttons: [
                 {
                     name: 'productSetting',
-          title: '流程历史',
+                    title: '流程详情',
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',

src/views/system/bpm/task/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div class="default-main">
+        <el-tabs v-model="activeName" type="border-card">
+            <el-tab-pane label="待办任务" name="1">
+                <TodoTask v-if="activeName == '1'" />
+            </el-tab-pane>
+            <el-tab-pane label="已办任务" name="2">
+                <DoneTask v-if="activeName == '2'" />
+            </el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import TodoTask from './todo/index.vue'
+import DoneTask from './done/index.vue'
+import { mainHeight } from '@/utils/layout'
+defineOptions({
+    name: 'bpm/task'
+})
+const activeName = ref('1')
+
+const layout = mainHeight(63) as any
+</script>
+
+<style lang="scss" scoped>
+.bars_w {
+    width: 100%;
+    height: 500px;
+}
+:deep(.el-tabs__content) {
+    height: v-bind('layout.height');
+    overflow-y: auto;
+}
+</style>

src/views/system/bpm/task/todo/index.vue

@@ -36,9 +36,10 @@ const { push } = useRouter()
 const tableStore = new TableStore({
     url: '/bpm-boot/bpm/task/todoList',
     method: 'POST',
+    publicHeight: 65,
     column: [
         { title: '序号', type: 'seq', width: 80 },
-        { title: '流程名称', field: 'processInstance.name', minWidth: 130 },
+        { title: '任务名称', field: 'processInstance.name', minWidth: 130 },
         { title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 },
         { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
         { title: '发起时间', field: 'createTime', minWidth: 170 },