From 294de75ea2c93266f4304aba238ef1dba25d1168 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期五, 16 六月 2023 13:40:48 +0800
Subject: [PATCH] 试卷列表修改
---
src/views/login/index.vue | 1
src/views/exam/question/list.vue | 67 +++++++++++++++++++++++++++++++++
src/views/answer/list.vue | 16 ++++++--
src/views/exam/paper/edit.vue | 33 ++++++++++------
4 files changed, 100 insertions(+), 17 deletions(-)
diff --git a/src/views/answer/list.vue b/src/views/answer/list.vue
index ea18e51..ba864ef 100644
--- a/src/views/answer/list.vue
+++ b/src/views/answer/list.vue
@@ -1,11 +1,17 @@
<template>
<div class="app-container">
<el-form :model="queryParam" ref="queryForm" :inline="true">
- <el-form-item label="璇剧洰锛�" >
- <el-select v-model="queryParam.subjectId" clearable>
- <el-option v-for="item in subjects" :key="item.id" :value="item.id" :label="item.name"></el-option>
- </el-select>
+<!-- <el-form-item label="璇剧洰锛�" >-->
+<!-- <el-select v-model="queryParam.subjectId" clearable>-->
+<!-- <el-option v-for="item in subjects" :key="item.id" :value="item.id" :label="item.name"></el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+ <el-form-item label="瀛︾敓锛�" >
+ <el-input v-model="queryParam.userName"></el-input>
</el-form-item>
+ <el-form-item label="璇曞嵎棰樼洰锛�">
+ <el-input v-model="queryParam.paperName"></el-input>
+ </el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm">鏌ヨ</el-button>
</el-form-item>
@@ -44,6 +50,8 @@
data () {
return {
queryParam: {
+ paperName:'',
+ userName:'',
subjectId: null,
pageIndex: 1,
pageSize: 10
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index fbb451a..638773c 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -24,29 +24,36 @@
range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-form-item label="璇曞嵎鍚嶇О锛�" prop="name" required>
- <el-input v-model="form.name"/>
+ <el-form-item label="璇曞嵎鍚嶇О锛�" prop="name" required >
+
+ <el-row :gutter="20">
+
+ <el-col :span="9">
+ <el-input v-model="form.name"/>
+ </el-col>
+ <el-col :span="2" v-if="form.paperType==7">
+ <span>鎬绘暟鍒嗭細</span>
+ </el-col>
+ <el-col :span="9" v-if="form.paperType==7">
+ <el-input v-model="form.name"/>
+ </el-col>
+ </el-row>
</el-form-item>
<el-form-item :key="index" :label="titleItem.label+':'" required v-for="(titleItem,index) in subjectIdList" v-if="form.paperType ==7">
- <el-row>
- <el-col :span="3">
+ <el-row >
+ <el-col :span="3" >
<span>棰樼洰鏁伴噺锛�</span>
</el-col>
<el-col :span="9">
<el-input v-model="titleItem.name" style="width: 80%"/>
</el-col>
- <el-col :span="3">
- <span>棰樼洰鍒嗘暟锛�</span>
- </el-col>
- <el-col :span="9">
- <el-input v-model="titleItem.name" style="width: 80%"/>
- </el-col>
+
</el-row>
</el-form-item>
- <el-form-item label="鎬绘暟鍒嗭細" v-if="form.paperType==7" prop="name" required>
- <el-input v-model="form.name"/>
- </el-form-item>
+<!-- <el-form-item label="鎬绘暟鍒嗭細" v-if="form.paperType==7" prop="name" required>-->
+<!-- <el-input v-model="form.name"/>-->
+<!-- </el-form-item>-->
<el-form-item :key="index" :label="'鏍囬'+(index+1)+'锛�'" required v-for="(titleItem,index) in form.titleItems">
<el-input v-model="titleItem.name" style="width: 80%"/>
<el-button v-if="form.paperType!=7" type="text" class="link-left" style="margin-left: 20px" size="mini" @click="addQuestion(titleItem)">
diff --git a/src/views/exam/question/list.vue b/src/views/exam/question/list.vue
index 0dd4ffd..532f6c3 100644
--- a/src/views/exam/question/list.vue
+++ b/src/views/exam/question/list.vue
@@ -25,13 +25,29 @@
</el-select>
</el-form-item>
<el-form-item>
+ <div style="display: flex">
<el-button type="primary" @click="submitForm">鏌ヨ</el-button>
<el-popover placement="bottom" trigger="click">
<el-button type="warning" size="mini" v-for="item in editUrlEnum" :key="item.key"
@click="$router.push({path:item.value})">{{item.name}}
</el-button>
<el-button slot="reference" type="primary" class="link-left">娣诲姞</el-button>
+
</el-popover>
+ <el-upload
+ class="upload-demo"
+ :action="upLoadUrl"
+ :with-credentials="true"
+ :on-success="handlePreview"
+ multiple
+ :show-file-list="false"
+ :file-list="fileList"
+ :before-upload="beforeAvatarUpload">
+ <el-button type="primary">瀵煎叆</el-button>
+ <!-- <div slot="tip" class="el-upload__tip">鍙兘涓婁紶Excel鏂囦欢</div>-->
+ </el-upload>
+ </div>
+
</el-form-item>
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
@@ -69,11 +85,15 @@
import Pagination from '@/components/Pagination'
import QuestionShow from './components/Show'
import questionApi from '@/api/question'
+import store from '@/store'
+import Cookies from 'js-cookie'
export default {
components: { Pagination, QuestionShow },
data () {
return {
+ upLoadUrl:'/api/admin/question/import',
+ fileList:[],
queryParam: {
id: null,
questionType: null,
@@ -94,6 +114,7 @@
}
}
},
+
created () {
this.initSubject()
this.search()
@@ -101,6 +122,37 @@
this.subjectFilter = this.subjects
},
methods: {
+ handlePreview(e){
+ console.log(e)
+ if (e.code==1){
+ this.search()
+ this.$message.success(e.message)
+ }else {
+ this.$message.error(e.message)
+ }
+ },
+ beforeAvatarUpload(file) {
+ let legalName = ['xlsx', 'xls']
+ // 鎷垮埌鍚庣紑鍚�
+ let name = file.name.substring(file.name.lastIndexOf('.') + 1, file.name.length)
+ if (legalName.includes(name)) {
+ // console.log(legalName.includes(name));
+ } else {
+ this.$message.warning('鏂囦欢鏍煎紡涓嶅锛屼粎闄恱ls鍜寈lsx')
+ return false
+ }
+ // console.log(file)
+ // const isJPG = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+ // // const isLt2M = file.size / 1024 / 1024 < 2;
+ //
+ // if (!isJPG) {
+ // this.$message.error('涓婁紶鏂囦欢鍙兘鏄疎xcel!');
+ // }
+ // // if (!isLt2M) {
+ // // this.$message.error('涓婁紶澶村儚鍥剧墖澶у皬涓嶈兘瓒呰繃 2MB!');
+ // // }
+ // return isJPG ;
+ },
submitForm () {
this.queryParam.pageIndex = 1
this.search()
@@ -164,6 +216,16 @@
...mapActions('exam', { initSubject: 'initSubject' })
},
computed: {
+
+ headers: function () {
+ console.log( Cookies.get('adminUserName'),)
+ // console.log(store.getters.Admin-Token)
+ // const tenantId = store.getters.userInfo.tenantId
+ return {
+ // 'Authorization': "Bearer " + store.getters.Admin-Token,
+ "Cookie":"JSESSIONID=shpHmjIK1ysHPDyAQB4-M-N3WytgJ3UIwYrfcA2t; adminUserName=admin"
+ }
+ },
...mapGetters('enumItem', ['enumFormat']),
...mapState('enumItem', {
questionType: state => state.exam.question.typeEnum,
@@ -175,3 +237,8 @@
}
}
</script>
+<style scoped lang="scss">
+.upload-demo{
+ margin-left: 5px;
+}
+</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f4f3561..e4fb268 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -138,6 +138,7 @@
this.loading = true
loginApi.login(this.loginForm).then(function (result) {
if (result && result.code === 1) {
+ console.log(result)
_this.setUserName(_this.loginForm.userName)
_this.$router.push({ path: '/' })
} else {
--
Gitblit v1.8.0