From 32a7e42c512705cc420b63a60c14b94a7d328b6a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 19 Jul 2024 11:36:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=85=E7=89=87=E6=A0=87=E5=87=86=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CriterionQuestionForm.vue      | 26 ++++++++++++++++---
 .../template/components/TableQsForm.vue       | 24 +++++++++++++++--
 .../dicoms/components/Fusion/Questions.vue    |  1 +
 vue.config.js                                 |  4 +--
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 37267972..3b4ff103 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -430,9 +430,26 @@
       <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
         <el-input-number v-model="form.ImageCount" controls-position="right" :min="1" :max="10" />
       </el-form-item>
-      <!--      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'summary'" label="注释">-->
-      <!--        <el-input v-model="form.Remark" />-->
-      <!--      </el-form-item>-->
+      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
+        <el-select v-model="form.HighlightAnswerList" clearable multiple>
+          <template v-if="form.TypeValue">
+            <el-option
+              v-for="item of form.TypeValue.split('|')"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </template>
+          <template v-else-if="form.DictionaryCode">
+            <el-option
+              v-for="item of $d[form.DictionaryCode]"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </template>
+        </el-select>
+      </el-form-item>
       <el-form-item label="序号" prop="ShowOrder">
         <el-input-number
           v-model="form.ShowOrder"
@@ -552,7 +569,8 @@ export default {
         LimitEdit: 0,
         GroupId: null,
         ConvertShowType: 0,
-        QuestionClassify: null
+        QuestionClassify: null,
+        HighlightAnswerList: []
       },
       rules: {
         Type: [
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index 0807b2ab..ebb98415 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -315,7 +315,26 @@
           :max="10"
         />
       </el-form-item>
-
+      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
+        <el-select v-model="form.HighlightAnswerList" clearable multiple>
+          <template v-if="form.TypeValue">
+            <el-option
+              v-for="item of form.TypeValue.split('|')"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </template>
+          <template v-else-if="form.DictionaryCode">
+            <el-option
+              v-for="item of $d[form.DictionaryCode]"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </template>
+        </el-select>
+      </el-form-item>
       <el-form-item label="序号" prop="ShowOrder">
         <el-input-number
           v-model="form.ShowOrder"
@@ -427,7 +446,8 @@ export default {
         QuestionMark: null,
         LimitEdit: 0,
         GlobalReadingShowType: null,
-        QuestionClassify: null
+        QuestionClassify: null,
+        HighlightAnswerList: []
 
         // IsEnable: true
       },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index cce388e7..20fe04be 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -185,6 +185,7 @@ export default {
               this.setChild(v.Childrens)
             }
           })
+          console.log(this.questionForm,questions)
           this.questions = questions
           this.setPet5PSCommentDisplay()
           this.measurements = []
diff --git a/vue.config.js b/vue.config.js
index 242321b9..38caa3a1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,8 +25,8 @@ module.exports = {
   devServer: {
     port: '8080',
     headers: {
-      // 'Cross-Origin-Opener-Policy': 'same-origin',
-      // 'Cross-Origin-Embedder-Policy': 'require-corp'
+      'Cross-Origin-Opener-Policy': 'same-origin',
+      'Cross-Origin-Embedder-Policy': 'require-corp'
     },
     // open: true,
     overlay: {