提交 0cf37cfb 编写于 作者: guangjun.yang's avatar guangjun.yang

Merge branch 'dev-prof-phrase1.0-0720' into release

* dev-prof-phrase1.0-0720:
  新建学科取消返回
  删除下一步弹窗
  支持搜索
  修改样式
  修改样式问题
  学科下架添加发布按钮
  修改文案
  对接cme职称考接口
  是否有试看限制
  对接学科列表
  添加学科页面和职称考页面
  添加试看的配置
  环境变量等
  新的职称考页面

# Conflicts:
#	src/views/layout/slidebar.vue
......@@ -13,6 +13,9 @@ const editManager = r => require.ensure([], () => r(require('../views/education/
const itemRole = r => require.ensure([], () => r(require('../views/system/item-role.vue')), 'item-role')
const msgPush = r => require.ensure([], () => r(require('../views/msgpush/msg-push.vue')), 'msg-push')
const editCme = r => require.ensure([], () => r(require('../views/education/edit-cme.vue')), 'edit-cme')
const editProfessionalExam = r => require.ensure([], () => r(require('../views/education/edit-professional-exam.vue')), 'edit-professional-exam')
const subjectManager = r => require.ensure([], () => r(require('../views/education/subject-manager.vue')), 'subject-manager')
const editSubject = r => require.ensure([], () => r(require('../views/education/edit-subject.vue')), 'edit-subject')
import patientsRouters from './patients'
import followRouters from './follow'
......@@ -91,6 +94,15 @@ export default [{
},{
path: '/edit-cme',
component: editCme
},{
path: '/edit-professional-exam',
component: editProfessionalExam
},{
path: '/subject-manager',
component: subjectManager
},{
path: '/edit-subject',
component: editSubject
},{
path: '/item-component',
component: itemComponent
......
......@@ -305,7 +305,8 @@ const GetLocalIPAddress = () => {
// // check();
// });
// $.getScript('http://pv.sohu.com/cityjson?ie=utf-8', function () {
return returnCitySN["cip"];
// return returnCitySN["cip"];
return '';
// });
// return ip;
};
......
......@@ -54,9 +54,9 @@ service.interceptors.request.use(config => {
}
if( process.env.BUILD_ENV == "development" ){ // 本地开发环境qgit
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
config.headers['token'] = '28731437A7EF482ABC5DF4D4DB13B3ED';
config.headers['token'] = 'B66468F48B5847DE8A5A5CFB0F79022A';
// config.headers['token'] = localStorage.getItem('storageToken')
config.headers['token'] = localStorage.getItem('storageToken')
}else{
config.headers['token'] = localStorage.getItem('storageToken')
}
......
......@@ -307,7 +307,8 @@ const GetLocalIPAddress = () => {
// // check();
// });
// $.getScript('http://pv.sohu.com/cityjson?ie=utf-8', function () {
return returnCitySN["cip"];
// return returnCitySN["cip"];
return '';
// });
// return ip;
};
......@@ -803,3 +804,7 @@ export const setOptionLabel = (self,selfModel,selfEId,selfEName,list,listEId,lis
}
return;
};
export function deepCopy(obj) {
return obj ? JSON.parse(JSON.stringify(obj)) : obj;
}
......@@ -265,7 +265,27 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="是否有试看限制">
<el-radio-group v-model="item3.content5">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
<!-- <el-radio-group v-if="!item3.content5" v-model="item3.content5">
<el-radio label="1">是</el-radio>
<el-radio label=null>否1</el-radio>
<el-radio label=undefind>否1</el-radio>
</el-radio-group> -->
</el-form-item>
</el-col>
<el-col :span="10" v-if="item3.content5 == 1">
<el-form-item label="试看时长">
<el-input maxlength="8" type="input" rows="4" v-model="item3.content6" size="small" placeholder="请输入试看时长" style="width:300px"></el-input>
<span class="word-num">(秒)</span>
</el-form-item>
</el-col>
</el-row>
</div>
</div>
</div>
......@@ -725,6 +745,10 @@ export default {
vm.GET('portal/portalComponent/OnlineExamList').then((res) => {
if( res.code == '000000') {
vm.testIdSelect = res.data.onlineExamList;
vm.testIdSelect.unshift({
id: 0,
onlineExamName: '无考试'
})
for(let i=0; i<vm.testIdSelect.length; i++) {
let type = vm.testIdSelect[i].isNeedApproval; // isNeedApproval: 0 全部考试 1 需审核考试
if( type && type == 1 ) {
......@@ -763,6 +787,10 @@ export default {
vm.GET('portal/portalComponent/CourseList').then((res) => {
if( res.code == '000000') {
vm.courseIdSelect = res.data.courseList
vm.courseIdSelect.unshift({
id: 0,
name: '无课程'
})
}else {
vm.$message.info(res.message)
}
......@@ -951,7 +979,9 @@ export default {
content1: '',
content2: '',
content3: '0',
content4: ''
content4: '',
content5: 0,
content6: 0,
}]
})
}else if(item.partConfigModelList[i].type == 2) { // 课程
......@@ -969,7 +999,11 @@ export default {
id: '',
seqNo: '',
content1: '',
content2: ''
content2: '',
content3: '0',
content4: '',
content5: '0',
content6: '',
}]
})
}
......
因为 它太大了无法显示 源差异 。您可以改为 查看blob
<template>
<div class="notice-editor-wrap" >
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :jumPathThird="jumPathThird"></bread-crumb>
<div class="add-content screenSet" id="screenSet">
<el-form
ref="formData"
:model="formData"
:rules="rules"
label-width="160px"
class="basic-form"
>
<el-form-item label="所属职称:" prop="titleCode">
<el-select size="small" v-model="formData.titleCode" placeholder="请选择职称">
<el-option
v-for="item in gradeList"
:key="item.code"
:label="item.name"
:value="item.code"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="学科名称:" prop="name">
<el-col :span="13">
<el-input
size="small"
v-model="formData.name"
placeholder="请输入学科名称"
style="width:70%;"
></el-input>
<span class="word-num">{{(formData.name).replace(/\s+/g,"").length}}/20</span>
</el-col>
</el-form-item>
<el-row>
<el-col :span="13">
<el-button type="primary" size="small" @click="addSecondList">添加二级分类</el-button>
</el-col>
</el-row>
<template v-for="(item, index) in formData.titleTestSubjectSecondModelList">
<div class="list-block" :key="index">
<el-form-item
label="二级分类名称:"
:prop="`titleTestSubjectSecondModelList.${index}.name`"
:rules="secondNameRules">
<el-col :span="13">
<el-input
size="small"
v-model="item.name"
placeholder="请输入二级分类名称"
style="width:70%;"
></el-input>
<span class="word-num">{{(item.name).replace(/\s+/g,"").length}}/20</span>
</el-col>
</el-form-item>
<el-form-item
label="二级分类代码:"
:prop="`titleTestSubjectSecondModelList.${index}.code`"
:rules="secondCodeRules">
<el-col :span="13">
<el-input
size="small"
v-model="item.code"
placeholder="请输入二级分类代码"
style="width:70%;"
></el-input>
<span class="word-num">{{(item.code).replace(/\s+/g,"").length}}/8</span>
</el-col>
</el-form-item>
<el-form-item
label="是否已在项目配置课程:"
:prop="`titleTestSubjectSecondModelList.${index}.openFlag`"
:rules="{ required: true, message: '请选择是否已在项目配置课程', trigger: 'change'}">
<el-col :span="13">
<el-radio-group v-model="item.openFlag">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-col>
</el-form-item>
<el-form-item
v-if="item.openFlag"
label="选择项目:"
:prop="`titleTestSubjectSecondModelList.${index}.projectId`"
:rules="{ required: true, message: '请选择项目', trigger: 'change'}">
<el-select size="small" v-model="item.projectId" filterable placeholder="请选择项目">
<el-option
v-for="item in projectList"
:key="item.projectId"
:label="item.projectName"
:value="item.projectId"
></el-option>
</el-select>
</el-form-item>
<el-form-item
v-else
label="选择预计上线时间:"
:prop="`titleTestSubjectSecondModelList.${index}.predictTime`"
:rules="{ required: true, message: '请选择预计上线时间', trigger: 'change'}">
<el-date-picker
v-model="item.predictTime"
type="month"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择月">
</el-date-picker>
</el-form-item>
<i v-show="index !== 0" class="el-icon-delete icon-delete" @click="deleteSecondList(index)"></i>
</div>
</template>
<el-form-item style="margin-top: 30px">
<el-button type="primary" @click="onSubmit">提交</el-button>
<el-button @click="goBack">取消</el-button>
</el-form-item>
</el-form>
</div>
</div>
</template>
<script>
import BreadCrumb from "@/components/breadcrumb.vue";
import { openLoading, closeLoading, deepCopy } from "@/utils/utils";
import * as commonUtil from "@/utils/utils";
let checkProjectStr = (rule, value, callback) => {
if (value.indexOf("\\") != -1) {
//存在
callback(new Error("请勿输入字符“ \\ "));
} else if (value.indexOf(".") != -1) {
callback(new Error("请勿输入字符“ . "));
} else {
callback();
}
};
export default {
components: {
BreadCrumb
},
data() {
return {
curmbFirst: "教培项目",
curmbSecond: "学科管理",
jumPathThird: '/subject-manager',
curmbThird: '新建学科',
detailInfo: {}, // 接口返回
formData: {
// deleteFlag: 0,
id: 0,
name: '',
seqNo: 0,
status: 2,
titleCode: '',
titleTestSubjectSecondModelList: [
{
code: '',
// deleteFlag: 0,
id: 0,
name: '',
openFlag: 1,
predictTime: '',
seqNo: '',
subjectFirstId: '',
projectId: '',
titleTestSubjectSecondResourceModelList: [{
// deleteFlag: 0,
id: 0,
resourceId: 0,
seqNo: 0,
subjectSecondId: 0,
type: 0
}]
}
],
},
gradeList: [], // 职称列表
projectList: [], // 项目列表
rules: {
titleCode: [
{ required: true, message: "请输入选择职称", trigger: "change" },
],
name: [
{ required: true, message: "请输入学科名称", trigger: "blur" },
{ min: 1, max: 20, message: "输入长度为1-20的科学名称", trigger: "blur" },
{ validator: checkProjectStr, trigger: "blur" }
],
},
secondNameRules: [
{ required: true, message: "请输入二级分类名称", trigger: "blur" },
{ min: 1, max: 20, message: "输入长度为1-20的二级分类名称", trigger: "blur" },
{ validator: checkProjectStr, trigger: "blur" }
],
secondCodeRules: [
{ required: true, message: "请输入二级分类代码", trigger: "blur" },
{ min: 1, max: 8, message: "输入长度为1-8的二级分类代码", trigger: "blur" },
]
}
},
created() {
const { id } = this.$route.query;
if (id) {
this.getSubjectDetail(id);
}
this.getGradeList();
this.getProjectList();
},
mounted() {
commonUtil.resizeHeight();
},
methods: {
// 学科详情
getSubjectDetail(id) {
openLoading(this);
this.GET(`portal/titleTest/info/${id}`).then(res => {
closeLoading(this);
if (res.code == "000000") {
console.log('_______data_______', res.data);
this.detailInfo = res.data;
this.onReset();
}
});
},
// 获取职称列表
getGradeList() {
openLoading(this);
this.GET("portal/titleTest/grade/list").then(res => {
closeLoading(this);
if (res.code == "000000") {
const { titleGradeModelList = [] } = res.data;
this.gradeList = titleGradeModelList;
}
});
},
// 获取项目列表
getProjectList() {
openLoading(this);
this.GET("portal/titleTest/cme/list").then(res => {
closeLoading(this);
if (res.code == "000000") {
this.projectList = res.data;
}
});
},
// 添加二级分类
addSecondList() {
this.formData.titleTestSubjectSecondModelList.push({
code: '',
// deleteFlag: 0,
id: 0,
name: '',
openFlag: 1,
predictTime: '',
seqNo: '',
subjectFirstId: '',
projectId: '',
titleTestSubjectSecondResourceModelList: [{
// deleteFlag: 0,
id: 0,
resourceId: 0,
seqNo: 0,
subjectSecondId: 0,
type: 0
}]
});
},
// 删除二级分类
deleteSecondList(index) {
this.$confirm('确定删除此二级分类吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.formData.titleTestSubjectSecondModelList.splice(index, 1);
}).catch(() => {
});
},
onSubmit() {
this.$refs['formData'].validate((valid) => {
if (!valid) {
return false;
}
const params = deepCopy(this.formData);
for (let item of params.titleTestSubjectSecondModelList) {
let id = item.projectId;
item.titleTestSubjectSecondResourceModelList[0]['resourceId'] = id || 0;
delete item.projectId;
}
// params.createdName = this.$store.state.reservationManage.userName;
openLoading(this);
this.POST("portal/titleTest/insertOrUpdate", params).then(res => {
closeLoading(this);
if (res.code == "000000") {
this.$message.success('提交成功')
setTimeout(() => {
this.goBack();
}, 2000)
}
});
});
},
goBack() {
this.$router.back();
},
// 重置
onReset() {
if (this.detailInfo.id) {
const result = deepCopy(this.detailInfo);
const modelList = [];
for (let item of result.secondSubjectModelList) {
if (item.resourceModelList && item.resourceModelList[0]) {
item.projectId = item.resourceModelList[0]['resourceId']
item.titleTestSubjectSecondResourceModelList = item.resourceModelList;
delete item.resourceModelList;
} else {
item.projectId = 0;
item.titleTestSubjectSecondResourceModelList = [{
// deleteFlag: 0,
id: 0,
resourceId: 0,
seqNo: 0,
subjectSecondId: 0,
type: 0
}]
}
modelList.push(item);
}
result.titleTestSubjectSecondModelList = modelList;
delete result.secondSubjectModelList;
this.formData = result;
} else {
this.formData = {
// deleteFlag: 0,
id: 0,
name: '',
seqNo: 0,
status: 2,
titleCode: '',
titleTestSubjectSecondModelList: [
{
code: '',
// deleteFlag: 0,
id: 0,
name: '',
openFlag: 1,
predictTime: '',
seqNo: '',
subjectFirstId: '',
projectId: '',
titleTestSubjectSecondResourceModelList: [{
// deleteFlag: 0,
id: 0,
resourceId: 0,
seqNo: 0,
subjectSecondId: 0,
type: 0
}]
}
],
}
}
}
},
}
</script>
<style lang="scss" scoped>
.notice-editor-wrap {
background: #fff;
}
.prot-dialog-tips-1 {
text-align: center !important;
}
.add-content{
padding: 30px 0;
}
.list-block{
position: relative;
padding: 20px 10px 0px;
border: 1px solid #cdcdcd;
border-radius: 5px;
margin-top: 25px;
}
.icon-delete{
position: absolute;
right: 20px;
top: 20px;
font-size: 30px;
color: red;
cursor: pointer;
}
</style>
......@@ -223,6 +223,7 @@
<el-radio :label="1">普通项目</el-radio>
<el-radio :label="2">CME项目</el-radio>
<el-radio :label="3">开放模板</el-radio>
<el-radio :label="5">职称考试</el-radio>
</el-radio-group>
<span slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false">取 消</el-button>
......@@ -465,6 +466,9 @@ export default {
toTemplatePage(isPreview = 0) {
this.$router.push("template-open?projectType=3&isPreview=" + isPreview);
},
toProfessionalExamPage(isPreview = 0) {
this.$router.push("edit-professional-exam?projectType=2&isPreview=" + isPreview);
},
toEditCustomPage(isPreview = 0) {
this.setKind(0);
this.$router.push("edit-custom?projectType=4&isPreview=" + isPreview);
......@@ -477,13 +481,15 @@ export default {
this.newProjectType = 1;
},
handleCreateProject() {
// 1 普通项目 2 CME项目 5 职称考试(对应的projectType仍为2)
if (this.newProjectType == 1) {
// 1 普通项目 2 CME项目
this.toPage();
} else if (this.newProjectType == 2) {
this.toCmePage();
} else if (this.newProjectType == 3) {
this.toTemplatePage();
} else if (this.newProjectType == 5) {
this.toProfessionalExamPage();
}
},
......@@ -693,6 +699,17 @@ export default {
this.formInline.pageNo
);
} else if (row.projectType === 2) {
// cmeType:3为职称考,其他为原cme
if (row.cmeType === 3) {
this.$router.push(
"edit-professional-exam?projectType=2&projectId=" +
projectId +
"&level=" +
level +
"&pageNum=" +
this.formInline.pageNo
);
} else {
this.$router.push(
"edit-cme?projectType=2&projectId=" +
projectId +
......@@ -701,6 +718,7 @@ export default {
"&pageNum=" +
this.formInline.pageNo
);
}
} else if (row.projectType === 3) {
this.$router.push(
"template-open?projectType=3&projectId=" +
......
<template>
<div class="item-manager-wrap">
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
<div class="component-content screenSet" id="screenSet">
<div class="header-title">学科管理</div>
<!-- 搜索查询 -->
<el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;">
<el-form ref="formInline" :model="formInline" label-width="75px" style="min-width:1200px;">
<el-col style="width: 300px">
<el-form-item label="学科名称:">
<el-input style="width: 192px;" v-model="formInline.subjectName" size="small" placeholder="请输入学科名称"></el-input>
</el-form-item>
</el-col>
<el-col style="width: 600px">
<el-form-item label="发布状态:">
<el-select size="small" v-model="formInline.status" placeholder="请选择发布状态">
<el-option
v-for="item in optionStatus"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" style="padding:0;text-align:right;padding-right:15px;">
<el-button type="primary" size="small" @click="searchList">查询</el-button>
<el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
</el-col>
</el-form>
</el-row>
<!-- 新建 -->
<el-form :model="formInline" class="demo-form-inline">
<el-form-item >
<el-button class="add-button" size="small" type="primary" @click="openProject()">新建学科</el-button>
</el-form-item>
</el-form>
<!-- 表格 -->
<el-table class="item-table" :data="tableData" style="width: 100%">
<el-table-column prop="id" label="ID编号" min-width="100" align="center"></el-table-column>
<el-table-column prop="firstSubjectName" label="学科名称" align="center"></el-table-column>
<!-- <el-table-column prop="title" label="所属职称" align="center"></el-table-column> -->
<el-table-column prop="createdName" label="创建人" align="center"></el-table-column>
<el-table-column prop="statusText" label="状态" align="center"></el-table-column>
<el-table-column fixed="right" label="操作" min-width="250" align="center">
<template slot-scope="scope">
<el-button
v-for="btn in scope.row.btns"
:key="btn.type"
@click="onBtnClick(scope.row, btn)"
type="primary"
size="small"
>{{ btn.name }}</el-button>
</template>
</el-table-column>
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/no-content1.png" />
<p>没有查询到相关结果</p>
</div>
</div>
</el-table>
<!-- 分页 -->
<div class="pagination">
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="formInline.pageNo"
:page-sizes="[10, 30, 50, 100]"
:page-size="formInline.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalRows"
></el-pagination>
</div>
</div>
</div>
</template>
<script>
import BreadCrumb from "../../components/breadcrumb.vue";
import { create } from "domain";
import { mapGetters, mapActions } from "vuex";
import { returnData } from "../../utils/mock";
import { openLoading, closeLoading } from "../../utils/utils";
import * as commonUtil from "../../utils/utils";
let vm = null;
export default {
components: {
BreadCrumb
},
data() {
return {
changeStatusVisible: false,
currentRow: null,
curmbFirst: "教培项目",
curmbSecond: "学科管理",
searchParam: {
name: "",
status: "",
pageNo: 1,
pageSize: 10
},
currentRow: {},
optionStatus: [
{ value: "", label: "全部" },
// { value: 1, label: "草稿" },
{ value: 2, label: "未上架" },
{ value: 3, label: "审核中/待审核" },
{ value: 4, label: "已上架" },
{ value: 5, label: "已下架" },
{ value: 6, label: "已拒绝/未上架" }
],
tableData: [],
totalRows: 0,
loading: true,
currentPage: 1,
formInline: {
subjectName: "",
status: "",
pageNo: 1,
pageSize: 10
},
idType: "",
isRoleOfOuter: 0
};
},
computed: {
...mapGetters([
"_token"
// "idType",
])
},
created() {
vm = this;
vm.idType = localStorage.getItem("storageIdType"); //
vm.isRoleOfOuter = localStorage.getItem("isRoleOfOuter") - 0; // 内部管理员权限
let pageSize = vm.formInline.pageSize;
console.log("idType:", vm.idType);
if (this.$route.query.pageNum) {
this.formInline = { ...this.$store.state.common.itemManager };
this.formInline.pageNo = parseInt(this.$route.query.pageNum);
this.formInline.pageSize = pageSize;
}
this.$nextTick(function() {
this.getProjectList();
});
},
// 挂载到Dom完成时
mounted: function() {
commonUtil.resizeHeight();
},
methods: {
...mapActions(["updateItemManager", "setKind"]),
// 打开新建页面
openProject() {
this.$router.push("edit-subject");
},
searchList() {
this.formInline.pageNo = 1;
this.getProjectList();
},
//查询项目列表
getProjectList() {
let req = {};
req = this.formInline;
openLoading(vm);
vm.GET("portal/titleTest/list", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
const { list = [], total } = res.data;
vm.tableData = list.map(item => {
let statusText = '';
let btns = [];
// 设置按钮名称、类型、操作之后的status、提示文字
let [edit, publish, accept, reject, outOf, del] = [
{ name: '编辑', type: 'edit' },
{ name: '发布', type: 'publish', next: 3, text: '确定要发布该学科吗?' },
{ name: '通过', type: 'accept', next: 4, text: '确定要通过该学科上架吗?' },
{ name: '拒绝', type: 'reject', next: 6, text: '确定要拒绝该学科吗?' },
{ name: '下架', type: 'outOf', next: 5, text: '确定要下架该学科吗?' },
{ name: '删除', type: 'del', next: -1, text: '确定要删除该学科吗?' },
];
switch (item.status) {
case 1:
statusText = '草稿';
btns = [edit, publish, del];
break;
case 2:
statusText = '未上架';
btns = [edit, publish, del];
break;
case 3:
statusText = '审核中/待审核';
btns = [accept, reject];
break;
case 4:
statusText = '已上架';
btns = [edit, outOf];
break;
case 5:
statusText = '已下架';
btns = [edit, publish, del];
break;
case 6:
statusText = '已拒绝/未上架';
btns = [edit, publish, del];
break;
default:
//
}
return {
...item,
statusText,
btns,
}
});
//console.log(vm.tableData);
vm.totalRows = total;
}
});
},
onBtnClick(item, btn) {
if (btn.type === 'edit') {
this.$router.push(
"edit-subject?id=" +
item.id +
"&level=" +
item.level +
"&pageNum=" +
this.formInline.pageNo
);
} else {
this.$confirm(btn.text, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.changeStatus(item.id, btn.next);
}).catch(() => {
});
}
},
// 修改状态
changeStatus(id, status) {
this.POST("portal/titleTest/changeSubjectStatus", { id, status }).then(res => {
this.$message.success(res.message);
if (res.code == "000000") {
console.log(res);
this.getProjectList();
}
});
},
// 重置表单
resetForm() {
vm.formInline = {
subjectName: "",
status: "",
pageNo: 1,
pageSize: 10,
duringTime: ""
}
vm.getProjectList();
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.formInline.pageSize = val;
this.handleCurrentChange(this.searchParam.pageNo);
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.formInline.pageNo = val;
this.getProjectList();
//需要判断是否检索
// if (!this.flag) {
// this.currentChangePage(this.tableDataEnd);
// } else {
// this.currentChangePage(this.filterTableDataEnd);
// }
}, //组件自带监控当前页码
currentChangePage(list) {
let from = (this.currentPage - 1) * this.pageSize;
let to = this.currentPage * this.pageSize;
this.tableDataEnd = [];
for (; from < to; from++) {
if (list[from]) {
this.tableDataEnd.push(list[from]);
}
}
},
}
};
</script>
<style lang="scss">
.item-table .el-button {
margin: 5px 0;
}
.item-manager-wrap {
.component-content {
background: #fff;
padding: 10px;
.header-title {
padding: 10px 12px;
font-size: 12px;
color: #449284;
border-bottom: 1px solid #efefef;
}
.demo-form-inline {
margin-right: 20px;
.add-button {
float: right;
margin-right: 10px;
}
}
.table-empty {
img {
width: 100px;
}
p {
margin-top: -50px;
}
}
}
}
.el-tooltip__popper {
max-width: 50%;
}
.item-table .el-button{
margin: 5px;
}
</style>
......@@ -412,6 +412,12 @@
index: 'advert-simple-manage'
};
const subjectManager = {
title: '学科管理',
icon: 'el-icon-setting',
index: 'subject-manager'
};
const eduRole = {
title: '角色权限',
icon: 'el-icon-menu',
......@@ -471,7 +477,7 @@
]
};
vm.items[1].subs.push(subjectManager);
vm.items[1].subs.push(itemComponent);
vm.items[1].subs.push(templateManager);
vm.items[1].subs.push(followSider);
......@@ -519,6 +525,7 @@
bottom: 0;
width: 255px;
background: #06232C;
overflow-y: scroll;
.el-menu {
background: #06232C;
border-right: none;
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册