zydx-plus 1.32.224 → 1.32.226

package/package.json

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

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

@@ -647,6 +647,7 @@ let buttonNames = {
                             lowLevel: {
                                 default: "setTask",
                                 setTask: '布置任务',
+                                groupStudy: '小组学习',
                                 duplicate: '违纪查重',
                                 teacherReview: '教师评价',
                                 studentReview: '同学互评',
@@ -1333,7 +1334,6 @@ let buttonNames = {
                         }
                     }
                 },
-
                 action_lesson012: {
                     actionName: '教师提问',
                     buttonList: {

package/src/components/biz_taskInfo/src/bizTaskInfo.vue

@@ -72,14 +72,12 @@
                     <zydxSelect :readonly="readonly" :options="reviewDemandOptions" v-model:value="reviewDemand"></zydxSelect>
                 </div>
             </div>
-
             <div v-if="actionConfig[actionId].isShowVirtualScore" class="task_item_main" style="z-index: 1">
                 <div class="task_text_desc">虚仿成绩：</div>
                 <div class="width250">
-                    <zydxSelect :readonly="readonly" :options="laterScoreOptions" v-model:value="virtualScore"></zydxSelect>
+                    <zydxSelect :readonly="readonly" :options="virtualScoreOptions" v-model:value="virtualScore"></zydxSelect>
                 </div>
             </div>
-
             <div class="default_item_main width100" >
                 <slot name="class_slot"></slot>
             </div>
@@ -115,6 +113,10 @@
             taskList: {
                 type: Array,
                 default: () => []
+            },
+            isNeedReview: {
+                type: Boolean,
+                default: true
             }
         },
         components: {zydxSelect, zydxInput, zydxCalender},
@@ -162,8 +164,8 @@
                         isShowFinishState: true,
                         isShowEndTime: true,
                         isShowLaterScore: true,
-                        isShowReviewObj: true,
-                        isShowReviewDemand: true,
+                        isShowReviewObj: this.isNeedReview? true: false,
+                        isShowReviewDemand: this.isNeedReview? true: false,
                         isShowScreenLimit: false,
                         isShowFunDisable: false,
                         isShowVirtualScore: false
@@ -287,8 +289,8 @@
                         isShowFinishState: true,
                         isShowEndTime: true,
                         isShowLaterScore: true,
-                        isShowReviewObj: true,
-                        isShowReviewDemand: true,
+                        isShowReviewObj: this.isNeedReview? true: false,
+                        isShowReviewDemand: this.isNeedReview? true: false,
                         isShowScreenLimit: false,
                         isShowFunDisable: false,
                         isShowVirtualScore: false
@@ -557,6 +559,52 @@
                         label: '100%'
                     }
                 ],
+                virtualScoreOptions: [
+                    {
+                        value: '0',
+                        label: '不占比'
+                    },
+                    {
+                        value: '10',
+                        label: '10%'
+                    },
+                    {
+                        value: '20',
+                        label: '20%'
+                    },
+                    {
+                        value: '30',
+                        label: '30%'
+                    },
+                    {
+                        value: '40',
+                        label: '40%'
+                    },
+                    {
+                        value: '50',
+                        label: '50%'
+                    },
+                    {
+                        value: '60',
+                        label: '60%'
+                    },
+                    {
+                        value: '70',
+                        label: '70%'
+                    },
+                    {
+                        value: '80',
+                        label: '80%'
+                    },
+                    {
+                        value: '90',
+                        label: '90%'
+                    },
+                    {
+                        value: '100',
+                        label: '100%'
+                    }
+                ],
                 screenLimitOptions: [
                     {
                         value: '0',
@@ -721,6 +769,7 @@
             confirm () {
                 let that = this
                 this.taskInfoList.forEach(item => {
+                    item.endTime = new Date(item.endTime);
                     Object.keys(item).forEach(key=>{
                         if(!that.keysArr.includes(key) || item[key] == null) {
                             delete item[key];

package/src/components/mind/src/mind.vue

@@ -2,18 +2,18 @@
     <div class="mind" :ref="id">
         <div class="table">
             <div class="table-left" v-if="!readOnly">
-                <button :disabled="retShow" @click="ret">返回</button>
-                <button :disabled="forwardShow" @click="forward">前进</button>
                 <button :disabled="mindShow" @click="addNode">添加节点</button>
                 <button :disabled="mindShow" @click="brotherNode">兄弟节点</button>
                 <button :disabled="mindShow" @click="delNode">删除节点</button>
                 <button :disabled="mindShow" @click="associativeLine">关联线</button>
                 <button :disabled="mindShow" @click="nodeStyle">节点样式</button>
                 <button @click="structure">结构切换</button>
+                <button :disabled="retShow" @click="ret">上一步</button>
+                <button :disabled="forwardShow" @click="forward">下一步</button>
                 <button v-if="protectShow" @click="preservation">保存</button>
+                <button @click="fullTap" v-if="fullShow">全屏</button>
+                <button @click="fullDel" v-else>退出</button>
             </div>
-            <button @click="fullTap" v-if="fullShow">全屏</button>
-            <button @click="fullDel" v-else>退出</button>
         </div>
         <div :id="id" class="mindMapContainer"></div>
         <div class="node-style" :ref="id+'e'" :class="{'node-s': trans, 'node-h': !trans}">
@@ -467,8 +467,9 @@ export default {
 <style scoped>
 
 .table-left {
-    display: inline-block;
     margin-right: 5px;
+    display: flex;
+    width: 100%;
 }
 
 .node-s {
@@ -577,12 +578,8 @@ export default {
 }
 
 .table {
-    position: absolute;
-    top: 10px;
-    left: 30px;
     background-color: #fff;
     border-radius: 5px;
-    padding: 10px;
     box-shadow: rgba(0, 0, 0, 0.06) 0 2px 16px 0;
     z-index: 10;
 }
@@ -637,13 +634,13 @@ export default {
 }
 
 .table button {
-    margin-right: 5px;
     background-color: #fff;
     border: 1px solid #ccc;
-    border-radius: 3px;
-    padding: 5px 10px;
     cursor: pointer;
-    font-size: 12px;
+    font-size: 14px;
+    height: 30px;
+    line-height: 30px;
+    flex: 1;
 }
 
 .table button:last-child {

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

@@ -208,3 +208,33 @@ input[name='check'] {
 .tab-title{
     font-weight: 700 !important;
 }
+.reasoning{
+    font-size: 16px;
+    font-weight: 700;
+    text-indent: 1.7em;
+    display: inline-block;
+    padding-bottom: 8px;
+}
+.subject-student-edi{
+    text-indent: 2em;
+    padding: 2px 0;
+}
+.review{
+    padding-left: 2em;
+    width: calc(100% - 2em);
+}
+.review-title{
+    padding: 6px 0 4px 0;
+    display: flex;
+    justify-content: center;
+}
+.review-title span{
+    flex: 1;
+    font-size: 16px;
+    font-weight: 700;
+}
+.table td>input{
+    width: 80px;
+    border: 0;
+    text-align: center;
+}

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

@@ -5,7 +5,7 @@
                <div class="subject">
                    <div class="subject-title">
                            <input v-if="multipleShow" type="checkbox" :checked="item.checked" @change="checkboxChange($event,index)" name="check" />
-                           <span>{{ item.order }}.<em v-html="item.title"></em><em v-if="scoreShow">({{ item.score }}分)</em>
+                           <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">
                                    <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="butShow" ref="b">
                                      <button class="but" @click="modify(item)">修改</button>
@@ -26,6 +26,10 @@
                                        <button class="but" :class="{'buts-actives': item.open}" @click="openOption(index)">{{ item.open?'收起选项':'试题选项'}}</button>
                                        <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>
+                                   </b>
                                </i>
                            </span>
                    </div>
@@ -35,6 +39,10 @@
                        <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">
@@ -44,6 +52,28 @@
                        </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>
@@ -157,6 +187,10 @@ export default {
         chooseAnswer: {
             type: Boolean,
             default: true
+        },
+        reasoning: {
+            type: Boolean,
+            default: false
         }
     },
     watch: {
@@ -169,6 +203,8 @@ export default {
                     item.top = 0
                     item.open = true
                     item.replace = true
+                    item.reasoning = true
+                    item.review = true
                     if(item.alist) {
                         item.alist.map(x => {
                             x.annexContent = json2html({node: "root",child: JSON.parse(x.annexContent)})
@@ -193,6 +229,12 @@ export default {
                             return x
                         })
                     }
+                    if(item.stuAnswer) {
+                        item.stuAnswer.answer = item.stuAnswer.answer.map(x => {
+                            x = json2html(x)
+                            return x
+                        })
+                    }
                     return item
                 })
                 this.$nextTick(() => {  // 保证所有的数据都渲染完毕
@@ -220,13 +262,22 @@ export default {
             deep: true
         }
     },
-    emits: ['change','modify','del','changeAll','replaceData','choiceData','judgeAnswer'],
+    emits: ['change','modify','del','changeAll','replaceData','choiceData','judgeAnswer','completeReview'],
     methods: {
+        completeReview(data) {
+            this.$emit('completeReview', data)
+        },
         diffLeveNum(v) {
             if(v === '1') return '简单'
             if(v === '2') return '中等'
             if(v === '3') return '困难'
         },
+        openReasoning(i) {
+            this.data[i].reasoning = !this.data[i].reasoning
+        },
+        review(i) {
+            this.data[i].review = !this.data[i].review
+        },
         openOption(i) {
             this.data[i].open = !this.data[i].open
         },

package/src/index.js

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