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

src/views/system/user/components/UserInfo.vue

@@ -18,11 +18,6 @@
       <el-form-item :label="$t('system:userlist:table:FirstName')" prop="FirstName">
         <el-input v-model="user.FirstName" />
       </el-form-item>
-      <el-form-item :label="$t('system:userlist:table:UserWorkLanguage')" prop="UserWorkLanguage">
-        <el-select v-model="user.UserWorkLanguage" style="width: 100%">
-          <el-option v-for="item of $d.UserWorkLanguage" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
       <!-- <el-form-item :label="$t('system:userlist:table:Gender')" prop="Sex" style="margin-right:40px;">
         <el-radio-group v-model="user.Sex">
           <el-radio :label="1">Male</el-radio>
@@ -43,6 +38,11 @@
           <el-radio v-for="item of $d.YesOrNo" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item :label="$t('system:userlist:table:UserWorkLanguage')" prop="UserWorkLanguage">
+        <el-select v-model="user.UserWorkLanguage" style="width: 100%">
+          <el-option v-for="item of $d.UserWorkLanguage" :key="item.id" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="$t('system:userlist:table:UserType')" prop="Roles" v-if="type === 0">
         <div style="display: flex; align-items: center">
           <el-select ref="userType" v-model="user.Roles" size="small" placeholder="Please select" multiple

src/views/trials/trials-myinfo/mine.vue

@@ -5,77 +5,42 @@
         <!-- 用户基本信息 -->
         {{ $t("trials:trials-myinfo:title:basicInfo") }}
       </div>
-      <el-form
+      <el-form ref="userForm" label-position="right" :model="user" :rules="userFormRules" label-width="120px">
-        ref="userForm"
-        label-position="right"
-        :model="user"
-        :rules="userFormRules"
-        label-width="120px"
-      >
         <el-form-item v-if="user.Code" label="ID: " prop="Code">
           <el-input v-model="user.Code" disabled />
         </el-form-item>
         <!-- 姓 -->
-        <el-form-item
+        <el-form-item :disabled="user.UserTypeEnum === 8" :label="$t('trials:trials-myinfo:form:surname')"
-          :disabled="user.UserTypeEnum === 8"
+          prop="LastName">
-          :label="$t('trials:trials-myinfo:form:surname')"
+          <el-input v-model="user.LastName" :placeholder="$t('trials:trials-myinfo:form:surname')" />
-          prop="LastName"
-        >
-          <el-input
-            v-model="user.LastName"
-            :placeholder="$t('trials:trials-myinfo:form:surname')"
-          />
         </el-form-item>
         <!-- 名 -->
-        <el-form-item
+        <el-form-item :disabled="user.UserTypeEnum === 8" :label="$t('trials:trials-myinfo:form:givenname')"
-          :disabled="user.UserTypeEnum === 8"
+          prop="FirstName">
-          :label="$t('trials:trials-myinfo:form:givenname')"
+          <el-input v-model="user.FirstName" :placeholder="$t('trials:trials-myinfo:form:givenname')" />
-          prop="FirstName"
-        >
-          <el-input
-            v-model="user.FirstName"
-            :placeholder="$t('trials:trials-myinfo:form:givenname')"
-          />
         </el-form-item>
         <!-- 单位 -->
-        <el-form-item
+        <el-form-item :label="$t('trials:trials-myinfo:form:organization')" prop="OrganizationName">
-          :label="$t('trials:trials-myinfo:form:organization')"
+          <el-input :disabled="user.IsZhiZhun" v-model="user.OrganizationName"
-          prop="OrganizationName"
+            :placeholder="$t('trials:trials-myinfo:form:organization')" />
-        >
-          <el-input
-            :disabled="user.IsZhiZhun"
-            v-model="user.OrganizationName"
-            :placeholder="$t('trials:trials-myinfo:form:organization')"
-          />
         </el-form-item>
         <!-- 部门 -->
-        <el-form-item
+        <el-form-item :label="$t('trials:trials-myinfo:form:department')" prop="DepartmentName">
-          :label="$t('trials:trials-myinfo:form:department')"
+          <el-input v-model="user.DepartmentName" :placeholder="$t('trials:trials-myinfo:form:organization')" />
-          prop="DepartmentName"
-        >
-          <el-input
-            v-model="user.DepartmentName"
-            :placeholder="$t('trials:trials-myinfo:form:organization')"
-          />
         </el-form-item>
         <!-- 职位 -->
-        <el-form-item
+        <el-form-item :label="$t('trials:trials-myinfo:form:position')" prop="PositionName">
-          :label="$t('trials:trials-myinfo:form:position')"
+          <el-input v-model="user.PositionName" :placeholder="$t('trials:trials-myinfo:form:position')" />
-          prop="PositionName"
+        </el-form-item>
-        >
+        <!-- 工作语言 -->
-          <el-input
+        <el-form-item :label="$t('trials:trials-myinfo:form:UserWorkLanguage')" prop="UserWorkLanguage">
-            v-model="user.PositionName"
+          <el-select v-model="user.UserWorkLanguage" style="width: 100%">
-            :placeholder="$t('trials:trials-myinfo:form:position')"
+            <el-option v-for="item of $d.UserWorkLanguage" :key="item.id" :label="item.label" :value="item.value" />
-          />
+          </el-select>
         </el-form-item>
       </el-form>
       <!-- 保存 -->
-      <el-button
+      <el-button class="trial-info-btn" type="primary" size="small" @click="handleSave">
-        class="trial-info-btn"
-        type="primary"
-        size="small"
-        @click="handleSave"
-      >
         {{ $t("trials:trials-myinfo:button:save") }}
       </el-button>
     </div>
@@ -102,6 +67,13 @@ export default {
   data() {
     return {
       userFormRules: {
+        UserWorkLanguage: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:select"),
+            trigger: ["blur", "change"],
+          },
+        ],
         UserName: [
           {
             required: true,

src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue

@@ -3394,6 +3394,7 @@ export default {
     },
     // 重置视口
     resetRenderingEngine(viewportId = null, i) {
+      if (viewportId.includes('MPR') && !this.isMPR) return false
       if (this.timer[viewportId]) {
         clearInterval(this.timer[viewportId])
         this.timer[viewportId] = null
@@ -3425,6 +3426,7 @@ export default {
     },
     // 切换全屏
     async toggleFullScreen(e, index) {
+      if (!this.isMPR && !this.isFusion && this.cells.length <= 1) return false
       if (this.isDelay && (this.readingTool === 3 || this.isMPR)) return false
       if (this.readingTool === 3 && this.isMPR) return false
       if (this.readingTool === 3) {