zydx-plus 1.32.226 → 1.32.227

package/package.json

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

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,52 @@ 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;
+}

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,10 +47,6 @@
                        <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">
@@ -52,28 +56,6 @@
                        </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>
@@ -191,6 +173,17 @@ export default {
         reasoning: {
             type: Boolean,
             default: false
+        },
+        reasoningBut: {
+            type: Array,
+            default: [
+                {startName: '收起推理',endName: '展开推理'},
+                {startName: '收起批阅',endName: '展开批阅'}
+            ]
+        },
+        task: {
+            type: Boolean,
+            default: false
         }
     },
     watch: {
@@ -205,6 +198,7 @@ export default {
                     item.replace = true
                     item.reasoning = true
                     item.review = true
+                    item.subject = true
                     if(item.alist) {
                         item.alist.map(x => {
                             x.annexContent = json2html({node: "root",child: JSON.parse(x.annexContent)})
@@ -262,10 +256,10 @@ export default {
             deep: true
         }
     },
-    emits: ['change','modify','del','changeAll','replaceData','choiceData','judgeAnswer','completeReview'],
+    emits: ['change','modify','del','changeAll','replaceData','choiceData','judgeAnswer','openReasoning','review','subject'],
     methods: {
-        completeReview(data) {
-            this.$emit('completeReview', data)
+        subject(i) {
+            this.data[i].subject = !this.data[i].subject
         },
         diffLeveNum(v) {
             if(v === '1') return '简单'
@@ -273,9 +267,11 @@ export default {
             if(v === '3') return '困难'
         },
         openReasoning(i) {
+            this.$emit('openReasoning', this.data[i].reasoning)
             this.data[i].reasoning = !this.data[i].reasoning
         },
         review(i) {
+            this.$emit('review', this.data[i].review )
             this.data[i].review = !this.data[i].review
         },
         openOption(i) {

package/src/index.js

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