|
@@ -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() {
|