|
|
@@ -33,21 +33,21 @@
|
|
|
:value="item.id"/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="安全分类" v-if="!placementTest" :prop="placementTest?'disciplineTypeId':''">
|
|
|
+ <el-form-item label="安全分类" v-if="rangeStatus != 'CLASSIFIED'" :prop="rangeStatus == 'CLASSIFIED'?'disciplineTypeId':''">
|
|
|
<el-select :disabled="showType" v-model="newData.disciplineTypeId" placeholder="安全分类" style="width:200px;">
|
|
|
<el-option v-for="item in tableList" :key="item.id"
|
|
|
:label="item.disciplineName"
|
|
|
:value="item.id"/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="安全分类" v-if="placementTest" :prop="placementTest?'disciplineTypeId':''">
|
|
|
+ <el-form-item label="安全分类" v-if="rangeStatus == 'CLASSIFIED'" :prop="rangeStatus == 'CLASSIFIED'?'disciplineTypeId':''">
|
|
|
<el-select :disabled="showType" v-model="newData.disciplineTypeId" placeholder="安全分类" style="width:200px;">
|
|
|
<el-option v-for="item in tableList2" :key="item.id"
|
|
|
:label="item.disciplineName"
|
|
|
:value="item.id"/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="风险等级" prop="riskLevelId" v-if="placementTest">
|
|
|
+ <el-form-item label="风险等级" prop="riskLevelId" v-if="rangeStatus == 'CLASSIFIED'">
|
|
|
<el-select :disabled="showType" v-model="newData.riskLevelId" placeholder="请选择" style="width:200px;">
|
|
|
<el-option v-for="item in optionRiskLevel" :key="item.levelId" :label="item.titleName"
|
|
|
:value="item.levelId"/>
|
|
|
@@ -81,32 +81,29 @@
|
|
|
<el-form-item label="是否共享">
|
|
|
<div class="switch-row">
|
|
|
<el-switch :disabled="showType" v-model="newData.shareStatus" :active-value="1" :inactive-value="0"
|
|
|
- active-color="#0183FB" inactive-color="#AAAAAA"
|
|
|
- />
|
|
|
+ active-color="#0183FB" inactive-color="#AAAAAA"/>
|
|
|
<p class="tip-text" style="margin:2px 0 0 10px;">共享开启,全校所有学院单位都可见</p>
|
|
|
-
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="启用" prop="enableStatus">
|
|
|
- <el-switch :disabled="showType" v-model="newData.enableStatus" :active-value="1" :inactive-value="0"
|
|
|
- active-color="#0183FB" inactive-color="#AAAAAA"
|
|
|
- />
|
|
|
+ <div class="switch-row">
|
|
|
+ <el-switch :disabled="showType" v-model="newData.enableStatus" :active-value="1" :inactive-value="0"
|
|
|
+ active-color="#0183FB" inactive-color="#AAAAAA"/>
|
|
|
+ <p class="tip-text" style="margin:2px 0 0 10px;">考试发布/停用开关</p>
|
|
|
+ </div>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
- <el-form-item label="考卷" prop="paperId">
|
|
|
- <div class="paper-select-row">
|
|
|
- <p class="checkButton-p" @click="openPaperDrawer" v-if="!showType">选择试卷</p>
|
|
|
- <div class="selected-tag" v-if="newData.paperName">
|
|
|
- <span>{{ newData.paperName }}</span>
|
|
|
- <!--<i class="el-icon-close" @click="newData.paperId = null; newData.paperName = ''"></i>-->
|
|
|
- </div>
|
|
|
+ <el-form-item label="自动创建执行" prop="enableStatus">
|
|
|
+ <div class="switch-row">
|
|
|
+ <el-switch :disabled="showType" v-model="newData.enableStatus" :active-value="1" :inactive-value="0"
|
|
|
+ active-color="#0183FB" inactive-color="#AAAAAA"/>
|
|
|
+ <p class="tip-text" style="margin:2px 0 0 10px;">开启后,每学年系统按考试周期自动创建执行该考试,无需重复创建</p>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="section-divider"></div>
|
|
|
<div class="section-block">
|
|
|
- <div class="flex-row-box">
|
|
|
+ <div class="flex-row-box" style="margin-bottom:8px;">
|
|
|
<el-form-item label="考试时间" prop="examTimeRange">
|
|
|
<el-date-picker
|
|
|
:disabled="showType"
|
|
|
@@ -142,122 +139,330 @@
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
-
|
|
|
- <el-form-item label="考试范围" prop="scopeType" v-if="!yzyhTest">
|
|
|
- <div class="scope-btn-group">
|
|
|
- <button
|
|
|
- v-for="item in scopeOptions"
|
|
|
- :key="item.value"
|
|
|
- class="scope-btn"
|
|
|
- v-show="!showType || newData.scopeType === item.value"
|
|
|
- :class="{ active: newData.scopeType === item.value }"
|
|
|
- @click.prevent="newData.scopeType = item.value"
|
|
|
- >
|
|
|
- <i v-if="newData.scopeType === item.value" class="el-icon-check"
|
|
|
- style="color:#0183fa;margin-right:4px;"
|
|
|
- ></i>
|
|
|
- {{ item.label }}
|
|
|
- </button>
|
|
|
- <p class="checkButton-p" @click="openExamScopeDrawer"
|
|
|
- v-if="(newData.scopeType == '2' || newData.scopeType == '3')&&!showType"
|
|
|
- >选择</p>
|
|
|
- </div>
|
|
|
- <!-- 考试范围表格(非全校时显示) -->
|
|
|
- <div v-if="newData.scopeType != '1'" class="scope-table-box">
|
|
|
- <div class="scope-table-header" v-if="newData.scopeType == '2'">已选取:{{ scopeList.length }}组</div>
|
|
|
- <div class="scope-table-header" v-if="newData.scopeType == '3'">已选取:{{ userList.length }}人</div>
|
|
|
- <el-table v-if="newData.scopeType == '2'" border class="table-box" :data="scopeList" size="small"
|
|
|
- style="width:100%;">
|
|
|
- <el-table-column label="学院" prop="deptName">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.deptName?scope.row.deptName:'-'}}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="专业" prop="disciplineName" width="200">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.disciplineName?scope.row.disciplineName:'-'}}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="角色" prop="roleName" width="180">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.roleName?scope.row.roleName:'-'}}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="学年" prop="academicYear" width="180">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.academicYear?scope.row.academicYear:'-'}}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="操作" width="140" align="center" v-if="!showType">
|
|
|
- <template slot-scope="{ $index }">
|
|
|
- <div class="table-button-box">
|
|
|
- <p class="table-button-null"></p>
|
|
|
- <p class="table-button-p"
|
|
|
- @click="scopeList.splice($index, 1)"
|
|
|
- >移除</p>
|
|
|
- <p class="table-button-null"></p>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- <el-table v-if="newData.scopeType == '3'" border class="table-box" :data="userList" size="small"
|
|
|
- style="width:100%;">
|
|
|
- <el-table-column label="姓名" prop="userName" width="200">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.userName?scope.row.userName:'-'}}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="学工号" prop="account">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.account?scope.row.account:'-'}}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="专业" prop="majorName" width="200">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.majorName?scope.row.majorName:'-'}}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="学院" prop="deptName" width="180">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.deptName?scope.row.deptName:'-'}}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="学年" prop="gradeNumber" width="180">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.academicYear?scope.row.academicYear:'-'}}
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="操作" width="140" align="center">
|
|
|
- <template slot-scope="{ $index }">
|
|
|
- <div class="table-button-box">
|
|
|
- <p class="table-button-null"></p>
|
|
|
- <p class="table-button-p" v-if="!showType"
|
|
|
- @click="userList.splice($index, 1)"
|
|
|
- >移除</p>
|
|
|
- <p class="table-button-null"></p>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </div>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="考试范围" prop="targetUserType" v-if="yzyhTest">
|
|
|
- <div class="scope-btn-group">
|
|
|
- <button
|
|
|
- v-for="item in scopeOptionsB"
|
|
|
- :key="item.value"
|
|
|
- class="scope-btn"
|
|
|
- v-show="!showType || newData.targetUserType === item.value"
|
|
|
- :class="{ active: newData.targetUserType === item.value }"
|
|
|
- @click.prevent="newData.targetUserType = item.value"
|
|
|
- >
|
|
|
- <i v-if="newData.targetUserType === item.value" class="el-icon-check"
|
|
|
- style="color:#0183fa;margin-right:4px;"
|
|
|
- ></i>
|
|
|
- {{ item.label }}
|
|
|
- </button>
|
|
|
- </div>
|
|
|
- </el-form-item>
|
|
|
+ <div v-if="rangeStatus == ''">
|
|
|
+ <el-form-item label="考试范围" prop="scopeType" v-if="rangeStatus != 'yzyh'">
|
|
|
+ <div class="scope-btn-group">
|
|
|
+ <button
|
|
|
+ v-for="item in scopeOptions"
|
|
|
+ :key="item.value"
|
|
|
+ class="scope-btn"
|
|
|
+ v-show="!showType || newData.scopeType === item.value"
|
|
|
+ :class="{ active: newData.scopeType === item.value }"
|
|
|
+ @click.prevent="newData.scopeType = item.value"
|
|
|
+ >
|
|
|
+ <i v-if="newData.scopeType === item.value" class="el-icon-check"
|
|
|
+ style="color:#0183fa;margin-right:4px;"
|
|
|
+ ></i>
|
|
|
+ {{ item.label }}
|
|
|
+ </button>
|
|
|
+ <p class="checkButton-p" @click="openExamScopeDrawer"
|
|
|
+ v-if="(newData.scopeType == '2' || newData.scopeType == '3')&&!showType"
|
|
|
+ >选择</p>
|
|
|
+ </div>
|
|
|
+ <!-- 考试范围表格(非全校时显示) -->
|
|
|
+ <div v-if="newData.scopeType != '1'" class="scope-table-box">
|
|
|
+ <div class="scope-table-header" v-if="newData.scopeType == '2'">已选取:{{ scopeList.length }}组</div>
|
|
|
+ <div class="scope-table-header" v-if="newData.scopeType == '3'">已选取:{{ userList.length }}人</div>
|
|
|
+ <el-table v-if="newData.scopeType == '2'" border class="table-box" :data="scopeList" size="small"
|
|
|
+ style="width:100%;">
|
|
|
+ <el-table-column label="学院" prop="deptName">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.deptName?scope.row.deptName:'-'}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="专业" prop="disciplineName" width="200">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.disciplineName?scope.row.disciplineName:'-'}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="角色" prop="roleName" width="180">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.roleName?scope.row.roleName:'-'}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="学年" prop="academicYear" width="180">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.academicYear?scope.row.academicYear:'-'}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作" width="140" align="center" v-if="!showType">
|
|
|
+ <template slot-scope="{ $index }">
|
|
|
+ <div class="table-button-box">
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ @click="scopeList.splice($index, 1)"
|
|
|
+ >移除</p>
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <el-table v-if="newData.scopeType == '3'" border class="table-box" :data="userList" size="small"
|
|
|
+ style="width:100%;">
|
|
|
+ <el-table-column label="姓名" prop="userName" width="200">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.userName?scope.row.userName:'-'}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="学工号" prop="account">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.account?scope.row.account:'-'}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="专业" prop="majorName" width="200">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.majorName?scope.row.majorName:'-'}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="学院" prop="deptName" width="180">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.deptName?scope.row.deptName:'-'}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="学年" prop="gradeNumber" width="180">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.academicYear?scope.row.academicYear:'-'}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作" width="140" align="center">
|
|
|
+ <template slot-scope="{ $index }">
|
|
|
+ <div class="table-button-box">
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ <p class="table-button-p" v-if="!showType"
|
|
|
+ @click="userList.splice($index, 1)"
|
|
|
+ >移除</p>
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="考试范围" prop="targetUserType" v-if="rangeStatus == 'yzyh'">
|
|
|
+ <div class="scope-btn-group">
|
|
|
+ <button
|
|
|
+ v-for="item in scopeOptionsB"
|
|
|
+ :key="item.value"
|
|
|
+ class="scope-btn"
|
|
|
+ v-show="!showType || newData.targetUserType === item.value"
|
|
|
+ :class="{ active: newData.targetUserType === item.value }"
|
|
|
+ @click.prevent="newData.targetUserType = item.value"
|
|
|
+ >
|
|
|
+ <i v-if="newData.targetUserType === item.value" class="el-icon-check"
|
|
|
+ style="color:#0183fa;margin-right:4px;"
|
|
|
+ ></i>
|
|
|
+ {{ item.label }}
|
|
|
+ </button>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <el-form-item label="考试范围" prop="scopeType" v-if="rangeStatus != ''">
|
|
|
+ <div class="scope-btn-group">
|
|
|
+ <button
|
|
|
+ class="scope-btn"
|
|
|
+ v-show="!showType || newData.scopeType === 1"
|
|
|
+ :class="{ active: newData.scopeType === 1 }">
|
|
|
+ <i v-if="newData.scopeType === 1" class="el-icon-check"
|
|
|
+ style="color:#0183fa;margin-right:4px;"></i>
|
|
|
+ 全校
|
|
|
+ </button>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ <!--其他考试-选择考卷-->
|
|
|
+ <el-form-item label="试卷配置" prop="paperId" v-if="rangeStatus == ''">
|
|
|
+ <div class="paper-select-row">
|
|
|
+ <p class="checkButton-p" @click="openPaperDrawer" v-if="!showType">选择试卷</p>
|
|
|
+ <div class="selected-tag" v-if="newData.paperName">
|
|
|
+ <span>{{ newData.paperName }}</span>
|
|
|
+ <!--<i class="el-icon-close" @click="newData.paperId = null; newData.paperName = ''"></i>-->
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ <!--新生入学考试-选择考卷-->
|
|
|
+ <el-form-item label="试卷配置" prop="paperId" v-if="rangeStatus == 'STUDENT'">
|
|
|
+ <div class="paper-select-row">
|
|
|
+ <el-select :disabled="showType" v-model="paperType" placeholder="选择试卷" style="width:200px;" v-if="rangeStatus=='STUDENT'">
|
|
|
+ <el-option key="1" label="通用抽题组卷" value="1"/>
|
|
|
+ <el-option key="2" label="多学院抽题组卷" value="2"/>
|
|
|
+ </el-select>
|
|
|
+ <p class="checkButton-p" @click="openPaperDrawer" v-if="!showType&&paperType==1">选择试卷</p>
|
|
|
+ <p class="checkButton-p" @click="openPaperDeptDrawer" v-if="!showType&&paperType==2">抽题配置</p>
|
|
|
+ <div class="selected-tag" v-if="newData.paperName&&paperType==1">
|
|
|
+ <span>{{ newData.paperName }}</span>
|
|
|
+ <!--<i class="el-icon-close" @click="newData.paperId = null; newData.paperName = ''"></i>-->
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="paper-select-column" style="margin-top:20px;height:400px;">
|
|
|
+ <el-table v-if="paperType==2" class="table-box" border :data="paperDeptList">
|
|
|
+ <el-table-column label="已选学院" prop="deptName" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span :style="scope.row.paperName?'color:#0183fa;':'color:#999;'">{{ scope.row.paperName || '未选择' }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ <!--分级分类考试-选择考卷-->
|
|
|
+ <el-form-item label="试卷配置" v-if="rangeStatus == 'CLASSIFIED'">
|
|
|
+ <div class="paper-select-column">
|
|
|
+ <div class="CLASSIFIED-check-box">
|
|
|
+ <p :class="checkPaperType == 1?'check-CLASSIFIED-p':''" @click="checkPaperType = 1">Ⅰ级(重大风险)</p>
|
|
|
+ <p :class="checkPaperType == 2?'check-CLASSIFIED-p':''" @click="checkPaperType = 2">Ⅱ级(高风险)</p>
|
|
|
+ <p :class="checkPaperType == 3?'check-CLASSIFIED-p':''" @click="checkPaperType = 3">Ⅲ级(中风险)</p>
|
|
|
+ <p :class="checkPaperType == 4?'check-CLASSIFIED-p':''" @click="checkPaperType = 4">Ⅳ级(低风险)</p>
|
|
|
+ </div>
|
|
|
+ <el-table v-if="checkPaperType == 1" class="table-box" border :data="paperListA1">
|
|
|
+ <el-table-column label="安全分类" prop="name" width="200" show-overflow-tooltip/>
|
|
|
+ <el-table-column label="试卷" prop="paperName" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span :style="scope.row.paperName?'color:#0183fa;':'color:#999;'">{{ scope.row.paperName || '未选择' }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作" width="240" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div class="table-button-box">
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ v-if="scope.$index != 0"
|
|
|
+ @click="paperTableButton(1,scope.$index)"
|
|
|
+ >试卷同上</p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ @click="paperTableButton(2,scope.$index)"
|
|
|
+ >选择试卷</p>
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <el-table v-if="checkPaperType == 2" class="table-box" border :data="paperListA2">
|
|
|
+ <el-table-column label="安全分类" prop="name" width="200" show-overflow-tooltip/>
|
|
|
+ <el-table-column label="试卷" prop="paperName" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span :style="scope.row.paperName?'color:#0183fa;':'color:#999;'">{{ scope.row.paperName || '未选择' }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作" width="240" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div class="table-button-box">
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ v-if="scope.$index != 0"
|
|
|
+ @click="paperTableButton(1,scope.$index)"
|
|
|
+ >试卷同上</p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ @click="paperTableButton(2,scope.$index)"
|
|
|
+ >选择试卷</p>
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <el-table v-if="checkPaperType == 3" class="table-box" border :data="paperListA3">
|
|
|
+ <el-table-column label="安全分类" prop="name" width="200" show-overflow-tooltip/>
|
|
|
+ <el-table-column label="试卷" prop="paperName" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span :style="scope.row.paperName?'color:#0183fa;':'color:#999;'">{{ scope.row.paperName || '未选择' }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作" width="240" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div class="table-button-box">
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ v-if="scope.$index != 0"
|
|
|
+ @click="paperTableButton(1,scope.$index)"
|
|
|
+ >试卷同上</p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ @click="paperTableButton(2,scope.$index)"
|
|
|
+ >选择试卷</p>
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <el-table v-if="checkPaperType == 4" class="table-box" border :data="paperListA4">
|
|
|
+ <el-table-column label="安全分类" prop="name" width="200" show-overflow-tooltip/>
|
|
|
+ <el-table-column label="试卷" prop="paperName" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span :style="scope.row.paperName?'color:#0183fa;':'color:#999;'">{{ scope.row.paperName || '未选择' }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作" width="240" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div class="table-button-box">
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ v-if="scope.$index != 0"
|
|
|
+ @click="paperTableButton(1,scope.$index)"
|
|
|
+ >试卷同上</p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ @click="paperTableButton(2,scope.$index)"
|
|
|
+ >选择试卷</p>
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ <!--应知应会-选择考卷-->
|
|
|
+ <el-form-item label="试卷配置" v-if="rangeStatus == 'yzyh'">
|
|
|
+ <div class="paper-select-column">
|
|
|
+ <el-table class="table-box" border :data="paperListB">
|
|
|
+ <el-table-column label="安全分类" prop="name" width="200" show-overflow-tooltip/>
|
|
|
+ <el-table-column label="试卷" prop="paperName" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span :style="scope.row.paperName?'color:#0183fa;':'color:#999;'">{{ scope.row.paperName || '未选择' }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作" width="240" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div class="table-button-box">
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ v-if="scope.$index != 0"
|
|
|
+ @click="paperTableButton(1,scope.$index)"
|
|
|
+ >试卷同上</p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ @click="paperTableButton(2,scope.$index)"
|
|
|
+ >选择试卷</p>
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ <!--负面清单-选择考卷-->
|
|
|
+ <el-form-item label="试卷配置" v-if="rangeStatus == 'FUMIANQINGDAN'">
|
|
|
+ <div class="paper-select-column">
|
|
|
+ <el-table class="table-box" border :data="paperListC">
|
|
|
+ <el-table-column label="安全分类" prop="name" width="200" show-overflow-tooltip/>
|
|
|
+ <el-table-column label="试卷" prop="paperName" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span :style="scope.row.paperName?'color:#0183fa;':'color:#999;'">{{ scope.row.paperName || '未选择' }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作" width="240" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div class="table-button-box">
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ v-if="scope.$index != 0"
|
|
|
+ @click="paperTableButton(1,scope.$index)"
|
|
|
+ >试卷同上</p>
|
|
|
+ <p class="table-button-p"
|
|
|
+ @click="paperTableButton(2,scope.$index)"
|
|
|
+ >选择试卷</p>
|
|
|
+ <p class="table-button-null"></p>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- ==================== 考前配置 ==================== -->
|
|
|
@@ -268,7 +473,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&&!placementTest)&&newData.studyHoursRequirementEnabled == 1" style="margin-left:12px;height:40px;">
|
|
|
+ <div class="number-stepper" v-if="(rangeStatus != 'yzyh'&&rangeStatus != 'CLASSIFIED')&&newData.studyHoursRequirementEnabled == 1" style="margin-left:12px;height:40px;">
|
|
|
<el-input-number
|
|
|
:disabled="showType"
|
|
|
class="form-input-number"
|
|
|
@@ -280,12 +485,12 @@
|
|
|
>
|
|
|
</el-input-number>
|
|
|
</div>
|
|
|
- <span v-if="(!yzyhTest&&!placementTest)&&newData.studyHoursRequirementEnabled == 1" class="unit-text" style="margin-top:2px;"
|
|
|
+ <span v-if="(rangeStatus != 'yzyh'&&rangeStatus != 'CLASSIFIED')&&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&&!placementTest)&&newData.studyHoursRequirementEnabled == 1"
|
|
|
+ v-if="(rangeStatus != 'yzyh'&&rangeStatus != 'CLASSIFIED')&&newData.studyHoursRequirementEnabled == 1"
|
|
|
style="width: 600px;margin-left:20px;"
|
|
|
v-model="newData.knowledgePointIds"
|
|
|
:options="optionListC"
|
|
|
@@ -303,7 +508,7 @@
|
|
|
></el-cascader>
|
|
|
</div>
|
|
|
<!--应知应会 学时要求-->
|
|
|
- <div class="yzyh-max-big-box" v-if="yzyhTest&&newData.studyHoursRequirementEnabled == 1">
|
|
|
+ <div class="yzyh-max-big-box" v-if="rangeStatus == 'yzyh'&&newData.studyHoursRequirementEnabled == 1">
|
|
|
<div class="yzyh-title-box">
|
|
|
<p>用户类别</p>
|
|
|
<p>学时要求配置</p>
|
|
|
@@ -484,30 +689,33 @@
|
|
|
<!--<span class="tip-text" style="margin-left:12px;" v-else>开启后,每隔 N 分钟,提醒弹窗验证</span>-->
|
|
|
<!--</div>-->
|
|
|
<!--</el-form-item>-->
|
|
|
-
|
|
|
- <el-form-item label="人脸识别校验">
|
|
|
+ <p style="margin-bottom:10px;">
|
|
|
+ <span style="font-size:15px;margin-left:10px;">人脸识别校验</span>
|
|
|
+ <span style="font-size:14px;color:#999;margin-left:20px;">(仅学习考试一体机)</span>
|
|
|
+ </p>
|
|
|
+ <el-form-item label="">
|
|
|
<div class="anti-cheat-group">
|
|
|
<div class="switch-row" style="margin-bottom:12px;">
|
|
|
<el-switch :disabled="showType" v-model="newData.preFaceVerifyEnabled" :active-value="1" :inactive-value="0"
|
|
|
active-color="#0183FB" inactive-color="#AAAAAA"
|
|
|
/>
|
|
|
- <span class="tip-text" style="margin-left:12px;">开启后,考试前需要进行人脸识别(仅学习考试一体机)</span>
|
|
|
+ <span class="tip-text" style="margin-left:12px;">开启后,考试前需要进行人脸识别</span>
|
|
|
</div>
|
|
|
<div class="switch-row">
|
|
|
<el-switch :disabled="showType" v-model="newData.postFaceVerifyEnabled" :active-value="1" :inactive-value="0"
|
|
|
active-color="#0183FB" inactive-color="#AAAAAA"
|
|
|
/>
|
|
|
- <span class="tip-text" style="margin-left:12px;">开启后,考试后需要进行人脸识别(仅学习考试一体机)</span>
|
|
|
+ <span class="tip-text" style="margin-left:12px;">开启后,考试后需要进行人脸识别</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item label="摄像头抓拍">
|
|
|
+ <el-form-item label="">
|
|
|
<div class="switch-row">
|
|
|
<el-switch :disabled="showType" v-model="newData.cameraCaptureEnabled" :active-value="1" :inactive-value="0"
|
|
|
active-color="#0183FB" inactive-color="#AAAAAA"
|
|
|
/>
|
|
|
- <span class="tip-text" style="margin-left:12px;">开启后,考试过程中摄像头随机抓拍(仅学习考试一体机)</span>
|
|
|
+ <span class="tip-text" style="margin-left:12px;">开启后,考试过程中随机人脸识别</span>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
@@ -621,6 +829,8 @@
|
|
|
<selectCertificate v-if="drawerType === 6&&drawer"></selectCertificate>
|
|
|
<!--选择安全承诺书-->
|
|
|
<safetyCommitmentLetter v-if="drawerType === 7&&drawer"></safetyCommitmentLetter>
|
|
|
+ <!--多学院抽题组卷-->
|
|
|
+ <selectPaperDept v-if="drawerType === 8&&drawer" :selectPaperDeptPropsData="selectPaperDeptPropsData"></selectPaperDept>
|
|
|
</el-drawer>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -634,6 +844,7 @@
|
|
|
import selectScope from './selectScope.vue'
|
|
|
import selectCertificate from './selectCertificate.vue'
|
|
|
import safetyCommitmentLetter from './safetyCommitmentLetter.vue'
|
|
|
+ import selectPaperDept from './selectPaperDept.vue'
|
|
|
import {
|
|
|
examElExamAdd,examElExamEdit,examElExamDetail,examElKnowledgePointTreeList,examElDisciplineTypeList,
|
|
|
examElExamTypeList, laboratoryLevelConfigGetLevelTitleList,examElConfigMasterInitMinHour
|
|
|
@@ -649,6 +860,7 @@
|
|
|
selectScope,
|
|
|
selectCertificate,
|
|
|
safetyCommitmentLetter,
|
|
|
+ selectPaperDept,
|
|
|
},
|
|
|
props: {
|
|
|
propsData: {}
|
|
|
@@ -672,15 +884,15 @@
|
|
|
}
|
|
|
const validateData1 = (rule, value, callback) => {
|
|
|
if(this.newData.targetUserType==2){
|
|
|
- if (this.newData.studyHoursRequirementEnabled == 1 && !this.yzyhTest && !this.placementTest && this.newData.studyHoursRequirement == 0) {
|
|
|
+ if (this.newData.studyHoursRequirementEnabled == 1 && this.rangeStatus != 'yzyh' && this.rangeStatus != 'CLASSIFIED' && this.newData.studyHoursRequirement == 0) {
|
|
|
callback(new Error('学时要求不能为0'))
|
|
|
- }else if (this.newData.studyHoursRequirementEnabled == 1 && this.yzyhTest && this.newData.mandatoryStudyHoursConfig.freshmanNoLabHours == 0) {
|
|
|
+ }else if (this.newData.studyHoursRequirementEnabled == 1 && this.rangeStatus == 'yzyh' && this.newData.mandatoryStudyHoursConfig.freshmanNoLabHours == 0) {
|
|
|
callback(new Error('研究生-新生的学时要求不能为0'))
|
|
|
} else {
|
|
|
callback()
|
|
|
}
|
|
|
}else if(this.newData.targetUserType==1){
|
|
|
- if (this.newData.studyHoursRequirementEnabled == 1 && this.yzyhTest && this.newData.mandatoryStudyHoursConfig.staffNewHours == 0) {
|
|
|
+ if (this.newData.studyHoursRequirementEnabled == 1 && this.rangeStatus == 'yzyh' && this.newData.mandatoryStudyHoursConfig.staffNewHours == 0) {
|
|
|
callback(new Error('教职工-新入职的学时要求不能为0'))
|
|
|
} else {
|
|
|
callback()
|
|
|
@@ -777,10 +989,6 @@
|
|
|
optionRiskLevel: [],
|
|
|
scopeList: [],
|
|
|
userList: [],
|
|
|
- //是否是分级考试
|
|
|
- placementTest: false,
|
|
|
- //是否是应知应会考试
|
|
|
- yzyhTest:false,
|
|
|
//答卷次数限制
|
|
|
answerUnlimited: false,
|
|
|
//应知应会学时要求数据
|
|
|
@@ -790,6 +998,10 @@
|
|
|
level3Hour:0,
|
|
|
level4Hour:0,
|
|
|
},
|
|
|
+ //考试范围显示状态 用于判断页面显示
|
|
|
+ rangeStatus:'',
|
|
|
+ //组卷类型
|
|
|
+ paperType:'',
|
|
|
newData: {
|
|
|
examTypeId: null,
|
|
|
disciplineTypeId: null,
|
|
|
@@ -916,11 +1128,39 @@
|
|
|
{ validator: validateData9, trigger: 'blur' }
|
|
|
],
|
|
|
},
|
|
|
+ //分级分类-试卷配置
|
|
|
+ checkPaperIndex:null,
|
|
|
+ checkPaperType:1,
|
|
|
+ //多学院试题配置
|
|
|
+ paperDeptList:[],
|
|
|
+ //试卷配置
|
|
|
+ paperListA1:[
|
|
|
+ { name:'化学类', paperName:'', paperId:'', }, { name:'生物类', paperName:'', paperId:'', },
|
|
|
+ ],
|
|
|
+ paperListA2:[
|
|
|
+ { name:'化学类', paperName:'', paperId:'', }, { name:'生物类', paperName:'', paperId:'', },
|
|
|
+ ],
|
|
|
+ paperListA3:[
|
|
|
+ { name:'化学类', paperName:'', paperId:'', }, { name:'生物类', paperName:'', paperId:'', },
|
|
|
+ ],
|
|
|
+ paperListA4:[
|
|
|
+ { name:'化学类', paperName:'', paperId:'', }, { name:'生物类', paperName:'', paperId:'', },
|
|
|
+ ],
|
|
|
+ //应知应会-试卷配置
|
|
|
+ paperListB:[
|
|
|
+ { name:'学生', paperName:'', paperId:'', }, { name:'教职工', paperName:'', paperId:'', },
|
|
|
+ ],
|
|
|
+ //负面清单-试卷配置
|
|
|
+ paperListC:[
|
|
|
+ { name:'化学类', paperName:'', paperId:'', }, { name:'生物类', paperName:'', paperId:'', },
|
|
|
+ ],
|
|
|
//弹窗相关
|
|
|
drawerTitle: '',
|
|
|
drawerType: '',
|
|
|
drawer: false,
|
|
|
showType:false,
|
|
|
+ //多学院抽题组卷-组件传参
|
|
|
+ selectPaperDeptPropsData:null
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -1049,7 +1289,7 @@
|
|
|
let obj = {
|
|
|
examTypeId:this.newData.examTypeId,
|
|
|
disciplineTypeId:this.newData.disciplineTypeId,
|
|
|
- riskLevelId:this.placementTest?this.newData.riskLevelId:'',
|
|
|
+ riskLevelId:this.rangeStatus == 'CLASSIFIED'?this.newData.riskLevelId:'',
|
|
|
examName:this.newData.examName,
|
|
|
attemptLimit:this.answerUnlimited?0:this.newData.attemptLimit,
|
|
|
shareStatus:this.newData.shareStatus,
|
|
|
@@ -1059,12 +1299,12 @@
|
|
|
endTime:this.newData.examTimeRange[1].replace(" ", "T"),
|
|
|
answerDuration:this.newData.answerDuration,
|
|
|
scopeType:this.newData.scopeType,
|
|
|
- targetUserType:this.yzyhTest?this.newData.targetUserType:'',
|
|
|
+ targetUserType:this.rangeStatus == 'yzyh'?this.newData.targetUserType:'',
|
|
|
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.placementTest)?this.newData.studyHoursRequirement:0,
|
|
|
- mandatoryStudyHoursConfig:this.newData.studyHoursRequirementEnabled == 1&&this.yzyhTest?{
|
|
|
+ studyHoursRequirement:this.newData.studyHoursRequirementEnabled == 1&&(this.rangeStatus != 'yzyh'&&this.rangeStatus != 'CLASSIFIED')?this.newData.studyHoursRequirement:0,
|
|
|
+ mandatoryStudyHoursConfig:this.newData.studyHoursRequirementEnabled == 1&&this.rangeStatus == 'yzyh'?{
|
|
|
freshmanNoLabHours:this.newData.targetUserType==2?this.newData.mandatoryStudyHoursConfig.freshmanNoLabHours:0,
|
|
|
undergraduateHours:this.newData.targetUserType==2?this.newData.mandatoryStudyHoursConfig.undergraduateHours:0,
|
|
|
staffNewHours:this.newData.targetUserType==1?this.newData.mandatoryStudyHoursConfig.staffNewHours:0,
|
|
|
@@ -1075,7 +1315,7 @@
|
|
|
staffNewHours:0,
|
|
|
staffNonNewHours:0,
|
|
|
},
|
|
|
- knowledgePointIds:this.newData.studyHoursRequirementEnabled == 1&&(!this.yzyhTest&&!this.placementTest)?this.newData.knowledgePointIds:[],
|
|
|
+ knowledgePointIds:this.newData.studyHoursRequirementEnabled == 1&&(this.rangeStatus != 'yzyh'&&!this.rangeStatus != 'CLASSIFIED')?this.newData.knowledgePointIds:[],
|
|
|
preCourseEnabled:this.newData.preCourseEnabled,
|
|
|
preCourseId:this.newData.preCourseEnabled == 1?this.newData.preCourseId:'',
|
|
|
mockEnabled:this.newData.mockEnabled,
|
|
|
@@ -1160,12 +1400,25 @@
|
|
|
this.$set(this, 'drawerType', 7)
|
|
|
this.$set(this, 'drawer', true)
|
|
|
},
|
|
|
+ openPaperDeptDrawer() {
|
|
|
+ // TODO: 打开选择多学院抽题组卷弹窗
|
|
|
+ this.$set(this, 'drawerTitle', '随机抽题组卷')
|
|
|
+ this.$set(this, 'selectPaperDeptPropsData', {
|
|
|
+ title:'新生入学考试'
|
|
|
+ })
|
|
|
+ this.$set(this, 'drawerType', 8)
|
|
|
+ this.$set(this, 'drawer', true)
|
|
|
+ },
|
|
|
//弹窗关闭
|
|
|
drawerOffButton(data) {
|
|
|
if (this.drawerType == 1) {
|
|
|
//选择试卷
|
|
|
- this.$set(this.newData, 'paperId', data.id)
|
|
|
- this.$set(this.newData, 'paperName', data.name)
|
|
|
+ if(this.rangeStatus == ''){
|
|
|
+ this.$set(this.newData, 'paperId', data.id)
|
|
|
+ this.$set(this.newData, 'paperName', data.name)
|
|
|
+ }else{
|
|
|
+ this.setPaperData(data);
|
|
|
+ }
|
|
|
}else if(this.drawerType == 2){
|
|
|
//选择课程
|
|
|
this.$set(this.newData, 'preCourseId', data.id)
|
|
|
@@ -1224,8 +1477,8 @@
|
|
|
let self = this
|
|
|
for (let i = 0; i < self.optionExamType.length; i++) {
|
|
|
if (self.optionExamType[i].id == self.newData.examTypeId) {
|
|
|
+ //分级分类
|
|
|
if (self.optionExamType[i].examTypeCode == 'CLASSIFIED') {
|
|
|
- self.$set(this, 'placementTest', true)
|
|
|
let num = 0;
|
|
|
for(let o=0;o<self.tableList2.length;o++){
|
|
|
if(self.newData.disciplineTypeId == self.tableList2[o].id){
|
|
|
@@ -1236,7 +1489,6 @@
|
|
|
self.$set(self.newData,'disciplineTypeId',null);
|
|
|
}
|
|
|
} else {
|
|
|
- self.$set(this, 'placementTest', false)
|
|
|
let num = 0;
|
|
|
for(let o=0;o<self.tableList.length;o++){
|
|
|
if(self.newData.disciplineTypeId == self.tableList[o].id){
|
|
|
@@ -1247,14 +1499,33 @@
|
|
|
self.$set(self.newData,'disciplineTypeId',null);
|
|
|
}
|
|
|
}
|
|
|
+ //应知应会
|
|
|
if (self.optionExamType[i].examTypeCode == 'yzyh') {
|
|
|
self.$set(this.newData, 'scopeType', 1)
|
|
|
if(!this.newData.targetUserType){
|
|
|
self.$set(this.newData, 'targetUserType', 2)
|
|
|
}
|
|
|
- self.$set(this, 'yzyhTest', true)
|
|
|
- } else {
|
|
|
- self.$set(this, 'yzyhTest', false)
|
|
|
+ }
|
|
|
+ //根据考试类型切换 范围显示 与指定考卷相关
|
|
|
+ if (self.optionExamType[i].examTypeCode == 'STUDENT') {
|
|
|
+ //新生入学考试
|
|
|
+ self.$set(self,'rangeStatus','STUDENT');
|
|
|
+ self.$set(self.newData,'scopeType',1);
|
|
|
+ }else if (self.optionExamType[i].examTypeCode == 'FUMIANQINGDAN') {
|
|
|
+ //负面清单考试
|
|
|
+ self.$set(self,'rangeStatus','FUMIANQINGDAN');
|
|
|
+ self.$set(self.newData,'scopeType',1);
|
|
|
+ }else if (self.optionExamType[i].examTypeCode == 'CLASSIFIED') {
|
|
|
+ //分级分类
|
|
|
+ self.$set(self,'rangeStatus','CLASSIFIED');
|
|
|
+ self.$set(self.newData,'scopeType',1);
|
|
|
+ }else if (self.optionExamType[i].examTypeCode == 'yzyh') {
|
|
|
+ //应知应会
|
|
|
+ self.$set(self,'rangeStatus','yzyh');
|
|
|
+ self.$set(self.newData,'scopeType',1);
|
|
|
+ }else{
|
|
|
+ //其他类型
|
|
|
+ self.$set(self,'rangeStatus','');
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1269,7 +1540,7 @@
|
|
|
} else {
|
|
|
let list = [];
|
|
|
for(let i=0;i<response.data.length;i++){
|
|
|
- if(response.data[i].examTypeCode != 'CLASSIFIED' && response.data[i].examTypeCode != 'yzyh' && response.data[i].examTypeCode != 'STUDENT'){
|
|
|
+ if(response.data[i].examTypeCode != 'CLASSIFIED' && response.data[i].examTypeCode != 'yzyh' && response.data[i].examTypeCode != 'STUDENT' && response.data[i].examTypeCode != 'FUMIANQINGDAN'){
|
|
|
list.push(response.data[i])
|
|
|
}
|
|
|
}
|
|
|
@@ -1306,6 +1577,87 @@
|
|
|
this.$set(this, 'tableList2', list)
|
|
|
})
|
|
|
},
|
|
|
+ //选择试卷
|
|
|
+ paperTableButton(val,index){
|
|
|
+ if(val == 1){
|
|
|
+ //试卷同上
|
|
|
+ if(index != 0){
|
|
|
+ if(this.rangeStatus == 'CLASSIFIED'){
|
|
|
+ if(this.checkPaperType == 1){
|
|
|
+ if(this.paperListA1[index-1].paperId){
|
|
|
+ this.$set(this.paperListA1[index],'paperName',this.paperListA1[index-1].paperName);
|
|
|
+ this.$set(this.paperListA1[index],'paperId',this.paperListA1[index-1].paperId);
|
|
|
+ }else{
|
|
|
+ this.msgError('上一个试卷未选择')
|
|
|
+ }
|
|
|
+ }else if(this.checkPaperType == 2){
|
|
|
+ if(this.paperListA2[index-1].paperId){
|
|
|
+ this.$set(this.paperListA2[index],'paperName',this.paperListA2[index-1].paperName);
|
|
|
+ this.$set(this.paperListA2[index],'paperId',this.paperListA2[index-1].paperId);
|
|
|
+ }else{
|
|
|
+ this.msgError('上一个试卷未选择')
|
|
|
+ }
|
|
|
+ }else if(this.checkPaperType == 3){
|
|
|
+ if(this.paperListA3[index-1].paperId){
|
|
|
+ this.$set(this.paperListA3[index],'paperName',this.paperListA3[index-1].paperName);
|
|
|
+ this.$set(this.paperListA3[index],'paperId',this.paperListA3[index-1].paperId);
|
|
|
+ }else{
|
|
|
+ this.msgError('上一个试卷未选择')
|
|
|
+ }
|
|
|
+ }else if(this.checkPaperType == 4){
|
|
|
+ if(this.paperListA4[index-1].paperId){
|
|
|
+ this.$set(this.paperListA4[index],'paperName',this.paperListA4[index-1].paperName);
|
|
|
+ this.$set(this.paperListA4[index],'paperId',this.paperListA4[index-1].paperId);
|
|
|
+ }else{
|
|
|
+ this.msgError('上一个试卷未选择')
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else if(this.rangeStatus == 'yzyh'){
|
|
|
+ if(this.paperListB[index-1].paperId){
|
|
|
+ this.$set(this.paperListB[index],'paperName',this.paperListB[index-1].paperName);
|
|
|
+ this.$set(this.paperListB[index],'paperId',this.paperListB[index-1].paperId);
|
|
|
+ }else{
|
|
|
+ this.msgError('上一个试卷未选择')
|
|
|
+ }
|
|
|
+ }else if(this.rangeStatus == 'FUMIANQINGDAN'){
|
|
|
+ if(this.paperListC[index-1].paperId){
|
|
|
+ this.$set(this.paperListC[index],'paperName',this.paperListC[index-1].paperName);
|
|
|
+ this.$set(this.paperListC[index],'paperId',this.paperListC[index-1].paperId);
|
|
|
+ }else{
|
|
|
+ this.msgError('上一个试卷未选择')
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else if(val == 2){
|
|
|
+ //选择试卷
|
|
|
+ this.$set(this,'checkPaperIndex',index);
|
|
|
+ this.openPaperDrawer();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //试卷选择完毕写入非常规考试试卷数据
|
|
|
+ setPaperData(data){
|
|
|
+ if(this.rangeStatus == 'CLASSIFIED'){
|
|
|
+ if(this.checkPaperType == 1){
|
|
|
+ this.$set(this.paperListA1[this.checkPaperIndex],'paperName',data.name);
|
|
|
+ this.$set(this.paperListA1[this.checkPaperIndex],'paperId',data.id);
|
|
|
+ }else if(this.checkPaperType == 2){
|
|
|
+ this.$set(this.paperListA2[this.checkPaperIndex],'paperName',data.name);
|
|
|
+ this.$set(this.paperListA2[this.checkPaperIndex],'paperId',data.id);
|
|
|
+ }else if(this.checkPaperType == 3){
|
|
|
+ this.$set(this.paperListA3[this.checkPaperIndex],'paperName',data.name);
|
|
|
+ this.$set(this.paperListA3[this.checkPaperIndex],'paperId',data.id);
|
|
|
+ }else if(this.checkPaperType == 4){
|
|
|
+ this.$set(this.paperListA4[this.checkPaperIndex],'paperName',data.name);
|
|
|
+ this.$set(this.paperListA4[this.checkPaperIndex],'paperId',data.id);
|
|
|
+ }
|
|
|
+ }else if(this.rangeStatus == 'yzyh'){
|
|
|
+ this.$set(this.paperListB[this.checkPaperIndex],'paperName',data.name);
|
|
|
+ this.$set(this.paperListB[this.checkPaperIndex],'paperId',data.id);
|
|
|
+ }else if(this.rangeStatus == 'FUMIANQINGDAN'){
|
|
|
+ this.$set(this.paperListC[this.checkPaperIndex],'paperName',data.name);
|
|
|
+ this.$set(this.paperListC[this.checkPaperIndex],'paperId',data.id);
|
|
|
+ }
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
@@ -1357,6 +1709,21 @@
|
|
|
overflow-y: auto;
|
|
|
padding: 24px 32px;
|
|
|
}
|
|
|
+ .CLASSIFIED-check-box{
|
|
|
+ display: flex;
|
|
|
+ margin-bottom:20px;
|
|
|
+ p{
|
|
|
+ padding:0 30px;
|
|
|
+ text-align: center;
|
|
|
+ color:#333;
|
|
|
+ cursor: pointer;
|
|
|
+ background-color: #F5F5F5;
|
|
|
+ }
|
|
|
+ .check-CLASSIFIED-p{
|
|
|
+ background-color: #0183fa;
|
|
|
+ color:#fff;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
.section-block {
|
|
|
padding-bottom: 8px;
|
|
|
@@ -1500,6 +1867,11 @@
|
|
|
gap: 12px;
|
|
|
flex-wrap: wrap;
|
|
|
}
|
|
|
+ .paper-select-column {
|
|
|
+ width:900px;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ }
|
|
|
|
|
|
.checkButton-p {
|
|
|
background-color: #0183fa;
|