From f87935f6f5e14112755dae90b15af9b84eda212e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 2 Aug 2024 13:44:39 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9B=B4?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trials/trials-panel/visit/qc-check/index.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 5fbd6f6d..5a609786 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -80,13 +80,13 @@
-
+
From ea413ffe0bacb1ccd89af68334b37ad5d6e03cdd Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 2 Aug 2024 14:00:23 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=B4=A8=E6=8E=A7?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trials/trials-panel/visit/qc-check/index.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 5a609786..68f34901 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -85,6 +85,7 @@
Date: Fri, 2 Aug 2024 14:08:42 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 59697a13..8fb13978 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -269,7 +269,7 @@ export default {
this.setLanguage("en");
this.$updateDictionary();
} else {
- if (this.location === "USA") {
+ if (this.location === "USA" || this.NODE_ENV === "usa") {
this.$i18n.locale = "en";
this.setLanguage("en");
this.$updateDictionary();
From 0aaa38e751de264ec9cf965b6a21aa636b37f435 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 2 Aug 2024 14:09:52 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E8=B4=A8=E6=8E=A7=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trials/trials-panel/visit/qc-check/index.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 68f34901..f521e282 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -89,6 +89,7 @@
type="datetimerange"
:default-time="['00:00:00', '23:59:59']"
@change="changeTimeList"
+ style="width:250px"
/>
From 38b9e092a445d8e0ddb71c3edca83f0587c16645 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Fri, 2 Aug 2024 14:17:17 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/index.vue | 2 +-
src/views/trials/trials-layout/components/trialsNavbar.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 8fb13978..70afba7f 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -119,7 +119,7 @@
{{ $t("login:button:login") }}
-
+
-
+
From 51e0322f6d0c8bab0b32965a31602c4b5c3d9a68 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 2 Aug 2024 14:19:15 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trials/trials-panel/visit/qc-check/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index f521e282..f09b56c8 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -85,7 +85,7 @@
Date: Fri, 2 Aug 2024 14:41:27 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trials/trials-panel/visit/qc-check/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index f09b56c8..3459aa8d 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -89,7 +89,7 @@
type="datetimerange"
:default-time="['00:00:00', '23:59:59']"
@change="changeTimeList"
- style="width:250px"
+ style="width:240px"
/>