Merge branch 'hjw-222' into 'master'

更改master

See merge request spfm/spfm-market-front!465

public/static/js/api.config.js

@@ -1,6 +1,6 @@
 // api config
 var apiConfig = {
-  // ctx: window.top.staticHost ? window.top.staticHost : "http://114.215.71.182:29600/spfm", //不知道干啥的
+  ctx: window.top.staticHost ? window.top.staticHost : "http://114.215.71.182:29600/spfm/",
   // http://114.215.71.182:29600/spfm/
   // ctx: "http://localhost:9601",//接口地址http://192.168.1.76:8090/ api-gateway
   // ctx: "http://192.168.2.192:9600/",//接口地址http://192.168.1.76:8090/ api-gateway

src/App.vue

@@ -1,6 +1,5 @@
 <template>
   <div id="app">
-      <!-- <router-view v-if="showRouter"></router-view> -->
     <transition name="el-fade-in">
         <router-view />
     </transition>
@@ -8,24 +7,6 @@
 </template>
 <script>
 export default {
-    provide (){
-    return {
-      reload: this.reload
-    }
-  },
-  data (){
-    return {
-      showRouter: true
-    }
-  },
-  methods: {
-    reload (){
-      this.showRouter = false
-      this.$nextTick(()=>{
-        this.showRouter = true
-      })
-    }
-  },
   watch: {
     $route(to) {
       this.$store.commit("setPages", to.path);

src/components/workflowBase.vue

@@ -230,7 +230,7 @@ export default {
         content: this.textarea, //意见内容
       };
       if (this.manyPeopleStatus == true) {
-        list.procinstid = this.list.process_id;
+        list.procinstid = this.list.processId;
         // if (this.backThree.length <= 1) {
         // this.$message.error("请选择多人");
         // return;
@@ -314,7 +314,6 @@ export default {
       });
     },
     async nextWork(list) {
-      console.log(list);
       //e:yes||no,list：传入数组，title:结束标签，res:驳回标签,id:工单更新id
       let _this = this;
       let copylist = list
@@ -519,7 +518,6 @@ export default {
       this.TransferStatus = false;
       //   this.clickTaskName = e.properties.name;
       this.clicknextName = e.properties.name;
-      console.log(this.clicknextName);
       this.seleIndex = index;
       this.getNextPath(e.resourceId, 3); //1 为点击后获取线
     },

src/config/dev.js

@@ -10,7 +10,7 @@ let devs = {
 }
 let dev = {
     TITLE:'本地环境',
-    BASE_URL:"http://192.168.2.188:8080", //本地环境
+    BASE_URL:"http://127.0.0.1:8080", //本地环境
     BASE_API:"http://43.138.50.94:8880/api",//工作流本地环境
     EXCEL_URL:"http://43.138.50.94:7777", //本地excel路径
     provincialWorkOrderAreafresourceId:'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市

src/pages/main/workflowdef/index.vue

@@ -109,9 +109,8 @@ export default {
             }
             this.common.httpPost(obj, success)
             function success(data) {
-                console.log(data);
-                self.list = data.rows
-                self.total = data.total
+                self.list = data.data.rows
+                self.total = data.data.total
             }
         },
         doImport() {