Merge branch 'uat' into uat_us

调研表国际化
LiLi-uat国际化
2024-08-07 18:31:12 +08:00 · 2024-08-07 18:30:56 +08:00 · 2024-08-07 18:26:56 +08:00
2 changed files with 2 additions and 2 deletions
--- a/src/views/research/components/ResearchForm.vue
+++ b/src/views/research/components/ResearchForm.vue
@ -6,7 +6,7 @@
        {{ $t('trials:researchForm:title:question') }}
      </h2>
      <div style="display: flex;justify-content: space-between;">
-        <div>调研表状态：<el-tag>{{ $fd('ResearchRecord', state) }}</el-tag></div>
+        <div>{{ $t('trials:researchForm:title:state') }}<el-tag>{{ $fd('ResearchRecord', state) }}</el-tag></div>

      </div>
    </div>
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@ -5,7 +5,7 @@
        <!-- 中心调研表 -->
        {{ $t('trials:researchForm:title:question') }}
      </h2>
-      <TopLang style="position: fixed;top: 40px;right: 40px" />
+      <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
      <div style="display: flex;justify-content: space-between;">
        <div>{{ $t('trials:researchForm:title:researchSurveyStatus') }} <el-tag>{{ $fd('ResearchRecord', state) }}</el-tag></div>
        <div>
Author	SHA1	Message	Date
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	4929bb594d	Merge branch 'uat' into uat_us	2024-08-07 18:31:12 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	e4b366c86a	调研表国际化 continuous-integration/drone/push Build is passing Details	2024-08-07 18:30:56 +08:00
$DESKTOP-6C3NK6N\WXS$ DESKTOP-6C3NK6N\WXS	741086f92f	LiLi-uat国际化	2024-08-07 18:26:56 +08:00