From 2afa20426193868ab45e0357c428f85deb8ee564 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期二, 28 五月 2024 09:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/~qirong/qyksxt-admin
---
src/views/education/subject/edit.vue | 14 +++++++-------
src/views/exam/question/list.vue | 5 ++++-
src/views/exam/personalRandomTemplate/list.vue | 2 +-
src/views/education/subject/list.vue | 4 ++--
src/views/user/student/list.vue | 12 ++++++++++--
src/router.js | 4 ++--
src/views/exam/paper/edit.vue | 6 +++---
7 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/src/router.js b/src/router.js
index 79a7290..1709084 100644
--- a/src/router.js
+++ b/src/router.js
@@ -494,13 +494,13 @@
path: 'departmentExamine/list',
component: () => import('@/views/user/departmentExamine/list'),
name: 'departmentExamineList',
- meta: { title: '璋冨姩瀹℃牳', noCache: true }
+ meta: { title: '璋冨姩鎻愬璁板綍', noCache: true }
},
{
path: 'UserConditionExamine/list',
component: () => import('@/views/user/UserConditionExamine/list'),
name: 'UserConditionExamineList',
- meta: { title: '鐘舵�佸鏍�', noCache: true }
+ meta: { title: '鐘舵�佹彁瀹¤褰�', noCache: true }
},
]
},
diff --git a/src/views/education/subject/edit.vue b/src/views/education/subject/edit.vue
index 5521100..d6f99d4 100644
--- a/src/views/education/subject/edit.vue
+++ b/src/views/education/subject/edit.vue
@@ -2,14 +2,14 @@
<div class="app-container">
<el-form :model="form" ref="form" label-width="100px" v-loading="formLoading">
- <el-form-item label="璇剧洰锛�" required>
+ <el-form-item label="鎵�灞為儴闂細" prop="deptIds">
+ <el-select v-model="form.deptIds" placeholder="鎵�灞為儴闂�" multiple filterable>
+ <el-option v-for="item in depart" :key="item.id" :value="item.id" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璇剧洰鍚嶇О锛�" required>
<el-input v-model="form.name"></el-input>
</el-form-item>
-<!-- <el-form-item label="閮ㄩ棬锛�" required>-->
-<!-- <el-select ref="departRef" v-model="form.level" placeholder="閮ㄩ棬">-->
-<!-- <el-option v-for="item in depart" :key="item.id" :value="item.id" :label="item.name"></el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" @click="submitForm">鎻愪氦</el-button>
<el-button @click="resetForm">閲嶇疆</el-button>
@@ -30,6 +30,7 @@
form: {
id: null,
name: '',
+ deptIds: [],
level: null,
levelName: ''
},
@@ -57,7 +58,6 @@
seachPageDepartMentList(){
let that = this
departmentApi.pageList(this.queryParam).then(res=>{
- console.log(res)
if (res.code == 1){
that.depart = res.response.list
}
diff --git a/src/views/education/subject/list.vue b/src/views/education/subject/list.vue
index 9299e88..092f6d3 100644
--- a/src/views/education/subject/list.vue
+++ b/src/views/education/subject/list.vue
@@ -16,8 +16,8 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="name" label="璇剧洰"/>
-<!-- <el-table-column prop="levelName" label="閮ㄩ棬" />-->
+ <el-table-column prop="name" label="璇剧洰鍚嶇О"/>
+ <el-table-column prop="deptNames" label="鎵�灞為儴闂�" />
<el-table-column width="220px" label="鎿嶄綔" align="center">
<template slot-scope="{row}">
<router-link :to="{path:'/education/subject/edit', query:{id:row.id}}" class="link-left">
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index 6816708..78865e2 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -102,8 +102,8 @@
</el-form>
<el-dialog :visible.sync="questionPage.showDialog" width="70%">
<el-form :model="questionPage.queryParam" ref="queryForm" :inline="true">
- <el-form-item label="ID锛�">
- <el-input v-model="questionPage.queryParam.id" clearable></el-input>
+ <el-form-item label="棰樺共锛�">
+ <el-input v-model="questionPage.queryParam.titleContent" clearable></el-input>
</el-form-item>
<el-form-item label="棰樺瀷锛�">
<el-select v-model="questionPage.queryParam.questionType" clearable>
@@ -248,7 +248,7 @@
multipleSelection: [],
showDialog: false,
queryParam: {
- id: null,
+ titleContent: "",
questionType: null,
subjectId: 1,
pageIndex: 1,
diff --git a/src/views/exam/personalRandomTemplate/list.vue b/src/views/exam/personalRandomTemplate/list.vue
index 1b91145..751e7a0 100644
--- a/src/views/exam/personalRandomTemplate/list.vue
+++ b/src/views/exam/personalRandomTemplate/list.vue
@@ -25,7 +25,7 @@
<el-button type="primary">娣诲姞</el-button>
</router-link>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="subjectId" label="璇剧洰" :formatter="subjectFormatter" width="120px" />
+ <el-table-column prop="subjectNames" label="璇剧洰" width="120px" />
<el-table-column prop="name" label="鍚嶇О" />
<el-table-column label="鎿嶄綔" align="center" width="360px">
<template slot-scope="{row}">
diff --git a/src/views/exam/question/list.vue b/src/views/exam/question/list.vue
index c333b0b..de99b95 100644
--- a/src/views/exam/question/list.vue
+++ b/src/views/exam/question/list.vue
@@ -39,7 +39,7 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="exportQuestion">瀵煎嚭</el-button>
+ <el-button type="primary" @click="exportQuestion" v-loading="exportLoading">瀵煎嚭</el-button>
</el-form-item>
</el-form>
<el-button slot="reference" class="op-item" type="success">瀵煎嚭</el-button>
@@ -96,6 +96,7 @@
components: { Pagination, QuestionShow },
data () {
return {
+ exportLoading: false,
subjectIdList: [],
timeRange: [],
exportForm: {
@@ -134,8 +135,10 @@
methods: {
// 瀵煎嚭棰樼洰
exportQuestion () {
+ this.exportLoading = true
questionApi.exportQuestion(this.exportForm).then(res => {
downloadExcel(res, '棰樼洰瀵煎嚭')
+ this.exportLoading = false
})
},
// 涓嬭浇瀵煎叆妯℃澘
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index 38fcd86..736da4c 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -39,7 +39,7 @@
<el-tag :type="row.condition == '姝ｅ父' || row.condition == null ? 'success' : 'warning'">{{ row.condition ? row.condition : '姝ｅ父' }}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter"/>
+ <el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter" align="center"/>
<el-table-column prop="phone" label="鎵嬫満鍙�" width="120"/>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="160px"/>
<el-table-column label="鐘舵��" prop="status" width="70px">
@@ -60,7 +60,7 @@
<router-link :to="{path:'/log/user/list', query:{userId:row.id}}" class="link-left">
<el-button size="mini" >鏃ュ織</el-button>
</router-link>
- <el-button size="mini" @click="status(row)" class="link-left">鐘舵��</el-button>
+ <el-button type="primary" size="mini" @click="status(row)" class="link-left">鐘舵��</el-button>
<el-button type="primary" size="mini" @click="transposition(row)" class="link-left">璋冨姩</el-button>
<el-popconfirm title="纭鍒犻櫎鍚�" @confirm="deleteUser(row)">
<el-button v-if="!deptAdmin()" slot="reference" size="mini" type="danger" class="link-left">鍒犻櫎</el-button>
@@ -197,6 +197,10 @@
})
},
transposition(item) {
+ if (item.conditionExamineResult) {
+ this.$message.warning("璇ョ敤鎴风姸鎬佸緟瀹℃牳");
+ return
+ }
this.examine.userId = item.id
this.examine.departmentId = item.deptIdList
this.examine.nowDepartmentIds = item.deptIdList.join(',')
@@ -210,6 +214,10 @@
})
},
status(user) {
+ if (user.conditionExamineResult) {
+ this.$message.warning("璇ョ敤鎴风姸鎬佸緟瀹℃牳");
+ return
+ }
this.statusVisible = true;
this.conditionExamine.sourceCondition = user.condition ? user.condition : '0';
this.conditionExamine.userId = user.id
--
Gitblit v1.8.0