update

src/common/axios.config.js

@@ -28,7 +28,7 @@ axios.interceptors.request.use((config) => {
     // }
     if (config.url === 'https://gpt.cocorobo.cn/search_image' || config.url === 'https://gpt.cocorobo.cn/chat' || config.url === 'https://gpt4.cocorobo.cn/create_free_assistants' || config.url === 'https://gpt4.cocorobo.cn/assistants_completion_response') {
         config.data = config.data//序列化post 参数
-    } else if (config.url.indexOf('https://gpt4.cocorobo.cn/') != -1 || config.url.indexOf('https://claude3.cocorobo.cn/') != -1 || config.url.indexOf('https://llm.cocorobo.cn/') != -1 || config.url.indexOf('http://gpt4.cocorobo.cn/') != -1) {
+    } else if (config.url.indexOf('https://gpt4.cocorobo.cn/') != -1 || config.url.indexOf('https://claude3.cocorobo.cn/') != -1 || config.url.indexOf('https://llm.cocorobo.cn/') != -1) {
         config.headers = {
             'Content-Type': 'application/json',
         }

src/components/pages/classroomObservation/components/addNewTeacherVoiceprintDialog.vue

@@ -29,7 +29,7 @@
           <div class="a_b_b_top">
             <span>请使用正常语速朗读以上内容</span>
           </div>
-          <div class="a_b_b_bottom">
+          <div class="a_b_b_bottom" :style="status==0?`justify-content:center`:''">
             <div class="a_b_b_b_btn" @click.stop="start()" v-if="status === 0">
               <svg width="16" height="22" viewBox="0 0 16 22" fill="none" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd" clip-rule="evenodd"
@@ -48,7 +48,7 @@
               <span>{{ recorderCountdown }}</span>
             </div>
 
-            <div class="a_b_b_b_record">
+            <div class="a_b_b_b_record" v-if="status!=0">
               <div class="a_b_b_b_r_left">
                 <!-- <img src="../../../../assets/icon/classroomObservation/recordLeft.png" alt=""> -->
                 <div>

src/components/pages/classroomObservation/components/analysisItem.vue

@@ -4,13 +4,17 @@
     ref="analysisItemRef"
     :style="
       `top:${moveTop}px;transition:${isDragging ? '0' : '.3s'}s;${
-        isDragging ? 'z-index:999' : ''
-      }`
+        isDragging ? 'z-index:999;' : ''
+      }${isDrag ? 'cursor:move' : ''}`
     "
-		@mousedown="moveDown($event)"
+    @mousedown="moveDown($event)"
   >
     <div class="ai-header">
-      <div class="ai-h-left" @click="changeOpenItem(!openItem)">
+      <div
+        class="ai-h-left"
+        :style="`${isDrag ? 'cursor:move' : ''}`"
+        @click="changeOpenItem(!openItem)"
+      >
         <span
           :class="['ai-h-l-icon', openItem ? 'ai-h-l-iconActive' : '']"
         ></span>
@@ -54,7 +58,10 @@
         </el-tooltip>
       </div>
       <div class="ai-h-right">
-        <span style="width: 100px;" class="generateError" v-if="loadNum == 2&& !isDrag"
+        <span
+          style="width: 100px;"
+          class="generateError"
+          v-if="loadNum == 2 && !isDrag"
           >优化失败
         </span>
         <span style="width: 100px" v-if="loadNum == 1 && !isDrag">
@@ -114,7 +121,6 @@
           </el-tooltip>
         </span>
 
-
         <span
           v-if="loadNum != 1 && openItem && !isDrag"
           :class="[
@@ -136,7 +142,10 @@
           </el-tooltip>
         </span>
 
-        <span v-if="loadNum != 1 && openItem && tid && !isDrag" @click="editBtn()">
+        <span
+          v-if="loadNum != 1 && openItem && tid && !isDrag"
+          @click="editBtn()"
+        >
           <el-tooltip
             class="item"
             effect="light"
@@ -156,7 +165,8 @@
             loadNum != 1 &&
               openItem &&
               tid &&
-              ['1', '2', '3'].includes(data.jsonData.echartsType) && !isDrag
+              ['1', '2', '3'].includes(data.jsonData.echartsType) &&
+              !isDrag
           "
           @click="editEcharts()"
         >
@@ -345,7 +355,7 @@ export default {
   },
   methods: {
     changeOpenItem(newValue) {
-			if(this.isDrag)return;
+      if (this.isDrag) return;
       if (this.loading == true && this.loadNum != 0)
         return this.$message("请稍后...");
       this.loadNum = 0;
@@ -923,7 +933,7 @@ export default {
       return `#${randomHex()}${randomHex()}${randomHex()}`;
     },
     moveDown(e) {
-			if(!this.isDrag)return;
+      if (!this.isDrag) return;
       this.isDragging = true;
       this.startY = e.clientY;
       this.$nextTick(() => {
@@ -932,15 +942,23 @@ export default {
             ...this.$parent.$parent.$refs[`analysis_${i.value}`][0].$refs
               .dragBoxRefTop
           );
-					if(this.$parent.$parent.$refs[`analysis_${i.value}`][0].$refs.dragBoxRefBottom.length>0){
-						this.dragBoxList.push(
-            ...this.$parent.$parent.$refs[`analysis_${i.value}`][0].$refs
+          if (
+            this.$parent.$parent.$refs[`analysis_${i.value}`][0].$refs
+              .dragBoxRefBottom.length > 0
+          ) {
+            this.dragBoxList.push(
+              ...this.$parent.$parent.$refs[`analysis_${i.value}`][0].$refs
+                .dragBoxRefBottom
+            );
+          } else if (
+            this.$parent.$parent.$refs[`analysis_${i.value}`][0].$refs
               .dragBoxRefBottom
-          );
-					}else if(this.$parent.$parent.$refs[`analysis_${i.value}`][0].$refs.dragBoxRefBottom){
-						this.dragBoxList.push(this.$parent.$parent.$refs[`analysis_${i.value}`][0].$refs.dragBoxRefBottom);
-					}
-          
+          ) {
+            this.dragBoxList.push(
+              this.$parent.$parent.$refs[`analysis_${i.value}`][0].$refs
+                .dragBoxRefBottom
+            );
+          }
         });
         // 禁用页面文本选择
         document.body.style.userSelect = "none";
@@ -985,18 +1003,19 @@ export default {
     stopDragging(e) {
       this.isDragging = false;
       try {
-        for (let i = 0; i <= this.dragBoxList.length; i++) {
+        const analysisItemRect = this.$refs.analysisItemRef.getBoundingClientRect();
+        this.enterDrag = null; // 初始化enterDrag为null
+        for (let i = 0; i < this.dragBoxList.length; i++) {
           let _i = this.dragBoxList[i].getBoundingClientRect();
+          // 判断this.$refs.analysisItemRef是否与dragBoxList中的某个元素相交
           if (
-            e.clientX >= _i.left &&
-            e.clientX <= _i.right &&
-            e.clientY >= _i.top &&
-            e.clientY <= _i.bottom
+            analysisItemRect.left < _i.right &&
+            analysisItemRect.right > _i.left &&
+            analysisItemRect.top < _i.bottom &&
+            analysisItemRect.bottom > _i.top
           ) {
             this.enterDrag = this.dragBoxList[i];
             break;
-          } else {
-            this.enterDrag = null;
           }
         }
         // 恢复页面的文本选择
@@ -1004,18 +1023,21 @@ export default {
         if (!this.enterDrag) {
           this.moveTop = 0;
         } else {
-					this.moveTop = 0;
-					let moveData = this.enterDrag.getAttribute('type');
-					this.$emit("moveAnalysis",{form:`${this.data.Type}_${this.index}_${this.data.tIndex}`,to:moveData})
+          this.moveTop = 0;
+          let moveData = this.enterDrag.getAttribute("type");
+          this.$emit("moveAnalysis", {
+            form: `${this.data.Type}_${this.index}_${this.data.tIndex}`,
+            to: moveData
+          });
         }
         // 移除全局的鼠标移动和释放事件
         document.removeEventListener("mousemove", this.onMouseMove);
         document.removeEventListener("mouseup", this.stopDragging);
       } catch (error) {
-				this.moveTop = 0;
-				document.removeEventListener("mousemove", this.onMouseMove);
+        this.moveTop = 0;
+        document.removeEventListener("mousemove", this.onMouseMove);
         document.removeEventListener("mouseup", this.stopDragging);
-			}
+      }
     }
   },
   mounted() {

src/components/pages/classroomObservation/components/bindingFormDialog.vue

@@ -33,7 +33,7 @@
 				</div>
 			</div>
 			<div class="bfd_box">
-				<el-table :data="list" border  v-loading="loading">
+				<el-table :data="list" border  v-loading="loading" height="560">
 					<el-table-column
 						prop="title"
 						label="标题"

src/components/pages/test/add/components/GapFilling/gap.vue

@@ -8,16 +8,12 @@
       <!-- <div class="title"><div>{{ `（${option[cJson.type].name}）` }}</div><div v-html="cJson.title"></div></div> -->
       <div class="title">
         <div style="display: flex;">
-          <span
-					 @click.stop="updateTitle()"
-            style="min-width:fit-content"
-            >{{ `（${option[cJson.type].name}）` }}</span
-          >
-          <span
-            v-if="!updateList.title"
-            @click.stop="updateTitle()"
-            >{{ cJson.title }}</span
-          >
+          <span @click.stop="updateTitle()" style="min-width:fit-content">{{
+            `（${option[cJson.type].name}）`
+          }}</span>
+          <span v-if="!updateList.title" @click.stop="updateTitle()">{{
+            cJson.title
+          }}</span>
           <input
             v-if="updateList.title"
             ref="titleRef"
@@ -34,15 +30,22 @@
         <span
           style="color: #efa030;display: flex;margin-top: 5px;line-height: 18px;"
         >
-          <span style="min-width: fit-content;" @click.stop="updateAnswer()" v-if="!cJson.answer && !updateList.answer"
+          <span
+            style="min-width: fit-content;"
+            @click.stop="updateAnswer()"
+            v-if="!cJson.answer && !updateList.answer"
             >暂无参考答案</span
           >
           <span style="min-width: fit-content;display: flex;" v-else>
-            <span style="min-width: fit-content;" @click.stop="updateAnswer()">参考答案：</span>
-            <span v-if="!updateList.answer" @click.stop="updateAnswer()">{{ cJson.answer }}</span>
+            <span style="min-width: fit-content;" @click.stop="updateAnswer()"
+              >参考答案：</span
+            >
+            <span v-if="!updateList.answer" @click.stop="updateAnswer()">{{
+              cJson.answer
+            }}</span>
           </span>
 
-					<input
+          <input
             v-if="updateList.answer"
             ref="answerRef"
             class="editInput answerInput"
@@ -73,14 +76,17 @@ export default {
     cJson: {
       type: Object
     },
+    cJson2: {
+      type: Object
+    },
     isOpen: {
       type: Boolean,
       default: false
     },
-		index:{
-			type:String,
-			default:""
-		}
+    index: {
+      type: String,
+      default: ""
+    }
   },
   data() {
     return {
@@ -99,12 +105,25 @@ export default {
   watch: {
     checkJson: {
       handler(newVal) {
-				// console.log("测试测试保存",newVal)
-        this.$emit("setJson", newVal,this.index);
+        // console.log("测试测试保存",newVal)
+        this.$emit("setJson", newVal, this.index);
         console.log("gapW", this.cJson);
       },
       deep: true
     },
+    isOpen(newValue) {
+      if (newValue) {
+        if (!this.cJson2 || Object.keys(this.cJson2).length == 0) {
+          this.checkJson = {
+            title: "标题",
+            type: 1,
+            answer: ""
+          };
+        } else {
+          this.checkJson = this.depthCopy(this.cJson2);
+        }
+      }
+    }
   },
   methods: {
     depthCopy(s) {
@@ -123,13 +142,13 @@ export default {
         this.$refs["titleRef"].focus();
       });
     },
-		updateAnswer(){
-			this.updateList.answer = true;
-			this.$nextTick(() => {
+    updateAnswer() {
+      this.updateList.answer = true;
+      this.$nextTick(() => {
         // 聚焦到输入框
         this.$refs["answerRef"].focus();
       });
-		},
+    },
     save() {
       for (let key in this.updateList) {
         this.updateList[key] = false;
@@ -137,15 +156,7 @@ export default {
     }
   },
   mounted() {
-    if (!this.cJson || Object.keys(this.cJson).length == 0) {
-      this.checkJson = {
-        title: "标题",
-        type: 1,
-        answer: ""
-      };
-    } else {
-      this.checkJson = this.depthCopy(this.cJson);
-    }
+		
   }
 };
 </script>

src/components/pages/test/add/components/checkOrder.vue

@@ -79,43 +79,43 @@
                             <div v-if="item3.ttype == 1 && canEdit.indexOf(item3.type) !== -1 && etype == 'edit'"
                                 class="edit_box">
                                 <div v-if="item3.type == 1">
-                                    <choiceX :cJson="item3.json" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 1 && checkC === `x${index1}-${index2}-${index3}`"></choiceX>
+                                    <choiceX :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 1 && checkC === `x${index1}-${index2}-${index3}`"></choiceX>
                                     <!-- <choiceDialog v-if="item3.type == 1 && checkC === `x${index1}-${index2}-${index3}`"
                                         :cJson="cJson" @setJson="setJson">
                                     </choiceDialog> -->
                                 </div>
                                 <div v-if="item3.type == 3">
-                                    <gapX :cJson="item3.json" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 3 && checkC === `x${index1}-${index2}-${index3}`"></gapX>
+                                    <gapX :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 3 && checkC === `x${index1}-${index2}-${index3}`"></gapX>
                                     <!-- <gapDialog v-if="item3.type == 3 && checkC === `x${index1}-${index2}-${index3}`"
                                         :cJson="cJson" @setJson="setJson">
                                     </gapDialog> -->
                                 </div>
                                 <div v-if="item3.type == 5">
-                                    <fileX :cJson="item3.json" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 5 && checkC === `x${index1}-${index2}-${index3}`"></fileX>
+                                    <fileX :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 5 && checkC === `x${index1}-${index2}-${index3}`"></fileX>
                                     <!-- <fileDialog v-if="item3.type == 5 && checkC === `x${index1}-${index2}-${index3}`"
                                         :cJson="cJson" @setJson="setJson">
                                     </fileDialog> -->
                                 </div>
                                 <div v-if="item3.type == 6">
-                                    <courseX :cJson="item3.json" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 6 && checkC === `x${index1}-${index2}-${index3}`"></courseX>
+                                    <courseX :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 6 && checkC === `x${index1}-${index2}-${index3}`"></courseX>
                                     <!-- <courseDialog v-if="item3.type == 6 && checkC === `x${index1}-${index2}-${index3}`"
                                         :cJson="cJson" @setJson="setJson">
                                     </courseDialog> -->
                                 </div>
                                 <div v-if="item3.type == 7">
-                                    <evaX :cJson="item3.json" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 7 && checkC === `x${index1}-${index2}-${index3}`"></evaX>
+                                    <evaX :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 7 && checkC === `x${index1}-${index2}-${index3}`"></evaX>
                                     <!-- <evaDialog v-if="item3.type == 7 && checkC === `x${index1}-${index2}-${index3}`"
                                         :cJson="cJson" @setJson="setJson">
                                     </evaDialog> -->
                                 </div>
                                 <div v-if="item3.type == 8">
-                                    <timeX :cJson="item3.json" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 8 && checkC === `x${index1}-${index2}-${index3}`"></timeX>
+                                    <timeX :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 8 && checkC === `x${index1}-${index2}-${index3}`"></timeX>
                                     <!-- <timeDialog v-if="item3.type == 8 && checkC === `x${index1}-${index2}-${index3}`"
                                         :cJson="cJson" @setJson="setJson">
                                     </timeDialog> -->
                                 </div>
                                 <div v-if="item3.type == 11">
-                                    <courseX2 :cJson="item3.json" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 11 && checkC === `x${index1}-${index2}-${index3}`"></courseX2>
+                                    <courseX2 :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 11 && checkC === `x${index1}-${index2}-${index3}`"></courseX2>
                                     <!-- <courseDialog2 v-if="item3.type == 11 && checkC === `x${index1}-${index2}-${index3}`"
                                         :cJson="cJson" @setJson="setJson">
                                     </courseDialog2>-->
@@ -129,37 +129,37 @@
                     <div v-else-if="item2.ttype == 1 && canEdit.indexOf(item2.type) !== -1 && etype == 'edit'"
                         class="edit_box">
                         <div v-if="item2.type == 1">
-                            <choiceX :cJson="item2.json" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 1 && checkC === `x${index1}-${index2}`"></choiceX>
+                            <choiceX :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 1 && checkC === `x${index1}-${index2}`"></choiceX>
                             <!-- <choiceDialog v-if="item2.type == 1 && checkC === `x${index1}-${index2}`" :cJson="cJson"
                                 @setJson="setJson"></choiceDialog> -->
                         </div>
                         <div v-else-if="item2.type == 3">
-                            <gapX :cJson="item2.json" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 3 && checkC === `x${index1}-${index2}`"></gapX>
+                            <gapX :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 3 && checkC === `x${index1}-${index2}`"></gapX>
                             <!-- <gapDialog v-if="item2.type == 3 && checkC === `x${index1}-${index2}`" :cJson="cJson"
                                 @setJson="setJson"></gapDialog> -->
                         </div>
                         <div v-else-if="item2.type == 5">
-                            <fileX :cJson="item2.json" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 5 && checkC === `x${index1}-${index2}`"></fileX>
+                            <fileX :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 5 && checkC === `x${index1}-${index2}`"></fileX>
                             <!-- <fileDialog v-if="item2.type == 5 && checkC === `x${index1}-${index2}`" :cJson="cJson"
                                 @setJson="setJson"></fileDialog> -->
                         </div>
                         <div v-else-if="item2.type == 6">
-                            <courseX :cJson="item2.json" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 6 && checkC === `x${index1}-${index2}`"></courseX>
+                            <courseX :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 6 && checkC === `x${index1}-${index2}`"></courseX>
                             <!-- <courseDialog v-if="item2.type == 6 && checkC === `x${index1}-${index2}`" :cJson="cJson"
                                 @setJson="setJson"></courseDialog> -->
                         </div>
                         <div v-else-if="item2.type == 7">
-                            <evaX :cJson="item2.json" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 7 && checkC === `x${index1}-${index2}`"></evaX>
+                            <evaX :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 7 && checkC === `x${index1}-${index2}`"></evaX>
                             <!-- <evaDialog v-if="item2.type == 7 && checkC === `x${index1}-${index2}`" :cJson="cJson"
                                 @setJson="setJson"></evaDialog> -->
                         </div>
                         <div v-else-if="item2.type == 8">
-                            <timeX :cJson="item2.json" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 8 && checkC === `x${index1}-${index2}`"></timeX>
+                            <timeX :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 8 && checkC === `x${index1}-${index2}`"></timeX>
                             <!-- <timeDialog v-if="item2.type == 8 && checkC === `x${index1}-${index2}`" :cJson="cJson"
                                 @setJson="setJson"></timeDialog> -->
                         </div>
                         <div v-else-if="item2.type == 11">
-                            <courseX2 :cJson="item2.json" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 11 && checkC === `x${index1}-${index2}`"></courseX2>
+                            <courseX2 :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 11 && checkC === `x${index1}-${index2}`"></courseX2>
                             <!-- <courseDialog2 v-if="item2.type == 11 && checkC === `x${index1}-${index2}`" :cJson="cJson"
                                 @setJson="setJson"></courseDialog2> -->
                         </div>
@@ -171,38 +171,38 @@
             </div>
             <div v-else-if="item1.ttype == 1 && canEdit.indexOf(item1.type) !== -1 && etype == 'edit'" class="edit_box">
                 <div v-if="item1.type == 1">
-                    <choiceX :cJson="item1.json" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 1 && checkC === `x${index1}`"></choiceX>
+                    <choiceX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 1 && checkC === `x${index1}`"></choiceX>
 										
                     <!-- <choiceDialog v-if="item1.type == 1 && checkC === `x${index1}`" :cJson="cJson" @setJson="setJson">
                     </choiceDialog> -->
                 </div>
                 <div v-else-if="item1.type == 3">
-                    <gapX :cJson="item1.json" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 3 && checkC === `x${index1}`"></gapX>
+                    <gapX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 3 && checkC === `x${index1}`"></gapX>
                     <!-- <gapDialog v-if="item1.type == 3 && checkC === `x${index1}`" :cJson="cJson" @setJson="setJson">
                     </gapDialog> -->
                 </div>
                 <div v-else-if="item1.type == 5">
-                    <fileX :cJson="item1.json" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 5 && checkC === `x${index1}`"></fileX>
+                    <fileX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 5 && checkC === `x${index1}`"></fileX>
                     <!-- <fileDialog v-if="item1.type == 5 && checkC === `x${index1}`" :cJson="cJson" @setJson="setJson">
                     </fileDialog> -->
                 </div>
                 <div v-else-if="item1.type == 6">
-                    <courseX :cJson="item1.json" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 6 && checkC === `x${index1}`"></courseX>
+                    <courseX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 6 && checkC === `x${index1}`"></courseX>
                     <!-- <courseDialog v-if="item1.type == 6 && checkC === `x${index1}`" :cJson="cJson" @setJson="setJson">
                     </courseDialog> -->
                 </div>
                 <div v-else-if="item1.type == 7">
-                    <evaX :cJson="item1.json" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 7 && checkC === `x${index1}`"></evaX>
+                    <evaX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 7 && checkC === `x${index1}`"></evaX>
                     <!-- <evaDialog v-if="item1.type == 7 && checkC === `x${index1}`" :cJson="cJson" @setJson="setJson">
                     </evaDialog> -->
                 </div>
                 <div v-else-if="item1.type == 8">
-                    <timeX :cJson="item1.json" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 8 && checkC === `x${index1}`"></timeX>
+                    <timeX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 8 && checkC === `x${index1}`"></timeX>
                     <!-- <timeDialog v-if="item1.type == 8 && checkC === `x${index1}`" :cJson="cJson" @setJson="setJson">
                     </timeDialog> -->
                 </div>
                 <div v-else-if="item1.type == 11">
-                    <courseX2 :cJson="item1.json" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 11 && checkC === `x${index1}`"></courseX2>
+                    <courseX2 :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 11 && checkC === `x${index1}`"></courseX2>
                     <!-- <courseDialog2 v-if="item1.type == 11 && checkC === `x${index1}`" :cJson="cJson" @setJson="setJson">
                     </courseDialog2> -->
                 </div>
@@ -323,7 +323,15 @@ export default {
                     } else if (item.type == 8) {
                         className += " test_icon_time"
                     }
-                    return `${this.etype=='edit'?'<span class="test_index">'+(index+1)+'</span>':index+1+'、'}` + "" + (item.json && this.etype != 'edit' ? `<span class='${className}'></span>` : `<span class='${className}'></span>` + this.options2[item.type]) + (item.json && this.etype != 'edit' ? `${item.json.title}` : "");
+										let itemType = item.type;
+										// if(itemType===1){
+										// 	if(item.json.type===1){
+										// 		itemType = 9;
+										// 	}else if(item.json.type==2){
+										// 		itemType = 10;
+										// 	}
+										// }
+                    return `${this.etype=='edit'?'<span class="test_index">'+(index+1)+'</span>':index+1+'、'}` + "" + (item.json && this.etype != 'edit' ? `<span class='${className}'></span>` : `<span class='${className}'></span>` + this.options2[itemType]) + (item.json && this.etype != 'edit' ? `${item.json.title}` : "");
                 } else if (item.ttype == 2) {
                     return `${item.name ? item.name : `第${index + 1}组`}（共${item.array.length}题）`;
                 } else if (item.ttype == 3) {

src/components/pages/test/add/components/choice/choice.vue

@@ -6,11 +6,12 @@
     <div v-else class="choice_box">
       <div class="title">
         <div style="display: flex;">
-          <span @click.stop="updateTitle()" style="min-width:fit-content">{{
+          <!-- <span @click.stop="updateTitle()" style="min-width:fit-content">{{
             `（${option[cJson.type].name}）`
           }}</span
-          ><span @click.stop="updateTitle()" v-if="!updateList.title">{{
-            cJson.title
+          > -->
+					<span @click.stop="updateTitle()" v-if="!updateList.title">{{
+            cJson.title ? cJson.title : "请填写标题"
           }}</span>
           <input
             v-if="updateList.title"
@@ -110,6 +111,9 @@ export default {
     cJson: {
       type: Object
     },
+		cJson2:{
+			type:Object
+		},
     isOpen: {
       type: Boolean,
       default: false
@@ -139,6 +143,19 @@ export default {
         this.$emit("setJson", newVal, this.index);
       },
       deep: true
+    },
+		isOpen(newValue) {
+      if (newValue) {
+        if (!this.cJson2 || Object.keys(this.cJson2).length == 0) {
+          this.checkJson = {
+            title: "标题",
+            type: 1,
+            answer: ""
+          };
+        } else {
+          this.checkJson = this.depthCopy(this.cJson2);
+        }
+      }
     }
   },
   methods: {
@@ -193,19 +210,19 @@ export default {
 		}
   },
   mounted() {
-    if (!this.cJson || Object.keys(this.cJson).length == 0) {
-      this.checkJson = {
-        title: "标题",
-        type: 1,
-        array: [
-          { option: "选项1", img: "" },
-          { option: "选项2", img: "" }
-        ],
-        answer: ""
-      };
-    } else {
-      this.checkJson = this.depthCopy(this.cJson);
-    }
+    // if (!this.cJson || Object.keys(this.cJson).length == 0) {
+    //   this.checkJson = {
+    //     title: "标题",
+    //     type: 1,
+    //     array: [
+    //       { option: "选项1", img: "" },
+    //       { option: "选项2", img: "" }
+    //     ],
+    //     answer: ""
+    //   };
+    // } else {
+    //   this.checkJson = this.depthCopy(this.cJson2);
+    // }
   }
 };
 </script>
@@ -254,9 +271,9 @@ export default {
 .choice_c .right {
   color: #efa030;
 }
-.choice_c .right::after {
+/* .choice_c .right::after {
   content: "（正确答案）";
-}
+} */
 
 .choice:hover > .choice_c > .deleteChoice {
   display: flex;

src/components/pages/test/add/components/course/course.vue

@@ -87,6 +87,9 @@ export default {
     cJson: {
       type: Object
     },
+		cJson2:{
+			type:Object
+		},
     isOpen: {
       type: Boolean,
       default: false
@@ -120,6 +123,19 @@ export default {
         this.$emit("setJson", newVal,this.index);
       },
       deep: true
+    },
+		isOpen(newValue) {
+      if (newValue) {
+        if (!this.cJson2 || Object.keys(this.cJson2).length == 0) {
+          this.checkJson = {
+            title: "标题",
+            type: 1,
+            answer: ""
+          };
+        } else {
+          this.checkJson = this.depthCopy(this.cJson2);
+        }
+      }
     },
     async courses(newValue) {
       this.loading = true;
@@ -167,16 +183,16 @@ export default {
     }
   },
   mounted() {
-    if (!this.cJson || Object.keys(this.cJson).length == 0) {
-      this.checkJson = {
-        title: "标题",
-        detail: "",
-        courses: []
-      };
-    } else {
-      this.checkJson = this.depthCopy(this.cJson);
-      this.courses = this.checkJson.courses;
-    }
+    // if (!this.cJson || Object.keys(this.cJson).length == 0) {
+    //   this.checkJson = {
+    //     title: "标题",
+    //     detail: "",
+    //     courses: []
+    //   };
+    // } else {
+    //   this.checkJson = this.depthCopy(this.cJson2);
+    //   this.courses = this.checkJson.courses;
+    // }
   }
 };
 </script>

src/components/pages/test/add/components/course2/course.vue

@@ -36,6 +36,9 @@ export default {
     cJson: {
       type: Object
     },
+		cJson2:{
+			type:Object
+		},
     isOpen: {
       type: Boolean,
       default: false
@@ -64,6 +67,19 @@ export default {
         this.$emit("setJson", newVal,this.index);
       },
       deep: true
+    },
+		isOpen(newValue) {
+      if (newValue) {
+        if (!this.cJson2 || Object.keys(this.cJson2).length == 0) {
+          this.checkJson = {
+            title: "标题",
+            type: 1,
+            answer: ""
+          };
+        } else {
+          this.checkJson = this.depthCopy(this.cJson2);
+        }
+      }
     }
   },
   methods: {
@@ -89,15 +105,15 @@ export default {
 		}
   },	
   mounted() {
-    if (!this.cJson || Object.keys(this.cJson).length == 0) {
-      this.checkJson = {
-        title: "标题",
-        detail: ""
-      };
-    } else {
-      this.checkJson = this.depthCopy(this.cJson);
-      this.courses = this.checkJson.courses;
-    }
+    // if (!this.cJson || Object.keys(this.cJson).length == 0) {
+    //   this.checkJson = {
+    //     title: "标题",
+    //     detail: ""
+    //   };
+    // } else {
+    //   this.checkJson = this.depthCopy(this.cJson2);
+    //   this.courses = this.checkJson.courses;
+    // }
   }
 };
 </script>

src/components/pages/test/add/components/evaBox/eva.vue

@@ -72,6 +72,9 @@ export default {
     cJson: {
       type: Object
     },
+		cJson2:{
+			type:Object
+		},
     isOpen: {
       type: Boolean,
       default: false
@@ -100,6 +103,19 @@ export default {
         this.$emit("setJson", newVal,this.index);
       },
       deep: true
+    },
+		isOpen(newValue) {
+      if (newValue) {
+        if (!this.cJson2 || Object.keys(this.cJson2).length == 0) {
+          this.checkJson = {
+            title: "标题",
+            type: 1,
+            answer: ""
+          };
+        } else {
+          this.checkJson = this.depthCopy(this.cJson2);
+        }
+      }
     }
   },
   methods: {
@@ -149,16 +165,16 @@ export default {
     }
   },
   mounted() {
-    if (!this.cJson || Object.keys(this.cJson).length == 0) {
-      this.checkJson = {
-        title: "标题",
-        detail: "",
-        small: 0,
-        big: 10
-      };
-    } else {
-      this.checkJson = this.depthCopy(this.cJson);
-    }
+    // if (!this.cJson || Object.keys(this.cJson).length == 0) {
+    //   this.checkJson = {
+    //     title: "标题",
+    //     detail: "",
+    //     small: 0,
+    //     big: 10
+    //   };
+    // } else {
+    //   this.checkJson = this.depthCopy(this.cJson2);
+    // }
   }
 };
 </script>

src/components/pages/test/add/components/file/file.vue

@@ -133,7 +133,10 @@ export default {
     index: {
       type: String,
       default: ""
-    }
+    },
+		cJson2:{
+			type:Object
+		},
   },
   data() {
     return {
@@ -157,6 +160,19 @@ export default {
         this.$emit("setJson", newVal, this.index);
       },
       deep: true
+    },
+		isOpen(newValue) {
+      if (newValue) {
+        if (!this.cJson2 || Object.keys(this.cJson2).length == 0) {
+          this.checkJson = {
+            title: "标题",
+            type: 1,
+            answer: ""
+          };
+        } else {
+          this.checkJson = this.depthCopy(this.cJson2);
+        }
+      }
     }
   },
   methods: {
@@ -412,15 +428,15 @@ export default {
     }
   },
   mounted() {
-    if (!this.cJson || Object.keys(this.cJson).length == 0) {
-      this.checkJson = {
-        title: "标题",
-        type: 1,
-        detail: ""
-      };
-    } else {
-      this.checkJson = this.depthCopy(this.cJson);
-    }
+    // if (!this.cJson || Object.keys(this.cJson).length == 0) {
+    //   this.checkJson = {
+    //     title: "标题",
+    //     type: 1,
+    //     detail: ""
+    //   };
+    // } else {
+    //   this.checkJson = this.depthCopy(this.cJson2);
+    // }
   }
 };
 </script>

src/components/pages/test/add/components/timeBox/time.vue

@@ -3,11 +3,27 @@
     <div class="mask" v-if="!isOpen"></div>
     <div class="choice_box">
       <div class="title" style="display: flex;">
-        <span @click.stop="updateTitle()" v-if="!updateList.title">{{ cJson.title }}</span>
-        <input v-if="updateList.title" ref="titleRef" class="editInput" v-model="checkJson.title" @blur="save" @keyup.enter="save" placeholder="请填写标题" />
+        <span @click.stop="updateTitle()" v-if="!updateList.title">{{
+          cJson.title
+        }}</span>
+        <input
+          v-if="updateList.title"
+          ref="titleRef"
+          class="editInput"
+          v-model="checkJson.title"
+          @blur="save"
+          @keyup.enter="save"
+          placeholder="请填写标题"
+        />
       </div>
-      <div class="detail" v-if="!updateList.detail" @click.stop="updateDetail()">{{ cJson.detail ? cJson.detail : "暂无描述" }}</div>
-			<input
+      <div
+        class="detail"
+        v-if="!updateList.detail"
+        @click.stop="updateDetail()"
+      >
+        {{ cJson.detail ? cJson.detail : "暂无描述" }}
+      </div>
+      <input
         v-if="updateList.detail"
         ref="detailRef"
         class="editInput"
@@ -17,7 +33,7 @@
         @keyup.enter="save"
         placeholder="请填写描述"
       />
-		</div>
+    </div>
   </div>
 </template>
 
@@ -27,14 +43,17 @@ export default {
     cJson: {
       type: Object
     },
+    cJson2: {
+      type: Object
+    },
     isOpen: {
       type: Boolean,
       default: false
     },
-		index:{
-			type:String,
-			default:""
-		}
+    index: {
+      type: String,
+      default: ""
+    }
   },
   data() {
     return {
@@ -53,45 +72,60 @@ export default {
     checkJson: {
       handler(newVal) {
         // console.log("测试测试保存",newVal)
-        this.$emit("setJson", newVal,this.index);
+        this.$emit("setJson", newVal, this.index);
         console.log("gapW", this.cJson);
       },
       deep: true
+    },
+		isOpen(newValue) {
+      if (newValue) {
+        if (!this.cJson2 || Object.keys(this.cJson2).length == 0) {
+          this.checkJson = {
+            title: "标题",
+            type: 1,
+            answer: ""
+          };
+        } else {
+          this.checkJson = this.depthCopy(this.cJson2);
+        }
+      }
     }
   },
   methods: {
     depthCopy(s) {
       return JSON.parse(JSON.stringify(s));
     },
-		updateTitle(){
-			this.updateList.title = true;
-			this.$nextTick(() => {
+    updateTitle() {
+      this.updateList.title = true;
+      this.$nextTick(() => {
         // 聚焦到输入框
         this.$refs["titleRef"].focus();
       });
-		},
-		updateDetail(){
-			this.updateList.detail = true;
-			this.$nextTick(() => {
+    },
+    updateDetail() {
+      this.updateList.detail = true;
+      this.$nextTick(() => {
         // 聚焦到输入框
         this.$refs["detailRef"].focus();
       });
-		},
-		save() {
+    },
+    save() {
       for (let key in this.updateList) {
         this.updateList[key] = false;
       }
     }
   },
   mounted() {
-    if (!this.cJson || Object.keys(this.cJson).length == 0) {
-      this.checkJson = {
-        title: "标题",
-        detail: ""
-      };
-    } else {
-      this.checkJson = this.depthCopy(this.cJson);
-    }
+    // if (!this.cJson || Object.keys(this.cJson).length == 0) {
+    //   this.checkJson = {
+    //     title: "标题",
+    //     detail: ""
+    //   };
+    // } else {
+    //   this.$nextTick(() => {
+    //     this.checkJson = this.depthCopy(this.cJson2);
+    //   });
+    // }
   }
 };
 </script>

src/components/pages/test/add/edit/edit/index.vue

@@ -166,7 +166,7 @@
 					@addQtype="addQtype"
         >
         </checkOrder>
-				<addCheckPopover v-if="manualJson.length==0" @addCheck="addCheck" @addQtype="addQtype"/>
+				<addCheckPopover v-if="manualJson.length==0 || checkC==''" @addCheck="addCheck" @addQtype="addQtype"/>
 
       </div>
     </div>

src/components/pages/test/add/edit/index.vue

@@ -6,7 +6,7 @@
     <div class="edit_top">
       <div class="e_t_left">
         <el-button type="primary" size="small" @click="useAiBtn()"
-          >智能生成表单</el-button
+          >按照文档创建</el-button
         >
 
 				<el-button :type="viewFile?'primary':''" size="small" v-if="fileData" @click="viewUploadFile()"