From 5be34bd5789536bbaabf0ada35dffe977b8673cd Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Mon, 13 Jan 2025 08:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=B5=81=E7=A8=8B=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=BB=93=E6=9D=9F=E8=8A=82=E7=82=B9=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development               |  2 +-
 bpm/leaveApplication/index.vue |  8 ++++++++
 bpm/supervise.vue              |  1 -
 pages/login/login.vue          | 16 ++++++++--------
 4 files changed, 17 insertions(+), 10 deletions(-)

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) {