From be96b2e93ef03e875be44c3546e2c06fe35f1716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 20 Feb 2024 11:41:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=BB=91=E5=9D=97=E8=B7=B3=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.usa                                             |  2 +-
 src/views/login/index.vue                            |  5 +++--
 .../attachments/self-attachment/index.vue            | 12 ++++++++----
 .../reading/dicoms/components/DicomCanvas.vue        |  2 +-
 .../dicoms/customize/CustomizeDicomCanvas.vue        |  3 ++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.env.usa b/.env.usa
index 1f1d2d26..84f3865a 100644
--- a/.env.usa
+++ b/.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
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1e13f20c..ed76f483 100644
--- a/src/views/login/index.vue
+++ b/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
diff --git a/src/views/trials/trials-panel/attachments/self-attachment/index.vue b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
index 2c002819..481cca23 100644
--- a/src/views/trials/trials-panel/attachments/self-attachment/index.vue
+++ b/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('Go to next document?').then(res => {
           getNextUnSignDocument({
             TrialId: this.trialId
           }).then(res => {
-            this.handleSign(res.Result)
+            if (!res.Result) {
+              this.currentIsConfirm = true
+            } else {
+              this.handleSign(res.Result)
+            }
+            this.getList()
           })
         }).catch(() => {
           this.currentIsConfirm = true
+          this.getList()
         })
-        this.getList()
       }
     },
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 8e1a48f3..72e1552c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/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 }}
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
index 6b08c699..021eb599 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/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

From 9906f4467729740472539d97ae6cb0a3a3c96da9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 20 Feb 2024 11:44:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Go=20to=20next=20document=3F=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/attachments/self-attachment/index.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/attachments/self-attachment/index.vue b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
index 481cca23..cff606da 100644
--- a/src/views/trials/trials-panel/attachments/self-attachment/index.vue
+++ b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
@@ -323,7 +323,7 @@ export default {
     closeSignDialog(isSave) {
       this.signVisible = false
       if (isSave) {
-        this.$confirm('Go to next document?').then(res => {
+        this.$confirm(this.$t('trials:self-attachment:message:nextDocument')).then(res => {
           getNextUnSignDocument({
             TrialId: this.trialId
           }).then(res => {