zydx-plus 1.32.227 → 1.32.228

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.32.227",
+  "version": "1.32.228",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/biz_header/src/button_name.js

@@ -1252,6 +1252,23 @@ let buttonNames = {
                                 analysis: '统计分析',
                                 power: '学习动力'
                             }
+                        },
+                        1: {
+                            headLevel: {
+                                default: "allClass",
+                                allClass: this.getPrefix(item) + '检测',
+                                wrongItem: '错误试题',
+                            },
+                            otherLevel: {
+                                default: "allClass",
+                                allClass: this.getPrefix(item) + '检测',
+                                wrongItem: '错误试题',
+                            },
+                            lowLevel: {
+                                default: "allClass",
+                                allClass: this.getPrefix(item) + '检测',
+                                wrongItem: '错误试题',
+                            }
                         }
                     }
                 },
@@ -1488,6 +1505,23 @@ let buttonNames = {
                                 analysis: '统计分析',
                                 power: '学习动力'
                             },
+                        },
+                        1: {
+                            headLevel: {
+                                default: "allClass",
+                                allClass: this.getPrefix(item) + '训练',
+                                wrongItem: '错误题目',
+                            },
+                            otherLevel: {
+                                default: "allClass",
+                                allClass: this.getPrefix(item) + '训练',
+                                wrongItem: '错误题目',
+                            },
+                            lowLevel: {
+                                default: "allClass",
+                                allClass: this.getPrefix(item) + '训练',
+                                wrongItem: '错误题目',
+                            },
                         }
                     }
                 },

package/src/components/word/src/word.css

@@ -238,52 +238,6 @@ input[name='check'] {
     border: 0;
     text-align: center;
 }
-.enclosure{
-    padding-left: 2em;
-    box-sizing: border-box;
-}
-.enclosure>p{
-    font-size: 16px;
-    font-weight: 700;
-}
-.enclosure-list{
-    margin: 5px 0 0 0;
-    height: 22px;
-    line-height: 22px;
-}
-.enclosure-list:after{
-    content: "";
-    clear: left;
-    display: block;
-}
-.enclosure-item:first-child{
-    width: calc(100% - 210px);
-}
-.enclosure-item:last-child{
-    width: 210px;
-}
-.enclosure-item{
-    height: 22px;
-    float: left;
-}
-.enclosure-item>span{
-    display: inline-block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    max-width: 100%;
-    box-sizing: border-box;
-    padding-right: 20px;
-}
-.en-but{
-    text-align: right;
-}
-.task{
-    display: flex;
-    justify-content: center;
-    font-size: 16px;
-    font-weight: 700;
-}
-.task span{
-    flex: 1;
+.choice-red{
+    color: red;
 }

package/src/components/word/src/word.vue

@@ -51,8 +51,8 @@
                <div class="choice" v-if="item.testKey" v-show="item.open">
                    <div class="choice-box" v-for="(ts,ind) in item.testKey">
                        <label>
-                           <input class="choice-input" v-if="chooseAnswer" :disabled="disabled" :checked="ts.checked" @change="answerChange($event,item,index)" :type="ques(item.quesType)?'radio':'checkbox'" :name="index" />
-                           <span :class="{'choice-span': chooseAnswer,'choice-color': disabled&&ts.checked}">{{ ts.index }}. {{ ts.content[0] }}</span>
+                           <input class="choice-input" v-if="chooseAnswer" :disabled="disabled" :checked="ts.checked" @change="answerChange($event,item,`${id}${index}`)" :type="ques(item.quesType)?'radio':'checkbox'" :name="`${id}${index}`" />
+                           <span :class="{'choice-span': chooseAnswer,'choice-color': disabled&&ts.checked&&!item.red,'choice-red': disabled&&ts.checked&&item.red}">{{ ts.index }}. {{ ts.content[0] }}</span>
                        </label>
                    </div>
                </div>
@@ -111,7 +111,8 @@ export default {
             multipleShow: this.multiple,
             choiceState: true,
             replaceShow: this.replace,
-            replaceOpen: false
+            replaceOpen: false,
+            id: null
         }
     },
     props: {
@@ -184,21 +185,27 @@ export default {
         task: {
             type: Boolean,
             default: false
+        },
+        state: {
+            type: Boolean,
+            default: false
         }
     },
     watch: {
         data: {
             handler: function (val, oldVal) {
-                this.value = val
+                if(this.state) return
+                this.value = JSON.parse(JSON.stringify(val))
                 this.value.map((item,index) => { // 转换html
                     item.choice = true
                     item.right = 0
                     item.top = 0
-                    item.open = true
-                    item.replace = true
-                    item.reasoning = true
-                    item.review = true
-                    item.subject = true
+                    item.open = item.open? item.open: true
+                    item.replace = item.replace? item.replace: true
+                    item.reasoning = item.reasoning? item.reasoning: true
+                    item.review = item.review? item.review: true
+                    item.subject = item.subject? item.subject: true
+                    item.red = item.red? item.red: false
                     if(item.alist) {
                         item.alist.map(x => {
                             x.annexContent = json2html({node: "root",child: JSON.parse(x.annexContent)})
@@ -223,12 +230,7 @@ export default {
                             return x
                         })
                     }
-                    if(item.stuAnswer) {
-                        item.stuAnswer.answer = item.stuAnswer.answer.map(x => {
-                            x = json2html(x)
-                            return x
-                        })
-                    }
+                    console.log(item)
                     return item
                 })
                 this.$nextTick(() => {  // 保证所有的数据都渲染完毕
@@ -256,10 +258,64 @@ export default {
             deep: true
         }
     },
+    mounted() {
+        this.id = this.randomId()
+        if(!this.state) return
+        this.value = JSON.parse(JSON.stringify(this.data))
+        this.value.map((item,index) => { // 转换html
+            item.choice = true
+            item.right = 0
+            item.top = 0
+            item.open = item.open? item.open: true
+            item.replace = item.replace? item.replace: true
+            item.reasoning = item.reasoning? item.reasoning: true
+            item.review = item.review? item.review: true
+            item.subject = item.subject? item.subject: true
+            item.red = item.red? item.red: false
+            if(item.alist) {
+                item.alist.map(x => {
+                    x.annexContent = json2html({node: "root",child: JSON.parse(x.annexContent)})
+                    return x
+                })
+            }
+            if(item.testKey) {
+                item.testKey = typeof item.testKey === 'string'? JSON.parse(item.testKey): item.testKey
+                item.testKey = item.testKey.map(x => {
+                    if(this.ques(item.quesType)) { // 判断是否单选
+                        x.checked = x.index === item?.judgeAnswer;  //答案
+                    }else {
+                        for(let i=0; i<item?.judgeAnswer?.length; i++) {
+                            if(x.index === item.judgeAnswer[i]) {
+                                x.checked = true
+                                break
+                            }else {
+                                x.checked = false
+                            }
+                        }
+                    }
+                    return x
+                })
+            }
+            return item
+        })
+        this.$nextTick(() => {  // 保证所有的数据都渲染完毕
+            const w = this.$refs.parer.offsetWidth // 获取父级宽度
+            for(let i = 0; i< this.$refs?.subject?.length; i++) {
+                this.value[i].right = w - this.$refs.subject[i].offsetLeft
+                if(this.$refs.b && this.$refs.b.length > 0) {
+                    if(this.value[i].right < this.$refs.b[i].offsetWidth) this.value[i].top = 25 // 判断是否换行
+                }
+            }
+        })
+    },
     emits: ['change','modify','del','changeAll','replaceData','choiceData','judgeAnswer','openReasoning','review','subject'],
     methods: {
+        randomId() { // 生成随机id
+            const id = Math.random().toString(36).substr(2)
+            return id.replace(/[0-9]/g, '')
+        },
         subject(i) {
-            this.data[i].subject = !this.data[i].subject
+            this.value[i].subject = !this.value[i].subject
         },
         diffLeveNum(v) {
             if(v === '1') return '简单'
@@ -267,18 +323,18 @@ export default {
             if(v === '3') return '困难'
         },
         openReasoning(i) {
-            this.$emit('openReasoning', this.data[i].reasoning)
-            this.data[i].reasoning = !this.data[i].reasoning
+            this.$emit('openReasoning', this.value[i].reasoning)
+            this.value[i].reasoning = !this.value[i].reasoning
         },
         review(i) {
-            this.$emit('review', this.data[i].review )
-            this.data[i].review = !this.data[i].review
+            this.$emit('review', this.value[i].review )
+            this.value[i].review = !this.value[i].review
         },
         openOption(i) {
-            this.data[i].open = !this.data[i].open
+            this.value[i].open = !this.value[i].open
         },
         statistics(i) {
-            this.data[i].replace = !this.data[i].replace
+            this.value[i].replace = !this.value[i].replace
         },
         answerChange(e,v,id) {
             let answerArr = []

package/src/index.js

@@ -79,7 +79,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.227',
+    version: '1.32.228',
     install,
     Calendar,
     Message,