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

src/components/Dicom/DicomCanvas.vue

@@ -680,7 +680,7 @@ export default {
     resetWwwc() {
       this.toolState.viewportInvert = false
       var viewport = cornerstone.getViewport(this.canvas)
-      viewport.invert = false
+      // viewport.invert = false
       var image = cornerstone.getImage(this.canvas)
       viewport.voi.windowWidth = image.windowWidth
       viewport.voi.windowCenter = image.windowCenter

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

@@ -1654,7 +1654,7 @@ export default {
     resetWwwc() {
       this.toolState.viewportInvert = false
       var viewport = cornerstone.getViewport(this.canvas)
-      viewport.invert = false
+      // viewport.invert = false
       var image = cornerstone.getImage(this.canvas)
       viewport.voi.windowWidth = image.windowWidth
       viewport.voi.windowCenter = image.windowCenter

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

@@ -1637,7 +1637,7 @@ export default {
     resetWwwc() {
       this.toolState.viewportInvert = false
       var viewport = cornerstone.getViewport(this.canvas)
-      viewport.invert = false
+      // viewport.invert = false
       var image = cornerstone.getImage(this.canvas)
       viewport.voi.windowWidth = image.windowWidth
       viewport.voi.windowCenter = image.windowCenter

src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue

@@ -13,7 +13,7 @@
               <span style="font-weight:700;">{{ record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
-            <div class="info-content" v-html="record.TalkContent" />
+            <div class="info-content" v-html="formattedText(record.TalkContent)" />
           </div>
         </div>
 
@@ -23,7 +23,7 @@
               <span style="font-weight:700;">{{ record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
-            <div class="info-content" v-html="record.TalkContent" />
+            <div class="info-content" v-html="formattedText(record.TalkContent)" />
           </div>
           <!-- <img :src="record.headUrl"> -->
           <img v-if="record.UserTypeEnum*1 === 8" :src="adminAvatar" alt="Admin">
@@ -231,6 +231,9 @@ export default {
     this.getMessageList()
   },
   methods: {
+    formattedText(text) {
+      return text.replace(/\n/g, '<br>')
+    },
     // 初始化聊天信息
     getMessageList() {
       var recordContent = []

src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue

@@ -13,7 +13,7 @@
               <span style="font-weight:700;">{{ record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
-            <div class="info-content" v-html="record.TalkContent" />
+            <div class="info-content" v-html="formattedText(record.TalkContent)" />
           </div>
         </div>
 
@@ -23,7 +23,7 @@
               <span style="font-weight:700;">{{ record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
-            <div class="info-content" v-html="record.TalkContent" />
+            <div class="info-content" v-html="formattedText(record.TalkContent)" />
           </div>
           <!-- <img :src="record.headUrl"> -->
           <img v-if="record.UserTypeEnum*1 === 8" :src="adminAvatar" alt="Admin">
@@ -153,6 +153,9 @@ export default {
     close() {
       this.$emit('close')
     },
+    formattedText(text) {
+      return text.replace(/\n/g, '<br>')
+    },
     // 初始化聊天信息
     getMessageList() {
       var recordContent = []

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -1643,14 +1643,14 @@ export default {
             var str = `${item.keyName} <br>`
             if (item.keyValue) {
               // 问题总结
-              str = `${str}${this.$t('trials:audit:form:questionSummary')}：${
+              str = `${str}${this.$t('trials:audit:form:questionSummary')}：<br>${
                 item.keyValue
               }<br>`
             }
             if (item.actionContent) {
               // 行动事项
               actions.push(`${item.actionContent}`)
-              str = `${str}${this.$t('trials:audit:form:actionMatters')}：${
+              str = `${str}${this.$t('trials:audit:form:actionMatters')}：<br>${
                 item.actionContent
               }<br>`
             }