fiex:第五阶段第一部分

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "ruoyi",
-  "version": "3.7.0",
+  "name": "zzadmin",
+  "version": "1.0.0",
   "description": "中正高校端管理系统",
   "author": "中正高校端",
   "license": "MIT",

src/components/questionBank.vue

@@ -899,6 +899,7 @@ export default {
   display: flex;
   margin-bottom: 15px;
   .spans {
+    flex-shrink: 0;
     text-align: right;
     width: 80px;
   }

src/settings.js

@@ -12,7 +12,7 @@ module.exports = {
   /**
    * 是否显示顶部导航
    */
-  topNav: false,
+  topNav: true,
 
   /**
    * 是否显示 tagsView

src/views/Marketing/goods/commodityManageMent/add/index.vue

@@ -1319,7 +1319,7 @@
           <el-table-column label="" width="45" align="center">
             <template scope="scope">
               <el-radio
-                :disabled="scope.row.goodsStatus === 0"
+                :disabled="scope.row.selectStatus === 0"
                 :label="scope.row.goodsId"
                 v-model="goodsId"
                 @change.native="getGoodsId(scope.$index, scope.row)"
@@ -2092,11 +2092,11 @@ export default {
         }
         var data = JSON.parse(JSON.stringify(this.formDataBK));
         this.$api.inquireGoodslistGoods(data).then((res) => {
-          for (let i = 0; i < res.rows.length; i++) {
-            if (res.rows[i].goodsId === this.getNewGoodsId) {
-              res.rows[i].goodsStatus = 1;
-            }
-          }
+          // for (let i = 0; i < res.rows.length; i++) {
+          //   if (res.rows[i].goodsId === this.getNewGoodsId) {
+          //     res.rows[i].goodsStatus = 1;
+          //   }
+          // }
           this.goodsList = res.rows;
           this.total5 = res.total;
           resolve();

src/views/Marketing/goods/commodityManageMent/edit/index.vue

@@ -1334,7 +1334,7 @@
           <el-table-column label="" width="45" align="center">
             <template scope="scope">
               <el-radio
-                :disabled="scope.row.goodsStatus === 0"
+                :disabled="scope.row.selectStatus === 0"
                 :label="scope.row.goodsId"
                 v-model="goodsId"
                 @change.native="getGoodsId(scope.$index, scope.row)"
@@ -2088,7 +2088,7 @@ export default {
         this.$api.inquireGoodslistGoods(data).then((res) => {
           for (let i = 0; i < res.rows.length; i++) {
             if (res.rows[i].goodsId === this.getNewGoodsId) {
-              res.rows[i].goodsStatus = 1;
+              res.rows[i].selectStatus = 1;
             }
           }
           this.goodsList = res.rows;

src/views/education/classManageMent/learningHoursRecordList/hoursTimesRecord.vue

@@ -18,9 +18,9 @@
       >
       <span style="margin-left: 10px"
         ><strong style="color: red">「4」</strong>学习时间：{{
-          $methodsTools.onlyForma(objs.studyStartTime, false)
+          $methodsTools.onlyForma(userData.studyStartTime, false)
         }}
-        - {{ $methodsTools.onlyForma(objs.studyEndTime, false) }}</span
+        - {{ $methodsTools.onlyForma(userData.studyEndTime, false) }}</span
       >
     </div>
     <div class="dis_fs">

src/views/education/classManageMent/learningHoursRecordList/index.vue

@@ -200,6 +200,14 @@ export default {
             },
           ],
         },
+        {
+          prop1: "searchStartTime",
+          prop2: "searchEndTime",
+          placeholder1: "查询开始时间",
+          placeholder2: "查询结束时间",
+          scope: "moreDataPicker",
+          Diszing: true,
+        },
         {
           prop: "searchKey",
           placeholder: "请输入商品编码/商品名称",
@@ -336,12 +344,20 @@ export default {
     loadingClose() {
       this.disabledBtn = false;
     },
-    exputs() {
-      var data = this.$refs.exportTable.formData;
-      if (!data.businessid) {
+    /**
+     *
+     * @param {Object} data
+     * @remards 导出条件
+     */
+    exputs(data) {
+      // var data = this.$refs.exportTable.formData;
+      if (!data.businessId) {
         this.$message.warning("请选择业务层次");
         return;
       }
+      /**
+       * @remards 学习状态为2的话 需要勾选学时官方推送状态
+       */
       if (
         data.studyStatus === 2 &&
         data.officialStatus !== 0 &&
@@ -351,14 +367,9 @@ export default {
         return;
       }
       this.disabledBtn = true;
+      this.$modal.loading("正在导出数据，请稍后...");
       this.$api
-        .inquireGradegradeListexport({
-          businessId: data.businessid,
-          studyStatus: data.studyStatus,
-          businessName: data.businessName,
-          officialStatus:
-            data.studyStatus === 2 ? data.officialStatus : undefined,
-        })
+        .inquireGradegradeListexport(data)
         .then((res) => {
           let url = baseUrls.baseURL + "common/download?fileName=" + res.msg;
           let link = document.createElement("a");
@@ -369,13 +380,39 @@ export default {
           link.click();
           link.remove();
           this.$message.success("批量导出成功");
-          this.dialogDR = false;
+          // this.dialogDR = false;
+        })
+        .catch((err) => {
+          /**
+           * @remards 请求超时处理
+           */
+          let { message } = err;
+          if (message.includes("timeout")) {
+            this.$message.error(
+              "数据体量过大，无法正常导出，请调整导出的日期范围，缩小数据体量"
+            );
+          }
         })
         .finally(() => {
-          this.disabledBtn = false;
+          this.$modal.closeLoading();
         });
     },
+    /**
+     * 导出前收集条件
+     */
     moreActive() {
+      let data = {
+        studyStatus: this.formData.studyStatus || "",
+        educationTypeId: this.formData.educationTypeId || "",
+        businessId: this.formData.businessId || "",
+        searchKey: this.formData.searchKey || "",
+        searchStartTime: this.formData.searchStartTime / 1000 || "",
+        searchEndTime: this.formData.searchEndTime / 1000 || "",
+        officialStatus:
+          this.formData.studyStatus === 2 ? this.formData.learnStatus : "",
+      };
+      this.exputs(data);
+      return;
       this.dialogDR = true;
     },
     /**
@@ -412,6 +449,9 @@ export default {
       };
       this.vidBox = true;
     },
+    /**
+     * 搜索列表
+     */
     search(int) {
       this.loading = true;
       if (int === 1) {
@@ -430,6 +470,12 @@ export default {
         this.formData.pageNum = 1;
       }
       var data = JSON.parse(JSON.stringify(this.formData));
+      if (this.formData.searchStartTime) {
+        data.searchStartTime = data.searchStartTime / 1000;
+      }
+      if (this.formData.searchEndTime) {
+        data.searchEndTime = data.searchEndTime / 1000;
+      }
       this.$api
         .inquireGradegradelistUserPeriod(data)
         .then((res) => {
@@ -441,14 +487,27 @@ export default {
           this.loading = false;
         });
     },
+    /**
+     * 重置列表
+     */
     init() {
       this.search(2);
     },
+    /**
+     *
+     * @param {Number} v
+     * @remards 每页数量
+     */
     handleSizeChange(v) {
       this.formData.pageSize = v;
       this.formData.pageNum = 1;
       this.search();
     },
+    /**
+     *
+     * @param {Number} v
+     * @remards 切换页码
+     */
     handleCurrentChange(v) {
       this.formData.pageNum = v;
       this.search();

src/views/education/classManageMent/learningHoursRecordList/studyTimesRecord.vue

@@ -18,9 +18,9 @@
       >
       <span style="margin-left: 10px"
         ><strong style="color: red">「4」</strong>学习时间：{{
-          $methodsTools.onlyForma(objs.studyStartTime, false)
+          $methodsTools.onlyForma(userData.studyStartTime, false)
         }}
-        - {{ $methodsTools.onlyForma(objs.studyEndTime, false) }}</span
+        - {{ $methodsTools.onlyForma(userData.studyEndTime, false) }}</span
       >
     </div>
 

src/views/education/classManageMent/studentMenu/index.vue

@@ -301,7 +301,7 @@
     </el-dialog>
     <el-dialog
       :visible.sync="dialogVisibleStudent"
-      width="760px"
+      width="1060px"
       :show-close="false"
       :close-on-click-modal="false"
     >
@@ -318,7 +318,65 @@
       <div>
         <el-row :gutter="20">
           <el-form label-position="right" label-width="130px" :model="listData">
-            <el-col :span="12">
+            <el-col :span="6">
+              <div class="dis_fs">
+                <div class="photoSty1">
+                  <img
+                    style="width: 100%; height: 100%"
+                    v-if="!listData.oneInchPhotos"
+                    src="@/assets/404_images/wuyuxaog.png"
+                    alt=""
+                  />
+                  <el-image
+                    v-else
+                    style="width: 100%; height: 100%"
+                    :src="$methodsTools.splitImgHost(listData.oneInchPhotos)"
+                    :preview-src-list="[
+                      $methodsTools.splitImgHost(listData.oneInchPhotos),
+                    ]"
+                  >
+                  </el-image>
+                  <div class="pos_bottom">一寸头像图</div>
+                </div>
+                <div class="photoSty2">
+                  <img
+                    style="width: 100%; height: 100%"
+                    v-if="!listData.idCardImg1"
+                    src="@/assets/404_images/wuyuxaog.png"
+                    alt=""
+                  />
+                  <el-image
+                    v-else
+                    style="width: 100%; height: 100%"
+                    :src="$methodsTools.splitImgHost(listData.idCardImg1)"
+                    :preview-src-list="[
+                      $methodsTools.splitImgHost(listData.idCardImg1),
+                    ]"
+                  >
+                  </el-image>
+                  <div class="pos_bottom">身份证正面照片</div>
+                </div>
+                <div class="photoSty2" style="margin-right: 0px">
+                  <img
+                    style="width: 100%; height: 100%"
+                    v-if="!listData.idCardImg2"
+                    src="@/assets/404_images/wuyuxaog.png"
+                    alt=""
+                  />
+                  <el-image
+                    v-else
+                    style="width: 100%; height: 100%"
+                    :src="$methodsTools.splitImgHost(listData.idCardImg2)"
+                    :preview-src-list="[
+                      $methodsTools.splitImgHost(listData.idCardImg2),
+                    ]"
+                  >
+                  </el-image>
+                  <div class="pos_bottom">身份证背面照片</div>
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="9">
               <el-form-item label="学员编码">
                 <el-input
                   disabled
@@ -402,7 +460,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="9">
               <el-form-item label="民族">
                 <el-input
                   disabled
@@ -1101,4 +1159,37 @@ export default {
 /deep/.radioTables > .el-radio__label {
   display: none;
 }
+.dis_fs {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.photoSty1 {
+  flex-shrink: 0;
+  width: 150px;
+  height: 160px;
+  background-color: #fff;
+  position: relative;
+  margin-bottom: 30px;
+}
+.photoSty2 {
+  position: relative;
+  flex-shrink: 0;
+  width: 230px;
+  height: 160px;
+  background-color: #fff;
+  margin-bottom: 30px;
+}
+.pos_bottom {
+  position: absolute;
+  height: 20px;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  background-color: rgba(0, 0, 0, 0.8);
+  text-align: center;
+  line-height: 20px;
+  font-size: 14px;
+  color: #fff;
+}
 </style>

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

@@ -417,6 +417,14 @@ export default {
             },
           ],
         },
+        {
+          prop1: "searchStartTime",
+          prop2: "searchEndTime",
+          placeholder1: "查询开始时间",
+          placeholder2: "查询结束时间",
+          scope: "moreDataPicker",
+          Diszing: true,
+        },
         {
           prop: "realname",
           placeholder: "请输入学员姓名",
@@ -534,7 +542,7 @@ export default {
       listInfos: [],
       recordList: [{ keyValueArrays: [] }], //记录列表
       activeIndex: 0,
-      activeDCIndex:0, //导出按钮索引
+      activeDCIndex: 0, //导出按钮索引
       DCLIST: [
         { label: "全部", value: 0 },
         { label: "待审核", value: 2 },
@@ -550,9 +558,10 @@ export default {
     this.search();
   },
   methods: {
-    exputs() {
+    exputs(data) {
+      this.$modal.loading("正在导出数据，请稍后...");
       this.$api
-        .inquirebaseprofileExport({ status: this.activeDCIndex })
+        .inquirebaseprofileExport(data)
         .then((res) => {
           if (res.code === 200) {
             let url = baseUrls.baseURL + "common/download?fileName=" + res.msg;
@@ -561,15 +570,39 @@ export default {
             document.body.appendChild(link);
             link.dowmload = fileName;
             link.href = url;
-            console.log(link)
-              link.click();
-              link.remove();
-              this.$message.success("批量导出成功");
-              this.dialogDR = false;
+            console.log(link);
+            link.click();
+            link.remove();
+            this.$message.success("批量导出成功");
+            this.dialogDR = false;
           }
+        })
+        .catch((err) => {
+          let { message } = err;
+          if (message.includes("timeout")) {
+            this.$message.error(
+              "数据体量过大，无法正常导出，请调整导出的日期范围，缩小数据体量"
+            );
+          }
+        })
+        .finally(() => {
+          this.$modal.closeLoading();
         });
     },
     moreActive() {
+      let data = {
+        changeStatus: this.formData.changeStatus || "",
+        status: this.formData.status || 0,
+        educationTypeId: this.formData.educationTypeId || "",
+        businessId: this.formData.businessId || "",
+        majorId: this.formData.majorId || "",
+        schoolId: this.formData.schoolId || "",
+        realname: this.formData.realname || "",
+        searchStartTime: this.formData.searchStartTime / 1000 || "",
+        searchEndTime: this.formData.searchEndTime / 1000 || "",
+      };
+      this.exputs(data);
+      return;
       this.activeDCIndex = 0;
       this.dialogDR = true;
     },
@@ -595,12 +628,13 @@ export default {
             item.keyValue = JSON.parse(item.keyValue);
             var arst = [];
             for (let k in item.keyValue) {
-              if(item.keyValue[k].value){
+              if (item.keyValue[k].fieldName) {
                 arst.push(item.keyValue[k]);
               }
             }
             item.keyValueArrays = arst;
           });
+          this.activeIndex = 0;
           this.recordList = res.rows;
           this.dialogVisibleRecord = true;
         });
@@ -654,8 +688,15 @@ export default {
           pageNum: 1,
         };
       }
+      var data = JSON.parse(JSON.stringify(this.formData));
+      if (this.formData.searchStartTime) {
+        data.searchStartTime = data.searchStartTime / 1000;
+      }
+      if (this.formData.searchEndTime) {
+        data.searchEndTime = data.searchEndTime / 1000;
+      }
       this.$api
-        .inquirebaseprofile(this.formData)
+        .inquirebaseprofile(data)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;
@@ -702,7 +743,9 @@ export default {
           this.listData = res.data;
           var arst = [];
           for (let k in res.data.keyValue) {
-            arst.push(res.data.keyValue[k]);
+            if (res.data.keyValue[k].fieldName) {
+              arst.push(res.data.keyValue[k]);
+            }
           }
           this.listInfos = arst;
         });

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

@@ -328,8 +328,16 @@ export default {
           ],
         },
         {
-          prop: "prefixName",
-          placeholder: "请输入搜索关键内容",
+          prop1: "searchStartTime",
+          prop2: "searchEndTime",
+          placeholder1: "查询开始时间",
+          placeholder2: "查询结束时间",
+          scope: "moreDataPicker",
+          Diszing: true,
+        },
+        {
+          prop: "realname",
+          placeholder: "请输入学员姓名",
         },
       ],
       formData: {
@@ -458,9 +466,10 @@ export default {
     this.search();
   },
   methods: {
-    exputs() {
+    exputs(data) {
+      this.$modal.loading("正在导出数据，请稍后...");
       this.$api
-        .inquirebaseprofileStampexport({ status: this.activeDCIndex })
+        .inquirebaseprofileStampexport(data)
         .then((res) => {
           if (res.code === 200) {
             let url = baseUrls.baseURL + "common/download?fileName=" + res.msg;
@@ -474,9 +483,33 @@ export default {
             this.$message.success("批量导出成功");
             this.dialogDR = false;
           }
+        })
+        .catch((err) => {
+          let { message } = err;
+          if (message.includes("timeout")) {
+            this.$message.error(
+              "数据体量过大，无法正常导出，请调整导出的日期范围，缩小数据体量"
+            );
+          }
+        })
+        .finally(() => {
+          this.$modal.closeLoading();
         });
     },
     moreActive() {
+      let data = {
+        changeStatus: this.formData.changeStatus || "",
+        status: this.formData.status || 0,
+        educationTypeId: this.formData.educationTypeId || "",
+        businessId: this.formData.businessId || "",
+        majorId: this.formData.majorId || "",
+        schoolId: this.formData.schoolId || "",
+        realname: this.formData.realname || "",
+        searchStartTime: this.formData.searchStartTime / 1000 || "",
+        searchEndTime: this.formData.searchEndTime / 1000 || "",
+      };
+      this.exputs(data);
+      return;
       this.activeDCIndex = 0;
       this.dialogDR = true;
     },
@@ -505,11 +538,13 @@ export default {
             item.keyValue = JSON.parse(item.keyValue);
             var arst = [];
             for (let k in item.keyValue) {
-              arst.push(item.keyValue[k]);
+              if (item.keyValue[k].fieldName) {
+                arst.push(item.keyValue[k]);
+              }
             }
             item.keyValueArrays = arst;
           });
-          this.activeIndex = 0
+          this.activeIndex = 0;
           this.recordList = res.rows;
           this.dialogVisibleRecord = true;
         });
@@ -563,6 +598,13 @@ export default {
           pageNum: 1,
         };
       }
+      var data = JSON.parse(JSON.stringify(this.formData));
+      if (this.formData.searchStartTime) {
+        data.searchStartTime = data.searchStartTime / 1000;
+      }
+      if (this.formData.searchEndTime) {
+        data.searchEndTime = data.searchEndTime / 1000;
+      }
       this.$api
         .inquirebaseprofileStamp(this.formData)
         .then((res) => {
@@ -611,7 +653,9 @@ export default {
           this.listData = res.data;
           var arst = [];
           for (let k in res.data.keyValue) {
-            arst.push(res.data.keyValue[k]);
+            if (res.data.keyValue[k].fieldName) {
+              arst.push(res.data.keyValue[k]);
+            }
           }
           this.listInfos = arst;
         });

src/views/education/examManagement/applicationData/asPlanned.vue

@@ -356,7 +356,7 @@ export default {
         index: 0,
         ch: "条",
         num: false,
-        tableHide:true,
+        tableHide: true,
         choice: true,
         changeWidth: "240px",
         addHide: true,
@@ -997,7 +997,6 @@ export default {
         });
     },
     addClick(v, int) {
-      console.log(v);
       // int = 2详情 3学员管理
       if (v === undefined) {
         // 添加班级

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

@@ -254,9 +254,9 @@ export default {
         {
           label: "出错原因",
           prop: "cause",
-          width:"",
+          width: "",
           hidden: true,
-          width:"260px"
+          width: "260px",
         },
       ],
     };
@@ -409,7 +409,7 @@ export default {
           this.tableDataSuccess = res.data.successList;
           this.tableDataError = res.data.errorList;
           this.typeInt = 1;
-          this.$message.info("导入操作执行成功")
+          this.$message.info("导入操作执行成功");
         })
         .finally(() => {
           e.target.value = "";
@@ -429,7 +429,7 @@ export default {
           this.tableDataSuccess = res.data.successList;
           this.tableDataError = res.data.errorList;
           this.typeInt = 2;
-          this.$message.info("导入操作执行成功")
+          this.$message.info("导入操作执行成功");
         })
         .finally(() => {
           e.target.value = "";

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

@@ -466,6 +466,11 @@ export default {
       if (this.formData.idCards) {
         data.idCards = this.formData.idCards.split("\n");
       }
+      if(this.formData.searchKey && this.formData.idCards){
+        data.searchType = 1
+      }else{
+        data.searchType = 0
+      }
       this.$api
         .inquiresystemsubscribelist(data)
         .then((res) => {

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

@@ -549,6 +549,11 @@ export default {
       if (this.formData.idCards) {
         data.idCards = this.formData.idCards.split("\n");
       }
+      if(this.formData.searchKey && this.formData.idCards){
+        data.searchType = 1
+      }else{
+        data.searchType = 0
+      }
       this.$api
         .inquiresystemsubscribelist(data)
         .then((res) => {

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

@@ -161,6 +161,11 @@ export default {
           placeholder: "前培计划",
           scope: "beforeList",
         },
+        {
+          prop: "applyId",
+          placeholder: "考试计划",
+          scope: "examList",
+        },
         {
           prop: "beforeStatus",
           placeholder: "开通状态",
@@ -188,6 +193,7 @@ export default {
       ],
       formData: {
         beforeId: "",
+        applyId:"",
         pageSize: 10,
         pageNum: 1,
         idCards: "",
@@ -465,7 +471,7 @@ export default {
       }
       if (this.beforeStatus === 2) {
         data.beforeStatus = 0;
-        data.beforeId = "";
+        data.beforeId = this.formData.beforeId;
       }
       this.$api.editsystemsubscribe(data).then((res) => {
         this.$message.success("前培账号已开通标记修改成功");
@@ -487,6 +493,7 @@ export default {
           idCards: "",
           canBefore: 1,
           beforeId: this.copyAppid,
+          applyId:"",
           beforeStatus: "",
         };
       }
@@ -494,6 +501,11 @@ export default {
       if (this.formData.idCards) {
         data.idCards = this.formData.idCards.split("\n");
       }
+      if(this.formData.searchKey && this.formData.idCards){
+        data.searchType = 1
+      }else{
+        data.searchType = 0
+      }
       this.$api
         .inquiresystemsubscribelist(data)
         .then((res) => {

src/views/education/examManagement/examArrangement/index.vue

@@ -929,9 +929,8 @@ export default {
           this.listDataGoods.goodsId = [];
         }
         this.$api
-          .inquirepayservelistGoods({ businessId: value })
+          .inquirepayservelistGoods({ businessId: value, goodsType: 1 })
           .then((res) => {
-            console.log(1121, res.rows);
             this.goodsList = res.rows;
           });
       }
@@ -948,7 +947,10 @@ export default {
         .inquirepayservegoodsInfo({ applyId: row.applyId })
         .then((res) => {
           this.$api
-            .inquirepayservelistGoods({ businessId: res.data.businessId })
+            .inquirepayservelistGoods({
+              businessId: res.data.businessId,
+              goodsType: 1,
+            })
             .then((result) => {
               this.goodsList = result.rows;
             });
@@ -1277,7 +1279,6 @@ export default {
       this.search();
     },
     watchs(v) {
-      console.log(v);
       this.$api.obtainsystemapply(v.applyId).then((res) => {
         if (res.data.applyStatus) {
           res.data.applyStatus = res.data.applyStatus.split(",").map(Number);
@@ -1310,7 +1311,6 @@ export default {
             }
           }
         }
-        console.log(res.data);
         this.infoData = res.data;
         this.dialoginfoWatch = true;
       });

src/views/education/examManagement/qianpeiArrange/index.vue

@@ -520,7 +520,7 @@ export default {
           this.listDataGoods.goodsId = [];
         }
         this.$api
-          .inquiresystembeforelistGoods({ businessId: value })
+          .inquiresystembeforelistGoods({ businessId: value, goodsType: 1 })
           .then((res) => {
             this.goodsList = res.rows;
           });
@@ -543,7 +543,10 @@ export default {
         .inquiresystembeforelistGoodsgoodsInfo({ beforeId: row.beforeId })
         .then((res) => {
           this.$api
-            .inquiresystembeforelistGoods({ businessId: res.data.businessId })
+            .inquiresystembeforelistGoods({
+              businessId: res.data.businessId,
+              goodsType: 1,
+            })
             .then((result) => {
               this.goodsList = result.rows;
             });
@@ -592,7 +595,6 @@ export default {
         this.dialogVisiblenew = false;
         this.search();
       });
-      console.log(data, 321);
     },
     //获取初始基础参数
     getDict() {

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

@@ -233,7 +233,7 @@
                     {{
                       getInfoRecord.doQuestionNum +
                       "/" +
-                      getInfoRecord.totalQuestionNum
+                      getInfoRecord.allQuestionNum
                     }}
                   </td>
                   <td>{{ getInfoRecord.performance }}</td>

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

@@ -9,7 +9,65 @@
         :rules="rules"
       >
         <el-row :gutter="20">
-          <el-col :span="12">
+          <el-col :span="6">
+            <div class="dis_fs">
+              <div class="photoSty1">
+                <img
+                  style="width: 100%; height: 100%"
+                  v-if="!listData.oneInchPhotos"
+                  src="@/assets/404_images/wuyuxaog.png"
+                  alt=""
+                />
+                <el-image
+                  v-else
+                  style="width: 100%; height: 100%"
+                  :src="$methodsTools.splitImgHost(listData.oneInchPhotos)"
+                  :preview-src-list="[
+                    $methodsTools.splitImgHost(listData.oneInchPhotos),
+                  ]"
+                >
+                </el-image>
+                <div class="pos_bottom">一寸头像图</div>
+              </div>
+              <div class="photoSty2">
+                <img
+                  style="width: 100%; height: 100%"
+                  v-if="!listData.idCardImg1"
+                  src="@/assets/404_images/wuyuxaog.png"
+                  alt=""
+                />
+                <el-image
+                  v-else
+                  style="width: 100%; height: 100%"
+                  :src="$methodsTools.splitImgHost(listData.idCardImg1)"
+                  :preview-src-list="[
+                    $methodsTools.splitImgHost(listData.idCardImg1),
+                  ]"
+                >
+                </el-image>
+                <div class="pos_bottom">身份证正面照片</div>
+              </div>
+              <div class="photoSty2" style="margin-right: 0px">
+                <img
+                  style="width: 100%; height: 100%"
+                  v-if="!listData.idCardImg2"
+                  src="@/assets/404_images/wuyuxaog.png"
+                  alt=""
+                />
+                <el-image
+                  v-else
+                  style="width: 100%; height: 100%"
+                  :src="$methodsTools.splitImgHost(listData.idCardImg2)"
+                  :preview-src-list="[
+                    $methodsTools.splitImgHost(listData.idCardImg2),
+                  ]"
+                >
+                </el-image>
+                <div class="pos_bottom">身份证背面照片</div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="9">
             <el-form-item label="学员编码" prop="studentCode">
               <el-input disabled v-model="listData.studentCode"></el-input>
             </el-form-item>
@@ -76,7 +134,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="9">
             <el-form-item label="民族" prop="nation">
               <el-input v-model="listData.nation"></el-input>
             </el-form-item>
@@ -208,5 +266,40 @@ export default {
   border-bottom: 1px dotted #9a9a9a;
   margin-bottom: 12px;
 }
+.dis_fs {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  background-color: #eee;
+}
+.photoSty1 {
+  flex-shrink: 0;
+  width: 150px;
+  height: 160px;
+  background-color: #fff;
+  position: relative;
+  margin-bottom: 30px;
+}
+.photoSty2 {
+  position: relative;
+  flex-shrink: 0;
+  width: 230px;
+  height: 160px;
+  background-color: #fff;
+  margin-bottom: 30px;
+}
+.pos_bottom {
+  position: absolute;
+  height: 20px;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  background-color: rgba(0, 0, 0, 0.8);
+  text-align: center;
+  line-height: 20px;
+  font-size: 14px;
+  color: #fff;
+}
 </style>
 

src/views/login.vue

@@ -128,7 +128,7 @@ export default {
     },
   },
   created() {
-    console.log("---Systems:tanglianfeng")
+    console.log("---Systems:中正科技")
     this.getCode();
     this.getCookie();
   },

src/views/resource/bankManagement/volumeManagement/edit/index.vue

@@ -64,6 +64,7 @@
               >
             </div>
             <el-button
+              disabled
               slot="reference"
               style="margin-left: 12px"
               @click="getMessage"
@@ -592,6 +593,7 @@ export default {
       });
       var data1 = {
         moduleExamId: this.listData.moduleExamId,
+        moduleName: this.listData.moduleName,
         name: this.listData.name,
         chapterList: chapterList,
         publishStatus: this.listData.publishStatus,

src/views/resource/videoManagement/moduleManagement/index.vue

@@ -149,7 +149,7 @@ export default {
           label: "学习时长",
           prop: "durationTime",
           hidden: true,
-          scope:"convert",
+          scope: "convert",
         },
         {
           label: "发布状态",

src/views/systemManagement/roleManagement/index.vue

@@ -28,7 +28,7 @@
     <el-dialog
       @closed="loadingClose"
       :visible.sync="dialogVisible"
-      width="460px"
+      width="860px"
       :show-close="false"
       :close-on-click-modal="false"
     >
@@ -41,106 +41,106 @@
         </div>
       </div>
       <div>
-        <el-form
-          label-position="right"
-          label-width="100px"
-          :model="listData"
-          :rules="rules"
-          ref="listData"
-        >
-          <el-form-item
-            v-for="(items, indexs) in listitem"
-            :key="indexs"
-            :label="items.label"
-            :prop="items.prop"
-          >
-            <el-radio-group
-              v-if="items.scope === 'status'"
-              v-model="listData[items.prop]"
+        <el-row :gutter="10">
+          <el-form
+            label-position="right"
+            label-width="100px"
+            :model="listData"
+            :rules="rules"
+            ref="listData"
+            ><el-col
+              :span="12"
+              v-for="(items, indexs) in listitem"
+              :key="indexs"
             >
-              <el-radio
-                v-for="(item, index) in items.options"
-                :key="index"
-                :label="item.value"
-                :disabled="statusPop === 2"
-                >{{ item.label }}</el-radio
-              >
-            </el-radio-group>
-            <div v-else-if="items.scope === 'tree'">
-              <el-checkbox
-                v-model="menuExpand"
-                @change="handleCheckedTreeExpand($event, 'menu')"
-                >展开/折叠</el-checkbox
-              >
-              <el-checkbox
-                v-model="menuNodeAll"
-                @change="handleCheckedTreeNodeAll($event, 'menu')"
-                >全选/全不选</el-checkbox
-              >
-              <!-- <el-checkbox
+              <el-form-item :label="items.label" :prop="items.prop">
+                <el-radio-group
+                  v-if="items.scope === 'status'"
+                  v-model="listData[items.prop]"
+                >
+                  <el-radio
+                    v-for="(item, index) in items.options"
+                    :key="index"
+                    :label="item.value"
+                    :disabled="statusPop === 2"
+                    >{{ item.label }}</el-radio
+                  >
+                </el-radio-group>
+                <div v-else-if="items.scope === 'tree'">
+                  <el-checkbox
+                    v-model="menuExpand"
+                    @change="handleCheckedTreeExpand($event, 'menu')"
+                    >展开/折叠</el-checkbox
+                  >
+                  <el-checkbox
+                    v-model="menuNodeAll"
+                    @change="handleCheckedTreeNodeAll($event, 'menu')"
+                    >全选/全不选</el-checkbox
+                  >
+                  <!-- <el-checkbox
                 v-model="listData.menuCheckStrictly"
                 @change="handleCheckedTreeConnect($event, 'menu')"
                 >父子联动</el-checkbox
               > -->
-              <el-tree
-                class="tree-border"
-                :data="menuOptions"
-                show-checkbox
-                ref="menu"
-                node-key="id"
-                empty-text="加载中，请稍后"
-                :props="defaultProps"
-              ></el-tree>
-            </div>
-            <div v-else-if="items.scope === 'treeInfo'">
-              <el-checkbox
-                v-model="menuExpandInfo"
-                @change="handleCheckedTreeExpandInfo($event, 'info')"
-                >展开/折叠</el-checkbox
-              >
-              <el-checkbox
-                v-model="menuNodeAll"
-                @change="handleCheckedTreeNodeAllInfo($event, 'info')"
-                >全选/全不选</el-checkbox
-              >
-              <!-- <el-checkbox
+                  <el-tree
+                    class="tree-border"
+                    :data="menuOptions"
+                    show-checkbox
+                    ref="menu"
+                    node-key="id"
+                    empty-text="加载中，请稍后"
+                    :props="defaultProps"
+                  ></el-tree>
+                </div>
+                <div v-else-if="items.scope === 'treeInfo'">
+                  <el-checkbox
+                    v-model="menuExpandInfo"
+                    @change="handleCheckedTreeExpandInfo($event, 'info')"
+                    >展开/折叠</el-checkbox
+                  >
+                  <el-checkbox
+                    v-model="menuNodeAllInfo"
+                    @change="handleCheckedTreeNodeAllInfo($event, 'info')"
+                    >全选/全不选</el-checkbox
+                  >
+                  <!-- <el-checkbox
                 v-model="listData.menuCheckStrictly"
                 @change="handleCheckedTreeConnect($event, 'menu')"
                 >父子联动</el-checkbox
               > -->
-              <!-- :check-strictly="!listData.menuCheckStrictly"👇 -->
-              <el-tree
-                class="tree-border"
-                :data="menuOptionsInfo"
-                show-checkbox
-                ref="info"
-                node-key="onlyId"
-                empty-text="加载中，请稍后"
-                :props="defaultProps"
-              ></el-tree>
-            </div>
-            <el-input
-              :disabled="statusPop === 2"
-              v-else-if="items.scope === 'textarea'"
-              type="textarea"
-              v-model="listData[items.prop]"
-            ></el-input>
-            <el-input-number
-              style="width: 100%"
-              :disabled="statusPop === 2"
-              v-else-if="items.scope === 'numberIndex'"
-              v-model="listData[items.prop]"
-              controls-position="right"
-              :min="0"
-              :max="99"
-            ></el-input-number>
-            <el-input
-              :disabled="statusPop === 2"
-              v-else
-              v-model="listData[items.prop]"
-            ></el-input>
-          </el-form-item>
-        </el-form>
+                  <!-- :check-strictly="!listData.menuCheckStrictly"👇 -->
+                  <el-tree
+                    class="tree-border"
+                    :data="menuOptionsInfo"
+                    show-checkbox
+                    ref="info"
+                    node-key="onlyId"
+                    empty-text="加载中，请稍后"
+                    :props="defaultProps"
+                  ></el-tree>
+                </div>
+                <el-input
+                  :disabled="statusPop === 2"
+                  v-else-if="items.scope === 'textarea'"
+                  type="textarea"
+                  v-model="listData[items.prop]"
+                ></el-input>
+                <el-input-number
+                  style="width: 100%"
+                  :disabled="statusPop === 2"
+                  v-else-if="items.scope === 'numberIndex'"
+                  v-model="listData[items.prop]"
+                  controls-position="right"
+                  :min="0"
+                  :max="99"
+                ></el-input-number>
+                <el-input
+                  :disabled="statusPop === 2"
+                  v-else
+                  v-model="listData[items.prop]"
+                ></el-input>
+              </el-form-item> </el-col></el-form
+        ></el-row>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="close">取 消</el-button>
@@ -719,6 +719,8 @@ export default {
   }
 }
 .tree-border {
+  max-height: 450px;
+  overflow: auto;
   margin-top: 5px;
   border: 1px solid #e5e6e7;
   background: #ffffff none;