Merge branch 'uat' into uat_us

Merge branch 'uat' of https://gitea.frp.extimaging.com/XCKJ/irc_web into uat
国际化问题修改
2024-08-02 14:17:49 +08:00 · 2024-08-02 14:17:29 +08:00 · 2024-08-02 14:17:17 +08:00 · 2024-08-02 14:10:11 +08:00 · 2024-08-02 14:09:52 +08:00
3 changed files with 3 additions and 2 deletions
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@ -112,7 +112,7 @@
            {{ $t("login:button:login") }}
          </el-button>
          <div style="text-align: right">
-            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
+            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
            <!-- Forget password? -->
            <el-button
              type="text"
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@ -86,7 +86,7 @@
          }}</el-menu-item>
        </el-submenu>
      </el-menu>
-      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
+      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
    </div>
  </div>
 </template>
--- 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"
          />
        </el-form-item>
        <el-form-item>
Author	SHA1	Message	Date
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	6ac94ec1a0	Merge branch 'uat' into uat_us	2024-08-02 14:17:49 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	7c379c9566	Merge branch 'uat' of https://gitea.frp.extimaging.com/XCKJ/irc_web into uat continuous-integration/drone/push Build is running Details	2024-08-02 14:17:29 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	38b9e092a4	国际化问题修改	2024-08-02 14:17:17 +08:00
caiyiling	23c0e4e675	Merge branch 'uat' of https://gitea.frp.extimaging.com/XCKJ/irc_web into uat continuous-integration/drone/push Build is running Details	2024-08-02 14:10:11 +08:00
caiyiling	0aaa38e751	质控样式调整	2024-08-02 14:09:52 +08:00