Merge remote-tracking branch 'origin/master'

flowable-engine-web/src/App.vue

@@ -8,7 +8,6 @@
 
 <script>
   //import layout from './components/layout'
-  import {getToken} from "./main";
 
   export default {
     components: {},
@@ -16,7 +15,6 @@
       return {}
     },
     created() {
-      getToken()
     },
     mounted() {
       let beforeUrl = sessionStorage.getItem('router-path')

flowable-engine-web/src/main.js

@@ -48,27 +48,6 @@ Vue.prototype.$deepCopy = function (obj) {
     return JSON.parse(JSON.stringify(obj))
 }
 
-export function getToken() {
-    // let item = localStorage.getItem("token");
-    // if (item != null) {
-    //     return
-    // }
-    axios.post(
-        // "http://security-react.mytwins.top/auth/login",
-        // getBaseUrl()+"/auth/login",
-        "http://gateway.mytwins.top/auth/login",
-        // "http://localhost:8000/auth/login",
-        {
-            code: "string",
-            password: "926425",
-            username: "admin",
-            uuid: "string"
-        }
-    ).then(res => {
-        console.log(res)
-        localStorage.setItem("token", res.data.data)
-    })
-}
 
 new Vue({
     router,

flowable-engine-web/src/views/Index.vue

@@ -2,6 +2,7 @@
   <div style="text-align: center">
 <!--    <h4>先选择本次登录人员的身份，再进入相应的系统 😅</h4>-->
     <h4>欢迎进入Spring Security 配套 Workflow工作流模块</h4>
+    <div><el-input v-model="username" /> <el-button @click="getToken">登录</el-button></div>
     <div class="work-panel">
 <!--      <div class="user">-->
 <!--        <el-button type="primary" round size="small" @click="showRolePicker()" icon="el-icon-user">选择本次登录者</el-button>-->
@@ -41,12 +42,14 @@
 
 <script>
 import Test from "@/components/common/Test";
+import axios from "axios";
 
 export default {
   name: "Index",
   components: {Test},
   data() {
     return {
+      username:null,
       select: [],
       roleData: [
         {
@@ -78,9 +81,29 @@ export default {
     }
   },
   methods: {
-    dengjie() {
-      console.log("==================================")
-      console.log(this.select)
+
+
+    getToken() {
+      // let item = localStorage.getItem("token");
+      // if (item != null) {
+      //     return
+      // }
+      axios.post(
+          // "http://security-react.mytwins.top/auth/login",
+          // getBaseUrl()+"/auth/login",
+          "http://gateway.mytwins.top/auth/login",
+          // "http://localhost:8000/auth/login",
+          {
+            code: "string",
+            password: "926425",
+            // username: "admin",
+            username: this.username,
+            uuid: "string"
+          }
+      ).then(res => {
+        console.log(res)
+        localStorage.setItem("token", res.data.data)
+      })
     },
 
 

flowable-engine-web/src/views/common/operation/OperationRender.vue

@@ -13,8 +13,8 @@
               <el-avatar size="large" :src="operation.userInfo.avatar"></el-avatar>
             </div>
             <div style="margin-left: 10px;">
-              <div style="color: #c0bebe">{{ operation.userInfo.name }}</div>
-              <div style="font-size: 16px; font-weight: bold;">{{ operation.operationName }}</div>
+              <div style="color: #c0bebe">{{ operation.operationName }}</div>
+              <div style="font-size: 14px; font-weight: bold;">{{ operation.remark }}</div>
             </div>
           </div>
           <template v-if="operation.operation === 'comment' || operation.operation === 'refuse'">
@@ -110,21 +110,35 @@ export default {
       let state = operation.state
       let type = operation.operation
 
+      if (state === 'create') {
+        this.$set(operation, "icon", "el-icon-check")
+        this.$set(operation, "color", "#0bbd87")
+        this.$set(operation,"remark",operation.userInfo.name)
+      }
       if (state === 'agree') {
         this.$set(operation, "icon", "el-icon-check")
         this.$set(operation, "color", "#0bbd87")
+        this.$set(operation,"remark",operation.userInfo.name + '  (已同意)')
       }
       if (state === 'process') {
         this.$set(operation, "icon", "el-icon-loading")
         this.$set(operation, "color", "#f78f5f")
+        this.$set(operation,"remark",operation.userInfo.name + '  (处理中)')
+      }
+      if (type === 'cc') {
+        this.$set(operation, "icon", "el-icon-s-promotion")
+        this.$set(operation, "color", "#3395f8")
+        this.$set(operation,"remark",operation.userInfo.name + '  (抄送成功)')
       }
       if (state === 'comment') {
         this.$set(operation, "icon", "el-icon-chat-dot-round")
         this.$set(operation, "color", "#0bbd87")
+        this.$set(operation,"remark",operation.userInfo.name + '  (添加了评论)')
       }
       if (state === 'refuse' && type === 'comment') {
         this.$set(operation, "icon", "el-icon-chat-dot-round")
         this.$set(operation, "color", "#f56c6c")
+        this.$set(operation,"remark",operation.userInfo.name + '  (填写拒绝理由)')
       }
       if (state === 'refuse' && type === 'opinion') {
         this.$set(operation, "icon", "el-icon-close")

flowable-engine-web/src/views/workspace/AboutInstance.vue

@@ -122,6 +122,7 @@ export default {
       this.loadProcessInstance(row.processInstanceId)
       this.selectProcessInstance = row
     },
+
     loadProcessInstance(processInstanceId) {
       let that = this;
       this.init();
@@ -137,7 +138,6 @@ export default {
       })
     },
 
-
     init() {
       this.processInstanceData = {
         userInfo: {},
@@ -146,6 +146,7 @@ export default {
         processList: [],
         operationList: [],
       };
+
       this.loading = true;
       this.$store.state.design = this.taskData;
       this.$store.state.runningList = [];