Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

lsc 1 year ago
parent
7f0a3e716f
commit
fa8495c6bd
13 changed files with 257 additions and 45 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.5322e10b79b0e01031aa5611ef44eaba.css.map
  3. 0 0
      dist/static/css/app.e387c865c33bc15a380ba1eeeb6719e5.css
  4. 0 0
      dist/static/css/app.e387c865c33bc15a380ba1eeeb6719e5.css.map
  5. 0 0
      dist/static/js/app.26e5385f7400c084415b.js
  6. 0 0
      dist/static/js/app.9125f27a2b57a54487b5.js
  7. 0 0
      dist/static/js/app.9125f27a2b57a54487b5.js.map
  8. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  9. 228 25
      src/components/pages/test/add/components/checkOrder.vue
  10. 4 1
      src/components/pages/test/add/edit/check/choice.vue
  11. 4 1
      src/components/pages/test/add/edit/check/file.vue
  12. 4 1
      src/components/pages/test/add/edit/check/gap.vue
  13. 16 16
      src/components/pages/test/add/edit/check/index.vue

+ 1 - 1
dist/index.html
View File 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       height: 100%;
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.5322e10b79b0e01031aa5611ef44eaba.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.26e5385f7400c084415b.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.e387c865c33bc15a380ba1eeeb6719e5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.9125f27a2b57a54487b5.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


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


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


+ 228 - 25
src/components/pages/test/add/components/checkOrder.vue
View File 

@@ -1,54 +1,74 @@
 
 <template>
 
 <template>
 
     <div class="co_box">
 
     <div class="co_box">
 
         <div v-for="(item1, index1) in this.checkJson" :key="index1" class="mc_ti_1" :draggable="isdrag == `${index1}`"
 
         <div v-for="(item1, index1) in this.checkJson" :key="index1" class="mc_ti_1" :draggable="isdrag == `${index1}`"
 
-            :class="{ active: checkC === `x${index1}` }" @click.stop="checkTitle(`${index1}`, 1, item1)">
 
+            :class="{
 
+                active: checkC === `x${index1}`,
 
+                dragOverTop: newIndex === index1 && typeIndex == 'drag-' + index1 && (oldIndex > index1 && (!(newIndex2 || newIndex2 === 0) || !(newIndex3 || newIndex3 === 0))),
 
+                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' }">
 
                 <div class="drag" @mousedown="setDrag(`${index1}`)" @mouseup="isdrag = ''"></div>
 
                 <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>
 
                 <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>
 
                 <el-tooltip :content="selectType2(item1, index1)" placement="top" effect="dark" v-else>
 
-                    <span class="content" v-html="selectType(item1, index1)" ></span>
 
+                    <span class="content" v-html="selectType(item1, index1)"></span>
 
                 </el-tooltip>
 
                 </el-tooltip>
 
-                
+
 
                 <!-- {{ selectType(item1, index1) }} -->
 
                 <!-- {{ selectType(item1, index1) }} -->
 
                 <div class="btnBox">
 
                 <div class="btnBox">
 
                     <!-- <div class="edit" @click.stop="editCheck(`${index1}`,item1)" v-if="item1.ttype == 1 && canEdit.indexOf(item1.type) !== -1 && etype == 'edit'"></div> -->
 
                     <!-- <div class="edit" @click.stop="editCheck(`${index1}`,item1)" v-if="item1.ttype == 1 && canEdit.indexOf(item1.type) !== -1 && etype == 'edit'"></div> -->
 
-                    <div :class="{deleteX:etype != 'edit',delete: etype == 'edit'}" @click.stop="deleteCheck(`${index1}`)"></div>
 
+                    <div :class="{ deleteX: etype != 'edit', delete: etype == 'edit' }"
 
+                        @click.stop="deleteCheck(`${index1}`)">
 
+                    </div>
 
                     <div class="open" v-if="item1.array && item1.array.length" :class="{ isopen: item1.isopen }"
 
                     <div class="open" v-if="item1.array && item1.array.length" :class="{ isopen: item1.isopen }"
 
                         @click.stop="openPan(index1)"></div>
 
                         @click.stop="openPan(index1)"></div>
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
             <div v-if="item1.array && item1.array.length && item1.isopen" class="mc_ti_1_xia">
 
             <div v-if="item1.array && item1.array.length && item1.isopen" class="mc_ti_1_xia">
 
                 <div v-for="(item2, index2) in item1.array" :key="`${index1}-${index2}`" class="mc_ti_2"
 
                 <div v-for="(item2, index2) in item1.array" :key="`${index1}-${index2}`" class="mc_ti_2"
 
-                    :draggable="isdrag == `${index1}-${index2}`" :class="{ active: checkC === `x${index1}-${index2}` }"
 
-                    @click.stop="checkTitle(`${index1}-${index2}`, 2, item2)">
 
+                    :draggable="isdrag == `${index1}-${index2}`" :class="{
 
+                        active: checkC === `x${index1}-${index2}`,
 
+                        dragOverTop: newIndex === index1 && newIndex2 === index2 && typeIndex == 'drag2-' + index1 + '-' + index2 && (oldIndex2 > index2  && ( !(newIndex3 || newIndex3 === 0))),
 
+                        dragOverBottom: newIndex === index1 && newIndex2 === index2 && typeIndex == 'drag2-' + index1 + '-' + index2 && (oldIndex2 < index2 || !( !(newIndex3 || newIndex3 === 0))),
 
+                    }" @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' }">
 
                         <div class="drag" @mousedown="setDrag(`${index1}-${index2}`)" @mouseup="isdrag = ''"></div>
 
                         <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>
 
+                        <span class="content" v-html="selectType(item2, index2)"
 
+                            v-if="etype == 'edit' || item2.ttype != 1"></span>
 
                         <el-tooltip :content="selectType2(item2, index2)" placement="top" effect="dark" v-else>
 
                         <el-tooltip :content="selectType2(item2, index2)" placement="top" effect="dark" v-else>
 
-                            <span class="content" v-html="selectType(item2, index2)" ></span>
 
+                            <span class="content" v-html="selectType(item2, index2)"></span>
 
                         </el-tooltip>
 
                         </el-tooltip>
 
                         <div class="btnBox">
 
                         <div class="btnBox">
 
                             <!-- <div class="edit" @click.stop="editCheck(`${index1}-${index2}`,item2)" v-if="item2.ttype == 1 && canEdit.indexOf(item2.type) !== -1 && etype == 'edit'"></div> -->
 
                             <!-- <div class="edit" @click.stop="editCheck(`${index1}-${index2}`,item2)" v-if="item2.ttype == 1 && canEdit.indexOf(item2.type) !== -1 && etype == 'edit'"></div> -->
 
-                            <div :class="{deleteX:etype != 'edit',delete: etype == 'edit'}" @click.stop="deleteCheck(`${index1}-${index2}`)"></div>
 
+                            <div :class="{ deleteX: etype != 'edit', delete: etype == 'edit' }"
 
+                                @click.stop="deleteCheck(`${index1}-${index2}`)"></div>
 
                             <div class="open" v-if="item2.array && item2.array.length" :class="{ isopen: item2.isopen }"
 
                             <div class="open" v-if="item2.array && item2.array.length" :class="{ isopen: item2.isopen }"
 
                                 @click.stop="openPan(index1, index2)"></div>
 
                                 @click.stop="openPan(index1, index2)"></div>
 
                         </div>
 
                         </div>
 
                     </div>
 
                     </div>
 
                     <div v-if="item2.array && item2.array.length && item2.isopen" class="mc_ti_2_xia">
 
                     <div v-if="item2.array && item2.array.length && item2.isopen" class="mc_ti_2_xia">
 
                         <div v-for="(item3, index3) in item2.array" :key="`${index1}-${index2}-${index3}`" class="mc_ti_3"
 
                         <div v-for="(item3, index3) in item2.array" :key="`${index1}-${index2}-${index3}`" class="mc_ti_3"
 
-                            :draggable="isdrag == `${index1}-${index2}-${index3}`"
 
-                            :class="{ active: checkC === `x${index1}-${index2}-${index3}` }"
 
-                            @click.stop="checkTitle(`${index1}-${index2}-${index3}`, 3, item3)">
 
+                            :draggable="isdrag == `${index1}-${index2}-${index3}`" :class="{
 
+                                active: checkC === `x${index1}-${index2}-${index3}`,
 
+                                dragOverTop: newIndex === index1 && newIndex2 === index2 && newIndex3 === index3 && typeIndex == 'drag3-' + index1 + '-' + index2 + '-' + index3 && oldIndex3 > index3,
 
+                                dragOverBottom: newIndex === index1 && newIndex2 === index2 && newIndex3 === index3 && typeIndex == 'drag3-' + index1 + '-' + index2 + '-' + index3 && oldIndex3 < index3,
 
+                            }" @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' }">
 
                                 <div class="drag" @mousedown="setDrag(`${index1}-${index2}-${index3}`)"
 
                                 <div class="drag" @mousedown="setDrag(`${index1}-${index2}-${index3}`)"
 
                                     @mouseup="isdrag = ''"></div>
 
                                     @mouseup="isdrag = ''"></div>
 
-                                    <span class="content" v-html="selectType(item3, index3)" v-if="etype == 'edit' || item3.ttype != 1"></span>
 
-                                    <el-tooltip :content="selectType2(item3, index3)" placement="top" effect="dark" v-else>
 
-                                        <span class="content" v-html="selectType(item3, index3)" ></span>
 
-                                    </el-tooltip>
 
+                                <span class="content" v-html="selectType(item3, index3)"
 
+                                    v-if="etype == 'edit' || item3.ttype != 1"></span>
 
+                                <el-tooltip :content="selectType2(item3, index3)" placement="top" effect="dark" v-else>
 
+                                    <span class="content" v-html="selectType(item3, index3)"></span>
 
+                                </el-tooltip>
 
                                 <div class="btnBox">
 
                                 <div class="btnBox">
 
                                     <!-- <div class="edit" @click.stop="editCheck(`${index1}-${index2}-${index3}`,item3)" v-if="item3.ttype == 1 && canEdit.indexOf(item3.type) !== -1 && etype == 'edit'"></div> -->
 
                                     <!-- <div class="edit" @click.stop="editCheck(`${index1}-${index2}-${index3}`,item3)" v-if="item3.ttype == 1 && canEdit.indexOf(item3.type) !== -1 && etype == 'edit'"></div> -->
 
-                                    <div :class="{deleteX:etype != 'edit',delete: etype == 'edit'}" @click.stop="deleteCheck(`${index1}-${index2}-${index3}`)"></div>
 
+                                    <div :class="{ deleteX: etype != 'edit', delete: etype == 'edit' }"
 
+                                        @click.stop="deleteCheck(`${index1}-${index2}-${index3}`)"></div>
 
                                 </div>
 
                                 </div>
 
                             </div>
 
                             </div>
 
                             <div v-if="item3.ttype == 1 && canEdit.indexOf(item3.type) !== -1 && etype == 'edit'"
 
                             <div v-if="item3.ttype == 1 && canEdit.indexOf(item3.type) !== -1 && etype == 'edit'"
 
@@ -145,8 +165,8 @@ export default {
 
             type: String,
 
             type: String,
 
             default: ""
 
             default: ""
 
         },
 
         },
 
-        cJson:{
 
-            type:Object,
 
+        cJson: {
 
+            type: Object,
 
         }
 
         }
 
     },
 
     },
 
     data() {
 
     data() {
 
@@ -155,6 +175,14 @@ export default {
 
             isdrag: "",
 
             isdrag: "",
 
             canEdit: [1, 3, 5],
 
             canEdit: [1, 3, 5],
 
             ctype: "",
 
             ctype: "",
 
+            dragType: "",
 
+            oldIndex: "",
 
+            newIndex: "",
 
+            oldIndex2: "",
 
+            newIndex2: "",
 
+            oldIndex3: "",
 
+            newIndex3: "",
 
+            oldData: "",
 
             // cJson: {}
 
             // cJson: {}
 
         }
 
         }
 
     },
 
     },
 
@@ -163,14 +191,14 @@ export default {
 
             return function (item, index) {
 
             return function (item, index) {
 
                 if (item.ttype == 1) {
 
                 if (item.ttype == 1) {
 
                     let className = "test_icon"
 
                     let className = "test_icon"
 
-                    if(item.type == 1){
 
+                    if (item.type == 1) {
 
                         className += " test_icon_check"
 
                         className += " test_icon_check"
 
-                    }else if(item.type == 3){
 
+                    } else if (item.type == 3) {
 
                         className += " test_icon_gap"
 
                         className += " test_icon_gap"
 
-                    }else if(item.type == 5){
 
+                    } else if (item.type == 5) {
 
                         className += " test_icon_file"
 
                         className += " test_icon_file"
 
                     }
 
                     }
 
-                    return 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}` : "");
 
+                    return 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}` : "");
 
                 } else if (item.ttype == 2) {
 
                 } else if (item.ttype == 2) {
 
                     return `第${index + 1}组 （共${item.array.length}题）`;
 
                     return `第${index + 1}组 （共${item.array.length}题）`;
 
                 } else if (item.ttype == 3) {
 
                 } else if (item.ttype == 3) {
 
@@ -181,7 +209,7 @@ export default {
 
         selectType2() {
 
         selectType2() {
 
             return function (item, index) {
 
             return function (item, index) {
 
                 if (item.ttype == 1) {
 
                 if (item.ttype == 1) {
 
-                    return  (item.json && this.etype != 'edit' ? '' : this.options2[item.type]) + (item.json && this.etype != 'edit' ? `${item.json.title}` : "");
 
+                    return (item.json && this.etype != 'edit' ? '' : this.options2[item.type]) + (item.json && this.etype != 'edit' ? `${item.json.title}` : "");
 
                 } else if (item.ttype == 2) {
 
                 } else if (item.ttype == 2) {
 
                     return `第${index + 1}组 （共${item.array.length}题）`;
 
                     return `第${index + 1}组 （共${item.array.length}题）`;
 
                 } else if (item.ttype == 3) {
 
                 } else if (item.ttype == 3) {
 
@@ -291,7 +319,172 @@ export default {
 
         },
 
         },
 
         editCheck(index, item) {
 
         editCheck(index, item) {
 
 
 
-        }
 
+        },
 
+        dragStart(val, i, index) {
 
+            if (this.isdrag != index) {
 
+                return
 
+            }
 
+            this.dragType = 'drag'
 
+            this.oldIndex = i;
 
+            this.oldData = val;
 
+        },
 
+        dragOver(i) {
 
+            // if(this.dragType != 'drag'){
 
+            //     return
 
+            // }
 
+            this.typeIndex = "drag-" + i
 
+            this.newIndex = i;
 
+        },
 
+        dragEnd() {
 
+            if (this.dragType != 'drag') {
 
+                this.typeIndex = "";
 
+                this.newIndex = "";
 
+                this.dragType = "";
 
+                this.isdrag = "";
 
+                return;
 
+            }
 
+
 
+            if (this.oldIndex == this.newIndex) {
 
+                this.typeIndex = "";
 
+                this.newIndex = "";
 
+                this.dragType = "";
 
+                this.isdrag = "";
 
+                return;
 
+            }
 
+
 
+            let newItems = [...this.manualJson];
 
+            // 删除老的节点
 
+            newItems.splice(this.oldIndex, 1);
 
+            // 在列表中目标位置增加新的节点
 
+            newItems.splice(this.newIndex, 0, this.oldData);
 
+            this.$emit("changeJson", [...newItems]);
 
+            this.typeIndex = "";
 
+            this.newIndex = "";
 
+            this.dragType = "";
 
+            this.isdrag = "";
 
+            this.$forceUpdate()
 
+        },
 
+        dragStart2(val, i, j, index) {
 
+            if (this.isdrag != index) {
 
+                return
 
+            }
 
+            this.dragType = 'drag2'
 
+            this.oldIndex = i;
 
+            this.oldIndex2 = j;
 
+            this.oldData = val;
 
+        },
 
+        dragOver2(i, j) {
 
+            // if(this.dragType != 'drag2'){
 
+            //     return
 
+            // }
 
+            this.typeIndex = "drag2-" + i + '-' + j
 
+            this.newIndex = i;
 
+            this.newIndex2 = j;
 
+            // console.log(i, j);
 
+        },
 
+        dragEnd2() {
 
+            if (this.dragType != 'drag2') {
 
+                this.typeIndex = "";
 
+                this.newIndex = "";
 
+                this.newIndex2 = "";
 
+                this.dragType = "";
 
+                this.isdrag = "";
 
+                return;
 
+            }
 
+
 
+            if (this.oldIndex == this.newIndex && this.oldIndex2 == this.newIndex2) {
 
+                this.typeIndex = "";
 
+                this.newIndex = "";
 
+                this.newIndex2 = "";
 
+                this.dragType = "";
 
+                this.isdrag = "";
 
+                return;
 
+            }
 
+
 
+            let newItems = [...this.manualJson];
 
+            // 删除老的节点
 
+            newItems[this.oldIndex].array.splice(this.oldIndex2, 1);
 
+            // 在列表中目标位置增加新的节点
 
+            if ((this.newIndex3 || this.newIndex3 === 0) && newItems[this.newIndex].array[this.newIndex2] && newItems[this.newIndex].array[this.newIndex2].array && this.oldData.ttype == 1) {
 
+                newItems[this.newIndex].array[this.newIndex2].array.splice(this.newIndex3, 0, this.oldData);
 
+            } else if (newItems[this.newIndex].array[this.newIndex2] && newItems[this.newIndex].array[this.newIndex2].array && this.oldData.ttype == 1) {
 
+                newItems[this.newIndex].array[this.newIndex2].array.push(this.oldData)
 
+            } else if (newItems[this.newIndex].array && newItems[this.newIndex].array.length && newItems[this.newIndex].array[0].ttype == 1 && this.oldData.ttype == 2) {
 
+                this.oldData.array = [...this.oldData.array, ...newItems[this.newIndex].array]
 
+                newItems[this.newIndex].array[0] = this.oldData
 
+            } else {
 
+                newItems[this.newIndex].array.splice(this.newIndex2, 0, this.oldData);
 
+            }
 
+            this.$emit("changeJson", [...newItems]);
 
+            this.typeIndex = "";
 
+            this.newIndex = "";
 
+            this.newIndex2 = "";
 
+            this.dragType = "";
 
+            this.isdrag = "";
 
+            this.$forceUpdate()
 
+        },
 
+        dragStart3(val, i, j, k, index) {
 
+            if (this.isdrag != index) {
 
+                return
 
+            }
 
+            this.dragType = 'drag3'
 
+            this.oldIndex = i;
 
+            this.oldIndex2 = j;
 
+            this.oldIndex3 = k;
 
+            this.oldData = val;
 
+        },
 
+        dragOver3(i, j, k) {
 
+            // if(this.dragType != 'drag3'){
 
+            //     return
 
+            // }
 
+            this.typeIndex = "drag3-" + i + '-' + j + '-' + k
 
+            this.newIndex = i;
 
+            this.newIndex2 = j;
 
+            this.newIndex3 = k;
 
+            console.log(i, j, k);
 
+        },
 
+        dragEnd3() {
 
+            if (this.dragType != 'drag3') {
 
+                this.typeIndex = "";
 
+                this.newIndex = "";
 
+                this.newIndex2 = "";
 
+                this.newIndex3 = "";
 
+                this.dragType = "";
 
+                this.isdrag = "";
 
+                return;
 
+            }
 
+
 
+            if (this.oldIndex == this.newIndex && this.oldIndex2 == this.newIndex2 && this.oldIndex3 == this.newIndex3) {
 
+                this.typeIndex = "";
 
+                this.newIndex = "";
 
+                this.newIndex2 = "";
 
+                this.newIndex3 = "";
 
+                this.dragType = "";
 
+                this.isdrag = "";
 
+                return;
 
+            }
 
+
 
+            let newItems = [...this.manualJson];
 
+            // 删除老的节点
 
+            newItems[this.oldIndex].array[this.oldIndex2].array.splice(this.oldIndex3, 1);
 
+            if (newItems[this.newIndex].array[this.newIndex2] && newItems[this.newIndex].array[this.newIndex2].array) {
 
+                // 在列表中目标位置增加新的节点
 
+                newItems[this.newIndex].array[this.newIndex2].array.splice(this.newIndex3, 0, this.oldData);
 
+            } else if (newItems[this.newIndex].array[0] && newItems[this.newIndex].array[0].ttype == 2 && this.oldData.ttype == 1) {
 
+                // 在列表中目标位置增加新的节点
 
+                newItems[this.newIndex].array[0].array.push(this.oldData)
 
+            } else {
 
+                newItems[this.newIndex].array.splice(this.newIndex2, 0, this.oldData);
 
+            }
 
+            this.$emit("changeJson", [...newItems]);
 
+            this.typeIndex = "";
 
+            this.newIndex = "";
 
+            this.newIndex2 = "";
 
+            this.newIndex3 = "";
 
+            this.dragType = "";
 
+            this.isdrag = "";
 
+            this.$forceUpdate()
 
+        },
 
     },
 
     },
 
     mounted() {
 
     mounted() {
 
         this.manualJson = this.depthCopy(this.checkJson);
 
         this.manualJson = this.depthCopy(this.checkJson);
 
@@ -482,5 +675,15 @@ export default {
 
     padding: 10px 0 0;
 
     padding: 10px 0 0;
 
 }
 
 }
 
 
 
+.dragOverTop {
 
+    border-top: 2px solid #0061FF !important;
 
+    border-radius: 0 !important;
 
+    margin-top: 10px;
 
+}
 
 
 
+.dragOverBottom {
 
+    border-bottom: 2px solid #0061FF !important;
 
+    border-radius: 0 !important;
 
+    margin-top: 10px;
 
+}
 
 </style>
 
 </style>

+ 4 - 1
src/components/pages/test/add/edit/check/choice.vue
View File 

@@ -5,7 +5,7 @@
 
         <!-- <div v-if="!cJson">暂未设置题目</div> -->
 
         <!-- <div v-if="!cJson">暂未设置题目</div> -->
 
         <div class="set_box" v-if="!cJson">请设置题目</div>
 
         <div class="set_box" v-if="!cJson">请设置题目</div>
 
         <div v-else class="choice_box">
 
         <div v-else class="choice_box">
 
-            <div class="title">{{ `（${option[checkJson.type].name}）` + checkJson.title }}<span style="color: #efa030;"
 
+            <div class="title">{{ tindex + 1 + "、" + `（${option[checkJson.type].name}）` + checkJson.title }}<span style="color: #efa030;"
 
                     v-if="checkJson.score">（{{ '分值：' + checkJson.score + '分' }}）</span></div>
 
                     v-if="checkJson.score">（{{ '分值：' + checkJson.score + '分' }}）</span></div>
 
             <div class="choices">
 
             <div class="choices">
 
                 <div class="choice" v-for="(item, index) in checkJson.array" :key="index">
 
                 <div class="choice" v-for="(item, index) in checkJson.array" :key="index">
 
@@ -26,6 +26,9 @@
 
 <script>
 
 <script>
 
 export default {
 
 export default {
 
     props: {
 
     props: {
 
+        tindex:{
 
+            type: Number
 
+        },
 
         cJson: {
 
         cJson: {
 
             type: Object,
 
             type: Object,
 
         },
 
         },

+ 4 - 1
src/components/pages/test/add/edit/check/file.vue
View File 

@@ -11,7 +11,7 @@
 
         <div v-else class="choice_box">
 
         <div v-else class="choice_box">
 
             <!-- <div class="title"><div>{{ `（${option[checkJson.type].name}）` }}</div><div v-html="checkJson.title"></div></div> -->
 
             <!-- <div class="title"><div>{{ `（${option[checkJson.type].name}）` }}</div><div v-html="checkJson.title"></div></div> -->
 
             <div class="title">
 
             <div class="title">
 
-                {{ `（${option[checkJson.type].name}）` + checkJson.title }}<span style="color: #efa030;"
 
+                {{ tindex + 1 + "、" + `（${option[checkJson.type].name}）` + checkJson.title }}<span style="color: #efa030;"
 
                     v-if="checkJson.score">（{{ '分值：' + checkJson.score + '分' }}）</span>
 
                     v-if="checkJson.score">（{{ '分值：' + checkJson.score + '分' }}）</span>
 
                 <!-- </div><div v-html="checkJson.title"></div> -->
 
                 <!-- </div><div v-html="checkJson.title"></div> -->
 
             </div>
 
             </div>
 
@@ -94,6 +94,9 @@ export default {
 
         wOffice,
 
         wOffice,
 
     },
 
     },
 
     props: {
 
     props: {
 
+        tindex:{
 
+            type: Number
 
+        },
 
         cJson: {
 
         cJson: {
 
             type: Object,
 
             type: Object,
 
         },
 
         },

+ 4 - 1
src/components/pages/test/add/edit/check/gap.vue
View File 

@@ -6,7 +6,7 @@
 
         <div v-else class="choice_box">
 
         <div v-else class="choice_box">
 
             <!-- <div class="title"><div>{{ `（${option[checkJson.type].name}）` }}</div><div v-html="checkJson.title"></div></div> -->
 
             <!-- <div class="title"><div>{{ `（${option[checkJson.type].name}）` }}</div><div v-html="checkJson.title"></div></div> -->
 
             <div class="title">
 
             <div class="title">
 
-                {{ `（${option[checkJson.type].name}）` + checkJson.title }}<span v-if="see" style="color: #efa030;">（{{ checkJson.answer ? '参考答案：'+checkJson.answer : '暂无参考答案' }} {{ cJson.score ? '分值：'+cJson.score+'分' : '' }}）</span><span style="color: #efa030;" v-if="checkJson.score && !see">（{{ '分值：'+checkJson.score+'分' }}）</span>
 
+                {{ tindex + 1 + "、" + `（${option[checkJson.type].name}）` + checkJson.title }}<span v-if="see" style="color: #efa030;">（{{ checkJson.answer ? '参考答案：'+checkJson.answer : '暂无参考答案' }} {{ cJson.score ? '分值：'+cJson.score+'分' : '' }}）</span><span style="color: #efa030;" v-if="checkJson.score && !see">（{{ '分值：'+checkJson.score+'分' }}）</span>
 
                 <!-- </div><div v-html="checkJson.title"></div> -->
 
                 <!-- </div><div v-html="checkJson.title"></div> -->
 
             </div>
 
             </div>
 
             <div class="choices">
 
             <div class="choices">
 
@@ -20,6 +20,9 @@
 
 <script>
 
 <script>
 
 export default {
 
 export default {
 
     props: {
 
     props: {
 
+        tindex:{
 
+            type: Number
 
+        },
 
         cJson: {
 
         cJson: {
 
             type: Object,
 
             type: Object,
 
         },
 
         },

+ 16 - 16
src/components/pages/test/add/edit/check/index.vue
View File 

@@ -5,19 +5,19 @@
 
     <div class="c_body">
 
     <div class="c_body">
 
       <div v-if="type == 3">
 
       <div v-if="type == 3">
 
         <div v-for="(item, index) in checkArray[page].array" :key="index" class="check_box">
 
         <div v-for="(item, index) in checkArray[page].array" :key="index" class="check_box">
 
-          <div class="title">{{ selectType(item, index) }}</div>
 
+          <div class="title" v-if="item.ttype != 1 || (!item.json && item.ttype == 1)" :style="{fontSize:item.ttype == 1 && '16px'}">{{ selectType(item, index) }}</div>
 
           <div v-if="item.ttype == 1" class="answerBox">
 
           <div v-if="item.ttype == 1" class="answerBox">
 
-            <choiceV :cJson.sync="item.json" v-if="item.type == 1"></choiceV>
 
-            <gapV :cJson.sync="item.json" v-if="item.type == 3"></gapV>
 
-            <fileV :cJson.sync="item.json" v-if="item.type == 5"></fileV>
 
+            <choiceV :tindex="index" :cJson.sync="item.json" v-if="item.type == 1"></choiceV>
 
+            <gapV :tindex="index" :cJson.sync="item.json" v-if="item.type == 3"></gapV>
 
+            <fileV :tindex="index" :cJson.sync="item.json" v-if="item.type == 5"></fileV>
 
             <span v-else>暂未设置题目</span>
 
             <span v-else>暂未设置题目</span>
 
           </div>
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
-            <div class="title">{{ selectType(item2, index2) }}</div>
 
+            <div class="title" v-if="item2.ttype != 1 || (!item2.json && item2.ttype == 1)" :style="{fontSize:item2.ttype == 1 && '16px'}">{{ selectType(item2, index2) }}</div>
 
             <div v-if="item2.ttype == 1" class="answerBox">
 
             <div v-if="item2.ttype == 1" class="answerBox">
 
-              <choiceV :cJson.sync="item2.json" v-if="item2.type == 1"></choiceV>
 
-              <gapV :cJson.sync="item2.json" v-if="item2.type == 3"></gapV>
 
-              <fileV :cJson.sync="item2.json" v-if="item2.type == 5"></fileV>
 
+              <choiceV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 1"></choiceV>
 
+              <gapV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 3"></gapV>
 
+              <fileV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 5"></fileV>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
@@ -25,19 +25,19 @@
 
       </div>
 
       </div>
 
       <div v-else>
 
       <div v-else>
 
         <div v-for="(item, index) in checkArray" :key="index" class="check_box">
 
         <div v-for="(item, index) in checkArray" :key="index" class="check_box">
 
-          <div class="title">{{ selectType(item, index) }}</div>
 
+          <div class="title" v-if="item.ttype != 1 || (!item.json && item.ttype == 1)" :style="{fontSize:item.ttype == 1 && '16px'}">{{ selectType(item, index) }}</div>
 
           <div v-if="item.ttype == 1" class="answerBox">
 
           <div v-if="item.ttype == 1" class="answerBox">
 
-            <choiceV :cJson.sync="item.json" v-if="item.type == 1"></choiceV>
 
-            <gapV :cJson.sync="item.json" v-if="item.type == 3"></gapV>
 
-            <fileV :cJson.sync="item.json" v-if="item.type == 5"></fileV>
 
+            <choiceV :tindex="index" :cJson.sync="item.json" v-if="item.type == 1"></choiceV>
 
+            <gapV :tindex="index" :cJson.sync="item.json" v-if="item.type == 3"></gapV>
 
+            <fileV :tindex="index" :cJson.sync="item.json" v-if="item.type == 5"></fileV>
 
             <!-- <span v-else>暂未设置题目</span> -->
 
             <!-- <span v-else>暂未设置题目</span> -->
 
           </div>
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
-            <div class="title">{{ selectType(item2, index2) }}</div>
 
+            <div class="title" v-if="item2.ttype != 1 || (!item2.json && item2.ttype == 1)" :style="{fontSize:item2.ttype == 1 && '16px'}">{{ selectType(item2, index2) }}</div>
 
             <div v-if="item2.ttype == 1" class="answerBox">
 
             <div v-if="item2.ttype == 1" class="answerBox">
 
-              <choiceV :cJson.sync="item2.json" v-if="item2.type == 1"></choiceV>
 
-              <gapV :cJson.sync="item2.json" v-if="item2.type == 3"></gapV>
 
-              <fileV :cJson.sync="item2.json" v-if="item2.type == 5"></fileV>
 
+              <choiceV :tindex="indexw" :cJson.sync="item2.json" v-if="item2.type == 1"></choiceV>
 
+              <gapV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 3"></gapV>
 
+              <fileV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 5"></fileV>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
             </div>
 
           </div>
 
           </div>

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