Skip to content

X
xichonght
Commit 7bb0bc01 authored by miaohaoyun's avatar miaohaoyun
1 Browse files
Options

Merge branch 'master' into 'mhy' 

Master

See merge request !31
parents b18a11e5 94b0bd47
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
xichongSys/src/utils/global.js
View file @ 7bb0bc01
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
//export const baseUrl = 'http://172.16.10.25:9009' //export const baseUrl = 'http://172.16.10.25:9009'
//export const baseUrl ="http://faceauth.weface.com.cn:98" //export const baseUrl ="http://faceauth.weface.com.cn:98"
//export const baseUrl2 = 'http://faceauth.weface.com.cn:97' //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.33:9002'
export const baseUrl = 'http://172.16.10.25: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.33:9002"
//export const baseUrl2 = 'http://172.16.10.25:9999' //export const baseUrl2 = 'http://172.16.10.25:9999'
//export const baseUrl = 'http://172.16.10.25:9002' //export const baseUrl = 'http://172.16.10.25:9002'
......
xichongSys/src/views/Myvue/flow.vue
View file @ 7bb0bc01
...@@ -262,7 +262,7 @@ this.$api.getlist.selectflowState(data).then((res) => { ...@@ -262,7 +262,7 @@ this.$api.getlist.selectflowState(data).then((res) => {
console.log(d) console.log(d)
if(s==1){ if(s==1){
this.flowTitle="新增流程" this.flowTitle="新增流程"
for(var i =1;i<=6;i++){ for(var i =1;i<=7;i++){
this.titleList.push({ this.titleList.push({
label:this.getType(i), label:this.getType(i),
value:i+","+this.getType(i) value:i+","+this.getType(i)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment