Sfoglia il codice sorgente

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

lsc 3 mesi fa
parent
commit
6e5aba5246

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</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() {
+    }</style><link href=./static/css/app.2b5d26585cec8c72398d534cabb52fbc.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.c8c9c5693bab676481f2.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.2b5d26585cec8c72398d534cabb52fbc.css


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


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


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


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


+ 29 - 30
src/components/pages/test/add/components/checkOrder.vue

@@ -8,7 +8,7 @@
                 dragOverBottom: newIndex === index1 && typeIndex == 'drag-' + index1 && (oldIndex < index1 || !(!(newIndex2 || newIndex2 === 0) || !(newIndex3 || newIndex3 === 0))),
             }" @click.stop="checkTitle(`${index1}`, 1, item1)" @dragstart="dragStart(item1, index1, `${index1}`)"
             @dragover.prevent="dragOver(index1)" @dragend="dragEnd()">
-            <div class="title" :style="{ fontSize: etype == 'order' && '16px' }">
+            <div class="title" :style="{ fontSize: etype == 'order' && '16px' }"  :ref="`x${index1}`">
                 <div class="drag" @mousedown="setDrag(`${index1}`)" @mouseup="isdrag = ''"></div>
                 <span class="content" v-html="selectType(item1, index1)" v-if="etype == 'edit' || item1.ttype != 1"></span>
                 <el-tooltip :content="selectType2(item1, index1)" placement="top" effect="dark" v-else>
@@ -36,7 +36,7 @@
                     }" @click.stop="checkTitle(`${index1}-${index2}`, 2, item2)"
                     @dragstart="dragStart2(item2, index1, index2, `${index1}-${index2}`)"
                     @dragover.prevent="dragOver2(index1, index2)" @dragend="dragEnd2()">
-                    <div class="title" :style="{ fontSize: etype == 'order' && '16px' }">
+                    <div class="title" :style="{ fontSize: etype == 'order' && '16px' }" :ref="`x${index1}-${index2}`">
                         <div class="drag" @mousedown="setDrag(`${index1}-${index2}`)" @mouseup="isdrag = ''"></div>
                         <span class="content" v-html="selectType(item2, index2)"
                             v-if="etype == 'edit' || item2.ttype != 1"></span>
@@ -62,7 +62,7 @@
                             }" @click.stop="checkTitle(`${index1}-${index2}-${index3}`, 3, item3)"
                             @dragstart="dragStart3(item3, index1, index2, index3, `${index1}-${index2}-${index3}`)"
                             @dragover.prevent="dragOver3(index1, index2, index3)" @dragend="dragEnd3()">
-                            <div class="title" :style="{ fontSize: etype == 'order' && '16px' }">
+                            <div class="title" :style="{ fontSize: etype == 'order' && '16px' }" :ref="`x${index1}-${index2}-${index3}`">
                                 <div class="drag" @mousedown="setDrag(`${index1}-${index2}-${index3}`)"
                                     @mouseup="isdrag = ''"></div>
                                 <span class="content" v-html="selectType(item3, index3)"
@@ -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" :ref="`x${index1}-${index2}-${index3}`" :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" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}-${index2}-${index3}`" :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" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}-${index2}-${index3}`" :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" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}-${index2}-${index3}`" :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" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}-${index2}-${index3}`" :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" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}-${index2}-${index3}`" :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" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}-${index2}-${index3}`" :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>-->
                                 </div>
 																<div v-if="item3.type == 12">
-																	<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}`"/>
+																	<sweep :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :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="">
@@ -129,45 +129,45 @@
 														</div>
                         </div>
                     </div>
-                    <div v-else-if="item2.ttype == 1 && canEdit.indexOf(item2.type) !== -1 && etype == 'edit'"
+                    <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" :ref="`x${index1}-${index2}`" :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" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :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" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :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" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :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" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :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" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :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" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :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>
 												<div v-else-if="item2.type == 12">
-													<sweep :cJson="item2.json" :cJson2="cJson" @setJson="setJson"  :ref="`x${index1}-${index2}`" :index="`x${index1}-${index2}`" :isOpen="item2.type == 12 && checkC === `x${index1}-${index2}`"/>
+													<sweep :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :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" :ref="`x${index1}`" :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" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :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>
 								<div v-else-if="item1.type == 12">
-									<sweep :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :ref="`x${index1}`" :index="`x${index1}`" :isOpen="item1.type == 12 && checkC === `x${index1}`"/>
+									<sweep :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 12 && checkC === `x${index1}`"/>
 								</div>
             </div>
 						<div class="addCheckBox" v-if="checkC === `x${index1}` && etype==='edit'" @click.stop="">
@@ -706,12 +706,11 @@ export default {
 					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,
+							top:moveEl[0].offsetTop - 100,
 							behavior:"smooth"
 						})
 					}

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