SanHQin 5 months ago
parent
commit
30c777d564

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.132ff5d726e389b7513018d8136e0aed.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.9e776ddbd5e8fbdb74b4.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.18624f47782de933e1d97dc8f7bbc42e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.c94cf366e915df6e85ff.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.132ff5d726e389b7513018d8136e0aed.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.18624f47782de933e1d97dc8f7bbc42e.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.18624f47782de933e1d97dc8f7bbc42e.css.map


BIN
dist/static/img/KekeLoading.5a4818f.gif


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.c94cf366e915df6e85ff.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.c94cf366e915df6e85ff.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


BIN
src/assets/KekeLoading.gif


+ 6 - 5
src/components/pages/test/add/components/GapFilling/gap.vue

@@ -8,12 +8,13 @@
       <!-- <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">{{
+          <!-- <span @click.stop="updateTitle()" style="min-width:fit-content">{{
             `(${option[cJson.type].name})`
-          }}</span>
+          }}</span> -->
           <span v-if="!updateList.title" @click.stop="updateTitle()">{{
-            cJson.title
+            cJson.title ? cJson.title : "请填写标题"
           }}</span>
+					<!-- <span v-if="!cJson.title && !updateList.title" class="t_empty" @click.stop="updateTitle()">请填写标题</span> -->
           <input
             v-if="updateList.title"
             ref="titleRef"
@@ -30,7 +31,7 @@
         <span
           style="color: #efa030;display: flex;margin-top: 5px;line-height: 18px;"
         >
-          <span
+          <!-- <span
             style="min-width: fit-content;"
             @click.stop="updateAnswer()"
             v-if="!cJson.answer && !updateList.answer"
@@ -43,7 +44,7 @@
             <span v-if="!updateList.answer" @click.stop="updateAnswer()">{{
               cJson.answer
             }}</span>
-          </span>
+          </span> -->
 
           <input
             v-if="updateList.answer"

+ 39 - 25
src/components/pages/test/add/components/checkOrder.vue

@@ -79,49 +79,49 @@
                             <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" :cJson2="cJson" @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" :ref="`x${index1}-${index2}-${index3}`" :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" :cJson2="cJson" @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" :ref="`x${index1}-${index2}-${index3}`" :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" :cJson2="cJson" @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" :ref="`x${index1}-${index2}-${index3}`" :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" :cJson2="cJson" @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" :ref="`x${index1}-${index2}-${index3}`" :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" :cJson2="cJson" @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" :ref="`x${index1}-${index2}-${index3}`" :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" :cJson2="cJson" @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" :ref="`x${index1}-${index2}-${index3}`" :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" :cJson2="cJson" @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" :ref="`x${index1}-${index2}-${index3}`" :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>-->
                                 </div>
 																<div v-if="item3.type == 12">
-																	<sweep :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 12 && checkC === `x${index1}-${index2}-${index3}`"/>
+																	<sweep :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}-${index2}-${index3}`" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 12 && checkC === `x${index1}-${index2}-${index3}`"/>
 																</div>
                             </div>
 														<div class="addCheckBox" v-if="checkC === `x${index1}-${index2}-${index3}` && etype==='edit'" @click.stop="">
@@ -132,42 +132,42 @@
                     <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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 1 && checkC === `x${index1}-${index2}`"></choiceX>
+                            <choiceX :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}-${index2}`" :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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 3 && checkC === `x${index1}-${index2}`"></gapX>
+                            <gapX :cJson="item2.json" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 5 && checkC === `x${index1}-${index2}`"></fileX>
+                            <fileX :cJson="item2.json" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 6 && checkC === `x${index1}-${index2}`"></courseX>
+                            <courseX :cJson="item2.json" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 7 && checkC === `x${index1}-${index2}`"></evaX>
+                            <evaX :cJson="item2.json" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 8 && checkC === `x${index1}-${index2}`"></timeX>
+                            <timeX :cJson="item2.json" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 11 && checkC === `x${index1}-${index2}`"></courseX2>
+                            <courseX2 :cJson="item2.json" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :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>
 												<div v-else-if="item2.type == 12">
-													<sweep :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 12 && checkC === `x${index1}-${index2}`"/>
+													<sweep :cJson="item2.json" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :index="`x${index1}-${index2}`" :isOpen="item2.type == 12 && checkC === `x${index1}-${index2}`"/>
 												</div>
                     </div>
 										<div class="addCheckBox" v-if="checkC === `x${index1}-${index2}` && etype==='edit'" @click.stop="">
@@ -177,43 +177,43 @@
             </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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 1 && checkC === `x${index1}`"></choiceX>
+                    <choiceX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 3 && checkC === `x${index1}`"></gapX>
+                    <gapX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 5 && checkC === `x${index1}`"></fileX>
+                    <fileX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 6 && checkC === `x${index1}`"></courseX>
+                    <courseX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 7 && checkC === `x${index1}`"></evaX>
+                    <evaX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 8 && checkC === `x${index1}`"></timeX>
+                    <timeX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 11 && checkC === `x${index1}`"></courseX2>
+                    <courseX2 :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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>
 								<div v-else-if="item1.type == 12">
-									<sweep :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 12 && checkC === `x${index1}`"/>
+									<sweep :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :index="`x${index1}`" :isOpen="item1.type == 12 && checkC === `x${index1}`"/>
 								</div>
             </div>
 						<div class="addCheckBox" v-if="checkC === `x${index1}` && etype==='edit'" @click.stop="">
@@ -408,7 +408,10 @@ export default {
                 this.$emit("update:checkC", "")
             } else {
                 this.$emit("update:checkC", 'x' + index)
-            }
+								if(this.etype==='order'){
+									this.$emit("scrollPage",'x' + index)
+								}
+							}
             this.$forceUpdate();
             // console.log(this.cJson);
             this.$emit("update:cJson", cJson)
@@ -701,6 +704,17 @@ export default {
 				},
 				addQtype(type){
 					this.$emit('addQtype',type)
+				},
+				scrollPage(index){
+					return;
+					let scrollEl = this.$parent.$refs['eContentRef']
+					let moveEl = this.$refs[index]
+					if(scrollEl && moveEl){
+						scrollEl.scrollTo({
+							top:moveEl[0].$el.offsetTop - 150,
+							behavior:"smooth"
+						})
+					}
 				}
     },
     mounted() {

+ 1 - 0
src/components/pages/test/add/components/choice/choice.vue

@@ -184,6 +184,7 @@ export default {
       }
     },
     updateAnswer(index) {
+			return;
       if (this.cJson.type == 1) {
         if (this.checkJson.answer.indexOf(index) == -1) {
           this.checkJson.answer = [index];

+ 3 - 3
src/components/pages/test/add/components/file/file.vue

@@ -10,11 +10,11 @@
     <div v-else class="choice_box">
       <!-- <div class="title"><div>{{ `(${option[cJson.type].name})` }}</div><div v-html="cJson.title"></div></div> -->
       <div class="title" 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> -->
         <span @click.stop="updateTitle()" v-if="!updateList.title">{{
-          cJson.title
+          cJson.title ? cJson.title : "请填写标题"
         }}</span>
         <input
           v-if="updateList.title"

+ 1 - 1
src/components/pages/test/add/components/sweep/index.vue

@@ -4,7 +4,7 @@
     <!-- <div v-if="!cJson">暂未设置题目</div> -->
     <div class="choice_box">
       <div class="title" style="display: flex;">
-        <span v-if="!updateList.title" @click.stop="updateTitle()">{{ cJson.title?cJson.title:"暂无标题" }}</span>
+        <span v-if="!updateList.title" @click.stop="updateTitle()">{{ cJson.title?cJson.title:"请填写标题" }}</span>
 				<input
             v-if="updateList.title"
             ref="titleRef"

+ 11 - 3
src/components/pages/test/add/edit/edit/index.vue

@@ -131,6 +131,7 @@
           showLeftMenu ? '20px' : '0'
         };`
       "
+			ref="eContentRef"
     >
       <div v-if="!isEditing" class="title" @click="editTitle">
         {{ title ? title : "请填写表单标题" }}
@@ -158,6 +159,7 @@
       />
       <div class="e_order_box">
         <checkOrder
+					ref="checkOrderEditRef"
           :checkC.sync="checkC"
           :checkJson="manualJson"
           @changeJson="changeJson"
@@ -176,7 +178,7 @@
     </div>
     <div class="e_order" v-show="showRightMenu">
       <div class="title">
-        题目排序
+        大纲
         <span style="font-size: 14px; color: #373737">总分:{{ score }}分</span>
       </div>
       <span
@@ -206,6 +208,7 @@
           :checkJson="manualJson"
           @changeJson="changeJson"
           etype="order"
+					@scrollPage="scrollPage"
           :cJson.sync="cJson"
         >
         </checkOrder>
@@ -264,6 +267,7 @@
 import checkOrder from "../../components/checkOrder.vue";
 import minxinVue from "../../minxins/minxin";
 import addCheckPopover from "../../../add/components/addCheckPopover.vue";
+import { ref } from "vue-demi";
 export default {
   components: {
     checkOrder,
@@ -718,7 +722,10 @@ export default {
         }
       }
       this.$emit("changeJson", this.manualJson);
-    }
+    },
+		scrollPage(index){
+			this.$refs.checkOrderEditRef.scrollPage(index)
+		}
   },
   mounted() {
     this.manualJson = this.depthCopy(this.checkJson);
@@ -813,7 +820,8 @@ export default {
 
 .e_add > .title,
 .e_order > .title {
-  text-align: center;
+  /* text-align: center; */
+	text-indent: 1.1em;
   font-size: 20px;
 }
 

+ 23 - 10
src/components/pages/test/add/edit/index.vue

@@ -6,12 +6,12 @@
     <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()"
+				<!-- <el-button :type="viewFile?'primary':''" size="small" v-if="fileData" @click="viewUploadFile()"
           >预览</el-button
-        >
+        > -->
       </div>
       <div class="edit_btn">
         <span class="edit" :class="{ active: type == 1 }" @click="type = 1"
@@ -43,8 +43,10 @@
       ></editBox>
       <checkBox v-if="type == 2" :cJson="checkJson" :title="title"></checkBox>
     </div>
-		<div class="ajaxCancel" v-if="loading && ajaxCancelToken">
-			 <el-button type="primary" @click.stop="cancelAjax">停止生成</el-button>
+		<div class="ajaxCancel" v-if="loading">
+				<img src="../../../../../assets/KekeLoading.gif">
+				<span>小可正在努力生成中...</span>
+			 <el-button type="primary" @click.stop="cancelAjax" size="small" v-if="ajaxCancelToken">停止生成</el-button>
 		</div>
   </div>
 </template>
@@ -298,9 +300,9 @@ Instruction: Based on the context, follow "Format example", write content
 说明:文档中的总标题下的说明性文字
 
 ##题目格式
-问答题:{"ttype":1,"type":3,"json":{"title":"标题","type":1,"answer":""}}
-单选:{"ttype":1,"type":1,"json":{"title":"标题","type":1,"array":[{"option":"选项1","img":""}, {"option":"选项2","img":""}],"answer":""}}
-多选:{"ttype":1,"type":1,"json":{"title":"标题","type":2,"array":[{"option":"选项1","img":""},{"option":"选项2","img":""}],"answer":""}}
+文本:{"ttype":1,"type":3,"json":{"title":"标题","type":1,"answer":""}}
+单选:{"ttype":1,"type":1,"json":{"title":"标题","type":1,"array":[{"option":"选项1","img":""}, {"option":"选项2","img":""}],"answer":""}}
+多选:{"ttype":1,"type":1,"json":{"title":"标题","type":2,"array":[{"option":"选项1","img":""},{"option":"选项2","img":""}],"answer":""}}
 
 标题和说明:{"formName":"标题","illustrate":"说明"}
 
@@ -502,17 +504,28 @@ Instruction: Based on the context, follow "Format example", write content
 
 .ajaxCancel{
 	position: fixed;
-	top: calc(50vh + 100px);
+	top: calc(50vh + 20px);
 	left: 50vw;
 	transform: translate(-50%,-50%);
 	z-index: 9999;
 	width: 150px;
 	height: 80px;
-	background: #fff;
 	border-radius: 5px;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 	justify-content: center;
 }
+
+.ajaxCancel>span{
+	margin-bottom: 10px;
+	color: #3681FC;
+	white-space: nowrap;
+}
+
+.ajaxCancel>img{
+	width: 200px;
+	height: 200px;
+	margin-bottom: -50px;
+}
 </style>

+ 4 - 0
src/components/pages/test/add/global_styles.css

@@ -100,3 +100,7 @@
 	border: 1px solid #409EFF !important;
 	color: #fff !important;
 }
+
+.t_empty{
+	color: #757575;
+}

+ 6 - 6
src/components/pages/test/add/minxins/minxin.js

@@ -19,7 +19,7 @@ const minxin = {
         // },
         {
           value: 3,
-          label: "问答题"
+          label: "文本"
         },
         // {
         //   value: 4,
@@ -43,11 +43,11 @@ const minxin = {
         },
         {
           value: 9,
-          label: "单选"
+          label: "单选"
         },
         {
           value: 10,
-          label: "多选"
+          label: "多选"
         },
 				{
 					value:12,
@@ -67,14 +67,14 @@ const minxin = {
       options2: JSON.parse(converter(JSON.stringify({
         1: "选择题",
         // 2: "问答题",
-        3: "问答题",
+        3: "文本",
         4: "添加文档",
         5: "附件",
         6: "课程",
         7: "评分",
         8: "日期",
-        9: "单选",
-        10: "多选",
+        9: "单选",
+        10: "多选",
         11: "课程",
 				12:"扫一扫"
       }))),

+ 3 - 3
src/components/pages/test/check/index.vue

@@ -633,12 +633,12 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="370px" fixed="right" v-if="isN!=1">
+              <el-table-column label="操作" width="200px" fixed="right" v-if="isN!=1">
 
                 <template slot-scope="scope">
                   <el-button @click="getTest(scope.row)" type="primary" size="small">查看</el-button>
-                  <el-button @click="setWordHtml(scope.row)" type="primary" size="small">导出答题信息</el-button>
-									<el-button @click="setWordTemplate(scope.row)" type="primary" size="small">word导出</el-button>
+                  <!-- <el-button @click="setWordHtml(scope.row)" type="primary" size="small">导出答题信息</el-button>
+									<el-button @click="setWordTemplate(scope.row)" type="primary" size="small">word导出</el-button> -->
                   <el-button @click="deleteTest(scope.row.id)" type="primary" size="small">删除</el-button>
                 </template>
               </el-table-column>

Some files were not shown because too many files changed in this diff