Merge branch 'main' into uat_us

2025-01-24 10:17:54 +08:00 · 2025-01-24 10:17:54 +08:00 · f7968667f6
parent 24303b208d a0f593a22f
commit f7968667f6
14 changed files with 118 additions and 34 deletions
--- a/src/views/dictionary/template/browser/index.vue
+++ b/src/views/dictionary/template/browser/index.vue
@ -10,12 +10,16 @@
          <el-input v-model="searchData.Version" style="width: 100px" />
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="handleReset">{{
-            $t("dictionary:browser:button:reset")
-          }}</el-button>
-          <el-button type="primary" @click="handleSearch">{{
-            $t("dictionary:browser:button:search")
-          }}</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left: auto">
--- a/src/views/dictionary/template/components/Anonymization.vue
+++ b/src/views/dictionary/template/components/Anonymization.vue
@ -16,8 +16,16 @@
          <el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
--- a/src/views/dictionary/template/components/ClinicalDataConfig.vue
+++ b/src/views/dictionary/template/components/ClinicalDataConfig.vue
@ -27,8 +27,16 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="handleReset">重置</el-button>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
--- a/src/views/dictionary/template/components/CriterionsConfig.vue
+++ b/src/views/dictionary/template/components/CriterionsConfig.vue
@ -8,9 +8,16 @@
              <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
            </el-form-item>
            <el-form-item>
-              <el-button type="primary" @click="handleReset">重置</el-button>
-              <el-button type="primary" @click="handleSearch">查询</el-button>
-
+              <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+                {{ $t('common:button:search') }}
+              </el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh-left"
+                @click="handleReset"
+              >
+                {{ $t('common:button:reset') }}
+              </el-button>
            </el-form-item>
          </el-form>
          <div>
--- a/src/views/dictionary/template/components/CriterionsTmp.vue
+++ b/src/views/dictionary/template/components/CriterionsTmp.vue
@ -57,8 +57,16 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="handleReset">重置</el-button>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
--- a/src/views/dictionary/template/components/IncreaseFields.vue
+++ b/src/views/dictionary/template/components/IncreaseFields.vue
@ -16,8 +16,16 @@
          <el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
--- a/src/views/dictionary/template/components/MedicalAudit.vue
+++ b/src/views/dictionary/template/components/MedicalAudit.vue
@ -38,8 +38,16 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="handleReset">重置</el-button>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
--- a/src/views/dictionary/template/components/QcQuestions.vue
+++ b/src/views/dictionary/template/components/QcQuestions.vue
@ -26,8 +26,16 @@
          <el-input v-model="searchData.Type" clearable style="width:120px;" />
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto">
--- a/src/views/dictionary/template/email/components/EmailList.vue
+++ b/src/views/dictionary/template/email/components/EmailList.vue
@ -123,8 +123,16 @@
          </el-select>
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
-          <el-button type="primary" @click="handleReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left: auto">
--- a/src/views/dictionary/template/sign/index.vue
+++ b/src/views/dictionary/template/sign/index.vue
@ -3,15 +3,23 @@
    <!-- 搜索框 -->
    <div class="search">
      <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="编号:">
+        <el-form-item label="Code:">
          <el-input v-model="searchData.Code" style="width:100px;" />
        </el-form-item>
        <el-form-item label="模板:">
          <el-input v-model="searchData.Name" style="width:100px;" />
        </el-form-item>
        <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left:auto;">
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@ -6,7 +6,14 @@
    <div class="login-body">
      <div class="login-l">
        <div class="login-logo">
-          <img src="@/assets/zzlogo-usa.png" alt="" class="usa-logo" />
+          <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
+          <img
+            v-else-if="NODE_ENV === 'usa'"
+            src="@/assets/zzlogo-usa.png"
+            alt=""
+            class="usa-logo"
+          />
+          <img v-else src="@/assets/zzlogo4.png" alt="" />
        </div>
        <div
          :class="{
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@ -392,15 +392,17 @@ export default {
        },
      ],
      searchHandle: [
-        {
-          label: this.$t('common:button:reset'),
-          type: 'primary',
-          emitKey: 'reset',
-        },
        {
          label: this.$t('common:button:search'),
          type: 'primary',
          emitKey: 'search',
+          icon: 'el-icon-search'
+        },
+        {
+          label: this.$t('common:button:reset'),
+          type: 'primary',
+          emitKey: 'reset',
+          icon: 'el-icon-refresh-left'
        },
        {
          label: this.$t('common:button:new'),
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@ -30,7 +30,7 @@
                        style="margin:0 10px;"
                        :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
                      >
-                        <el-button type="text" @click="previewImage(file.ImagePath)">
+                        <el-button type="text" @click="previewImage(file.ImagePath)" style="width: 400px;white-space: normal; word-wrap: break-word;text-align: left;">
                          {{ file.FileName }}
                        </el-button>
                        <img
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@ -31,7 +31,7 @@
                        style="margin:0 10px;"
                        :images="[`${OSSclientConfig.basePath}${file.ImagePath}`]"
                      >
-                        <el-button type="text" @click="previewImage(file.ImagePath)">
+                        <el-button type="text" @click="previewImage(file.ImagePath)" style="width: 400px;white-space: normal; word-wrap: break-word;text-align: left;">
                          {{ file.FileName }}
                        </el-button>
                        <img