Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/views/research/components/EquipmentForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="equipmentForm" :model="form" :rules="rules" label-width="300px">
+  <el-form ref="equipmentForm" :model="form" :rules="rules" label-width="350px">
     <div class="base-dialog-body">
       <!-- 扫描设备 -->
       <el-form-item :label="$t('trials:equiptResearch:form:equipment')" prop="EquipmentTypeEnum"

src/views/research/login.vue

@@ -4,7 +4,7 @@
       <h2 style="text-align:center;">
         <!-- 中心调研表 -->
         {{ $t('trials:researchForm:title:question') }}
-        <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
+        <TopLang style="position: fixed;top: 40px;right: 40px" />
       </h2>
       <el-card shadow="hover">
         <el-form ref="resetForm" v-loading="loading" :model="form" label-width="150px" style="width:80%;margin:0 auto;"

src/views/research/topLang.vue

@@ -26,7 +26,7 @@
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
-
+import { changeURLStatic } from '@/utils/history.js'
 export default {
   name: 'TopLang',
 
@@ -44,7 +44,8 @@ export default {
       this.$i18n.locale = lang
       this.setLanguage(lang)
       this.$updateDictionary()
-      // window.location.reload()
+      changeURLStatic('lang', lang)
+      window.location.reload()
     }
   }
 }