Skip to content

C
confucius
Commit 52d2ae1e authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents 6269570a 68e30a24
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 142 deletions
src/App.vue
View file @ 52d2ae1e
......@@ -20,7 +20,7 @@ export default {
</script>
<style>
@import url("//at.alicdn.com/t/font_2077629_spbvq8xiwk.css");
@import url("//at.alicdn.com/t/font_2077629_14lp3cy4cqf.css");
.q-scrollarea__thumb {
z-index: 999999 !important;
}
......
src/components/exam/exam-paperform.vue
View file @ 52d2ae1e
......@@ -6,13 +6,12 @@
</style>
<template>
<div class="page-content examForm">
<div style="margin-top:15px;">
<q-btn v-if="multipleSelection&&multipleSelection.length>0" color="accent" size="sm" class="q-mr-md"
<div style="margin:15px 0;">
<q-btn v-if="multipleSelection&&multipleSelection.length>0" color="accent" size="sm" class="q-mr-md"
@click="movePaperFile()" label="移动到" />
<q-btn v-if="multipleSelection&&multipleSelection.length>0" color="accent" size="sm" class="q-mr-md"
label="删除" @click="batchDelete()" />
<q-btn v-if="multipleSelection&&multipleSelection.length>0" color="accent" size="sm" class="q-mr-md" label="删除"
@click="batchDelete()" />
</div>
<el-table :data="dataList" v-loading="loading" ref="multipleTable" :cell-class-name="isRender"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55">
......@@ -189,6 +188,10 @@
loading: {
type: Boolean,
default: null
},
msg: {
type: Object,
default: null
}
},
data() {
......@@ -196,22 +199,21 @@
isShowExamFolder: false, //是否显示新增文件夹
isShowMoveFolder: false, //是否显示
isShowSetOpenFolder: false, //是否显示设置权限
examObj:{},
examObj: {},
multipleSelection: [],
MoveIds: '',
currentUserInfo: {}, //当前登录用户
IsPaperManager:false
IsPaperManager: false
}
},
created() {
let userinfo = this.getLocalStorage();
this.currentUserInfo = userinfo;
userinfo.ActionMenuList.map(x => { //判断权限
if (x.FunctionCode == "Paper_Manager") { //判断是否是试卷管理员
if (x.FunctionCode == "Paper_Manager") { //判断是否是试卷管理员
this.IsPaperManager = true;
}
})
this.commonAccountId = this.currentUserInfo.AccountId;
},
mounted() {},
methods: {
......@@ -270,6 +272,9 @@
this.msg.ParentId = Id;
this.refreshPage();
},
refreshPage() {
this.$emit('refreshPage');
},
//点击编辑 跳转
goExameEdit(item) {
var obj = {
......
src/pages/exam/examPaper.vue
View file @ 52d2ae1e
......@@ -103,7 +103,7 @@
<span v-if="index!=navList.length-1" :key="index">></span>
</template>
</div>
<examPaperForm :dataList="dataList" ref="examPaper" :loading="loading"></examPaperForm>
<examPaperForm :dataList="dataList" ref="examPaper" :msg="msg" :loading="loading" @refreshPage="refreshPage"></examPaperForm>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
</div>
......@@ -112,10 +112,7 @@
<script>
import examPaperForm from '../../components/exam/exam-paperform'
import {
GetPaperPage,
deletePaperInfo,
copyPaperInfo,
submitApproval
GetPaperPage
} from '../../api/teacher/index';
//获取校区列表
export default {
......@@ -138,16 +135,10 @@
pageCount: 0,
loading: false,
dataList: [],
isShowExamFolder: false, //是否显示新增文件夹
isShowMoveFolder: false, //是否显示
isShowSetOpenFolder: false, //是否显示设置权限
examObj: {}, //弹窗对象
navList: [], //导航列表
IsCreateFolder: false, //是否试卷创建文件夹权限
IsCreatePaper: false, //是否创建试卷权限
MoveIds: '',
currentUserInfo: {}, //当前登录用户
commonAccountId:-1,
currentUserInfo: {} //当前登录用户
}
},
created() {
......@@ -166,15 +157,6 @@
this.getList();
},
methods: {
rowsClick(row, column, event) {
this.$refs.examPaperTab.toggleRowExpansion(row);
},
//创建试卷
CreatePaper() {
this.OpenNewUrl('/exam/paperCreate', {
ToParentId: this.msg.ParentId
})
},
//翻页
changePage(val) {
this.msg.pageIndex = val;
......@@ -218,118 +200,8 @@
},
//新增修改文件夹
showExamFolder(obj) {
this.examObj = obj;
this.isShowExamFolder = true;
},
//实在开放权限
showOpenForm(obj) {
this.examObj = obj;
this.isShowSetOpenFolder = true;
},
//关闭弹窗
closeExamForm() {
this.isShowExamFolder = false;
this.isShowMoveFolder = false;
this.isShowSetOpenFolder = false;
},
//发布考试
publishExam(item) {
let PaperId = 0;
if (item) {
PaperId = item.PaperId
}
this.OpenNewUrl('/exam/paperPublish', {
PaperId: PaperId
})
},
//试卷详情
showPaperInfo(item) {
let PaperId = 0;
if (item) {
PaperId = item.PaperId
}
this.OpenNewUrl('/exam/paperInfo', {
Id: PaperId
})
},
//移动到文件夹
movePaperInfo(item) {
this.examObj = item;
this.isShowMoveFolder = true;
},
//复制试卷
copyPaperInfo(item) {
var msg = {
PaperId: item.PaperId
}
var message = "是否要复制【" + item.PaperName + "】试卷?";
this.$q.dialog({
title: '提示信息',
message: message,
cancel: true,
persistent: true,
ok: "确定",
cancel: "取消",
}).onOk(() => {
copyPaperInfo(msg).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '操作成功!',
position: 'top'
})
this.refreshPage();
}
});
})
},
//批量删除
batchDelete() {
var msg = {
PaperIds: this.MoveIds
}
var message = "是否要删除选中的文件信息";
this.deletePaperCommon(msg, message);
},
//删除
deletePaperInfo(item) {
var msg = {
PaperId: item.PaperId
}
var message = "";
if (item.PaperType == 1) {
message = "是否要删除【" + item.PaperName + "】及下面的内容?";
} else {
message = "是否要删除【" + item.PaperName + "】试卷?"
}
this.deletePaperCommon(msg, message);
},
deletePaperCommon(msg, tipMsg) {
this.$q.dialog({
title: '提示信息',
message: tipMsg,
cancel: true,
persistent: true,
ok: "确定",
cancel: "取消",
}).onOk(() => {
deletePaperInfo(msg).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '操作成功!',
position: 'top'
})
this.refreshPage();
}
});
})
this.$refs.examPaper.showExamFolder(obj);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment