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

.env.usa

@@ -2,7 +2,7 @@
 ENV = 'production'
 NODE_ENV = 'production'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-01-31/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-02-16/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = false

src/views/login/index.vue

@@ -109,7 +109,7 @@
         <span style="color:#428bca">关于</span>
       </a>
     </div>
-    <Vcode :show="isShow" slider-text="拖到滑块完成验证" :imgs="[Img1]" @success="onSuccess" />
+<!--    <Vcode :show="isShow" slider-text="拖到滑块完成验证" :imgs="[Img1]" @success="onSuccess" />-->
     <el-dialog
       v-if="aboutVisible"
       :visible.sync="aboutVisible"
@@ -230,7 +230,8 @@ export default {
       this.loginType = this.$route.query.loginType
       this.$refs.loginForm.validate(valid => {
         if (valid) {
-          this.isShow = true
+          this.onSuccess()
+          // this.isShow = true
         } else {
           // console.log('error submit!!')
           return false

src/views/trials/trials-panel/attachments/self-attachment/index.vue

@@ -39,7 +39,6 @@
         </el-form-item>
       </el-form>
     </template>
-
     <template slot="main-container">
       <!-- 系统文件列表 -->
       <el-table
@@ -324,16 +323,21 @@ export default {
     closeSignDialog(isSave) {
       this.signVisible = false
       if (isSave) {
-        this.$confirm('是否进入下一个签署文档？').then(res => {
+        this.$confirm(this.$t('trials:self-attachment:message:nextDocument')).then(res => {
           getNextUnSignDocument({
             TrialId: this.trialId
           }).then(res => {
+            if (!res.Result) {
+              this.currentIsConfirm = true
+            } else {
               this.handleSign(res.Result)
+            }
+            this.getList()
           })
         }).catch(() => {
           this.currentIsConfirm = true
-        })
           this.getList()
+        })
       }
     },
 

src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue

@@ -83,7 +83,7 @@
       <!-- <div>{{ dicomInfo.time }}</div> -->
     </div>
     <div ref="sliderBox" class="my_slider_box" style="position: absolute;right: 1px;height: calc(100% - 140px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer" @click.stop="goViewer($event)">
-      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @mousedown.stop="sliderMousedown($event)" />
+      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event)" />
     </div>
     <div style="position: absolute;left: 50%;top: 30px;color: #f44336;transform: translateX(-50%);">
       {{ markers.top }}

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue

@@ -76,7 +76,7 @@
       <!-- <div>{{ dicomInfo.time }}</div> -->
     </div>
     <div ref="sliderBox" class="my_slider_box" style="position: absolute;right: 1px;height: calc(100% - 140px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer" @click.stop="goViewer($event)">
-      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @mousedown.stop="sliderMousedown($event)" />
+      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event)" />
     </div>
     <div style="position: absolute;left: 50%;top: 30px;color: #f44336;transform: translateX(-50%);">
       {{ markers.top }}
@@ -471,6 +471,7 @@ export default {
   },
   methods: {
     goViewer(e) {
+      console.log('goViewer')
       console.log(this.$refs['sliderBox'].clientHeight)
       var height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight
       this.height = height