修改登录接口 修改监控详情

src/api/modules/processCenter.js

@@ -27,6 +27,16 @@ export default {
       method: 'post',
       data: data
     })
+  },
+
+
+  // 获取监控流程详情
+  getMonitorPageList(data){
+    return request({
+      url: '/api/task/get_list_by_instance',
+      method: 'GET',
+      data: data
+    })
   }
 
 }

src/views/Layout.vue

@@ -81,7 +81,7 @@ export default {
       this.menuData = this.addLevel(treeData, 1)
     },
     getSysMenu () {
-      this.$api.menu.getSysMenu({ roleId: this.$store.state.userInfo.roleIdList[0] }).then(({ data }) => {
+      this.$api.menu.getSysMenu({ roleId: this.$store.getters.userInfo.roleIdList[0] }).then(({ data }) => {
         if (data === null) {
           data = []
         }

src/views/Login.vue

@@ -107,6 +107,9 @@ export default {
           this.verifyCode()
           return this.$message.error(res.data.message)
         }
+        res.data.roleIdList=res.data.roleEOList.map(item=>{
+          return item.id
+        })
         this.$message.success('登录成功')
         this.$store.commit('saveUserInfo', res.data)
         this.$router.push({ path: '/report/list', query: { id: 'AEHJB8YNJ3' } })

src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue

@@ -135,15 +135,19 @@
         </div>
       </el-drawer>
     </div>
+    <monitorModal ref="monitorModal"></monitorModal>
   </div>
 </template>
 
 <script>
+import axios  from "axios";
 import { mapMutations } from 'vuex'
+import monitorModal from './monitorModal.vue'
 import ProcessMixin from "@/components/ProcessMixin";
 export default {
   name: 'processDetail',
   mixins: [ProcessMixin],
+
   data () {
     return {
       assigneeNewLoading: false, // 调整处理人确定loading
@@ -175,6 +179,9 @@ export default {
     }
   },
   methods: {
+    showDialog() {
+      this.$refs.monitorModal.open()
+    },
     formatIssueDate(str) {
       const momentDate = this.$moment(str)
       if (momentDate.isValid()) {
@@ -337,7 +344,7 @@ export default {
     processNum (row) {
       this.imgLoading = true;
       axios.request({
-        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        url: '/libary/api/model/getImg?_t=' + new Date().getTime(),
         responseType: 'blob',
         method: 'get',
         params: {
@@ -353,28 +360,15 @@ export default {
     },
     // 请求列表
     processTable (row) {
-      this.$http.get('lawss/activiti/get_list_by_instance', {
+      debugger
-        prcNum:(row && row.parentFlowNum) || this.$route.query.prcNum,
+      this.$api.processCenter.getMonitorPageList({
-        sortWord: this.shunxu ? this.paixu : '',
+          prcNum:(row && row.parentFlowNum) || this.$route.query.prcNum,
-        shunxu: this.shunxu
+          sortWord: this.shunxu ? this.paixu : '',
-      }, {
+          shunxu: this.shunxu
-        loading: 'loading',
+      }).then(res=>{
-        _this: this
+          this.detailData = res
-      }, res => {
+          res[res.length - 1].endTime ? this.urgeRowFlag = false : this.urgeRowFlag = true
-        this.detailData = res
+      })
-        res[res.length - 1].endTime ? this.urgeRowFlag = false : this.urgeRowFlag = true
-      }, e => {})
-    },
-    ...mapMutations(['setProcess', 'setHandleInfo', 'setPrcLastDetail']),
-    processFlag (res) {
-      //   if (res.data.hisTaskExcelVOList[0].processTypeFlag === '1' || res.data.hisTaskExcelVOList[0].processTypeFlag === '2' || res.data.hisTaskExcelVOList[0].processTypeFlag === '3' || res.data.hisTaskExcelVOList[0].processTypeFlag === '4' ||
-      //     res.data.hisTaskExcelVOList[0].processTypeFlag === '5' || res.data.hisTaskExcelVOList[0].processTypeFlag === '6' || res.data.hisTaskExcelVOList[0].processTypeFlag === '8') {
-      //     return false
-      //   } else {
-      //     return true
-      //   }
-      // }
-      return false
     },
     // 导出事件
     exportStandard () {
@@ -499,6 +493,7 @@ export default {
     },
   },
   components: {
+    monitorModal
   },
   props: {},
   computed: {

src/views/userCenter/processCenter/monitorProcesses/monitorViews.vue

@@ -1,84 +0,0 @@
-<template>
-    <div class="content">
-       <div class="map">
-       </div>
-       <div class="btn">
-        <el-button type="primary" class="inner-btn" @click="showDialog">
-            调整处理人
-        </el-button>
-       </div>
-       <div class="table">
-        <el-table :data="tableData" style="width: 100%" border
-            :header-cell-style="{ background: '#DFE6EC', fontWeight: '700', color: '#1F2D3D' }">
-            <el-table-column
-            type="selection"
-            width="55">
-            </el-table-column>
-            <el-table-column prop="step" label="任务步骤"  align="center">
-            </el-table-column>
-            <el-table-column prop="missionPer" label="任务受理人"  align="center">
-            </el-table-column>
-            <el-table-column prop="createTime" label="创建时间"  sortable align="center">
-            </el-table-column>
-            <el-table-column prop="endTime" label="完成时间"  sortable align="center">
-            </el-table-column>
-            <el-table-column prop="status" label="状态"  align="center">
-            </el-table-column>
-        </el-table>
-       </div>
-       <monitorModal ref="monitorModal"></monitorModal>
-    </div>
-</template>
-
-<script>
-import monitorModal from './monitorModal.vue'
-    export default {
-        name:'monitorViews',
-        components:{
-            monitorModal
-        },
-        data() {
-            return {
-                tableData: [
-                    {
-                        step:'1',
-                        missionPer:'王五',
-                        createTime:'2023-1-1',
-                        endTime:'2023-5-1',
-                        status:'待定'
-                    }
-                ]
-            }
-        },
-        methods: {
-            showDialog() {
-                this.$refs.monitorModal.open()
-            }
-        },
-    }
-</script>
-
-<style lang="scss" scoped>
-.content{
-    min-height: calc(100vh - 60px - 20px);
-    box-shadow: 0 6px 11px 0 rgba(163, 163, 163, 0.2);
-    border-radius: 6px;
-    background: #FFFFFF;
-    .map{
-        width: 100%;
-        height: 360px;
-        border: 1px red solid;
-    }
-    .btn{
-        padding: 20px 13px;
-     .inner-btn{
-        width: 100px;
-        height: 40px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-    }
-    
-}
-</style>