Merge branch 'revert-7bb0bc01' into 'mhy'

Revert "Merge branch 'master' into 'mhy'"

See merge request !32

xichongSys/src/utils/global.js

@@ -9,8 +9,8 @@
 //export const baseUrl = 'http://172.16.10.25:9009'
 //export const baseUrl ="http://faceauth.weface.com.cn:98"
 //export const baseUrl2 = 'http://faceauth.weface.com.cn:97'
-export const baseUrl = 'http://172.16.10.33:9002'
-//export const baseUrl = 'http://172.16.10.25:9002'
+//export const baseUrl = 'http://172.16.10.33:9002'
+export const baseUrl = 'http://172.16.10.25:9002'
 //export const baseUrl ="http://172.16.10.33:9002"
 //export const baseUrl2 = 'http://172.16.10.25:9999'
 //export const baseUrl = 'http://172.16.10.25:9002'

xichongSys/src/views/Myvue/flow.vue

@@ -262,7 +262,7 @@ this.$api.getlist.selectflowState(data).then((res) => {
         console.log(d)
         if(s==1){
           this.flowTitle="新增流程"
-         for(var i =1;i<=7;i++){
+         for(var i =1;i<=6;i++){
            this.titleList.push({
              label:this.getType(i),
              value:i+","+this.getType(i)