zc

src/views/safetyEducationExaminationNew/components/examRecords.vue

@@ -34,7 +34,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList">
+        <el-table class="table-box"  border :data="dataList">
           <el-table-column label="考试时间" prop="createTime"  show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}至{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
@@ -165,7 +165,6 @@
       },
       //获取数据列表
       getList() {
-        this.$set(this, 'loading', true)
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if (this.dateRange[0]) {
           obj.startTime = this.dateRange[0] + 'T00:00:00'
@@ -175,7 +174,6 @@
           obj.endTime = ''
         }
         getListFunction(obj).then(response => {
-          this.$set(this, 'loading', false)
           this.$set(this, 'dataList', response.data.records)
           this.$set(this, 'total', response.data.total)
         })

src/views/safetyEducationExaminationNew/components/historyOfIncorrectQuestions.vue

@@ -62,7 +62,7 @@
       </el-form>
     </div>
     <div class="page-content-box">
-      <el-table class="table-box" v-loading="loading" border :data="dataList">
+      <el-table class="table-box"  border :data="dataList">
         <el-table-column label="题干" prop="name"  show-overflow-tooltip/>
         <el-table-column label="题型" prop="content" width="200" show-overflow-tooltip/>
         <el-table-column label="难度" prop="content" width="200" show-overflow-tooltip/>
@@ -116,8 +116,6 @@
     },
     data() {
       return {
-        //页面遮罩
-        loading: false,
         //下拉列表数据
         optionListA: [],
         optionListB: [{value:'1',label:'单选'},{value:'2',label:'多选'},{value:'3',label:'判断'}],
@@ -193,10 +191,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         getListFunction(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/courseManagement/courseManagement/drawerItem.vue

@@ -64,7 +64,7 @@
         <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
       </el-form>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="rightList"
+        <el-table class="table-box"  border :data="rightList"
                   ref="multipleTable" :row-key="getRowKey" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" :reserve-selection="true"></el-table-column>
           <el-table-column label="课件名称" prop="coursewareName"  show-overflow-tooltip/>
@@ -148,7 +148,7 @@
           deptId :null,
         },
         rightList:[],
-        loading:false,
+
         total:0,
         multipleSelection: [], // 存储所有被勾选的数据
       }
@@ -247,7 +247,7 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if(!this.newData.knowledgePointId){
           if(this.leftList[0]){
@@ -261,7 +261,7 @@
           obj.knowledgePointId = this.newData.knowledgePointId;
         }
         examElCoursewarePage(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'rightList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/courseManagement/courseManagement/index.vue

@@ -82,7 +82,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList">
+        <el-table class="table-box"  border :data="dataList">
           <el-table-column label="课程名称" prop="courseName"  show-overflow-tooltip>
             <template slot-scope="scope">
               <span @click="tableButton(5,scope.row)" style="color:#0183fa;cursor: pointer">{{scope.row.courseName}}</span>
@@ -160,8 +160,6 @@
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
         //页面状态
         pageType:1,
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListA:[{value:1,label:'上架'},{value:0,label:'未上架'}],
         optionListB:[],
@@ -223,10 +221,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         examElCoursePage(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/courseManagement/coursewareManagement/index.vue

@@ -73,7 +73,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList">
+        <el-table class="table-box"  border :data="dataList">
           <el-table-column label="课件名称" prop="coursewareName"  show-overflow-tooltip>
             <template slot-scope="scope">
               <span @click="tableButton(2,scope.row)" style="color:#0183fa;cursor: pointer">{{scope.row.coursewareName}}</span>
@@ -159,8 +159,6 @@
         tableButtonType:this.hasPermiDom(['exam:courseware:edit','exam:courseware:del',]),
         //页面状态
         pageType:1,
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListA:[{value:1,label:'视频'},{value:3,label:'文档'},{value:4,label:'文章'}],
         optionListB:[],
@@ -218,10 +216,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         examElCoursewarePage(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/addPage.vue

@@ -802,8 +802,8 @@
               certificateValidMonths: response.data.certificateEnabled==1?response.data.certificateValidMonths:0,
               certificateReviewMonths: response.data.certificateEnabled==1?response.data.certificateReviewMonths:0
             };
-            this.$set(this,'scopeList',response.data.ruleScopeItems);
-            this.$set(this,'userList',response.data.designatedCandidates);
+            this.$set(this,'scopeList',response.data.ruleScopeItems?response.data.ruleScopeItems:[]);
+            this.$set(this,'userList',response.data.designatedCandidates?response.data.designatedCandidates:[]);
             this.$set(this,'newData',obj);
             this.examChange();
           })
@@ -855,8 +855,8 @@
           endTime:this.newData.examTimeRange[1].replace(" ", "T"),
           answerDuration:this.newData.answerDuration,
           scopeType:this.newData.scopeType,
-          ruleScopeItems:this.scopeList,
-          designatedCandidates:this.userList,
+          ruleScopeItems:this.newData.scopeType==2?this.scopeList:[],
+          designatedCandidates:this.newData.scopeType==3?this.userList:[],
           studyHoursRequirementEnabled:this.newData.studyHoursRequirementEnabled,
           studyHoursRequirement:this.newData.studyHoursRequirementEnabled == 1?this.newData.studyHoursRequirement:0,
           knowledgePointIds:this.newData.studyHoursRequirement == 1?this.newData.knowledgePointIds:[],

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/index.vue

@@ -92,7 +92,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList">
+        <el-table class="table-box"  border :data="dataList">
           <el-table-column label="考试名称" prop="examName"  show-overflow-tooltip>
             <template slot-scope="scope">
               <span style="color:#0183fa;cursor: pointer;" @click="tableButton(7,scope.row)">{{scope.row.examName}}</span>
@@ -178,8 +178,6 @@
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
         //页面状态
         pageType:1,
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListA:[],
         optionListB:[],
@@ -239,7 +237,7 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if(this.dateRange[0]){
           obj.startTime = this.dateRange[0]+'T00:00:00'
@@ -249,7 +247,7 @@
           obj.endTime = "";
         }
         examElExamPage(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/selectCertificate.vue

@@ -50,7 +50,7 @@
       </el-form>
     </div>
     <div class="page-content-box">
-      <el-table class="table-box" v-loading="loading" border :data="dataList">
+      <el-table class="table-box"  border :data="dataList">
         <el-table-column label="证书模板名称" prop="templateName"  show-overflow-tooltip/>
         <el-table-column label="适用考试类型" prop="examTypeName" width="200" show-overflow-tooltip/>
         <el-table-column label="是否共享" prop="shareStatus" width="200" show-overflow-tooltip>
@@ -93,8 +93,6 @@
     },
     data() {
       return {
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListA:[],
         optionListB:[],
@@ -148,10 +146,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         examElCertificateTemplatePage(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/selectCourse.vue

@@ -67,7 +67,7 @@
       </el-form>
     </div>
     <div class="page-content-box">
-      <el-table class="table-box" v-loading="loading" border :data="dataList">
+      <el-table class="table-box"  border :data="dataList">
         <el-table-column label="课程名称" prop="courseName"  show-overflow-tooltip/>
         <el-table-column label="知识点" prop="knowledgePointNames" width="200" show-overflow-tooltip/>
         <el-table-column label="专业类别" prop="disciplineTypeName" width="200" show-overflow-tooltip/>
@@ -113,8 +113,6 @@
     },
     data() {
       return {
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListB:[],
         optionListC:[],
@@ -172,10 +170,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         examElCoursePage(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/selectScope.vue

@@ -62,7 +62,7 @@
       </el-form>
     </div>
     <div class="page-content-box">
-      <el-table class="table-box" v-loading="loading" border :data="dataList"
+      <el-table class="table-box" border :data="dataList"
                 ref="multipleTable" :row-key="getRowKey" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" :reserve-selection="true"></el-table-column>
         <el-table-column label="学院单位" prop="deptName"  show-overflow-tooltip>
@@ -109,8 +109,6 @@
     },
     data() {
       return {
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListB:[],
         optionListC:[],
@@ -184,10 +182,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         systemUserGetRuleDataByParam(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/selectTestPaper.vue

@@ -73,7 +73,7 @@
       </el-form>
     </div>
     <div class="page-content-box">
-      <el-table class="table-box" v-loading="loading" border :data="dataList">
+      <el-table class="table-box"  border :data="dataList">
         <el-table-column label="试卷名称" prop="paperName"  show-overflow-tooltip/>
         <el-table-column label="组卷方式" prop="assemblyMode" width="200" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -124,8 +124,6 @@
     },
     data() {
       return {
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListB:[],
         optionListC:[],
@@ -188,10 +186,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         examElPaperPage(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/selectUser.vue

@@ -70,7 +70,7 @@
       </el-form>
     </div>
     <div class="page-content-box">
-      <el-table class="table-box" v-loading="loading" border :data="dataList"
+      <el-table class="table-box" border :data="dataList"
                 ref="multipleTable" :row-key="getRowKey" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" :reserve-selection="true"></el-table-column>
         <el-table-column label="姓名" prop="userName"  show-overflow-tooltip/>
@@ -103,8 +103,6 @@
     },
     data() {
       return {
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListA:[],
         optionListB:[],
@@ -182,10 +180,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         systemUserGetUserDataByParam(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/examManagement/examinationArrange/studentsTakingMakeUpExams.vue

@@ -112,7 +112,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList">
+        <el-table class="table-box"  border :data="dataList">
           <el-table-column label="姓名" prop="userName" show-overflow-tooltip/>
           <el-table-column label="学工号" prop="account" width="140" show-overflow-tooltip/>
           <el-table-column label="专业" prop="disciplineName" width="120" show-overflow-tooltip/>
@@ -196,8 +196,6 @@
             return time.getTime() < Date.now() - 8.64e7;
           }
         },
-        //页面遮罩
-        loading: false,
         newData: {
           parentExamId:null,
           reuseOriginalPaper: 1,
@@ -333,11 +331,9 @@
       },
       //获取数据列表
       getList() {
-        this.$set(this, 'loading', true)
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         obj.examId = this.newData.parentExamId
         examElExamMakeupCandidates(obj).then(response => {
-          this.$set(this, 'loading', false)
           this.$set(this, 'dataList', response.data.records)
           this.$set(this, 'total', response.data.total)
         })

src/views/safetyEducationExaminationNew/examManagement/examinationResult/academicPerformance.vue

@@ -41,7 +41,7 @@
       </el-form>
     </div>
     <div class="page-content-box">
-      <el-table class="table-box" v-loading="loading" border :data="dataList">
+      <el-table class="table-box"  border :data="dataList">
         <el-table-column label="姓名" prop="userName"  show-overflow-tooltip/>
         <el-table-column label="学工号" prop="account" width="140" show-overflow-tooltip/>
         <el-table-column label="学院单位" prop="deptName" width="240" show-overflow-tooltip/>
@@ -82,8 +82,6 @@
     },
     data() {
       return {
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListA:[],
         //查询条件
@@ -152,11 +150,11 @@
       //获取数据列表
       getList(){
         console.log('drawerPropsData',this.drawerPropsData)
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         obj.examId = this.drawerPropsData.examId
         examElExamResultScorePage(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/examManagement/examinationResult/index.vue

@@ -75,7 +75,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList">
+        <el-table class="table-box"  border :data="dataList">
           <el-table-column label="考试名称" prop="examName"  show-overflow-tooltip/>
           <el-table-column label="考试类型" prop="examTypeName" width="200" show-overflow-tooltip/>
           <el-table-column label="考试时间" prop="startTime" width="290" show-overflow-tooltip>
@@ -145,8 +145,6 @@
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
         //页面状态
         pageType:1,
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListA:[],
         optionListB:[],
@@ -234,7 +232,7 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if(this.dateRange[0]){
           obj.startTime = this.dateRange[0]+'T00:00:00'
@@ -244,7 +242,7 @@
           obj.endTime = "";
         }
         examElExamResultPage(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/examManagement/examinationResult/viewGrades.vue

@@ -71,7 +71,7 @@
       </el-form>
     </div>
     <div class="page-content-box">
-      <el-table class="table-box" v-loading="loading" border :data="dataList">
+      <el-table class="table-box"  border :data="dataList">
         <el-table-column label="姓名" prop="userName"  show-overflow-tooltip/>
         <el-table-column label="学工号" prop="account" width="140" show-overflow-tooltip/>
         <el-table-column label="专业" prop="disciplineName" width="200" show-overflow-tooltip/>
@@ -143,8 +143,6 @@
     },
     data() {
       return {
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListA:[],
         optionListB:[],
@@ -229,11 +227,11 @@
       //获取数据列表
       getList(){
         console.log('drawerPropsData',this.drawerPropsData)
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         obj.examId = this.drawerPropsData.examId
         examElExamResultScorePage(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/examManagement/testPaperManagement/drawerItem.vue

@@ -56,7 +56,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="leftLoading" border :data="leftDataList"
+        <el-table class="table-box" border :data="leftDataList"
                   ref="leftMultipleTable" :row-key="leftGetRowKey" @selection-change="leftHandleSelectionChange">
           <el-table-column type="selection" width="55" :reserve-selection="true"></el-table-column>
           <el-table-column label="题干" prop="questionContent"  show-overflow-tooltip>
@@ -149,7 +149,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="rightLoading" border :data="rightDataList"
+        <el-table class="table-box" border :data="rightDataList"
                   ref="rightMultipleTable" :row-key="rightGetRowKey" @selection-change="rightHandleSelectionChange">
           <el-table-column type="selection" width="55" :reserve-selection="true"></el-table-column>
           <el-table-column label="题干" prop="questionContent"  show-overflow-tooltip>
@@ -215,7 +215,6 @@
         },
         leftDataList:[],
         leftTotal:0,
-        leftLoading:false,
         rightQueryParams:{
           page:1,
           pageSize:20,
@@ -226,7 +225,6 @@
         },
         rightDataList:[],
         rightTotal:0,
-        rightLoading:false,
         //过滤/显示的题目ids
         questionIds:[],
         leftMultipleSelection:[],
@@ -302,12 +300,10 @@
         this.leftGetList();
       },
       leftGetList(){
-        this.$set(this,'leftLoading',true);
         let obj = JSON.parse(JSON.stringify(this.leftQueryParams))
         obj.knowledgePointId = this.knowledgePointId;
         obj.excludeQuestionIds = this.questionIds;
         examElQuestionBankList(obj).then(response => {
-          this.$set(this,'leftLoading',false);
           this.$set(this,'leftDataList',response.data.records);
           this.$set(this,'leftTotal',response.data.total);
         });
@@ -341,12 +337,10 @@
           this.$set(this,'rightTotal',0);
           return
         }
-        this.$set(this,'rightLoading',true);
         let obj = JSON.parse(JSON.stringify(this.rightQueryParams))
         obj.knowledgePointId = this.knowledgePointId;
         obj.includeQuestionIds = this.questionIds;
         examElQuestionBankList(obj).then(response => {
-          this.$set(this,'rightLoading',false);
           this.$set(this,'rightDataList',response.data.records);
           this.$set(this,'rightTotal',response.data.total);
           this.$set(this,'maxNum',response.data.total);

src/views/safetyEducationExaminationNew/examManagement/testPaperManagement/index.vue

@@ -78,7 +78,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList">
+        <el-table class="table-box"  border :data="dataList">
           <el-table-column label="试卷名称" prop="paperName"  show-overflow-tooltip>
             <template slot-scope="scope">
               <span style="color:#0183fa;cursor: pointer" @click="tableButton(2,scope.row)">{{scope.row.paperName}}</span>
@@ -155,8 +155,6 @@
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
         //页面状态
         pageType:1,
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListB:[],
         optionListC:[],
@@ -211,10 +209,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         examElPaperPage(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/mockPractice/mockPractice.vue

@@ -47,7 +47,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList">
+        <el-table class="table-box"  border :data="dataList">
           <el-table-column label="名称" prop="name" show-overflow-tooltip/>
           <el-table-column label="内容" prop="content" width="200" show-overflow-tooltip/>
           <el-table-column label="状态" prop="state" width="100" show-overflow-tooltip>
@@ -119,8 +119,6 @@
         tableButtonType: this.hasPermiDom(['demo:demo:detail', 'demo:demo:edit', 'demo:demo:del']),
         //页面状态
         pageType: 1,
-        //页面遮罩
-        loading: false,
         //下拉列表数据
         optionList: [{ value: true, label: '启用' }, { value: false, label: '停用' }],
         //查询条件
@@ -165,7 +163,6 @@
       },
       //获取数据列表
       getList() {
-        this.$set(this, 'loading', true)
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if (this.dateRange[0]) {
           obj.startTime = this.dateRange[0] + 'T00:00:00'
@@ -175,7 +172,6 @@
           obj.endTime = ''
         }
         getListFunction(obj).then(response => {
-          this.$set(this, 'loading', false)
           this.$set(this, 'dataList', response.data.records)
           this.$set(this, 'total', response.data.total)
         })

src/views/safetyEducationExaminationNew/publicConfiguration/certificateTemplate/index.vue

@@ -56,7 +56,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList">
+        <el-table class="table-box"  border :data="dataList">
           <el-table-column label="序号" type="index" align="center" width="50"/>
           <el-table-column label="证书模板名称" prop="templateName"  show-overflow-tooltip/>
           <el-table-column label="适用考试类型" prop="examTypeName" width="200" show-overflow-tooltip/>
@@ -122,8 +122,6 @@
         tableButtonType:this.hasPermiDom(['exam:certificateTemplate:detail','exam:certificateTemplate:edit','exam:certificateTemplate:del',]),
         //页面状态
         pageType:1,
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionClassList:[],
         optionList:[],
@@ -170,10 +168,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         examElCertificateTemplatePage(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/publicConfiguration/knowledgePointManagement/index.vue

@@ -38,7 +38,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading"
+        <el-table class="table-box"
                   row-key="id"
                   :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
                   default-expand-all
@@ -140,8 +140,6 @@
     data () {
       return {
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         options:[],
         cascaderProps: {
@@ -205,10 +203,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         examElKnowledgePointTreeList(obj).then(response => {
-          this.$set(this,'loading',false);
+
           const list = response.data || [];
           this.formatTreeData(list);
           this.$set(this,'dataList',list);

src/views/safetyEducationExaminationNew/questionBankManagement/practiceSolvingProblems/index.vue

@@ -60,7 +60,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList">
+        <el-table class="table-box"  border :data="dataList">
           <el-table-column label="知识点" prop="name"  show-overflow-tooltip/>
           <el-table-column label="试题总数" prop="content" width="200" show-overflow-tooltip/>
           <el-table-column label="练习人数" prop="content" width="200" show-overflow-tooltip/>
@@ -108,8 +108,6 @@
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
         //页面状态
         pageType:1,
-        //页面遮罩
-        loading:false,
         //下拉列表数据
         optionListA:[],
         optionListB:[],
@@ -158,7 +156,7 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if(this.dateRange[0]){
           obj.startTime = this.dateRange[0]+'T00:00:00'
@@ -168,7 +166,7 @@
           obj.endTime = "";
         }
         getListFunction(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/questionBankManagement/questionBankManagement/index.vue

@@ -72,7 +72,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList">
+        <el-table class="table-box"  border :data="dataList">
           <el-table-column label="题干" prop="questionContent"  show-overflow-tooltip>
             <template slot-scope="scope">
               <span style="color:#0183fa;cursor: pointer;" @click="tableButton(2,scope.row)">{{ cleanRichText(scope.row.questionContent) }}</span>
@@ -152,8 +152,6 @@
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
         //页面状态
         pageType:1,
-        //页面遮罩
-        loading:false,
         importConfig:{
           upLoadApi:'/system/user/student/importData',                //上传接口地址
           downloadApi:'/system/user/student/importTemplate',          //下载模板接口地址
@@ -232,10 +230,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'loading',true);
+
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         examElQuestionBankList(obj).then(response => {
-          this.$set(this,'loading',false);
+
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         });

src/views/safetyEducationExaminationNew/safetyEducation/knowledgeLearning/index.vue

@@ -94,8 +94,6 @@
       return {
         //页面状态
         pageType: 1,
-        //页面遮罩
-        loading: false,
         letDataList:[
           {name:'全部知识点',id:'1'},{name:'全部知识点',id:'2'},
           {name:'全部知识点',id:'3'},{name:'全部知识点',id:'4'},
@@ -179,7 +177,6 @@
       },
       //获取数据列表
       getList() {
-        this.$set(this, 'loading', true)
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if (this.dateRange[0]) {
           obj.startTime = this.dateRange[0] + 'T00:00:00'
@@ -189,7 +186,6 @@
           obj.endTime = ''
         }
         getListFunction(obj).then(response => {
-          this.$set(this, 'loading', false)
           this.$set(this, 'dataList', response.data.records)
           this.$set(this, 'total', response.data.total)
         })

src/views/safetyEducationExaminationNew/safetyEducation/learningTasks/index.vue

@@ -83,8 +83,6 @@
       return {
         //页面状态
         pageType: 1,
-        //页面遮罩
-        loading: false,
         //下拉列表数据
         optionListB: [],
         //查询条件
@@ -145,7 +143,6 @@
       },
       //获取数据列表
       getList() {
-        this.$set(this, 'loading', true)
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if (this.dateRange[0]) {
           obj.startTime = this.dateRange[0] + 'T00:00:00'
@@ -155,7 +152,6 @@
           obj.endTime = ''
         }
         getListFunction(obj).then(response => {
-          this.$set(this, 'loading', false)
           this.$set(this, 'dataList', response.data.records)
           this.$set(this, 'total', response.data.total)
         })

src/views/safetyEducationExaminationNew/safetyTest/mockExam/index.vue

@@ -89,8 +89,6 @@
         tableButtonType: this.hasPermiDom(['demo:demo:detail', 'demo:demo:edit', 'demo:demo:del']),
         //页面状态
         pageType: 1,
-        //页面遮罩
-        loading: false,
         //横向列表
         topDataList:[
           {label:'全部',id:'1',num:'10'},{label:'全部',id:'2',num:'10'},{label:'全部',id:'3',num:'10'},
@@ -174,7 +172,6 @@
       },
       //获取数据列表
       getList() {
-        this.$set(this, 'loading', true)
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if (this.dateRange[0]) {
           obj.startTime = this.dateRange[0] + 'T00:00:00'
@@ -184,7 +181,6 @@
           obj.endTime = ''
         }
         getListFunction(obj).then(response => {
-          this.$set(this, 'loading', false)
           this.$set(this, 'dataList', response.data.records)
           this.$set(this, 'total', response.data.total)
         })

src/views/safetyEducationExaminationNew/safetyTest/myGrades/index.vue

@@ -84,8 +84,6 @@
         tableButtonType: this.hasPermiDom(['demo:demo:detail', 'demo:demo:edit', 'demo:demo:del']),
         //页面状态
         pageType: 1,
-        //页面遮罩
-        loading: false,
         //横向列表
         topDataList:[
           {label:'全部',id:'1',num:'10'},{label:'全部',id:'2',num:'10'},{label:'全部',id:'3',num:'10'},
@@ -170,7 +168,6 @@
       },
       //获取数据列表
       getList() {
-        this.$set(this, 'loading', true)
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if (this.dateRange[0]) {
           obj.startTime = this.dateRange[0] + 'T00:00:00'
@@ -180,7 +177,6 @@
           obj.endTime = ''
         }
         getListFunction(obj).then(response => {
-          this.$set(this, 'loading', false)
           this.$set(this, 'dataList', response.data.records)
           this.$set(this, 'total', response.data.total)
         })

src/views/safetyEducationExaminationNew/safetyTest/onlineExam/index.vue

@@ -91,8 +91,6 @@
         tableButtonType: this.hasPermiDom(['demo:demo:detail', 'demo:demo:edit', 'demo:demo:del']),
         //页面状态
         pageType: 1,
-        //页面遮罩
-        loading: false,
         //横向列表
         topDataList:[
           {label:'全部',id:'1',num:'10'},{label:'全部',id:'2',num:'10'},{label:'全部',id:'3',num:'10'},
@@ -176,7 +174,6 @@
       },
       //获取数据列表
       getList() {
-        this.$set(this, 'loading', true)
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if (this.dateRange[0]) {
           obj.startTime = this.dateRange[0] + 'T00:00:00'
@@ -186,7 +183,6 @@
           obj.endTime = ''
         }
         getListFunction(obj).then(response => {
-          this.$set(this, 'loading', false)
           this.$set(this, 'dataList', response.data.records)
           this.$set(this, 'total', response.data.total)
         })

src/views/safetyEducationExaminationNew/safetyTest/practiceQuestions/index.vue

@@ -104,8 +104,6 @@
       return {
         //页面状态
         pageType: 1,
-        //页面遮罩
-        loading: false,
         letDataList:[
           {name:'全部知识点',id:'1'},{name:'全部知识点',id:'2'},
           {name:'全部知识点',id:'3'},{name:'全部知识点',id:'4'},
@@ -183,7 +181,6 @@
       },
       //获取数据列表
       getList() {
-        this.$set(this, 'loading', true)
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if (this.dateRange[0]) {
           obj.startTime = this.dateRange[0] + 'T00:00:00'
@@ -193,7 +190,6 @@
           obj.endTime = ''
         }
         getListFunction(obj).then(response => {
-          this.$set(this, 'loading', false)
           this.$set(this, 'dataList', response.data.records)
           this.$set(this, 'total', response.data.total)
         })

src/views/safetyEducationExaminationNew/startExam/startExam.vue

@@ -47,7 +47,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList">
+        <el-table class="table-box"  border :data="dataList">
           <el-table-column label="名称" prop="name" show-overflow-tooltip/>
           <el-table-column label="内容" prop="content" width="200" show-overflow-tooltip/>
           <el-table-column label="状态" prop="state" width="100" show-overflow-tooltip>
@@ -119,8 +119,6 @@
         tableButtonType: this.hasPermiDom(['demo:demo:detail', 'demo:demo:edit', 'demo:demo:del']),
         //页面状态
         pageType: 1,
-        //页面遮罩
-        loading: false,
         //下拉列表数据
         optionList: [{ value: true, label: '启用' }, { value: false, label: '停用' }],
         //查询条件
@@ -165,7 +163,6 @@
       },
       //获取数据列表
       getList() {
-        this.$set(this, 'loading', true)
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if (this.dateRange[0]) {
           obj.startTime = this.dateRange[0] + 'T00:00:00'
@@ -175,7 +172,6 @@
           obj.endTime = ''
         }
         getListFunction(obj).then(response => {
-          this.$set(this, 'loading', false)
           this.$set(this, 'dataList', response.data.records)
           this.$set(this, 'total', response.data.total)
         })