zydx-plus 1.32.236 → 1.32.238
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
<div v-if="actionConfig[actionId].isShowFinishState" class="task_item_main width100" :class="isWidth50 ? 'width50': 'width100'" style="z-index: 110">
|
|
5
5
|
<div class="task_text_desc">动作性质：</div>
|
|
6
6
|
<div class="width250">
|
|
7
|
-
<zydxSelect :readonly="readonly" :options="finishStateOptions" v-model:value="finishState"></zydxSelect>
|
|
7
|
+
<zydxSelect :color="'#000000'" :readonly="readonly" :options="finishStateOptions" v-model:value="finishState"></zydxSelect>
|
|
8
8
|
</div>
|
|
9
9
|
</div>
|
|
10
10
|
<template v-if="actionConfig[actionId].isShowEndTime">
|
|
@@ -12,46 +12,63 @@
|
|
|
12
12
|
<div v-if="isTimeModel" class="task_item_main" :class="getZindex(index)">
|
|
13
13
|
<div class="task_text_desc"><span v-if="actionId === 'action_lesson015'">{{getUppercase(index)}}轮</span>{{actionConfig[actionId].endTimeBtn2}}：</div>
|
|
14
14
|
<div class="width250">
|
|
15
|
-
<
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
<
|
|
22
|
-
|
|
23
|
-
|
|
15
|
+
<template v-if="!readonly">
|
|
16
|
+
<zydx-input v-model:value="info.examJoinTime"
|
|
17
|
+
:readonly="readonly"
|
|
18
|
+
:placeholder="'不限制'"
|
|
19
|
+
:border="!readonly"
|
|
20
|
+
:type="'number'">
|
|
21
|
+
<template #suffix>
|
|
22
|
+
<span v-if="!readonly">分钟</span>
|
|
23
|
+
</template>
|
|
24
|
+
</zydx-input>
|
|
25
|
+
</template>
|
|
26
|
+
<template v-else>
|
|
27
|
+
<span v-if="info.examJoinTime" style="padding: 0px 10px;">
|
|
28
|
+
{{info.examJoinTime}} 分钟
|
|
29
|
+
</span>
|
|
30
|
+
<span v-else style="padding: 0px 10px;">
|
|
31
|
+
不限制
|
|
32
|
+
</span>
|
|
33
|
+
</template>
|
|
24
34
|
</div>
|
|
25
35
|
</div>
|
|
26
36
|
<div v-else class="task_item_main" :class="getZindex(index)">
|
|
27
37
|
<div class="task_text_desc"><span v-if="actionId === 'action_lesson015'">{{getUppercase(index)}}轮</span>{{actionConfig[actionId].endTimeBtn1}}：</div>
|
|
28
38
|
<div class="width250" style=" position: relative">
|
|
29
|
-
<
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
39
|
+
<template v-if="readonly && info.endTime == null">
|
|
40
|
+
<span style="padding: 0px 10px;">
|
|
41
|
+
不限制
|
|
42
|
+
</span>
|
|
43
|
+
</template>
|
|
44
|
+
<template v-else>
|
|
45
|
+
<zydx-input :value="dateFormat(info.endTime)"
|
|
46
|
+
:placeholder="'不限制'"
|
|
47
|
+
:readonly="readonly"
|
|
48
|
+
:border="!readonly"
|
|
49
|
+
:type="'input'">
|
|
50
|
+
<template #suffix>
|
|
51
|
+
<span><img v-if="!readonly" @click="this.showExamJoinCalenderTime[index] = !this.showExamJoinCalenderTime[index]" src="data:image/png;base64,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"/></span>
|
|
52
|
+
</template>
|
|
53
|
+
</zydx-input>
|
|
54
|
+
<div style="position: absolute; right: 0px; top: 15px;">
|
|
55
|
+
<zydx-calender :showDate="true" v-if="showExamJoinCalenderTime[index]" @confirm="examJoinConfirm($event, index)"></zydx-calender>
|
|
56
|
+
</div>
|
|
57
|
+
</template>
|
|
47
58
|
</div>
|
|
48
59
|
</div>
|
|
49
60
|
</template>
|
|
61
|
+
<div v-if="actionConfig[actionId].isShowLaterScore" class="task_item_main" :class="getZindex(index)">
|
|
62
|
+
<div class="task_text_desc">迟交扣分：</div>
|
|
63
|
+
<div class="width250">
|
|
64
|
+
<zydxSelect :color="'#000000'" :readonly="readonly" :options="laterScoreOptions" v-model:value="laterScore"></zydxSelect>
|
|
65
|
+
</div>
|
|
66
|
+
</div>
|
|
50
67
|
</template>
|
|
51
68
|
<div v-if="actionConfig[actionId].isShowScreenLimit" class="task_item_main" style="z-index: 2">
|
|
52
69
|
<div class="task_text_desc">切屏限制：</div>
|
|
53
70
|
<div class="width250">
|
|
54
|
-
<zydxSelect :readonly="readonly" :options="screenLimitOptions" v-model:value="screenLimit"></zydxSelect>
|
|
71
|
+
<zydxSelect :color="'#000000'" :readonly="readonly" :options="screenLimitOptions" v-model:value="screenLimit"></zydxSelect>
|
|
55
72
|
</div>
|
|
56
73
|
</div>
|
|
57
74
|
<div v-if="actionConfig[actionId].isShowFunDisable" class="task_item_main" style="z-index: 2">
|
|
@@ -63,19 +80,19 @@
|
|
|
63
80
|
<div v-if="actionConfig[actionId].isShowReviewObj" class="task_item_main" style="z-index: 1">
|
|
64
81
|
<div class="task_text_desc">评价主体：</div>
|
|
65
82
|
<div class="width250">
|
|
66
|
-
<zydxSelect :readonly="readonly" :options="reviewObjOptions" v-model:value="reviewObj"></zydxSelect>
|
|
83
|
+
<zydxSelect :color="'#000000'" :readonly="readonly" :options="reviewObjOptions" v-model:value="reviewObj"></zydxSelect>
|
|
67
84
|
</div>
|
|
68
85
|
</div>
|
|
69
86
|
<div v-if="actionConfig[actionId].isShowReviewDemand" class="task_item_main" style="z-index: 1">
|
|
70
87
|
<div class="task_text_desc">评价要求：</div>
|
|
71
88
|
<div class="width250">
|
|
72
|
-
<zydxSelect :readonly="readonly" :options="reviewDemandOptions" v-model:value="reviewDemand"></zydxSelect>
|
|
89
|
+
<zydxSelect :color="'#000000'" :readonly="readonly" :options="reviewDemandOptions" v-model:value="reviewDemand"></zydxSelect>
|
|
73
90
|
</div>
|
|
74
91
|
</div>
|
|
75
92
|
<div v-if="actionConfig[actionId].isShowVirtualScore" class="task_item_main" style="z-index: 1">
|
|
76
93
|
<div class="task_text_desc">虚仿成绩：</div>
|
|
77
94
|
<div class="width250">
|
|
78
|
-
<zydxSelect :readonly="readonly" :options="virtualScoreOptions" v-model:value="virtualScore"></zydxSelect>
|
|
95
|
+
<zydxSelect :color="'#000000'" :readonly="readonly" :options="virtualScoreOptions" v-model:value="virtualScore"></zydxSelect>
|
|
79
96
|
</div>
|
|
80
97
|
</div>
|
|
81
98
|
<div class="default_item_main width100" >
|
|
@@ -632,7 +649,8 @@
|
|
|
632
649
|
reviewObj: '',
|
|
633
650
|
screenLimit: '',
|
|
634
651
|
funDisable: '',
|
|
635
|
-
virtualScore: ''
|
|
652
|
+
virtualScore: '',
|
|
653
|
+
laterScore: ''
|
|
636
654
|
}
|
|
637
655
|
},
|
|
638
656
|
watch: {
|
|
@@ -666,6 +684,27 @@
|
|
|
666
684
|
item.virtualScore = val
|
|
667
685
|
});
|
|
668
686
|
},
|
|
687
|
+
laterScore: function (val) { //时间改变
|
|
688
|
+
this.taskInfoList.forEach(item => {
|
|
689
|
+
item.laterScore == 0 ? null : val
|
|
690
|
+
});
|
|
691
|
+
},
|
|
692
|
+
taskInfoList: {
|
|
693
|
+
handler(newValue) {
|
|
694
|
+
this.taskInfoList.forEach(item => {
|
|
695
|
+
if (!isNaN(parseInt(item.examJoinTime))) {
|
|
696
|
+
if (parseInt(item.examJoinTime) <= 0) {
|
|
697
|
+
item.examJoinTime = null
|
|
698
|
+
}
|
|
699
|
+
if (parseInt(item.examJoinTime) >= 999) {
|
|
700
|
+
item.examJoinTime = "999"
|
|
701
|
+
}
|
|
702
|
+
}
|
|
703
|
+
});
|
|
704
|
+
},
|
|
705
|
+
deep: true,
|
|
706
|
+
immediate: true
|
|
707
|
+
},
|
|
669
708
|
taskList: {
|
|
670
709
|
handler(newValue) {
|
|
671
710
|
if (newValue.length === 0) {
|
|
@@ -676,7 +715,7 @@
|
|
|
676
715
|
reviewDemand: "1",
|
|
677
716
|
finishState: "0",
|
|
678
717
|
laterScore: '0',
|
|
679
|
-
examJoinTime: '',
|
|
718
|
+
examJoinTime: '0',
|
|
680
719
|
endTime: null,
|
|
681
720
|
screenLimit: '0',
|
|
682
721
|
funDisable: '0',
|
|
@@ -688,7 +727,7 @@
|
|
|
688
727
|
reviewDemand: "1",
|
|
689
728
|
finishState: "0",
|
|
690
729
|
laterScore: '0',
|
|
691
|
-
examJoinTime: '',
|
|
730
|
+
examJoinTime: '0',
|
|
692
731
|
endTime: null,
|
|
693
732
|
screenLimit: '0',
|
|
694
733
|
funDisable: '0',
|
|
@@ -700,7 +739,7 @@
|
|
|
700
739
|
reviewDemand: "1",
|
|
701
740
|
finishState: "0",
|
|
702
741
|
laterScore: '0',
|
|
703
|
-
examJoinTime: '',
|
|
742
|
+
examJoinTime: '0',
|
|
704
743
|
endTime: null,
|
|
705
744
|
screenLimit: '0',
|
|
706
745
|
funDisable: '0',
|
|
@@ -735,6 +774,7 @@
|
|
|
735
774
|
this.screenLimit = this.taskInfoList[0].screenLimit
|
|
736
775
|
this.funDisable = this.taskInfoList[0].funDisable
|
|
737
776
|
this.virtualScore = this.taskInfoList[0].virtualScore
|
|
777
|
+
this.laterScore = this.taskInfoList[0].laterScore
|
|
738
778
|
},
|
|
739
779
|
deep: true,
|
|
740
780
|
immediate: true
|
|
@@ -769,7 +809,9 @@
|
|
|
769
809
|
confirm () {
|
|
770
810
|
let that = this
|
|
771
811
|
this.taskInfoList.forEach(item => {
|
|
772
|
-
item.endTime
|
|
812
|
+
if(item.endTime != null) {
|
|
813
|
+
item.endTime = new Date(item.endTime);
|
|
814
|
+
}
|
|
773
815
|
Object.keys(item).forEach(key=>{
|
|
774
816
|
if(!that.keysArr.includes(key) || item[key] == null) {
|
|
775
817
|
delete item[key];
|
|
@@ -61,8 +61,10 @@ export default {
|
|
|
61
61
|
watch: {
|
|
62
62
|
url: {
|
|
63
63
|
handler: function (val, oldVal) {
|
|
64
|
+
this.idArr = []
|
|
64
65
|
this.repeatInit()
|
|
65
66
|
},
|
|
67
|
+
deep: true,
|
|
66
68
|
immediate: true
|
|
67
69
|
}
|
|
68
70
|
},
|
|
@@ -95,7 +97,6 @@ export default {
|
|
|
95
97
|
loadingTask.promise.then((pdf) => {
|
|
96
98
|
that.pdfPages = pdf.numPages // 获取pdf文件的总页数
|
|
97
99
|
let page = pdf.numPages
|
|
98
|
-
// if(that.pdfPages > 5) page = 5
|
|
99
100
|
that.getPDF(pdf,page)
|
|
100
101
|
})
|
|
101
102
|
},
|
|
@@ -223,4 +224,4 @@ export default {
|
|
|
223
224
|
width: 100%;
|
|
224
225
|
}
|
|
225
226
|
}
|
|
226
|
-
</style>
|
|
227
|
+
</style>
|
|
@@ -3,18 +3,18 @@
|
|
|
3
3
|
<div class="word-slot" :style="page?style:{}" :ref="'test'+id">
|
|
4
4
|
<slot></slot>
|
|
5
5
|
</div>
|
|
6
|
-
<!-- <div class="answer">-->
|
|
7
|
-
<!-- <div class="answer-max">-->
|
|
8
|
-
<!-- <div class="answer-title">一、单选题《共2题，合计20分)</div>-->
|
|
9
|
-
<!-- <div class="answer-list">-->
|
|
10
|
-
<!-- <div class="answer-list-title">1.我们从分享时机、分享形式、分享动机、分享场量4个来聊聊了社交分享]的那些事儿在常用的杜交分享姐件中，微信 (微信好友和朋友西) 、微、QQ?</div>-->
|
|
11
|
-
<!-- <div class="answer-const">-->
|
|
12
|
-
<!-- <div class="answer-const-title">参考答案：</div>-->
|
|
13
|
-
<!-- <div class="answer-const-text">A.景4个址度来聊聊 社交分享] 的那些事儿在常用的社交分享组件中，微信《微信好友和朋友圈) 、微博、QQ</div>-->
|
|
14
|
-
<!-- </div>-->
|
|
15
|
-
<!-- </div>-->
|
|
16
|
-
<!-- </div>-->
|
|
17
|
-
<!-- </div>-->
|
|
6
|
+
<!-- <div class="answer">-->
|
|
7
|
+
<!-- <div class="answer-max">-->
|
|
8
|
+
<!-- <div class="answer-title">一、单选题《共2题，合计20分)</div>-->
|
|
9
|
+
<!-- <div class="answer-list">-->
|
|
10
|
+
<!-- <div class="answer-list-title">1.我们从分享时机、分享形式、分享动机、分享场量4个来聊聊了社交分享]的那些事儿在常用的杜交分享姐件中，微信 (微信好友和朋友西) 、微、QQ?</div>-->
|
|
11
|
+
<!-- <div class="answer-const">-->
|
|
12
|
+
<!-- <div class="answer-const-title">参考答案：</div>-->
|
|
13
|
+
<!-- <div class="answer-const-text">A.景4个址度来聊聊 社交分享] 的那些事儿在常用的社交分享组件中，微信《微信好友和朋友圈) 、微博、QQ</div>-->
|
|
14
|
+
<!-- </div>-->
|
|
15
|
+
<!-- </div>-->
|
|
16
|
+
<!-- </div>-->
|
|
17
|
+
<!-- </div>-->
|
|
18
18
|
<div class="word-page" :ref="'wordPage'+id" v-if="page">
|
|
19
19
|
<div class="page-cont" v-for="(item,index) in htmlArr" :key="index" :style="{'z-index': zIndex}">
|
|
20
20
|
<div class="page-cont-html" v-html="item" :style="{padding: padding?'100px':'100px 0', 'padding-top': index === 0?'10px': '100px'}"></div>
|
|
@@ -89,7 +89,7 @@ export default {
|
|
|
89
89
|
this.html = ''
|
|
90
90
|
setTimeout(() => {
|
|
91
91
|
const data = this.$refs[`test${this.id}`].children[0].childNodes
|
|
92
|
-
this.max = (this.$refs[`wordPage${this.id}`].offsetWidth * 1.4) -
|
|
92
|
+
this.max = (this.$refs[`wordPage${this.id}`].offsetWidth * 1.4) - 300
|
|
93
93
|
this.children(data)
|
|
94
94
|
},100)
|
|
95
95
|
},
|
|
@@ -97,7 +97,7 @@ export default {
|
|
|
97
97
|
for (let i = 0; i < data.length; i++) {
|
|
98
98
|
let mar = this.marginCal(data[i])
|
|
99
99
|
let text = data[i].offsetHeight + mar
|
|
100
|
-
if((this.pHeight + text) > this.max) {
|
|
100
|
+
if((this.pHeight + text) > (this.htmlArr.length === 0? this.max: this.max - 100)) {
|
|
101
101
|
this.propsClass(data[i].children)
|
|
102
102
|
}else {
|
|
103
103
|
this.pHeight += text
|
|
@@ -122,9 +122,10 @@ export default {
|
|
|
122
122
|
},
|
|
123
123
|
propsClass(data) {
|
|
124
124
|
for (let i = 0; i < data.length; i++) {
|
|
125
|
-
let
|
|
126
|
-
|
|
127
|
-
|
|
125
|
+
let mar = this.marginCal(data[i])
|
|
126
|
+
let text = data[i].offsetHeight + mar
|
|
127
|
+
if((this.pHeight + text) > (this.htmlArr.length === 0? this.max: this.max - 100)) {
|
|
128
|
+
if(data[i].children.length === 0 || data[i].className.indexOf('paper-choice') !== -1 || data[i].localName === 'table') {
|
|
128
129
|
this.htmlArr.push(this.html)
|
|
129
130
|
this.pHeight = 0
|
|
130
131
|
this.html = ''
|