From b5aac33e0b73b73867d1001b2a8cdda1d263547f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 17 Jan 2024 16:01:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?suv=E6=B5=8B=E9=87=8F=E5=80=BC=E5=90=8E?=
 =?UTF-8?q?=E9=9D=A2=E8=A1=A5=E5=85=85=E6=88=AA=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintignore                                 |  2 +-
 .../reading/dicoms/components/DicomViewer.vue | 12 ++-
 .../dicoms/components/Lugano/QuestionForm.vue | 83 +++++++++++++------
 3 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 3ff12bc3..f8cee48b 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -4,7 +4,7 @@ src/utils/*
 public
 dist
 
-src/*
+# src/*
 src/views/trials/trials-panel/visit/*
 src/App.vue
 src/views/trials/trials-panel/reading/global-review/*
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 90c9ec44..b03f87ec 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -1909,7 +1909,11 @@ export default {
       }
     },
     handleCTSelectionChange(rows) {
-      this.ctSeriesInfo = rows[0]
+      if (rows.length > 0) {
+        this.ctSeriesInfo = rows[0]
+      } else {
+        this.ctSeriesInfo = {}
+      }
     },
     handleCTSelect(selection) {
       if (selection.length > 1) {
@@ -1924,7 +1928,11 @@ export default {
       }
     },
     handlePTSelectionChange(rows) {
-      this.petSeriesInfo = rows[0]
+      if (rows.length > 0) {
+        this.petSeriesInfo = rows[0]
+      } else {
+        this.petSeriesInfo = {}
+      }
     },
     handleSubmitFusionSeries() {
       this.$refs['fusionForm'].validate((valid) => {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index df0f19e8..36bba668 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -177,33 +177,60 @@
               {{ val }}
             </el-radio>
           </el-radio-group>
-          <el-input
-            v-if="qs.Type==='calculation'"
-            v-model="questionForm[qs.Id]"
-            disabled
-            @change="((val)=>{formItemChange(val, qs)})"
-          >
-            <template v-if="qs.Unit" slot="append">
-              {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-            </template>
-          </el-input>
-        </el-form-item>
-        <el-form-item
-          v-if="answers.OtherPicturePath"
-          :label="$t('trials:lugano:button:suvscreenshot')"
-        >
-          <div>
-            <img
-              v-if="answers.OtherPicturePath"
-              v-viewer
-              :options="{ toolbar: false }"
-              style="width: 50px; height: 50px; cursor: pointer;"
-              crossorigin="anonymous"
-              :src="answers.OtherPicturePath"
-              alt="Image"
-              class="suv_viewer"
+          <template v-if="qs.QuestionMark === 20">
+            <div style="display: flex;flex-direction: row;justify-content: flex-start;">
+              <el-input
+                v-if="qs.Type==='calculation'"
+                v-model="questionForm[qs.Id]"
+                disabled
+                style="width:120px;"
+                @change="((val)=>{formItemChange(val, qs)})"
+              >
+                <template v-if="qs.Unit" slot="append">
+                  {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+                </template>
+              </el-input>
+              <viewer
+                v-if="answers.OtherPicturePath"
+                ref="viewer"
+                style="margin:0 10px;"
+                :images="[answers.OtherPicturePath]"
+              >
+                <span style="color:#409eff;cursor: pointer" @click="previewImage()">
+                  {{ $t('trials:lugano:button:suvscreenshot') }}
+                </span>
+                <img
+                  v-show="false"
+                  crossorigin="anonymous"
+                  :src="answers.OtherPicturePath"
+                  alt="Image"
+                >
+              </viewer>
+              <!-- <img
+                v-if="answers.OtherPicturePath"
+                v-viewer
+                :options="{ toolbar: false }"
+                style="width: 25px; height: 25px; cursor: pointer;margin-left:10px;"
+                crossorigin="anonymous"
+                :src="answers.OtherPicturePath"
+                alt="Image"
+                class="suv_viewer"
+              > -->
+              <!-- <el-link v-if="answers.OtherPicturePath" type="primary" style="margin-left:10px;" @click="previewImage(answers.OtherPicturePath)">截图</el-link> -->
+            </div>
+          </template>
+          <template v-else>
+            <el-input
+              v-if="qs.Type==='calculation'"
+              v-model="questionForm[qs.Id]"
+              disabled
+              @change="((val)=>{formItemChange(val, qs)})"
             >
-          </div>
+              <template v-if="qs.Unit" slot="append">
+                {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+              </template>
+            </el-input>
+          </template>
         </el-form-item>
       </div>
       <div
@@ -335,6 +362,10 @@ export default {
         toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
       })
     },
+    previewImage() {
+      console.log(this.$refs.viewer[0])
+      this.$refs.viewer[0].$viewer.show()
+    },
     async initForm() {
       const loading = this.$loading({ fullscreen: true })
       this.questions.forEach(item => {

From 06b5110fbc6326a6ca285d23a9d3d8ad4115d3d3 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 17 Jan 2024 16:09:13 +0800
Subject: [PATCH 2/3] 1

---
 .eslintignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintignore b/.eslintignore
index f8cee48b..3ff12bc3 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -4,7 +4,7 @@ src/utils/*
 public
 dist
 
-# src/*
+src/*
 src/views/trials/trials-panel/visit/*
 src/App.vue
 src/views/trials/trials-panel/reading/global-review/*

From bbd64cde5eb1766b0f507dc5c2f19fd33ed55d51 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 17 Jan 2024 17:31:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 irc_vue_drone.yml | 60 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 irc_vue_drone.yml

diff --git a/irc_vue_drone.yml b/irc_vue_drone.yml
new file mode 100644
index 00000000..6dbcef8e
--- /dev/null
+++ b/irc_vue_drone.yml
@@ -0,0 +1,60 @@
+kind: pipeline
+type: ssh
+name: ssh-linux-test-irc-publish
+
+platform:
+  os: Linux
+  arch: 386
+  
+clone:
+  disable: true  #禁用默认克隆
+  
+server:
+  host: 192.168.3.68
+  user: root
+  password:
+    from_secret: local_pwd
+
+steps:
+- name: publish-test-irc-vue
+  commands:
+  - echo start publish test-irc-vue
+  - cd /opt/hang/vue/test-irc    
+  - sh test-irc.sh v${DRONE_BUILD_NUMBER}
+  
+trigger:
+  branch:
+    - main    
+       
+---
+
+      
+kind: pipeline
+type: ssh
+name: ssh-linux-test-study-publish
+
+platform:
+  os: Linux
+  arch: 386
+
+clone:
+  disable: true  #禁用默认克隆
+  
+server:
+  host: 123.56.94.154
+  user: root
+  password:
+    from_secret: local_pwd
+  
+steps:
+- name: publish-test-study
+  commands:
+  - echo start publish test-study-api
+  - cd /opt/1panel/hang/devops/test-study
+  - sh test-study.sh v${DRONE_BUILD_NUMBER}
+  
+trigger:
+  branch:
+    - Test.Study  
+    
+    
\ No newline at end of file