diff --git a/.env.development b/.env.development index 47afe86..b6fc12c 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ # 开发环境 # 请求接口地址 -VITE_REQUEST_BASE_URL = http://10.75.15.249:8080 +VITE_REQUEST_BASE_URL = https://36.112.48.190 diff --git a/bpm/leaveApplication/index.vue b/bpm/leaveApplication/index.vue index a9c86a6..4a79283 100644 --- a/bpm/leaveApplication/index.vue +++ b/bpm/leaveApplication/index.vue @@ -182,6 +182,14 @@ }).then((res) => { if (res.success) { step.value = res.result.records + step.value = step.value.map(item => { + if (item.name === 'start') { + item.name = '开始'; + } else if (item.name === 'end') { + item.name = '结束'; + } + return item; + }); } }) } diff --git a/bpm/supervise.vue b/bpm/supervise.vue index e04519a..c09bd2a 100644 --- a/bpm/supervise.vue +++ b/bpm/supervise.vue @@ -196,7 +196,6 @@ const step = ref([]) /**审批步骤*/ const processHistoryList = (processInstanceId) => { - console.log('000', processInstanceId); processHistoryListApi({ processInstanceId }).then((res) => { diff --git a/pages/login/login.vue b/pages/login/login.vue index 8648a8f..a3bda2e 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -98,17 +98,17 @@ }); /*生产环境 begin */ - loginApi({ - username: un, - password: pw, - ip: getDeviceIp() + // loginApi({ + // username: un, + // password: pw, + // ip: getDeviceIp() /*生产环境 end */ /*开发环境 begin */ - // localLoginApi({ - // username: username.value, - // password: password.value, - // captcha: 'app' + localLoginApi({ + username: username.value, + password: password.value, + captcha: 'app' /*开发环境 end */ }).then((loginres) => { if (loginres.success) {