zc

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

@@ -239,7 +239,7 @@
                     <el-switch :disabled="showType" v-model="newData.studyHoursRequirementEnabled" :active-value="1" :inactive-value="0"
                                active-color="#0183FB" inactive-color="#AAAAAA"
                     />
-                    <div class="number-stepper" v-if="!yzyhTest&&newData.studyHoursRequirementEnabled == 1" style="margin-left:12px;height:40px;">
+                    <div class="number-stepper" v-if="(!yzyhTest&&!placementTest)&&newData.studyHoursRequirementEnabled == 1" style="margin-left:12px;height:40px;">
                       <el-input-number
                         :disabled="showType"
                         class="form-input-number"
@@ -251,12 +251,12 @@
                       >
                       </el-input-number>
                     </div>
-                    <span v-if="!yzyhTest&&newData.studyHoursRequirementEnabled == 1" class="unit-text" style="margin-top:2px;"
+                    <span v-if="(!yzyhTest&&!placementTest)&&newData.studyHoursRequirementEnabled == 1" class="unit-text" style="margin-top:2px;"
                     >学时</span>
                     <span class="tip-text" style="margin-left:12px;">开启后，需完成相应学时才能参加考试</span>
                     <el-cascader
                       :disabled="showType"
-                      v-if="!yzyhTest&&newData.studyHoursRequirementEnabled == 1"
+                      v-if="(!yzyhTest&&!placementTest)&&newData.studyHoursRequirementEnabled == 1"
                       style="width: 600px;margin-left:20px;"
                       v-model="newData.knowledgePointIds"
                       :options="optionListC"
@@ -976,14 +976,14 @@
           ruleScopeItems:this.newData.scopeType==2?this.scopeList:[],
           designatedCandidates:this.newData.scopeType==3?this.userList:[],
           studyHoursRequirementEnabled:this.newData.studyHoursRequirementEnabled,
-          studyHoursRequirement:this.newData.studyHoursRequirementEnabled == 1&&!this.yzyhTest?this.newData.studyHoursRequirement:0,
+          studyHoursRequirement:this.newData.studyHoursRequirementEnabled == 1&&(!this.yzyhTest&&!this.placementTest)?this.newData.studyHoursRequirement:0,
           mandatoryStudyHoursConfig:this.newData.studyHoursRequirementEnabled == 1&&this.yzyhTest?this.newData.mandatoryStudyHoursConfig:{
             freshmanNoLabHours:0,
             undergraduateHours:0,
             staffNewHours:0,
             staffNonNewHours:0,
           },
-          knowledgePointIds:this.newData.studyHoursRequirement == 1?this.newData.knowledgePointIds:[],
+          knowledgePointIds:this.newData.studyHoursRequirement == 1&&(!this.yzyhTest&&!this.placementTest)?this.newData.knowledgePointIds:[],
           preCourseEnabled:this.newData.preCourseEnabled,
           preCourseId:this.newData.preCourseEnabled == 1?this.newData.preCourseId:'',
           mockEnabled:this.newData.mockEnabled,

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

@@ -156,11 +156,11 @@
         //页面状态
         pageType:1,
         importConfig:{
-          upLoadApi:'/system/user/student/importData',                //上传接口地址
-          downloadApi:'/system/user/student/importTemplate',          //下载模板接口地址
+          upLoadApi:'/exam/elQuestionBank/importData',                //上传接口地址
+          downloadApi:'/exam/elQuestionBank/importTemplate',          //下载模板接口地址
           downloadCustomKey:null,                                     //下载模板自定义参数KEY(非必填)
           downloadCustomValue:null,                                   //下载模板自定义参数VALUE(非必填)
-          loseApi:'/system/user/student/importErrorData',             //失败报表接口地址
+          loseApi:'/exam/elQuestionBank/exportErrorData',             //失败报表接口地址
           loseCustomKey:null,                                         //失败报表自定义参数KEY(非必填)
           loseCustomValue:null,                                       //失败报表自定义参数VALUE(非必填)
           fileName:'导入模板-',                                       //下载模板命名

src/views/safetyEducationExaminationNew/workbench/UserInfoCard.vue

@@ -24,11 +24,12 @@
           <p>所属单位</p>
           <p>{{userInfo.deptName}}</p>
         </div>
-        <div class="left-min-box" v-if="userInfo.userType == 2">
-          <p>实验室信息</p>
-          <p>{{userInfo.labName?userInfo.labName:'暂无绑定实验室'}}</p>
-          <p @click="shadeButton(4)" v-show="!userInfo.bound">去绑定</p>
-          <p v-if="userInfo.bound">{{userInfo.bindStatus}}</p>
+        <div class="left-sub-min-box" v-if="userInfo.userType == 2">
+          <p class="name-p">实验室信息</p>
+          <p class="text-p" v-if="userInfo.bound">{{userInfo.labName}}</p>
+          <p class="text-p" v-if="!userInfo.bound&&userInfo.educationType == 2">{{userInfo.isFinishExam?'暂无绑定实验室':'请先完成入学考试'}}</p>
+          <p class="button-p" v-if="!userInfo.bound&&(userInfo.educationType == 1 ||(userInfo.educationType == 2&&userInfo.isFinishExam))" @click="shadeButton(4)">去绑定</p>
+          <p class="sub-name-p" v-if="userInfo.bound">{{userInfo.bindStatus}}</p>
         </div>
       </div>
       <!--进度-->
@@ -170,7 +171,7 @@
               <p class="shade-text-p">毕业论文或毕业设计，科创等相关需要在具体的实验室开展业务的情况可申请绑定实验室，绑定完毕后需要完成对应的分级考试。</p>
             </div>
             <!--研究生选项-->
-            <div class="checkbox-box" v-if="userInfo.educationType == 1">
+            <div class="checkbox-box" v-if="userInfo.educationType == 1&&userInfo.isNew">
               <el-form-item label="" label-width="0">
                 <el-checkbox v-model="shadeFormData.isEnter">无需进入实验室</el-checkbox>
                 <p class="checkbox-text-p">人文、体育等相关学院无需进入实验室的新研究生可选择此项，选择后学时要求为4小时，需通过应知应会考试。</p>
@@ -353,9 +354,18 @@ export default {
     examElLabEduRelationBind(){
       let obj = {
         subId:this.shadeFormData.subId,
-        reason:this.userInfo.educationType == 2?this.shadeFormData.reason:'',
-        isEnter:this.userInfo.educationType == 1?(this.shadeFormData.isEnter?'1':'0'):'',
       };
+      if(this.userInfo.educationType == 1&&this.userInfo.isNew){
+        obj.reason = '';
+        obj.isEnter = this.shadeFormData.isEnter?'0':'1';
+      }else if(this.userInfo.educationType == 1&&!this.userInfo.isNew){
+        obj.reason = '';
+        obj.isEnter = '0';
+      }else if(this.userInfo.educationType == 2){
+        obj.reason = this.shadeFormData.reason;
+        obj.isEnter = '1';
+      }
+
       examElLabEduRelationBind(obj).then(response => {
         this.msgSuccess(response.message);
         this.$set(this,'shadeType',null);
@@ -434,6 +444,38 @@ export default {
           cursor: pointer;
         }
       }
+      .left-sub-min-box{
+        display: inline-block;
+        overflow:hidden;
+        width:198px;
+        margin-bottom:15px;
+        p{
+          line-height:30px;
+        }
+        .name-p{
+          font-size:14px;
+          color:#666;
+        }
+        .text-p{
+          font-size:16px;
+          font-weight:700;
+          display:block;
+          overflow:hidden;
+          text-overflow:ellipsis;
+          white-space:nowrap;
+        }
+        .button-p{
+          font-size:16px;
+          font-weight:700;
+          color: #0183fa;
+          cursor: pointer;
+        }
+        .sub-name-p{
+          font-size:16px;
+          font-weight:700;
+          color: #0183fa;
+        }
+      }
     }
     .center-max-box{
       width:430px;