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

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  
+    
+    

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

@@ -1909,7 +1909,11 @@ export default {
       }
     },
     handleCTSelectionChange(rows) {
+      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) {
+      if (rows.length > 0) {
         this.petSeriesInfo = rows[0]
+      } else {
+        this.petSeriesInfo = {}
+      }
     },
     handleSubmitFusionSeries() {
       this.$refs['fusionForm'].validate((valid) => {

src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue

@@ -177,6 +177,49 @@
               {{ val }}
             </el-radio>
           </el-radio-group>
+          <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]"
@@ -187,23 +230,7 @@
                 {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
               </template>
             </el-input>
-        </el-form-item>
+          </template>
-        <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"
-            >
-          </div>
         </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 => {