Merge branch 'fouradd' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into fiveadd

src/newApi/paperquestion.js

@@ -47,4 +47,12 @@ export default {
             method: 'get',
         })
     },
+    //导入题目Word模板
+    bankquestionimportWordData(data) {
+        return request({
+            url: '/bank/question/importWordData',
+            method: 'post',
+            data
+        })
+    },
 }

src/views/education/classManageMent/classHoursReview/studyTimes.vue

@@ -118,7 +118,7 @@
         </div>
       </div>
     </div>
-    <div style="max-height: 540px; overflow: auto">
+    <div style="flex: 1; flex-shrink: 0; overflow: auto">
       <el-table
         :default-expand-all="defaultExpand"
         v-for="asrt in computedList(listLabel)"
@@ -1159,6 +1159,11 @@ export default {
 </script>
 
 <style lang="less" scoped>
+#classHoursReview {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - 126px);
+}
 .styFlex {
   width: 80px;
   text-align: center;
@@ -1241,6 +1246,7 @@ export default {
   color: #fff;
 }
 .dis_fls {
+  height: 65px;
   margin: 16px 0px;
   display: flex;
   align-items: center;

src/views/education/dataReview/informationTemplate/index.vue

@@ -871,7 +871,16 @@ export default {
           label: "状态",
           prop: "status",
           hidden: true,
-          scope: "status",
+          scope: "isOptions",
+          options:[
+            {
+              label:"启用",
+              value:1
+            },{
+              label:"停用",
+              value:0
+            }
+          ]
         },
       ],
       tableData: [], //表单数据

src/views/education/examManagement/applicationData/bulkImportPlan/newRegister.vue

@@ -467,10 +467,10 @@ export default {
         this.$message.warning("请选择学员");
         return;
       }
-      const indexs = this.examList.findIndex((item) => {
+      const indexs = this.examLists.findIndex((item) => {
         return item.applyId == data.applyId;
       });
-      data.applyName = this.examList[indexs].applyName;
+      data.applyName = this.examLists[indexs].applyName;
       this.$api.inquiresystemsubscribeexportRegister(data).then((res) => {
         let url = baseUrls.baseURL + "common/download?fileName=" + res.msg;
         let link = document.createElement("a");

src/views/education/examManagement/applicationData/bulkImportPlan/newYY.vue

@@ -384,10 +384,10 @@ export default {
       if (int === 1) {
         delete data.applySiteAddressTrain;
       }
-      const indexs = this.examList.findIndex((item) => {
+      const indexs = this.examLists.findIndex((item) => {
         return item.applyId == data.applyId;
       });
-      data.applyName = this.examList[indexs].applyName;
+      data.applyName = this.examLists[indexs].applyName;
       this.$api.inquiresystemsubscribeexportNew(data).then(async (res) => {
         for (let k in res.data) {
           if (res.data[k].code === 200) {

src/views/education/examManagement/applicationData/cancelAppointMent/index.vue

@@ -459,8 +459,9 @@ export default {
           pageSize: 10,
           pageNum: 1,
           idCards: "",
+          applyId: this.formData.applyId,
           canCancel: 1,
-          applyId: this.copyAppid,
+          // applyId: this.copyAppid,
         };
       }
       var data = JSON.parse(JSON.stringify(this.formData));

src/views/education/examManagement/applicationData/examRegistration/index.vue

@@ -543,7 +543,8 @@ export default {
           pageNum: 1,
           idCards: "",
           canExam: 1,
-          applyId: this.copyAppid,
+          applyId: this.formData.applyId,
+          // applyId: this.copyAppid,
         };
       }
       var data = JSON.parse(JSON.stringify(this.formData));

src/views/education/examManagement/applicationData/formerAccount/index.vue

@@ -492,7 +492,7 @@ export default {
           pageNum: 1,
           idCards: "",
           canBefore: 1,
-          beforeId: this.copyAppid,
+          beforeId: this.formData.beforeId,
           applyId: "",
           beforeStatus: "",
         };

src/views/education/studentManageMent/studentXQ/studyRecord.vue

@@ -352,7 +352,11 @@ export default {
         return;
       }
       let result = (int1 / int2) * 100;
-      return result + "%";
+      if(result == 0 || result == 100){
+        return result + "%";
+      }else{
+        return result.toFixed(2) + "%";
+      }
     },
     //改变返回值
     getTypes(arr) {