zydx-plus 1.33.429 → 1.33.430

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zydx-plus",
3
- "version": "1.33.429",
3
+ "version": "1.33.430",
4
4
  "description": "Vue.js",
5
5
  "main": "src/index.js",
6
6
  "files": [
@@ -806,6 +806,52 @@ let buttonNames = {
806
806
  }
807
807
  }
808
808
  },
809
+ action_lesson_soft: {
810
+ actionName: '软件学习',
811
+ buttonList: {
812
+ 0: {
813
+ headLevel: {
814
+ default: "demand",
815
+ demand: '学习要求',
816
+ singletonClass: this.getCurrentPrefix(item) + '任务',
817
+ allClass: this.getPrefix(item) + '情况',
818
+ },
819
+ otherLevel: {
820
+ default: "singletonClass",
821
+ singletonClass: this.getCurrentPrefix(item) + '任务',
822
+ allClass: this.getPrefix(item) + '情况',
823
+ },
824
+ lowLevel: {
825
+ default: "singletonClass",
826
+ singletonClass: '学习任务',
827
+ score: '学习成绩',
828
+ analysis: '统计分析',
829
+ assessment: '素养评估',
830
+ power: '学习动力'
831
+ },
832
+ },
833
+ 2: {
834
+ headLevel: {
835
+ default: "singletonClass",
836
+ singletonClass: this.getCurrentPrefix(item) + '任务',
837
+ allClass: this.getPrefix(item) + '情况',
838
+ },
839
+ otherLevel: {
840
+ default: "singletonClass",
841
+ singletonClass: this.getCurrentPrefix(item) + '任务',
842
+ allClass: this.getPrefix(item) + '情况',
843
+ },
844
+ lowLevel: {
845
+ default: "singletonClass",
846
+ singletonClass: '学习任务',
847
+ score: '学习成绩',
848
+ analysis: '统计分析',
849
+ assessment: '素养评估',
850
+ power: '学习动力'
851
+ },
852
+ }
853
+ }
854
+ },
809
855
  action_lesson_homework: {
810
856
  actionName: '课后作业',
811
857
  buttonList: {
@@ -1788,6 +1834,32 @@ let buttonNames = {
1788
1834
  }
1789
1835
  }
1790
1836
  },
1837
+ action_lesson_soft: {
1838
+ actionName: '软件学习',
1839
+ buttonList: {
1840
+ 0: {
1841
+ headLevel: {
1842
+ default: "demand",
1843
+ demand: '学习要求',
1844
+ singletonClass: this.getCurrentPrefix(item) + '学习',
1845
+ allClass: this.getPrefix(item) + '情况',
1846
+ },
1847
+ otherLevel: {
1848
+ default: "singletonClass",
1849
+ singletonClass: this.getCurrentPrefix(item) + '学习',
1850
+ allClass: this.getPrefix(item) + '情况',
1851
+ },
1852
+ lowLevel: {
1853
+ default: "singletonClass",
1854
+ singletonClass: this.getCurrentPrefix(item) + '学习',
1855
+ score: '学习成绩',
1856
+ analysis: '统计分析',
1857
+ assessment: '素养评估',
1858
+ power: '学习动力'
1859
+ },
1860
+ }
1861
+ }
1862
+ },
1791
1863
  action_lesson056: {
1792
1864
  actionName: '讲给他人',
1793
1865
  buttonList: {
@@ -2684,6 +2756,35 @@ let buttonNames = {
2684
2756
  }
2685
2757
  }
2686
2758
  },
2759
+ resource_lesson_soft: {
2760
+ actionName: '软件学习',
2761
+ buttonList: {
2762
+ 0: {
2763
+ headLevel: {
2764
+ default: "demand",
2765
+ demand: '学习要求',
2766
+ resourceIndex: '学习任务',
2767
+ review: '学习点评',
2768
+ analyse: '学习分析',
2769
+ countermeasure: this.getJobType() === 'resource_guidance' ? '指导对策' : '教学对策',
2770
+ assessment: '素养评估',
2771
+ analysis: '素养分析',
2772
+ proposal: '成长建议'
2773
+ },
2774
+ otherLevel: {
2775
+ default: "singletonClass",
2776
+ singletonClass: this.getCurrentPrefix(item) + '任务',
2777
+ allClass: this.getPrefix(item) + '任务'
2778
+ },
2779
+ lowLevel: {
2780
+ default: "viewResource",
2781
+ createResource: '创建任务',
2782
+ viewResource: '任务列表',
2783
+ // selectResource: '查找任务',
2784
+ }
2785
+ }
2786
+ }
2787
+ },
2687
2788
  resource_lesson_homework: {
2688
2789
  actionName: '作业资源',
2689
2790
  buttonList: {
@@ -341,6 +341,20 @@
341
341
  isShowFunDisable: false,
342
342
  isShowVirtualScore: false
343
343
  },
344
+ action_lesson_soft: {
345
+ actionName: '软件学习',
346
+ endTimeBtn1: '学习截止',
347
+ endTimeBtn2: '学习时长',
348
+ laterScoreBtn: '迟交扣分',
349
+ isShowFinishState: true,
350
+ isShowEndTime: true,
351
+ isShowLaterScore: true,
352
+ isShowReviewObj: true,
353
+ isShowReviewDemand: true,
354
+ isShowScreenLimit: false,
355
+ isShowFunDisable: false,
356
+ isShowVirtualScore: false
357
+ },
344
358
  action_lesson056: {
345
359
  actionName: '讲给他人',
346
360
  endTimeBtn1: '任务截止',
@@ -73,7 +73,7 @@
73
73
  <img :src="menusData('signMenu')?.ico" alt=""/>
74
74
  <span>{{ menusData('signMenu')?.text }}</span>
75
75
  </div>
76
- <editor-content :editor="editor" class="editing-cont" @click.stop="editorContentClick"
76
+ <editor-content :editor="editor" class="editing-cont" ref="editing-cont" @click.stop="editorContentClick"
77
77
  @paste.native.capture.prevent="preventPaste"></editor-content>
78
78
  <div class="menu">
79
79
  <button v-if="readOnly" class="but" @click="enlSee">查看</button>
@@ -110,7 +110,7 @@
110
110
  </div>
111
111
  </div>
112
112
 
113
- <div v-if="page&&readOnly" class="read-only">
113
+ <div v-if="page&&readOnly" class="read-only" ref="read-only">
114
114
  <!-- :style="{width: (wit + 20) + 'px'}"-->
115
115
  <div v-if="signMenuShow" class="editing-header">
116
116
  <img :src="menusData('signMenu')?.ico" alt=""/>
@@ -2090,8 +2090,8 @@ export default {
2090
2090
  readOnlyPage() { // 只读分页
2091
2091
  this.$nextTick(() => {
2092
2092
  this.htmlArr = []
2093
- const data = document.querySelectorAll('.editing-cont')[0].childNodes[0].childNodes
2094
- this.wit = document.getElementsByClassName('read-only')[0].offsetWidth + 20
2093
+ const data = this.$refs['editing-cont'].$el.childNodes[0]?.childNodes//document.querySelectorAll('.editing-cont')[0]?.childNodes[0]?.childNodes
2094
+ this.wit = this.$refs['read-only'].offsetWidth//document.getElementsByClassName('read-only')[0]?.offsetWidth + 20
2095
2095
  if (this.wit > 900) this.wit = 900
2096
2096
  let max = this.wit * 1.6 - 46
2097
2097
  let pHeight = 0
@@ -4443,7 +4443,7 @@ li {
4443
4443
 
4444
4444
 
4445
4445
  .menu-one {
4446
- //max-width: 557px; min-width: 300px; width: max-content; padding: 10px; border-radius: 7px; //margin:0 100px; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.58); background: #FFFFFF; display: flex; flex-direction: column; justify-content: space-between; z-index: 10 !important;
4446
+ //max-width: 557px; min-width: 300px; width: max-content; padding: 10px; border-radius: 7px; //margin:0 100px; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.58); background: #FFFFFF; display: flex; flex-direction: column; justify-content: space-between; z-index: 10 !important;
4447
4447
  }
4448
4448
 
4449
4449
  .menu-one-text {
@@ -4455,7 +4455,7 @@ li {
4455
4455
  font-weight: 400;
4456
4456
  overflow-y: auto;
4457
4457
  font-family: FangSong;
4458
- //text-indent: 2em; margin-bottom: 6px;
4458
+ //text-indent: 2em; margin-bottom: 6px;
4459
4459
  }
4460
4460
 
4461
4461
  .menu-one-title {
@@ -4840,7 +4840,7 @@ li {
4840
4840
  }
4841
4841
 
4842
4842
  :deep(.annotation-num) {
4843
- border:1px solid #000;
4843
+ border: 1px solid #000;
4844
4844
  border-radius: 50%;
4845
4845
  }
4846
4846
  </style>
@@ -8,7 +8,7 @@
8
8
  <div>
9
9
  <div class="tip-title" v-html="title"></div>
10
10
  </div>
11
- <div class="tip-boxContent">
11
+ <div class="tip-boxContent" ref="tip-boxContent" :style="overflowShow?'overflow-y: scroll':''">
12
12
  <div class="tap-p" ref="tapP">
13
13
  <div class="tip-title2" ref="tipTitle" v-if="type === 'text'"
14
14
  :style="{'text-align': (middles)? 'center': 'left', 'text-indent': indent? '2em': '0' }">
@@ -150,6 +150,7 @@ export default {
150
150
  fileName: '',
151
151
  middles: this.middle,
152
152
  indent: false,
153
+ overflowShow: false,
153
154
  timeo: 0,
154
155
  dropData: []
155
156
  }
@@ -237,6 +238,7 @@ export default {
237
238
  this.timeo = this.countdown
238
239
  this.countdownFun()
239
240
  }
241
+ this.overflowShow = this.$refs['tip-boxContent'].scrollHeight>600
240
242
  })
241
243
  },
242
244
  beforeUnmount() {
@@ -368,9 +370,9 @@ export default {
368
370
  .cover-img>div{
369
371
  color: #666;
370
372
  }
371
- :deep(.tip-boxContent){
373
+ /*:deep(.tip-boxContent){
372
374
  overflow-y: scroll;
373
- }
375
+ }*/
374
376
  :deep(.tip-boxContent)::-webkit-scrollbar{
375
377
  width: 0;
376
378
  }
package/src/index.js CHANGED
@@ -83,7 +83,7 @@ function install(app) {
83
83
  }
84
84
 
85
85
  export default {
86
- version: '1.33.429',
86
+ version: '1.33.430',
87
87
  install,
88
88
  Calendar,
89
89
  Message,