zydx-plus 1.32.226 → 1.32.228

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.32.226",
+  "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

@@ -221,7 +221,7 @@ input[name='check'] {
 }
 .review{
     padding-left: 2em;
-    width: calc(100% - 2em);
+    box-sizing: border-box;
 }
 .review-title{
     padding: 6px 0 4px 0;
@@ -238,3 +238,6 @@ input[name='check'] {
     border: 0;
     text-align: center;
 }
+.choice-red{
+    color: red;
+}

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

@@ -2,8 +2,16 @@
    <div :class="{paper: borderShow}">
        <div class="parer-cont" ref="parer">
            <div class="paper-choice" :class="{'array-ch': !styleText(item.testKey)}" v-for="(item,index) in value">
+               <div v-if="task" class="task">
+                   <span>作业题目1:</span>
+                   <div class="task-but">
+                       <button class="but" :class="{'buts-actives': item.subject}" @click="subject(index)">{{ item.subject?'收起题目':'展开题目'}}</button>
+                       <button class="but" :class="{'buts-actives': item.reasoning}" @click="openReasoning(index)">{{ item.reasoning?'收起回答':'展开回答'}}</button>
+                       <button class="but" :class="{'buts-actives': item.review}" @click="review(index)">{{ item.review?'收起批阅':'展开批阅'}}</button>
+                   </div>
+               </div>
                <div class="subject">
-                   <div class="subject-title">
+                   <div class="subject-title" v-if="item.subject">
                            <input v-if="multipleShow" type="checkbox" :checked="item.checked" @change="checkboxChange($event,index)" name="check" />
                            <span>{{ item.order? item.order: index + 1 }}.<em v-html="item.title"></em><em v-if="scoreShow">({{ item.score }}分)</em>
                                <i class="subject-but" ref="subject">
@@ -27,8 +35,8 @@
                                        <button class="but" :class="{'buts-actives': item.replace}" @click="statistics(index)">{{ item.replace?'收统计表':'统计表'}}</button>
                                    </b>
                                    <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="reasoning" ref="b">
-                                       <button class="but" :class="{'buts-actives': item.reasoning}" @click="openReasoning(index)">{{ item.reasoning?'收起推理':'展开推理'}}</button>
-                                       <button class="but" :class="{'buts-actives': item.review}" @click="review(index)">{{ item.review?'收起批阅':'展开批阅'}}</button>
+                                       <button class="but" :class="{'buts-actives': item.reasoning}" @click="openReasoning(index)">{{ item.reasoning?reasoningBut[0].startName:reasoningBut[0].endName}}</button>
+                                       <button class="but" :class="{'buts-actives': item.review}" @click="review(index)">{{ item.review?reasoningBut[1].startName:reasoningBut[1].endName}}</button>
                                    </b>
                                </i>
                            </span>
@@ -39,41 +47,15 @@
                        <div class="subject-html-title">{{ titleText }}{{ ind + 1 }}</div>
                        <div class="subject-html-cont" v-html="it.annexContent"></div>
                    </div>
-                   <div class="subject-student" v-if="item.reasoning&&item.stuAnswer">
-                       <div class="reasoning">学生推理:</div>
-                       <div class="subject-student-edi" v-for="(it,ind) in item.stuAnswer.answer" v-html="it"></div>
-                   </div>
                </div>
                <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>
-               <div class="table review" v-if="item.review&&item.scoreList">
-                   <div class="review-title">
-                       <span>训练批阅:</span>
-                       <button class="but" @click="completeReview(item.scoreList)">完成批阅</button>
-                   </div>
-                   <table border="0" cellspacing="0" cellpadding="0">
-                       <tr>
-                           <td class="tab-title">序号</td>
-                           <td class="tab-title">批阅人</td>
-                           <td class="tab-title">批阅得分</td>
-                           <td class="tab-title">矫正得分</td>
-                           <td class="tab-title">合计得分</td>
-                       </tr>
-                       <tr v-for="(it,ind) in item.scoreList">
-                           <td>{{ ind + 1 }}</td>
-                           <td>{{ it.stuName }}</td>
-                           <td>{{ it.studentScore }}</td>
-                           <td><input type="text" v-model="it.correctScore" placeholder="请输入分值" /> </td>
-                           <td>{{ it.correctTeacher }}</td>
-                       </tr>
-                   </table>
-               </div>
                <div class="table" v-if="item.replace&&item.itemList&&collapse&&item.quesType === '102_1'">
                    <table border="0" cellspacing="0" cellpadding="0">
                        <tr>
@@ -129,7 +111,8 @@ export default {
             multipleShow: this.multiple,
             choiceState: true,
             replaceShow: this.replace,
-            replaceOpen: false
+            replaceOpen: false,
+            id: null
         }
     },
     props: {
@@ -191,20 +174,38 @@ export default {
         reasoning: {
             type: Boolean,
             default: false
+        },
+        reasoningBut: {
+            type: Array,
+            default: [
+                {startName: '收起推理',endName: '展开推理'},
+                {startName: '收起批阅',endName: '展开批阅'}
+            ]
+        },
+        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.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)})
@@ -229,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(() => {  // 保证所有的数据都渲染完毕
@@ -262,10 +258,64 @@ export default {
             deep: true
         }
     },
-    emits: ['change','modify','del','changeAll','replaceData','choiceData','judgeAnswer','completeReview'],
+    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: {
-        completeReview(data) {
-            this.$emit('completeReview', data)
+        randomId() { // 生成随机id
+            const id = Math.random().toString(36).substr(2)
+            return id.replace(/[0-9]/g, '')
+        },
+        subject(i) {
+            this.value[i].subject = !this.value[i].subject
         },
         diffLeveNum(v) {
             if(v === '1') return '简单'
@@ -273,16 +323,18 @@ export default {
             if(v === '3') return '困难'
         },
         openReasoning(i) {
-            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.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.226',
+    version: '1.32.228',
     install,
     Calendar,
     Message,