应急演练记录集成Flow

.env.development

@@ -5,7 +5,7 @@
  # @LastEditTime: 2024-11-15 09:21:38
  # @FilePath: \ruoyi\.env.development
  # @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-### 
+###
 # 页面标题
 VUE_APP_TITLE = 双重预防综合管理系统
 
@@ -13,8 +13,8 @@ VUE_APP_TITLE = 双重预防综合管理系统
 ENV = 'development'
 
 # 双重防御系统开发环境后台接口地址配置
-VUE_APP_BASE_API = 'http://101.42.248.108:17005'
-# VUE_APP_BASE_API = 'http://192.168.3.200:18080'
+# VUE_APP_BASE_API = 'http://101.42.248.108:17005'
+VUE_APP_BASE_API = 'http://192.168.3.200:18080'
 # VUE_APP_BASE_API = 'http://localhost:18080'
 
 

.env.production

@@ -8,4 +8,7 @@ ENV = 'production'
 # 公司服务器
 #VUE_APP_BASE_API = 'http://39.105.121.97:18080'
 # 王宇服务器
-VUE_APP_BASE_API = 'http://101.42.248.108:17007'
+#VUE_APP_BASE_API = 'http://101.42.248.108:17007'
+# 本地开发编译器
+VUE_APP_BASE_API = 'http://192.168.3.200:18080'
+

src/api/flowable/definition.js

@@ -138,3 +138,12 @@ export function exportDeployment(query) {
     params: query
   })
 }
+
+// 查看演习详情
+export function getInfoItem(params) {
+  return request({
+    url: '/drill/plan/getInfo',
+    method: "get",
+    params
+  });
+}

src/views/emergencies/summarize.vue

@@ -134,6 +134,7 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template slot-scope="scope">
+            <!--
             <el-button
               v-if="scope.row.processStatus === 1 && scope.row.drillSummary"
               type="text"
@@ -150,6 +151,14 @@
             >
               查看
             </el-button>
+            -->
+            <el-button
+              type="text"
+              size="mini"
+              @click="seeItem(scope.row.id)"
+            >
+              查看
+            </el-button>
             <el-button type="text" size="mini" @click="del(scope.row.id)">
               删除
             </el-button>

src/views/flowable/task/finished/detail/index.vue

@@ -11,7 +11,71 @@
           <el-col :span="16" :offset="4">
             <v-form-render ref="vFormRef" />
           </el-col>
+
+          <!--从业务表单复制的弹出框代码： 应急演练 - 应急演练记录 - 编辑/查看/审核 的弹出框-->
+          <div style="height: 600px; overflow-y: auto" v-if="2 > 1">
+            <p>演习总结-已办任务：</p>
+            <el-input
+              type="textarea"
+              resize="none"
+              :autosize="{ minRows: 4, maxRows: 400 }"
+              placeholder="请输入演习总结"
+              v-model="drillSummary"
+            >
+            </el-input>
+            <p style="margin-top: 50px">演习过程问题及整改措施：</p>
+            <el-table
+              height="calc(100% - 350px)"
+              :data="summaryList"
+              :row-style="{ height: '0px' }"
+              :header-cell-style="{ 'text-align': 'center', padding: '0px' }"
+              :cell-style="{ 'text-align': 'center', padding: '2px' }"
+              style="width: 100%"
+            >
+              <el-table-column label="序号" align="center" width="50">
+                <template slot-scope="scope">
+                  <span> {{ scope.$index + 1 }}</span>
+                </template>
+              </el-table-column>
+
+              <el-table-column label="问题描述" align="center">
+                <template slot-scope="scope">
+                  <span v-show="summaryType">{{ scope.row.problemsInfo || '-' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="整改措施" align="center">
+                <template slot-scope="scope">
+                  <span v-show="summaryType">{{ scope.row.rectificationInfo || '-' }}</span>
+
+                </template>
+              </el-table-column>
+              <el-table-column label="责任人" align="center">
+                <template slot-scope="scope">
+                  <span  >{{ scope.row.personLiableName || '-' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="整改期限" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.rectificationTerm || '-' }}</span>
+
+                </template>
+              </el-table-column>
+              <el-table-column label="整改人" align="center">
+                <template slot-scope="scope">
+                  <span v-show="summaryType">{{ scope.row.rectificationByName || '-' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="整改时间" align="center" width="160">
+                <template slot-scope="scope">
+                  <span v-show="summaryType">{{ scope.row.rectificationTime }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+
         </el-tab-pane>
+
+
         <!--流程流转记录-->
         <el-tab-pane label="流转记录" name="2">
           <el-col :span="16" :offset="4">
@@ -64,7 +128,7 @@
 
 <script>
 import {flowRecord} from "@/api/flowable/finished";
-import {getProcessVariables, flowXmlAndNode} from "@/api/flowable/definition";
+import {getProcessVariables, flowXmlAndNode, getInfoItem} from "@/api/flowable/definition";
 import BpmnViewer from '@/components/Process/viewer';
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -76,6 +140,23 @@ export default {
   props: {},
   data() {
     return {
+      //应急演练表单-开始
+      summaryType: 0,
+      summaryAlert: false,
+      summaryList: [
+        {
+          problemsInfo: '',
+          rectificationInfo: '',
+          personLiable: '',
+          rectificationTerm: '',
+          rectificationBy: '',
+          rectificationTime: ''
+        }
+      ],
+      drillSummary: '',
+      userList: [],
+      //应急演练表单-结束
+
       // 模型xml数据
       flowData: {},
       activeName: '1',
@@ -145,6 +226,29 @@ export default {
       if (taskId) {
         // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
         getProcessVariables(taskId).then(res => {
+
+          /*
+          {
+            "msg": "操作成功",
+            "code": 200,
+            "data": {
+              "businessKey": "f85678973e874f439beba667e05ca0ef",
+                "businessName": "应急演练记录",
+                "businessFlag": "drill_plan",
+                "INITIATOR": 1
+            }
+          }
+           */
+          console.log('代办任务-接口响应信息', res.data)
+          if(res.data && res.data.businessKey){
+            this.seeItem(res.data.businessKey);
+            console.log('代办任务-接口响应信息', res.data.businessKey)
+            //根据 res.data.businessFlag 判断显示哪个DIV
+            // ……
+            // ……
+            // ……
+          }
+
           // 回显表单
           this.$nextTick(() => {
             this.$refs.vFormRef.setFormJson(res.data.formJson);
@@ -160,6 +264,24 @@ export default {
         });
       }
     },
+
+    //查看演习
+    seeItem (id) {
+      this.summaryType = 2
+      this.title = '查看详情'
+      getInfoItem({ id: id }).then((res) => {
+        if (res.code === 200) {
+          if (res.data.drillRectificationProblemsList) {
+            this.summaryList = res.data.drillRectificationProblemsList
+          }
+
+          this.drillSummary = res.data.drillSummary
+
+        }
+      });
+      this.summaryAlert = true
+    },
+
     /** 返回页面 */
     goBack() {
       // 关闭当前标签页并返回上个页面

src/views/flowable/task/myProcess/detail/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span class="el-icon-document">已发任务</span>
+        <span class="el-icon-document">已发任务-详情</span>
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
       </div>
       <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
@@ -11,6 +11,69 @@
           <el-col :span="16" :offset="4">
             <v-form-render ref="vFormRef" />
           </el-col>
+
+
+       <div style="height: 700px; overflow-y: auto" v-if="2 > 1">
+        <p>演习总结-已发任务：</p>
+        <el-input
+          type="textarea"
+          resize="none"
+          :autosize="{ minRows: 4, maxRows: 400 }"
+          placeholder="请输入演习总结"
+          v-model="drillSummary"
+        >
+        </el-input>
+        <p style="margin-top: 50px">演习过程问题及整改措施：</p>
+        <el-table
+          height="calc(100% - 350px)"
+          :data="summaryList"
+          :row-style="{ height: '0px' }"
+          :header-cell-style="{ 'text-align': 'center', padding: '0px' }"
+          :cell-style="{ 'text-align': 'center', padding: '2px' }"
+          style="width: 100%"
+        >
+          <el-table-column label="序号" align="center" width="50">
+            <template slot-scope="scope">
+              <span> {{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="问题描述" align="center">
+            <template slot-scope="scope">
+              <span v-show="summaryType">{{ scope.row.problemsInfo || '-' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="整改措施" align="center">
+            <template slot-scope="scope">
+              <span v-show="summaryType">{{ scope.row.rectificationInfo || '-' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="责任人" align="center">
+            <template slot-scope="scope">
+              <span v-show="summaryType">{{ scope.row.personLiableName || '-' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="整改期限" align="center">
+            <template slot-scope="scope">
+              <span v-show="summaryType">{{ scope.row.rectificationTerm || '-' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="整改人" align="center">
+            <template slot-scope="scope">
+              <span v-show="summaryType">{{ scope.row.rectificationByName || '-' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="整改时间" align="center" width="160">
+            <template slot-scope="scope">
+              <span v-show="summaryType">{{ scope.row.rectificationTime }}</span>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+
+
+
         </el-tab-pane>
         <!--流程流转记录-->
         <el-tab-pane label="流转记录" name="2">
@@ -65,7 +128,7 @@
 
 <script>
 import {flowRecord} from "@/api/flowable/finished";
-import {getProcessVariables, flowXmlAndNode} from "@/api/flowable/definition";
+import {getProcessVariables, flowXmlAndNode, getInfoItem} from "@/api/flowable/definition";
 import BpmnViewer from '@/components/Process/viewer';
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -77,6 +140,25 @@ export default {
   props: {},
   data() {
     return {
+
+      //应急演练表单-开始
+      summaryType: 0,
+      summaryAlert: false,
+      summaryList: [
+        {
+          problemsInfo: '',
+          rectificationInfo: '',
+          personLiable: '',
+          rectificationTerm: '',
+          rectificationBy: '',
+          rectificationTime: ''
+        }
+      ],
+      drillSummary: '',
+      userList: [],
+      //应急演练表单-结束
+
+      dialogVisible: true,
       // 模型xml数据
       flowData: {},
       activeName: '1',
@@ -142,6 +224,28 @@ export default {
         // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
         getProcessVariables(taskId).then(res => {
           this.$nextTick(() => {
+            /*
+          {
+            "msg": "操作成功",
+            "code": 200,
+            "data": {
+              "businessKey": "f85678973e874f439beba667e05ca0ef",
+                "businessName": "应急演练记录",
+                "businessFlag": "drill_plan",
+                "INITIATOR": 1
+            }
+          }
+           */
+            console.log('代办任务-接口响应信息', res.data)
+            if(res.data && res.data.businessKey){
+              this.seeItem(res.data.businessKey);
+              console.log('代办任务-接口响应信息', res.data.businessKey)
+              //根据 res.data.businessFlag 判断显示哪个DIV
+              // ……
+              // ……
+              // ……
+            }
+
             // 回显表单
             this.$refs.vFormRef.setFormJson(res.data.formJson);
             this.$nextTick(() => {
@@ -156,6 +260,25 @@ export default {
         });
       }
     },
+
+
+    //查看演习
+    seeItem (id) {
+      this.summaryType = 2
+      this.title = '查看详情'
+      getInfoItem({ id: id }).then((res) => {
+        if (res.code === 200) {
+          if (res.data.drillRectificationProblemsList) {
+            this.summaryList = res.data.drillRectificationProblemsList
+          }
+
+          this.drillSummary = res.data.drillSummary
+
+        }
+      });
+      this.summaryAlert = true
+    },
+
     /** 返回页面 */
     goBack() {
       // 关闭当前标签页并返回上个页面

src/views/flowable/task/myProcess/send/index.vue

@@ -118,18 +118,26 @@ export default {
         // 根据当前任务或者流程设计配置的下一步节点 todo 暂时未涉及到考虑网关、表达式和多节点情况
         getNextFlowNodeByStart({deploymentId: this.deployId, variables: formData}).then(res => {
           const data = res.data;
+          console.log('流程发起时获取下一节点接口返回的数据=>',data)
           if (data) {
             this.formData = formData;
             if (data.dataType === 'dynamic') {
-              if (data.type === 'assignee') { // 指定人员
+                // 指定人员
+              if (data.type === 'assignee') {
                 this.checkSendUser = true;
                 this.checkType = "single";
-              } else if (data.type === 'candidateUsers') {  // 候选人员(多个)
+              }
+              // 候选人员(多个)
+              else if (data.type === 'candidateUsers') {
                 this.checkSendUser = true;
                 this.checkType = "multiple";
-              } else if (data.type === 'candidateGroups') { // 指定组(所属角色接收任务)
+              }
+              // 指定组(所属角色接收任务)
+              else if (data.type === 'candidateGroups') {
                 this.checkSendRole = true;
-              } else { // 会签
+              }
+              // 会签
+              else {
                 // 流程设计指定的 elementVariable 作为会签人员列表
                 this.multiInstanceVars = data.vars;
                 this.checkSendUser = true;

src/views/flowable/task/todo/detail/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span class="el-icon-document">待办任务</span>
+        <span class="el-icon-document">待办任务-审核面板</span>
         <el-tag style="margin-left:10px">发起人:{{ startUser }}</el-tag>
         <el-tag>任务节点:{{ taskName }}</el-tag>
         <el-button style="float: right;" size="mini" type="danger" @click="goBack">关闭</el-button>
@@ -12,8 +12,71 @@
         <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4">
             <v-form-render ref="vFormRef" />
+
+
+            <!--从业务表单复制的弹出框代码： 应急演练 - 应急演练记录 - 编辑/查看/审核 的弹出框-->
+            <div style="height: 600px; overflow-y: auto" v-if="2 > 1">
+              <p>演习总结：</p>
+              <el-input
+                type="textarea"
+                resize="none"
+                :autosize="{ minRows: 4, maxRows: 400 }"
+                placeholder="请输入演习总结"
+                v-model="drillSummary"
+              >
+              </el-input>
+              <p style="margin-top: 50px">演习过程问题及整改措施：</p>
+              <el-table
+                height="calc(100% - 350px)"
+                :data="summaryList"
+                :row-style="{ height: '0px' }"
+                :header-cell-style="{ 'text-align': 'center', padding: '0px' }"
+                :cell-style="{ 'text-align': 'center', padding: '2px' }"
+                style="width: 100%"
+              >
+                <el-table-column label="序号" align="center" width="50">
+                  <template slot-scope="scope">
+                    <span> {{ scope.$index + 1 }}</span>
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="问题描述" align="center">
+                  <template slot-scope="scope">
+                    <span v-show="summaryType">{{ scope.row.problemsInfo || '-' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="整改措施" align="center">
+                  <template slot-scope="scope">
+                    <span v-show="summaryType">{{ scope.row.rectificationInfo || '-' }}</span>
+
+                  </template>
+                </el-table-column>
+                <el-table-column label="责任人" align="center">
+                  <template slot-scope="scope">
+                    <span  >{{ scope.row.personLiableName || '-' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="整改期限" align="center">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.rectificationTerm || '-' }}</span>
+
+                  </template>
+                </el-table-column>
+                <el-table-column label="整改人" align="center">
+                  <template slot-scope="scope">
+                    <span v-show="summaryType">{{ scope.row.rectificationByName || '-' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="整改时间" align="center" width="160">
+                  <template slot-scope="scope">
+                    <span v-show="summaryType">{{ scope.row.rectificationTime }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
             <div style="margin-left:10%;margin-bottom: 20px;font-size: 14px;">
-              <el-button type="primary" @click="handleComplete">审 批</el-button>
+              <el-button type="primary" @click="handleComplete">审 批-FLowable的按钮</el-button>
+              <el-button type="danger" @click="handleReject">驳 回-FLowable的按钮</el-button>
             </div>
           </el-col>
         </el-tab-pane>
@@ -67,7 +130,7 @@
         </el-tab-pane>
       </el-tabs>
       <!--审批任务-->
-      <el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
+      <el-dialog :title="completeTitle" :visible.sync="completeOpen" width="40%" append-to-body>
         <el-form ref="taskForm" :model="taskForm">
           <el-form-item prop="targetKey">
             <flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
@@ -121,7 +184,7 @@
 import {flowRecord} from "@/api/flowable/finished";
 import FlowUser from '@/components/flow/User'
 import FlowRole from '@/components/flow/Role'
-import {flowXmlAndNode} from "@/api/flowable/definition";
+import {flowXmlAndNode, getInfoItem} from "@/api/flowable/definition";
 import {
   complete,
   rejectTask,
@@ -133,6 +196,7 @@ import {
 } from "@/api/flowable/todo";
 import BpmnViewer from '@/components/Process/viewer';
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+// import {getInfoItem} from "@/api/emergencies";
 
 export default {
   name: "Record",
@@ -145,6 +209,24 @@ export default {
   data() {
     return {
       eventName: "click",
+
+      //应急演练表单-开始
+      summaryType: 0,
+      summaryAlert: false,
+      summaryList: [
+        {
+          problemsInfo: '',
+          rectificationInfo: '',
+          personLiable: '',
+          rectificationTerm: '',
+          rectificationBy: '',
+          rectificationTime: ''
+        }
+      ],
+      drillSummary: '',
+      userList: [],
+      //应急演练表单-结束
+
       // 流程数据
       flowData: {},
       activeName: '1',
@@ -198,6 +280,8 @@ export default {
     }
   },
   methods: {
+
+
     handleClick(tab, event) {
       if (tab.name === '3') {
         flowXmlAndNode({procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId}).then(res => {
@@ -258,8 +342,32 @@ export default {
     /** 流程节点表单 */
     getFlowTaskForm(taskId) {
       if (taskId) {
+
         // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
         flowTaskForm({taskId: taskId}).then(res => {
+
+          /*
+            {
+              "msg": "操作成功",
+              "code": 200,
+              "data": {
+                "businessKey": "f85678973e874f439beba667e05ca0ef",
+                  "businessName": "应急演练记录",
+                  "businessFlag": "drill_plan",
+                  "INITIATOR": 1
+              }
+            }
+             */
+          console.log('代办任务-接口响应信息', res.data)
+          if(res.data && res.data.businessKey){
+            this.seeItem(res.data.businessKey);
+            console.log('代办任务-接口响应信息', res.data.businessKey)
+            //根据 res.data.businessFlag 判断显示哪个DIV
+            // ……
+            // ……
+            // ……
+          }
+
           // 回显表单
           this.$refs.vFormRef.setFormJson(res.data.formJson);
           this.formJson = res.data.formJson;
@@ -275,6 +383,23 @@ export default {
       }
     },
 
+    //查看演习
+    seeItem (id) {
+      this.summaryType = 2
+      this.title = '查看详情'
+      getInfoItem({ id: id }).then((res) => {
+        if (res.code === 200) {
+          if (res.data.drillRectificationProblemsList) {
+            this.summaryList = res.data.drillRectificationProblemsList
+          }
+
+          this.drillSummary = res.data.drillSummary
+
+        }
+      });
+      this.summaryAlert = true
+    },
+
     /** 委派任务 */
     handleDelegate() {
       this.taskForm.delegateTaskShow = true;