Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/config/route.js

@@ -2914,17 +2914,7 @@ const routes = [
 							perms: ["train"],
 						},
 						component: "edu/train",
-					},
+					}
-					{
-						name: "examrecord",
-						path: "/edu/examrecord",
-						meta: {
-							title: "考试记录",
-							// icon: "el-icon-notebook",
-							perms: ["examrecord"],
-						},
-						component: "edu/examrecord",
-					},
 				],
 			},
 			{

src/views/edu/exam.vue

@@ -40,9 +40,7 @@
 					width="80"
 				>
 				<template #default="scope">
-						<el-icon v-if="scope.row.can_attend" color="green"
+					<el-tag v-if="scope.row.can_attend" type="success">是</el-tag>
-							><CircleCheckFilled
-						/></el-icon>
 					</template>
 			</el-table-column>
 				<el-table-column
@@ -67,16 +65,14 @@
 					width="80"
 				>
 				<template #default="scope">
-						<el-icon v-if="scope.row.is_public" color="green"
+						<el-tag v-if="scope.row.is_public" type="success">是</el-tag>
-							><CircleCheckFilled
-						/></el-icon>
 					</template>
 			</el-table-column>
 				<el-table-column
 					label="操作"
 					fixed="right"
 					align="center"
-					width="150"
+					width="160"
 				>
 					<template #default="scope">
 						<el-button
@@ -92,7 +88,7 @@
 							size="small"
 							@click="row_detail(scope.row)"
 							type="primary"
-							>详情</el-button
+							>答题详情</el-button
 						>
 						<el-popconfirm
 							title="确定删除吗？"
@@ -158,8 +154,24 @@
 							</el-form-item>
 						</el-col>
 								<el-col :span="16">
-			  <el-form-item label="所用试卷"  prop="paper" required>
+			  <el-form-item label="所用试卷"  prop="paper" required v-if="examDialog">
-                <el-select
+				<xtSelect
+					 v-model="examForm.paper"
+					 v-model:label="examForm.paper_name"
+					 :apiObj = "apiPaper"
+					 style="width: 100%;"
+				>
+				<el-table-column label="名称" prop="name"></el-table-column>
+				<el-table-column
+					label="限时(分钟)"
+					prop="limit"
+				></el-table-column>
+				<el-table-column
+					label="满分"
+					prop="total_score"
+				></el-table-column>
+				</xtSelect>
+                <!-- <el-select
                   v-model="examForm.paper"
 				  filterable
                   reserve-keyword
@@ -171,7 +183,7 @@
                     :label="item.name"
                     :value="item.id"
                   />
-                </el-select>
+                </el-select> -->
               </el-form-item>
 			</el-col>
 			<el-col :span="8">
@@ -188,39 +200,38 @@
 			<template #footer>
 				<el-button
 					type="primary"
-					:loading="examSaving"
 					@click="examSubmit()"
 					>保 存</el-button
 				>
 			</template>
 		</el-dialog>
+		<el-drawer v-model="drawerVisible" title="考试记录" size="50%">
+			<ExamRecord :exam="examId" v-if="drawerVisible"></ExamRecord>
+		</el-drawer>
 	</el-container>
 </template>
 <script>
 const defaultExam = {chance: 1, is_public:false}
+import ExamRecord from './examrecord.vue';
 export default {
+	components: { ExamRecord },
 	data() {
 		return {
 			paperOptions:[],
 			examDialog: false,
 			apiObj: this.$API.edu.exam.list,
+			apiPaper: this.$API.edu.paper.list,
 			query: {
 				search: "",
 			},
 			examForm: Object.assign({}, defaultExam),
+			drawerVisible: false,
+			examId: null
 		};
 	},
 	mounted() {
-		this.getPaperOptions();
 	},
 	methods: {
-		getPaperOptions() {
-			this.$API.edu.paper.list.req({
-				page: 0
-			}).then(res => {
-				this.paperOptions = res;
-			});
-		},
 		handleQuery() {
 			this.$refs.table.queryData(this.query);
 		},
@@ -233,10 +244,12 @@ export default {
 			this.examDialog = true;
         },
 		row_detail(row) {
-			this.$router.push({
+			// this.$router.push({
-				path: "/edu/examrecord/",
+			// 	path: "/edu/examrecord/",
-				query: { id: row.id },
+			// 	query: { id: row.id },
-			});
+			// });
+			this.examId = row.id;
+			this.drawerVisible = true;
 		},
         table_del(row) {
             this.$API.edu.exam.delete.req(row.id).then(() => {

src/views/edu/examrecord.vue

@@ -3,9 +3,9 @@
 		<el-header>
 			<div class="right-panel">
 				<el-input
-					style="margin-right: 5px"
+					style="margin-right: 2px"
 					v-model="query.search"
-					placeholder="考试名称或用户"
+					placeholder="用户名"
 					clearable
 				></el-input>
 				<el-button
@@ -20,12 +20,14 @@
 				ref="table"
 				:apiObj="apiObj"
 				row-key="id"
+				:params="params"
 				:query="query"
+				hidePagination
 			>
-				<el-table-column
+				<!-- <el-table-column
 					label="考试名称"
 					prop="exam_name"
-				></el-table-column>
+				></el-table-column> -->
 				<el-table-column
 					label="用户"
 					prop="create_by_name"
@@ -46,6 +48,7 @@
 				<el-table-column
 					label="答题时间"
 					prop="start_time"
+					width="160"
 				></el-table-column>
 				<el-table-column
 					label="是否通过"
@@ -83,27 +86,22 @@
 </template>
 <script>
 export default {
+	props: {
+		exam: { type: String }
+	},
 	data() {
 		return {
-			paperOptions:[],
 			examDialog: false,
 			apiObj: this.$API.edu.examrecord.list,
+			params: { exam: this.exam },
 			query: {
-				search: "",
+				search: ""
 			},
 		};
 	},
 	mounted() {
-		this.getPaperOptions();
 	},
 	methods: {
-		getPaperOptions() {
-			this.$API.edu.paper.list.req({
-				page: 0
-			}).then(res => {
-				this.paperOptions = res;
-			});
-		},
 		formatBoolean(row) {
       		return row.isTrue ? '是' : '否';
     	},

src/views/edu/train.vue

@@ -44,6 +44,7 @@
 				<el-table-column
 					label="时长(h)"
 					prop="duration"
+					width="80"
 				></el-table-column>
 				<el-table-column
 					label="开始时间"
@@ -57,18 +58,12 @@
 					label="地点"
 					prop="place"
 				></el-table-column>
-				<el-table-column
-					label="内容描述"
-					prop="description"
-				></el-table-column>
 				<el-table-column
 					label="是否公开"
 					width="80"
 				>
 				<template #default="scope">
-						<el-icon v-if="scope.row.is_public" color="green"
+					<el-tag v-if="scope.row.is_public" type="success">是</el-tag>
-							><CircleCheckFilled
-						/></el-icon>
 					</template>
 			</el-table-column>
 				<el-table-column
@@ -117,57 +112,16 @@
 				label-width="100px"
 				ref="questioncatForm"
 			>
+			<el-row>
+				<el-col :span="18">
 				<el-form-item label="培训名称" prop="name" required>
 					<el-input
 						v-model="trainForm.name"
-						style="width: 80%;"
+						style="width: 100%;"
 					></el-input>
 				</el-form-item>
-				<el-row>
-					<el-col :span="8">
-				<el-form-item label="开始时间"  prop="start_time" required>
-                <el-date-picker
-                  v-model="trainForm.start_time"
-                  type="datetime"
-				  style="width:100%"
-                />
-              </el-form-item>
 			</el-col>
-			<el-col :span="8">
+			<el-col :span="6">
-			  <el-form-item label="结束时间"  prop="end_time">
-                <el-date-picker
-                  v-model="trainForm.end_time"
-                  type="datetime"
-				  style="width:100%"
-                />
-              </el-form-item>
-			</el-col>
-			<el-form-item label="地点" prop="place" required>
-					<el-input
-						v-model="trainForm.place"
-						clearable
-					></el-input>
-				</el-form-item>
-			<el-form-item label="时长(h)" prop="duration" required>
-				<el-input-number
-                        v-model="trainForm.duration"
-                        controls-position="right"
-                        :step="0.5"
-                        step-strictly="true"
-                    />
-			</el-form-item>
-			<el-form-item label="内容描述" prop="description" required>
-					<el-input
-						v-model="trainForm.description"
-						clearable
-						autisize
-						type="textarea"
-						style="width: 240%;"
-					></el-input>
-				</el-form-item>
-			<el-col :span="8">
-						</el-col>
-								<el-col :span="16">
 			  <el-form-item label="级别"  prop="level" required>
                 <el-select
                   v-model="trainForm.level"
@@ -186,7 +140,43 @@
               </el-form-item>
 
 			</el-col>
-			<el-col :span="8">
+					<el-col :span="12">
+				<el-form-item label="开始时间"  prop="start_time" required>
+                <el-date-picker
+                  v-model="trainForm.start_time"
+                  type="datetime"
+				  style="width:100%"
+                />
+              </el-form-item>
+			</el-col>
+			<el-col :span="12">
+			  <el-form-item label="结束时间"  prop="end_time">
+                <el-date-picker
+                  v-model="trainForm.end_time"
+                  type="datetime"
+				  style="width:100%"
+                />
+              </el-form-item>
+			</el-col>
+			<el-col :span="12">
+			<el-form-item label="地点" prop="place" required>
+					<el-input
+						v-model="trainForm.place"
+						clearable
+					></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="6">
+			<el-form-item label="时长(h)" prop="duration" required>
+				<el-input-number
+                        v-model="trainForm.duration"
+                        controls-position="right"
+                        :step="0.5"
+                        step-strictly="true"
+                    />
+			</el-form-item>
+			</el-col>
+			<el-col :span="6">
 			<el-form-item
 								label="是否公开"
 								prop="is_public"
@@ -195,6 +185,16 @@
 								<el-switch v-model="trainForm.is_public"/>
 							</el-form-item>
 						</el-col>	
+			<el-col :span="24">
+			<el-form-item label="内容描述" prop="description" required>
+					<el-input
+						v-model="trainForm.description"
+						clearable
+						autisize
+						type="textarea"
+					></el-input>
+				</el-form-item>
+			</el-col>
 			<el-form-item label="附件" prop="files">
 				<sc-upload-file
 					:multiple="false"

src/views/hrm/certificate.vue

@@ -43,7 +43,8 @@
         clearable
         style="margin-left: 2px"
       >
-
+      <el-option v-for="e in certStateEnum.values" :key="e.key" :value="e.key"
+      :label="e.text"></el-option>
       </el-select>
       </div>
       <div class="right-panel">