From 6d3f1ff6d736a5f2f697e38aff7628014dba16a8 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 18 Oct 2024 19:47:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tinymce/src/tinymce2.ts        |   4 +-
 src/views/kc/wjxCswj/WjxCywjV2List.vue        | 251 +++++++++++--
 src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue  |   8 +-
 src/views/kc/wjxWjxxTmlb/TikuList.vue         | 305 ++++++++++------
 src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts  |  12 +-
 .../kc/wjxWjxxTmlb/YinyongTikuDcList.vue      |   8 +-
 src/views/kc/wjxWjxxTmlb/YinyongTikuList.vue  |   5 +-
 .../components/WjxWjxxTmlbForm.vue            | 331 +++++++++---------
 8 files changed, 616 insertions(+), 308 deletions(-)

diff --git a/src/components/Tinymce/src/tinymce2.ts b/src/components/Tinymce/src/tinymce2.ts
index c23ca64..0d05403 100644
--- a/src/components/Tinymce/src/tinymce2.ts
+++ b/src/components/Tinymce/src/tinymce2.ts
@@ -31,10 +31,10 @@ export const toolbar =
 
   // fullscreen code preview | undo redo | 
 
-export const simplePlugins = ['lists insertfile image link table textcolor wordcount contextmenu fullscreen'];
+export const simplePlugins = ['lists insertfile image link table fullscreen'];
 
 export const simpleToolbar = [
-  'lists link unlink image media table removeformat fullscreen',
+  'lists link unlink image media table  fullscreen',
 ];
 
 export const menubar = '';
diff --git a/src/views/kc/wjxCswj/WjxCywjV2List.vue b/src/views/kc/wjxCswj/WjxCywjV2List.vue
index b83b709..93cf359 100644
--- a/src/views/kc/wjxCswj/WjxCywjV2List.vue
+++ b/src/views/kc/wjxCswj/WjxCywjV2List.vue
@@ -181,7 +181,7 @@
                       <a-card title="引用题库">
                         <p><a-button type="primary" @click="handleYylx('0')" :disabled="editDisabled">我的题库</a-button></p>
                         <p><a-button type="primary" @click="handleYylx('1')" :disabled="editDisabled">公有题库</a-button></p>
-                        <p><a-button type="primary" @click="importOpen = true">导入试题</a-button></p>
+                        <p><a-button type="primary" @click="importOpen = true" :disabled="editDisabled">导入试题</a-button></p>
                       </a-card>
                     </a-col>
                     <a-col :span="20" style="overflow-y: scroll; min-height: 100px">
@@ -192,18 +192,68 @@
                             <div style="width: 100%" v-if="item.wjType == 3 || item.wjType == '3'">
                               <a-card>
                                 <template #title>
-                                  <span>{{ index + 1 }}、</span>
-                                  <a-textarea
+                                  <div>
+                                    <a-row>
+                                      <a-col :span="12">
+                                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[单选]</span></span>
+                                      </a-col>
+                                      <a-col :span="12" style="text-align: right;">
+                                        <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                                          <a-select
+                                            style="width: 120px"
+                                            v-model:value="item.wjScore"
+                                            placeholder="请选择分数"
+                                            v-if="item.wjSfqh == '0'"
+                                            :disabled="editDisabled"
+                                          >
+                                            <a-select-option value="5">5</a-select-option>
+                                            <a-select-option value="4">4</a-select-option>
+                                            <a-select-option value="3">3</a-select-option>
+                                            <a-select-option value="2">2</a-select-option>
+                                            <a-select-option value="1">1</a-select-option>
+                                          </a-select>
+                                          <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                                            >自定义分数</span
+                                          >
+                                          <a-input-number
+                                            v-model:value="item.wjScore"
+                                            style="width: 120px"
+                                            v-if="item.wjSfqh == '1'"
+                                            :disabled="editDisabled"
+                                          ></a-input-number>
+                                          <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                                            >返回</span
+                                          >
+                                        </a-tooltip>
+                                        <a-tooltip placement="topRight" title="删除此题"
+                                          ><Icon
+                                            icon="ant-design:delete-outlined"
+                                            style="cursor: pointer; font-size: 20px; margin: 10px"
+                                            @click="handleDelTigan(item, index)"
+                                            v-if="!editDisabled"
+                                        /></a-tooltip>
+                                      </a-col>
+                                    </a-row>
+                                  </div>
+                                  <!-- <a-textarea
                                     placeholder="请填写单选题题干"
                                     v-model:value="item.wjTitle"
                                     :bordered="false"
                                     :style="{ width: '30rem' }"
                                     :auto-size="{ minRows: 1, maxRows: 5 }"
                                     :disabled="editDisabled"
-                                  />
-                                  <span style="color: #c2bfbf">[单选]</span>
+                                  /> -->
+
+                                  <JEditor2 placeholder="请填写文件上传题题干"
+                                    v-model:value="item.wjTitle"
+                                    :bordered="false"
+                                    :style="{ width: '30rem' }"
+                                    :auto-size="{ minRows: 1, maxRows: 5 }"
+                                    :disabled="editDisabled" v-if="!editDisabled"/>
+                                    <div v-else v-html="item.wjTitle"></div>
+                                  
                                 </template>
-                                <template #extra>
+                                <!-- <template #extra>
                                   <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
                                     <a-select
                                       style="width: 120px"
@@ -238,8 +288,8 @@
                                       @click="handleDelTigan(item, index)"
                                       v-if="!editDisabled"
                                   /></a-tooltip>
-                                </template>
-                                <j-upload v-model:value="item.picPath" text="上传图片" fileType="image" :maxCount="9" :disabled="!isShow"></j-upload>
+                                </template> -->
+                                <!-- <j-upload v-model:value="item.picPath" text="上传图片" fileType="image" :maxCount="9" :disabled="!isShow"></j-upload> -->
                                 <a-row v-if="isShow">
                                   <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
                                 </a-row>
@@ -278,7 +328,59 @@
                             <div style="width: 100%" v-else-if="item.wjType == 4 || item.wjType == '4'">
                               <a-card>
                                 <template #title>
-                                  <span>{{ index + 1 }}、</span
+
+                                  <div>
+                                    <a-row>
+                                      <a-col :span="12">
+                                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[多选]</span></span>
+                                      </a-col>
+                                      <a-col :span="12" style="text-align: right;">
+                                        <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                                          <a-select
+                                            style="width: 120px"
+                                            v-model:value="item.wjScore"
+                                            placeholder="请选择分数"
+                                            v-if="item.wjSfqh == '0'"
+                                            :disabled="editDisabled"
+                                          >
+                                            <a-select-option value="5">5</a-select-option>
+                                            <a-select-option value="4">4</a-select-option>
+                                            <a-select-option value="3">3</a-select-option>
+                                            <a-select-option value="2">2</a-select-option>
+                                            <a-select-option value="1">1</a-select-option>
+                                          </a-select>
+                                          <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                                            >自定义分数</span
+                                          >
+                                          <a-input-number
+                                            v-model:value="item.wjScore"
+                                            style="width: 120px"
+                                            v-if="item.wjSfqh == '1'"
+                                            :disabled="editDisabled"
+                                          ></a-input-number>
+                                          <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                                            >返回</span
+                                          >
+                                        </a-tooltip>
+                                        <a-tooltip placement="topRight" title="删除此题"
+                                          ><Icon
+                                            icon="ant-design:delete-outlined"
+                                            style="cursor: pointer; font-size: 20px; margin: 10px"
+                                            @click="handleDelTigan(item, index)"
+                                            v-if="!editDisabled"
+                                        /></a-tooltip>
+                                      </a-col>
+                                    </a-row>
+                                  </div>
+                                  <JEditor2 placeholder="请填写多选题题干"
+                                    v-model:value="item.wjTitle"
+                                    :bordered="false"
+                                    :style="{ width: '30rem' }"
+                                    :auto-size="{ minRows: 1, maxRows: 5 }"
+                                    :disabled="editDisabled" v-if="!editDisabled"/>
+                                    <div v-else v-html="item.wjTitle"></div>
+
+                                  <!-- <span>{{ index + 1 }}、</span
                                   ><a-textarea
                                     placeholder="请填写多选题题干"
                                     v-model:value="item.wjTitle"
@@ -287,9 +389,9 @@
                                     :auto-size="{ minRows: 1, maxRows: 5 }"
                                     :disabled="editDisabled"
                                   />
-                                  <span style="color: #c2bfbf">[多选]</span>
+                                  <span style="color: #c2bfbf">[多选]</span> -->
                                 </template>
-                                <template #extra>
+                                <!-- <template #extra>
                                   <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
                                     <a-select
                                       style="width: 120px"
@@ -324,8 +426,8 @@
                                       @click="handleDelTigan(item, index)"
                                       v-if="!editDisabled"
                                   /></a-tooltip>
-                                </template>
-                                <j-upload v-model:value="item.picPath" text="上传图片" fileType="image" :maxCount="9" :disabled="!isShow"></j-upload>
+                                </template> -->
+                                <!-- <j-upload v-model:value="item.picPath" text="上传图片" fileType="image" :maxCount="9" :disabled="!isShow"></j-upload> -->
                                 <a-row v-if="isShow">
                                   <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
                                 </a-row>
@@ -365,7 +467,7 @@
                             <div style="width: 100%" v-else-if="item.wjType == 5 || item.wjType == '5'">
                               <a-card>
                                 <template #title>
-                                  <span>{{ index + 1 }}、</span
+                                  <!-- <span>{{ index + 1 }}、</span
                                   ><a-textarea
                                     placeholder="请填写填空题题干"
                                     v-model:value="item.wjTitle"
@@ -374,9 +476,59 @@
                                     :auto-size="{ minRows: 1, maxRows: 5 }"
                                     :disabled="editDisabled"
                                   />
-                                  <span style="color: #c2bfbf">[填空]</span>
+                                  <span style="color: #c2bfbf">[填空]</span> -->
+                                  <div>
+                                    <a-row>
+                                      <a-col :span="12">
+                                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[填空]</span></span>
+                                      </a-col>
+                                      <a-col :span="12" style="text-align: right;">
+                                        <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                                          <a-select
+                                            style="width: 120px"
+                                            v-model:value="item.wjScore"
+                                            placeholder="请选择分数"
+                                            v-if="item.wjSfqh == '0'"
+                                            :disabled="editDisabled"
+                                          >
+                                            <a-select-option value="5">5</a-select-option>
+                                            <a-select-option value="4">4</a-select-option>
+                                            <a-select-option value="3">3</a-select-option>
+                                            <a-select-option value="2">2</a-select-option>
+                                            <a-select-option value="1">1</a-select-option>
+                                          </a-select>
+                                          <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                                            >自定义分数</span
+                                          >
+                                          <a-input-number
+                                            v-model:value="item.wjScore"
+                                            style="width: 120px"
+                                            v-if="item.wjSfqh == '1'"
+                                            :disabled="editDisabled"
+                                          ></a-input-number>
+                                          <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                                            >返回</span
+                                          >
+                                        </a-tooltip>
+                                        <a-tooltip placement="topRight" title="删除此题"
+                                          ><Icon
+                                            icon="ant-design:delete-outlined"
+                                            style="cursor: pointer; font-size: 20px; margin: 10px"
+                                            @click="handleDelTigan(item, index)"
+                                            v-if="!editDisabled"
+                                        /></a-tooltip>
+                                      </a-col>
+                                    </a-row>
+                                  </div>
+                                  <JEditor2 placeholder="请填写填空题题干"
+                                    v-model:value="item.wjTitle"
+                                    :bordered="false"
+                                    :style="{ width: '30rem' }"
+                                    :auto-size="{ minRows: 1, maxRows: 5 }"
+                                    :disabled="editDisabled" v-if="!editDisabled"/>
+                                    <div v-else v-html="item.wjTitle"></div>
                                 </template>
-                                <template #extra>
+                                <!-- <template #extra>
                                   <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
                                     <a-select
                                       style="width: 120px"
@@ -411,15 +563,15 @@
                                       @click="handleDelTigan(item, index)"
                                       v-if="!editDisabled"
                                   /></a-tooltip>
-                                </template>
+                                </template> -->
                                 <a-row v-if="isShow">
-                                  <j-upload
+                                  <!-- <j-upload
                                     v-model:value="item.picPath"
                                     text="上传图片"
                                     fileType="image"
                                     :maxCount="9"
                                     :disabled="!isShow"
-                                  ></j-upload>
+                                  ></j-upload> -->
                                   <a-col :span="24">
                                     <a-textarea
                                       placeholder="请填写答案"
@@ -437,7 +589,57 @@
                             <div style="width: 100%" v-else-if="item.wjType == 8 || item.wjType == '8'">
                               <a-card>
                                 <template #title>
-                                  <span>{{ index + 1 }}、</span>
+                                  <div>
+                                    <a-row>
+                                      <a-col :span="12">
+                                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[文件]</span></span>
+                                      </a-col>
+                                      <a-col :span="12" style="text-align: right;">
+                                        <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                                          <a-select
+                                            style="width: 120px"
+                                            v-model:value="item.wjScore"
+                                            placeholder="请选择分数"
+                                            v-if="item.wjSfqh == '0'"
+                                            :disabled="editDisabled"
+                                          >
+                                            <a-select-option value="5">5</a-select-option>
+                                            <a-select-option value="4">4</a-select-option>
+                                            <a-select-option value="3">3</a-select-option>
+                                            <a-select-option value="2">2</a-select-option>
+                                            <a-select-option value="1">1</a-select-option>
+                                          </a-select>
+                                          <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                                            >自定义分数</span
+                                          >
+                                          <a-input-number
+                                            v-model:value="item.wjScore"
+                                            style="width: 120px"
+                                            v-if="item.wjSfqh == '1'"
+                                            :disabled="editDisabled"
+                                          ></a-input-number>
+                                          <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                                            >返回</span
+                                          >
+                                        </a-tooltip>
+                                        <a-tooltip placement="topRight" title="删除此题"
+                                          ><Icon
+                                            icon="ant-design:delete-outlined"
+                                            style="cursor: pointer; font-size: 20px; margin: 10px"
+                                            @click="handleDelTigan(item, index)"
+                                            v-if="!editDisabled"
+                                        /></a-tooltip>
+                                      </a-col>
+                                    </a-row>
+                                  </div>
+                                  <JEditor2 placeholder="请填写文件上传题题干"
+                                    v-model:value="item.wjTitle"
+                                    :bordered="false"
+                                    :style="{ width: '30rem' }"
+                                    :auto-size="{ minRows: 1, maxRows: 5 }"
+                                    :disabled="editDisabled" v-if="!editDisabled"/>
+                                    <div v-else v-html="item.wjTitle"></div>
+                                  <!-- <span>{{ index + 1 }}、</span>
                                   <a-textarea
                                     placeholder="请填写文件题题干"
                                     v-model:value="item.wjTitle"
@@ -446,7 +648,7 @@
                                     :auto-size="{ minRows: 1, maxRows: 5 }"
                                     :disabled="editDisabled"
                                   />
-                                  <span style="color: #c2bfbf">[文件]</span>
+                                  <span style="color: #c2bfbf">[文件]</span> -->
                                   <!-- <a-textarea
                                     placeholder="请填写文件上传题题干"
                                     v-model:value="item.wjTitle"
@@ -463,7 +665,7 @@
                                     :disabled="editDisabled" v-if="!editDisabled"/>
                                     <div v-else v-html="item.wjTitle"></div> -->
                                 </template>
-                                <template #extra>
+                                <!-- <template #extra>
                                   <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
                                     <a-select
                                       style="width: 120px"
@@ -498,9 +700,8 @@
                                       @click="handleDelTigan(item, index)"
                                       v-if="!editDisabled"
                                   /></a-tooltip>
-                                  <!-- <JUpload ref="uploadRef" /> -->
                                 </template>
-                                <j-upload v-model:value="item.picPath" text="上传图片" fileType="image" :maxCount="9" :disabled="!isShow"></j-upload>
+                                <j-upload v-model:value="item.picPath" text="上传图片" fileType="image" :maxCount="9" :disabled="!isShow"></j-upload> -->
                               </a-card>
                             </div>
 
@@ -1321,9 +1522,11 @@ function handleYylx(sylx) {
   }
   var record = { wjLeixing, createBy, wjSytype };
   if (wjLeixing.value == '6') {
+    console.log('11111111111');
     YinyongTikuListModalpage.value.disableSubmit = false;
     YinyongTikuListModalpage.value.init(record);
   } else {
+    console.log('22222222222');
     YinyongTikuDcListModalpage.value.disableSubmit = false;
     YinyongTikuDcListModalpage.value.init(record);
   }
diff --git a/src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue b/src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue
index 3700b24..a0dba5f 100644
--- a/src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue
+++ b/src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue
@@ -16,6 +16,7 @@
                 <a-select-option value="3">单选</a-select-option>
                 <a-select-option value="4">多选</a-select-option>
                 <a-select-option value="5">填空</a-select-option>
+                <a-select-option value="8">文件</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -43,14 +44,13 @@
       <template #action="{ record }">
         <TableAction :actions="getTableAction(record)"/>
       </template>
+      <template #wjTitleaction="{ record }">
+        <div v-html="record.wjTitle"></div>
+      </template>
       <!--字段回显插槽-->
       <template #htmlSlot="{text}">
          <div v-html="text"></div>
       </template>
-      <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
-        {{ getAreaTextByCode(text) }}
-      </template>
       <template #fileSlot="{text}">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
diff --git a/src/views/kc/wjxWjxxTmlb/TikuList.vue b/src/views/kc/wjxWjxxTmlb/TikuList.vue
index b258d20..32e1f84 100644
--- a/src/views/kc/wjxWjxxTmlb/TikuList.vue
+++ b/src/views/kc/wjxWjxxTmlb/TikuList.vue
@@ -32,6 +32,7 @@
                 <a-select-option value="3">单选</a-select-option>
                 <a-select-option value="4">多选</a-select-option>
                 <a-select-option value="5">填空</a-select-option>
+                <a-select-option value="8">文件</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -59,6 +60,11 @@
       <template #action="{ record }">
         <TableAction :actions="getTableAction(record)" />
       </template>
+      
+      <template #wjTitleaction="{ record }">
+        <div v-html="record.wjTitle"></div>
+      </template>
+      
       <!--字段回显插槽-->
       <template #htmlSlot="{ text }">
         <div v-html="text"></div>
@@ -104,6 +110,7 @@
               <p><a-button type="primary" preIcon="ant-design:check-circle-outlined" @click="addTigan(3)">单选</a-button></p>
               <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(4)">多选</a-button></p>
               <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(5)">填空</a-button></p>
+              <p><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(8)">文件</a-button></p>
             </a-card>
           </a-col>
           <a-col :span="20" style="overflow-y: scroll; min-height: 100px">
@@ -114,35 +121,57 @@
                   <div style="width: 100%" v-if="item.wjType == 3 || item.wjType == '3'">
                     <a-card>
                       <template #title>
-                        <span>{{ index + 1 }}、</span>
-                        <a-textarea
-                          placeholder="请填写单选题题干"
+                        <div>
+                          <a-row>
+                            <a-col :span="12">
+                              <span>{{ index + 1 }}、<span style="color: #c2bfbf">[单选]</span></span>
+                            </a-col>
+                            <a-col :span="12" style="text-align: right;">
+                              <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                                <a-select
+                                  style="width: 120px"
+                                  v-model:value="item.wjScore"
+                                  placeholder="请选择分数"
+                                  v-if="item.wjSfqh == '0'"
+                                  :disabled="editDisabled"
+                                >
+                                  <a-select-option value="5">5</a-select-option>
+                                  <a-select-option value="4">4</a-select-option>
+                                  <a-select-option value="3">3</a-select-option>
+                                  <a-select-option value="2">2</a-select-option>
+                                  <a-select-option value="1">1</a-select-option>
+                                </a-select>
+                                <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                                  >自定义分数</span
+                                >
+                                <a-input-number
+                                  v-model:value="item.wjScore"
+                                  style="width: 120px"
+                                  v-if="item.wjSfqh == '1'"
+                                  :disabled="editDisabled"
+                                ></a-input-number>
+                                <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                                  >返回</span
+                                >
+                              </a-tooltip>
+                              <a-tooltip placement="topRight" title="删除此题"
+                                ><Icon
+                                  icon="ant-design:delete-outlined"
+                                  style="cursor: pointer; font-size: 20px; margin: 10px"
+                                  @click="handleDelTigan(item, index)"
+                                  v-if="!editDisabled"
+                              /></a-tooltip>
+                            </a-col>
+                          </a-row>
+                        </div>
+
+                        <JEditor2 placeholder="请填写文件上传题题干"
                           v-model:value="item.wjTitle"
                           :bordered="false"
-                          :style="{ width: handinpwei(item.wjTitle) }"
+                          :style="{ width: '30rem' }"
                           :auto-size="{ minRows: 1, maxRows: 5 }"
-                        />
-                        <span style="color: #c2bfbf">[单选]</span>
-                      </template>
-                      <template #extra>
-                        <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                          <a-select style="width: 120px" v-model:value="item.wjScore" placeholder="请选择分数" v-if="item.wjSfqh == '0'">
-                            <a-select-option value="5">5</a-select-option>
-                            <a-select-option value="4">4</a-select-option>
-                            <a-select-option value="3">3</a-select-option>
-                            <a-select-option value="2">2</a-select-option>
-                            <a-select-option value="1">1</a-select-option>
-                          </a-select>
-                          <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e">自定义分数</span>
-                          <a-input-number v-model:value="item.wjScore" style="width: 120px" v-if="item.wjSfqh == '1'"></a-input-number>
-                          <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e">返回</span>
-                        </a-tooltip>
-                        <a-tooltip placement="topRight" title="删除此题"
-                          ><Icon
-                            icon="ant-design:delete-outlined"
-                            style="cursor: pointer; font-size: 20px; margin: 10px"
-                            @click="handleDelTigan(item, index)"
-                        /></a-tooltip>
+                          :disabled="editDisabled" v-if="!editDisabled"/>
+                          <div v-else v-html="item.wjTitle"></div>
                       </template>
                       <a-row v-if="isShow">
                         <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
@@ -178,35 +207,56 @@
                   <div style="width: 100%" v-else-if="item.wjType == 4 || item.wjType == '4'">
                     <a-card>
                       <template #title>
-                        <span>{{ index + 1 }}、</span
-                        ><a-textarea
-                          placeholder="请填写多选题题干"
+                        <div>
+                          <a-row>
+                            <a-col :span="12">
+                              <span>{{ index + 1 }}、<span style="color: #c2bfbf">[多选]</span></span>
+                            </a-col>
+                            <a-col :span="12" style="text-align: right;">
+                              <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                                <a-select
+                                  style="width: 120px"
+                                  v-model:value="item.wjScore"
+                                  placeholder="请选择分数"
+                                  v-if="item.wjSfqh == '0'"
+                                  :disabled="editDisabled"
+                                >
+                                  <a-select-option value="5">5</a-select-option>
+                                  <a-select-option value="4">4</a-select-option>
+                                  <a-select-option value="3">3</a-select-option>
+                                  <a-select-option value="2">2</a-select-option>
+                                  <a-select-option value="1">1</a-select-option>
+                                </a-select>
+                                <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                                  >自定义分数</span
+                                >
+                                <a-input-number
+                                  v-model:value="item.wjScore"
+                                  style="width: 120px"
+                                  v-if="item.wjSfqh == '1'"
+                                  :disabled="editDisabled"
+                                ></a-input-number>
+                                <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                                  >返回</span
+                                >
+                              </a-tooltip>
+                              <a-tooltip placement="topRight" title="删除此题"
+                                ><Icon
+                                  icon="ant-design:delete-outlined"
+                                  style="cursor: pointer; font-size: 20px; margin: 10px"
+                                  @click="handleDelTigan(item, index)"
+                                  v-if="!editDisabled"
+                              /></a-tooltip>
+                            </a-col>
+                          </a-row>
+                        </div>
+                        <JEditor2 placeholder="请填写多选题题干"
                           v-model:value="item.wjTitle"
                           :bordered="false"
-                          :style="{ width: handinpwei(item.wjTitle) }"
+                          :style="{ width: '30rem' }"
                           :auto-size="{ minRows: 1, maxRows: 5 }"
-                        />
-                        <span style="color: #c2bfbf">[多选]</span>
-                      </template>
-                      <template #extra>
-                        <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                          <a-select style="width: 120px" v-model:value="item.wjScore" placeholder="请选择分数" v-if="item.wjSfqh == '0'">
-                            <a-select-option value="5">5</a-select-option>
-                            <a-select-option value="4">4</a-select-option>
-                            <a-select-option value="3">3</a-select-option>
-                            <a-select-option value="2">2</a-select-option>
-                            <a-select-option value="1">1</a-select-option>
-                          </a-select>
-                          <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e">自定义分数</span>
-                          <a-input-number v-model:value="item.wjScore" style="width: 120px" v-if="item.wjSfqh == '1'"></a-input-number>
-                          <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e">返回</span>
-                        </a-tooltip>
-                        <a-tooltip placement="topRight" title="删除此题"
-                          ><Icon
-                            icon="ant-design:delete-outlined"
-                            style="cursor: pointer; font-size: 20px; margin: 10px"
-                            @click="handleDelTigan(item, index)"
-                        /></a-tooltip>
+                          :disabled="editDisabled" v-if="!editDisabled"/>
+                          <div v-else v-html="item.wjTitle"></div>
                       </template>
                       <a-row v-if="isShow">
                         <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
@@ -244,35 +294,56 @@
                   <div style="width: 100%" v-else-if="item.wjType == 5 || item.wjType == '5'">
                     <a-card>
                       <template #title>
-                        <span>{{ index + 1 }}、</span
-                        ><a-textarea
-                          placeholder="请填写填空题题干"
+                        <div>
+                          <a-row>
+                            <a-col :span="12">
+                              <span>{{ index + 1 }}、<span style="color: #c2bfbf">[填空]</span></span>
+                            </a-col>
+                            <a-col :span="12" style="text-align: right;">
+                              <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                                <a-select
+                                  style="width: 120px"
+                                  v-model:value="item.wjScore"
+                                  placeholder="请选择分数"
+                                  v-if="item.wjSfqh == '0'"
+                                  :disabled="editDisabled"
+                                >
+                                  <a-select-option value="5">5</a-select-option>
+                                  <a-select-option value="4">4</a-select-option>
+                                  <a-select-option value="3">3</a-select-option>
+                                  <a-select-option value="2">2</a-select-option>
+                                  <a-select-option value="1">1</a-select-option>
+                                </a-select>
+                                <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                                  >自定义分数</span
+                                >
+                                <a-input-number
+                                  v-model:value="item.wjScore"
+                                  style="width: 120px"
+                                  v-if="item.wjSfqh == '1'"
+                                  :disabled="editDisabled"
+                                ></a-input-number>
+                                <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                                  >返回</span
+                                >
+                              </a-tooltip>
+                              <a-tooltip placement="topRight" title="删除此题"
+                                ><Icon
+                                  icon="ant-design:delete-outlined"
+                                  style="cursor: pointer; font-size: 20px; margin: 10px"
+                                  @click="handleDelTigan(item, index)"
+                                  v-if="!editDisabled"
+                              /></a-tooltip>
+                            </a-col>
+                          </a-row>
+                        </div>
+                        <JEditor2 placeholder="请填写填空题题干"
                           v-model:value="item.wjTitle"
                           :bordered="false"
-                          :style="{ width: handinpwei(item.wjTitle) }"
+                          :style="{ width: '30rem' }"
                           :auto-size="{ minRows: 1, maxRows: 5 }"
-                        />
-                        <span style="color: #c2bfbf">[填空]</span>
-                      </template>
-                      <template #extra>
-                        <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                          <a-select style="width: 120px" v-model:value="item.wjScore" placeholder="请选择分数" v-if="item.wjSfqh == '0'">
-                            <a-select-option value="5">5</a-select-option>
-                            <a-select-option value="4">4</a-select-option>
-                            <a-select-option value="3">3</a-select-option>
-                            <a-select-option value="2">2</a-select-option>
-                            <a-select-option value="1">1</a-select-option>
-                          </a-select>
-                          <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e">自定义分数</span>
-                          <a-input-number v-model:value="item.wjScore" style="width: 120px" v-if="item.wjSfqh == '1'"></a-input-number>
-                          <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e">返回</span>
-                        </a-tooltip>
-                        <a-tooltip placement="topRight" title="删除此题"
-                          ><Icon
-                            icon="ant-design:delete-outlined"
-                            style="cursor: pointer; font-size: 20px; margin: 10px"
-                            @click="handleDelTigan(item, index)"
-                        /></a-tooltip>
+                          :disabled="editDisabled" v-if="!editDisabled"/>
+                          <div v-else v-html="item.wjTitle"></div>
                       </template>
                       <a-row v-if="isShow">
                         <a-col :span="24">
@@ -291,40 +362,61 @@
                   <div style="width: 100%" v-else-if="item.wjType == 8 || item.wjType == '8'">
                     <a-card>
                       <template #title>
-                        <span>{{ index + 1 }}、</span>
-                        <a-textarea
-                          placeholder="请填写文件上传题题干"
+                        <div>
+                          <a-row>
+                            <a-col :span="12">
+                              <span>{{ index + 1 }}、<span style="color: #c2bfbf">[文件]</span></span>
+                            </a-col>
+                            <a-col :span="12" style="text-align: right;">
+                              <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                                <a-select
+                                  style="width: 120px"
+                                  v-model:value="item.wjScore"
+                                  placeholder="请选择分数"
+                                  v-if="item.wjSfqh == '0'"
+                                  :disabled="editDisabled"
+                                >
+                                  <a-select-option value="5">5</a-select-option>
+                                  <a-select-option value="4">4</a-select-option>
+                                  <a-select-option value="3">3</a-select-option>
+                                  <a-select-option value="2">2</a-select-option>
+                                  <a-select-option value="1">1</a-select-option>
+                                </a-select>
+                                <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                                  >自定义分数</span
+                                >
+                                <a-input-number
+                                  v-model:value="item.wjScore"
+                                  style="width: 120px"
+                                  v-if="item.wjSfqh == '1'"
+                                  :disabled="editDisabled"
+                                ></a-input-number>
+                                <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                                  >返回</span
+                                >
+                              </a-tooltip>
+                              <a-tooltip placement="topRight" title="删除此题"
+                                ><Icon
+                                  icon="ant-design:delete-outlined"
+                                  style="cursor: pointer; font-size: 20px; margin: 10px"
+                                  @click="handleDelTigan(item, index)"
+                                  v-if="!editDisabled"
+                              /></a-tooltip>
+                            </a-col>
+                          </a-row>
+                        </div>
+                        <JEditor2 placeholder="请填写文件上传题题干"
                           v-model:value="item.wjTitle"
                           :bordered="false"
-                          :style="{ width: handinpwei(item.wjTitle) }"
+                          :style="{ width: '30rem' }"
                           :auto-size="{ minRows: 1, maxRows: 5 }"
-                        />
-                        <span style="color: #c2bfbf">[文件上传]</span>
-                      </template>
-                      <template #extra>
-                        <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                          <a-select style="width: 120px" v-model:value="item.wjScore" placeholder="请选择分数" v-if="item.wjSfqh == '0'">
-                            <a-select-option value="5">5</a-select-option>
-                            <a-select-option value="4">4</a-select-option>
-                            <a-select-option value="3">3</a-select-option>
-                            <a-select-option value="2">2</a-select-option>
-                            <a-select-option value="1">1</a-select-option>
-                          </a-select>
-                          <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e">自定义分数</span>
-                          <a-input-number v-model:value="item.wjScore" style="width: 120px" v-if="item.wjSfqh == '1'"></a-input-number>
-                          <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e">返回</span>
-                        </a-tooltip>
-                        <a-tooltip placement="topRight" title="删除此题"
-                          ><Icon
-                            icon="ant-design:delete-outlined"
-                            style="cursor: pointer; font-size: 20px; margin: 10px"
-                            @click="handleDelTigan(item, index)"
-                        /></a-tooltip>
+                          :disabled="editDisabled" v-if="!editDisabled"/>
+                          <div v-else v-html="item.wjTitle"></div>
                       </template>
                     </a-card>
                   </div>
 
-                  <div v-else> 无对应类型 -{{ item.wjType }}- </div>
+                  <div v-else> 无对应类型 </div>
                 </div>
               </template>
             </draggable>
@@ -359,6 +451,8 @@ import { useMessage } from '/@/hooks/web/useMessage';
 import { useGlobSetting } from '/@/hooks/setting';
 import { downloadByUrl } from '/@/utils/file/download';
 import draggable from 'vuedraggable';
+import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
+import JEditor2 from '/@/components/Form/src/jeecg/components/JEditor2.vue';
 
 //用户相关
 const userStore = useUserStore();
@@ -371,6 +465,7 @@ const tiganData = ref<any>([]);
 const isShow = ref<boolean>(true);
 const mainId = ref<string>('');
 const wjLeixing = ref<string>('6');
+  const editDisabled = ref<boolean>(false);
 // const wjLeixing = ref<string>('');
 //注册model
 const [registerModal, { openModal }] = useModal();
diff --git a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts
index 89fd25d..c9f456a 100644
--- a/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts
+++ b/src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts
@@ -26,7 +26,8 @@ export const columns: BasicColumn[] = [
    {
     title: '问题标题',
     align:"center",
-    dataIndex: 'wjTitle'
+    dataIndex: 'wjTitle',
+    slots: { customRender: 'wjTitleaction' },
    },
    {
     title: '问题分值',
@@ -61,7 +62,8 @@ export const wjdccolumns: BasicColumn[] = [
    {
     title: '问题标题',
     align:"center",
-    dataIndex: 'wjTitle'
+    dataIndex: 'wjTitle',
+    slots: { customRender: 'wjTitleaction' },
    },
    {
     title: '是否公有',
@@ -91,7 +93,8 @@ export const columnsYytk: BasicColumn[] = [
   {
    title: '题干名称',
    align:"center",
-   dataIndex: 'wjTitle'
+   dataIndex: 'wjTitle',
+   slots: { customRender: 'wjTitleaction' },
   },
   {
    title: '题目分值',
@@ -126,7 +129,8 @@ export const columnsYytkdc: BasicColumn[] = [
   {
    title: '题干名称',
    align:"center",
-   dataIndex: 'wjTitle'
+   dataIndex: 'wjTitle',
+   slots: { customRender: 'wjTitleaction' },
   },
   {
    title: '是否公有',
diff --git a/src/views/kc/wjxWjxxTmlb/YinyongTikuDcList.vue b/src/views/kc/wjxWjxxTmlb/YinyongTikuDcList.vue
index bd0dec3..6d5f143 100644
--- a/src/views/kc/wjxWjxxTmlb/YinyongTikuDcList.vue
+++ b/src/views/kc/wjxWjxxTmlb/YinyongTikuDcList.vue
@@ -17,6 +17,7 @@
                 <a-select-option value="3">单选</a-select-option>
                 <a-select-option value="4">多选</a-select-option>
                 <a-select-option value="5">填空</a-select-option>
+                <a-select-option value="8">文件</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -39,14 +40,13 @@
       <template #action="{ record }">
         <TableAction :actions="getTableAction(record)"/>
       </template>
+      <template #wjTitleaction="{ record }">
+        <div v-html="record.wjTitle"></div>
+      </template>
       <!--字段回显插槽-->
       <template #htmlSlot="{text}">
          <div v-html="text"></div>
       </template>
-      <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
-        {{ getAreaTextByCode(text) }}
-      </template>
       <template #fileSlot="{text}">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
diff --git a/src/views/kc/wjxWjxxTmlb/YinyongTikuList.vue b/src/views/kc/wjxWjxxTmlb/YinyongTikuList.vue
index 9501787..86f18e1 100644
--- a/src/views/kc/wjxWjxxTmlb/YinyongTikuList.vue
+++ b/src/views/kc/wjxWjxxTmlb/YinyongTikuList.vue
@@ -44,9 +44,8 @@
       <template #htmlSlot="{text}">
          <div v-html="text"></div>
       </template>
-      <!--省市区字段回显插槽-->
-      <template #pcaSlot="{text}">
-        {{ getAreaTextByCode(text) }}
+      <template #wjTitleaction="{ record }">
+        <div v-html="record.wjTitle"></div>
       </template>
       <template #fileSlot="{text}">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
diff --git a/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue
index dafdd98..8776831 100644
--- a/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue
+++ b/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue
@@ -8,43 +8,49 @@
             <div style="width: 100%" v-if="item.wjType == 3 || item.wjType == '3'">
               <a-card>
                 <template #title>
-                  <span>{{ index + 1 }}、</span>
-                  <a-textarea
-                    placeholder="请填写单选题题干"
+                  <div>
+                    <a-row>
+                      <a-col :span="12">
+                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[单选]</span></span>
+                      </a-col>
+                      <a-col :span="12" style="text-align: right;">
+                        <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                          <a-select
+                            style="width: 120px"
+                            v-model:value="item.wjScore"
+                            placeholder="请选择分数"
+                            v-if="item.wjSfqh == '0'"
+                            :disabled="editDisabled"
+                          >
+                            <a-select-option value="5">5</a-select-option>
+                            <a-select-option value="4">4</a-select-option>
+                            <a-select-option value="3">3</a-select-option>
+                            <a-select-option value="2">2</a-select-option>
+                            <a-select-option value="1">1</a-select-option>
+                          </a-select>
+                          <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                            >自定义分数</span
+                          >
+                          <a-input-number
+                            v-model:value="item.wjScore"
+                            style="width: 120px"
+                            v-if="item.wjSfqh == '1'"
+                            :disabled="editDisabled"
+                          ></a-input-number>
+                          <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                            >返回</span
+                          >
+                        </a-tooltip>
+                      </a-col>
+                    </a-row>
+                  </div>
+                  <JEditor2 placeholder="请填写文件上传题题干"
                     v-model:value="item.wjTitle"
                     :bordered="false"
-                    :style="{ width: handinpwei(item.wjTitle) }"
+                    :style="{ width: '30rem' }"
                     :auto-size="{ minRows: 1, maxRows: 5 }"
-                    :disabled="editDisabled"
-                  />
-                  <span style="color: #c2bfbf">[单选]</span>
-                </template>
-                <template #extra>
-                  <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                    <a-select
-                      style="width: 120px"
-                      v-model:value="item.wjScore"
-                      placeholder="请选择分数"
-                      v-if="item.wjSfqh == '0'"
-                      :disabled="editDisabled"
-                    >
-                      <a-select-option value="5">5</a-select-option>
-                      <a-select-option value="4">4</a-select-option>
-                      <a-select-option value="3">3</a-select-option>
-                      <a-select-option value="2">2</a-select-option>
-                      <a-select-option value="1">1</a-select-option>
-                    </a-select>
-                    <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
-                      >自定义分数</span
-                    >
-                    <a-input-number
-                      v-model:value="item.wjScore"
-                      style="width: 120px"
-                      v-if="item.wjSfqh == '1'"
-                      :disabled="editDisabled"
-                    ></a-input-number>
-                    <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled">返回</span>
-                  </a-tooltip>
+                    :disabled="editDisabled" v-if="!editDisabled"/>
+                    <div v-else v-html="item.wjTitle"></div>
                 </template>
                 <a-row v-if="isShow">
                   <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
@@ -57,7 +63,6 @@
                         v-model:value="tmxx.itemTitle"
                         :style="{ width: handinpwei(tmxx.itemTitle) }"
                         :bordered="false"
-                        :disabled="editDisabled"
                       />
                       <span style="color: #ecb646" v-if="item.itemSelected == tmxx.itemIndex">(正确答案)</span>
                       <a-tooltip placement="topLeft" title="在下方添加新的选项"
@@ -65,14 +70,12 @@
                           icon="ant-design:plus-circle-outlined"
                           style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
                           @click="handleAddTmxx(tmxx, index, item.wjxWjxxTmxxList)"
-                          v-if="!editDisabled"
                       /></a-tooltip>
                       <a-tooltip placement="topLeft" title="删除选项"
                         ><Icon
                           icon="ant-design:minus-circle-outlined"
                           style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
                           @click="handleRemTmxx(tmxx, index, item.wjxWjxxTmxxList)"
-                          v-if="!editDisabled"
                       /></a-tooltip>
                     </a-radio>
                   </div>
@@ -83,43 +86,49 @@
             <div style="width: 100%" v-else-if="item.wjType == 4 || item.wjType == '4'">
               <a-card>
                 <template #title>
-                  <span>{{ index + 1 }}、</span
-                  ><a-textarea
-                    placeholder="请填写多选题题干"
+                  <div>
+                    <a-row>
+                      <a-col :span="12">
+                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[多选]</span></span>
+                      </a-col>
+                      <a-col :span="12" style="text-align: right;">
+                        <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                          <a-select
+                            style="width: 120px"
+                            v-model:value="item.wjScore"
+                            placeholder="请选择分数"
+                            v-if="item.wjSfqh == '0'"
+                            :disabled="editDisabled"
+                          >
+                            <a-select-option value="5">5</a-select-option>
+                            <a-select-option value="4">4</a-select-option>
+                            <a-select-option value="3">3</a-select-option>
+                            <a-select-option value="2">2</a-select-option>
+                            <a-select-option value="1">1</a-select-option>
+                          </a-select>
+                          <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                            >自定义分数</span
+                          >
+                          <a-input-number
+                            v-model:value="item.wjScore"
+                            style="width: 120px"
+                            v-if="item.wjSfqh == '1'"
+                            :disabled="editDisabled"
+                          ></a-input-number>
+                          <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                            >返回</span
+                          >
+                        </a-tooltip>
+                      </a-col>
+                    </a-row>
+                  </div>
+                  <JEditor2 placeholder="请填写多选题题干"
                     v-model:value="item.wjTitle"
                     :bordered="false"
-                    :style="{ width: handinpwei(item.wjTitle) }"
+                    :style="{ width: '30rem' }"
                     :auto-size="{ minRows: 1, maxRows: 5 }"
-                    :disabled="editDisabled"
-                  />
-                  <span style="color: #c2bfbf">[多选]</span>
-                </template>
-                <template #extra>
-                  <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                    <a-select
-                      style="width: 120px"
-                      v-model:value="item.wjScore"
-                      placeholder="请选择分数"
-                      v-if="item.wjSfqh == '0'"
-                      :disabled="editDisabled"
-                    >
-                      <a-select-option value="5">5</a-select-option>
-                      <a-select-option value="4">4</a-select-option>
-                      <a-select-option value="3">3</a-select-option>
-                      <a-select-option value="2">2</a-select-option>
-                      <a-select-option value="1">1</a-select-option>
-                    </a-select>
-                    <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
-                      >自定义分数</span
-                    >
-                    <a-input-number
-                      v-model:value="item.wjScore"
-                      style="width: 120px"
-                      v-if="item.wjSfqh == '1'"
-                      :disabled="editDisabled"
-                    ></a-input-number>
-                    <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled">返回</span>
-                  </a-tooltip>
+                    :disabled="editDisabled" v-if="!editDisabled"/>
+                    <div v-else v-html="item.wjTitle"></div>
                 </template>
                 <a-row v-if="isShow">
                   <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
@@ -134,7 +143,6 @@
                           v-model:value="tmxx.itemTitle"
                           :bordered="false"
                           :style="{ width: handinpwei(tmxx.itemTitle) }"
-                          :disabled="editDisabled"
                       /></a-checkbox>
                       <span style="color: #ecb646" v-if="cheGrp(item.itemSelected, tmxx.itemIndex)">(正确答案)</span>
                       <a-tooltip placement="topLeft" title="在下方添加新的选项"
@@ -142,7 +150,12 @@
                           icon="ant-design:plus-circle-outlined"
                           style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
                           @click="handleAddTmxx(tmxx, index, item.wjxWjxxTmxxList)"
-                          v-if="!editDisabled"
+                      /></a-tooltip>
+                      <a-tooltip placement="topLeft" title="删除选项"
+                        ><Icon
+                          icon="ant-design:minus-circle-outlined"
+                          style="cursor: pointer; margin: 5px; font-size: 20px; color: #1890ff"
+                          @click="handleRemTmxx(tmxx, index, item.wjxWjxxTmxxList)"
                       /></a-tooltip>
                     </a-col>
                   </a-row>
@@ -153,53 +166,57 @@
             <div style="width: 100%" v-else-if="item.wjType == 5 || item.wjType == '5'">
               <a-card>
                 <template #title>
-                  <span>{{ index + 1 }}、</span
-                  ><a-textarea
-                    placeholder="请填写填空题题干"
+                  <div>
+                    <a-row>
+                      <a-col :span="12">
+                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[填空]</span></span>
+                      </a-col>
+                      <a-col :span="12" style="text-align: right;">
+                        <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                          <a-select
+                            style="width: 120px"
+                            v-model:value="item.wjScore"
+                            placeholder="请选择分数"
+                            v-if="item.wjSfqh == '0'"
+                            :disabled="editDisabled"
+                          >
+                            <a-select-option value="5">5</a-select-option>
+                            <a-select-option value="4">4</a-select-option>
+                            <a-select-option value="3">3</a-select-option>
+                            <a-select-option value="2">2</a-select-option>
+                            <a-select-option value="1">1</a-select-option>
+                          </a-select>
+                          <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                            >自定义分数</span
+                          >
+                          <a-input-number
+                            v-model:value="item.wjScore"
+                            style="width: 120px"
+                            v-if="item.wjSfqh == '1'"
+                            :disabled="editDisabled"
+                          ></a-input-number>
+                          <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                            >返回</span
+                          >
+                        </a-tooltip>
+                      </a-col>
+                    </a-row>
+                  </div>
+                  <JEditor2 placeholder="请填写填空题题干"
                     v-model:value="item.wjTitle"
                     :bordered="false"
-                    :style="{ width: handinpwei(item.wjTitle) }"
+                    :style="{ width: '30rem' }"
                     :auto-size="{ minRows: 1, maxRows: 5 }"
-                    :disabled="editDisabled"
-                  />
-                  <span style="color: #c2bfbf">[填空]</span>
-                </template>
-                <template #extra>
-                  <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                    <a-select
-                      style="width: 120px"
-                      v-model:value="item.wjScore"
-                      placeholder="请选择分数"
-                      v-if="item.wjSfqh == '0'"
-                      :disabled="editDisabled"
-                    >
-                      <a-select-option value="5">5</a-select-option>
-                      <a-select-option value="4">4</a-select-option>
-                      <a-select-option value="3">3</a-select-option>
-                      <a-select-option value="2">2</a-select-option>
-                      <a-select-option value="1">1</a-select-option>
-                    </a-select>
-                    <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
-                      >自定义分数</span
-                    >
-                    <a-input-number
-                      v-model:value="item.wjScore"
-                      style="width: 120px"
-                      v-if="item.wjSfqh == '1'"
-                      :disabled="editDisabled"
-                    ></a-input-number>
-                    <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled">返回</span>
-                  </a-tooltip>
+                    :disabled="editDisabled" v-if="!editDisabled"/>
+                    <div v-else v-html="item.wjTitle"></div>
                 </template>
                 <a-row v-if="isShow">
                   <a-col :span="24">
                     <a-textarea
                       placeholder="请填写答案"
                       v-model:value="item.wjAnswer"
-                      :bordered="false"
                       style="width: 100%"
                       :auto-size="{ minRows: 1, maxRows: 5 }"
-                      :disabled="editDisabled"
                     />
                   </a-col>
                 </a-row>
@@ -209,43 +226,49 @@
             <div style="width: 100%" v-else-if="item.wjType == 8 || item.wjType == '8'">
               <a-card>
                 <template #title>
-                  <span>{{ index + 1 }}、</span>
-                  <a-textarea
-                    placeholder="请填写文件上传题题干"
+                  <div>
+                    <a-row>
+                      <a-col :span="12">
+                        <span>{{ index + 1 }}、<span style="color: #c2bfbf">[文件]</span></span>
+                      </a-col>
+                      <a-col :span="12" style="text-align: right;">
+                        <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                          <a-select
+                            style="width: 120px"
+                            v-model:value="item.wjScore"
+                            placeholder="请选择分数"
+                            v-if="item.wjSfqh == '0'"
+                            :disabled="editDisabled"
+                          >
+                            <a-select-option value="5">5</a-select-option>
+                            <a-select-option value="4">4</a-select-option>
+                            <a-select-option value="3">3</a-select-option>
+                            <a-select-option value="2">2</a-select-option>
+                            <a-select-option value="1">1</a-select-option>
+                          </a-select>
+                          <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                            >自定义分数</span
+                          >
+                          <a-input-number
+                            v-model:value="item.wjScore"
+                            style="width: 120px"
+                            v-if="item.wjSfqh == '1'"
+                            :disabled="editDisabled"
+                          ></a-input-number>
+                          <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                            >返回</span
+                          >
+                        </a-tooltip>
+                      </a-col>
+                    </a-row>
+                  </div>
+                  <JEditor2 placeholder="请填写文件上传题题干"
                     v-model:value="item.wjTitle"
                     :bordered="false"
-                    :style="{ width: handinpwei(item.wjTitle) }"
-                    :auto-size="{ minRows: 1, maxRows: 5 }"
-                    :disabled="editDisabled"
-                  />
-                  <span style="color: #c2bfbf">[文件上传]</span>
-                </template>
-                <template #extra>
-                  <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
-                    <a-select
-                      style="width: 120px"
-                      v-model:value="item.wjScore"
-                      placeholder="请选择分数"
-                      v-if="item.wjSfqh == '0'"
-                      :disabled="editDisabled"
-                    >
-                      <a-select-option value="5">5</a-select-option>
-                      <a-select-option value="4">4</a-select-option>
-                      <a-select-option value="3">3</a-select-option>
-                      <a-select-option value="2">2</a-select-option>
-                      <a-select-option value="1">1</a-select-option>
-                    </a-select>
-                    <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
-                      >自定义分数</span
-                    >
-                    <a-input-number
-                      v-model:value="item.wjScore"
-                      style="width: 120px"
-                      v-if="item.wjSfqh == '1'"
-                      :disabled="editDisabled"
-                    ></a-input-number>
-                    <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled">返回</span>
-                  </a-tooltip>
+                    :style="{ width: '30rem' }"
+                    :auto-size="{ minRows: 5, maxRows: 5 }"
+                    :disabled="editDisabled" v-if="!editDisabled"/>
+                    <div v-else v-html="item.wjTitle"></div>
                 </template>
               </a-card>
             </div>
@@ -256,24 +279,6 @@
       </draggable>
     </a-form>
 
-    <!-- 子表单区域 -->
-    <!-- <a-tabs v-model:activeKey="activeKey" animated v-if="!formData.wjAnswer">
-      <a-tab-pane tab="选项信息2" key="wjxWjxxTmxx" :forceRender="true">
-        <j-vxe-table
-          :keep-source="true"
-          resizable
-          ref="wjxWjxxTmxxTableRef"
-          :loading="wjxWjxxTmxxTable.loading"
-          :columns="wjxWjxxTmxxTable.columns"
-          :dataSource="wjxWjxxTmxxTable.dataSource"
-          :height="340"
-          :disabled="disabled"
-          :rowNumber="true"
-          :rowSelection="false"
-          :toolbar="false">
-          </j-vxe-table>
-      </a-tab-pane>
-    </a-tabs> -->
   </a-spin>
 </template>
 
@@ -286,6 +291,7 @@ import { JVxeTable } from '/@/components/jeecg/JVxeTable';
 import { wjxWjxxTmxxColumns, wjxWjdcColumns } from '../WjxWjxxTmlb.data';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { Form } from 'ant-design-vue';
+import JEditor2 from '/@/components/Form/src/jeecg/components/JEditor2.vue';
 import draggable from 'vuedraggable';
 const useForm = Form.useForm;
 
@@ -294,6 +300,7 @@ export default defineComponent({
   components: {
     JVxeTable,
     draggable,
+    JEditor2,
   },
   props: {
     formDisabled: {