Commit 8c65bdba authored by 黄奎's avatar 黄奎

页面修改

parent 1ca0d350
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
</div> </div>
<q-list style="width:180px;overflow:hidden"> <q-list style="width:180px;overflow:hidden">
<template v-for="(x,i) in secondNavs"> <template v-for="(x,i) in secondNavs">
<q-item :to="x.MenuUrl" clickable v-ripple :active="currentPath==x.MenuUrl" v-if="x.SubList.length==0" <q-item :to="x.MenuUrl" clickable v-ripple :active="currentPath==x.MenuUrl"
:key="i"> v-if="x.SubList&&x.SubList.length==0" :key="i">
<q-item-section avatar style="min-width:30px;"> <q-item-section avatar style="min-width:30px;">
<q-icon :name="x.MenuIcon" size="20px" /> <q-icon :name="x.MenuIcon" size="20px" />
</q-item-section> </q-item-section>
...@@ -68,7 +68,8 @@ ...@@ -68,7 +68,8 @@
</div> </div>
</div> </div>
<div class="col" style="background: #f2f4f7;"> <div class="col" style="background: #f2f4f7;">
<q-scroll-area :thumb-style="thumbStyle" :bar-style="barStyle" visible class="fit content-scroll full-width full-height"> <q-scroll-area :thumb-style="thumbStyle" :bar-style="barStyle" visible
class="fit content-scroll full-width full-height">
<router-view /> <router-view />
</q-scroll-area> </q-scroll-area>
</div> </div>
...@@ -119,7 +120,7 @@ ...@@ -119,7 +120,7 @@
isExpend: false, isExpend: false,
IsShowLeft: true, IsShowLeft: true,
userCenterMenuList: [], //用户中心菜单 userCenterMenuList: [], //用户中心菜单
socektArr:[], //消息数组 socektArr: [], //消息数组
} }
}, },
components: { components: {
...@@ -153,7 +154,8 @@ ...@@ -153,7 +154,8 @@
handler: function (newVal) { handler: function (newVal) {
let i = this.tab.split('_')[1]; let i = this.tab.split('_')[1];
if (newVal && newVal.MenuList) { if (newVal && newVal.MenuList) {
this.secondNavs = newVal.MenuList.length > 0 ? newVal.MenuList[i].SubList : []; this.secondNavs = newVal.MenuList.length > 0 ? (newVal.MenuList[i] && newVal.MenuList[i].SubList ? newVal
.MenuList[i].SubList : []) : [];
} }
if (newVal && newVal.UserCenterList) { if (newVal && newVal.UserCenterList) {
this.userCenterMenuList = newVal.UserCenterList; this.userCenterMenuList = newVal.UserCenterList;
...@@ -176,11 +178,11 @@ ...@@ -176,11 +178,11 @@
} }
this.tab = `navs_${i}` this.tab = `navs_${i}`
if (this.userInfo && this.userInfo.MenuList) { if (this.userInfo && this.userInfo.MenuList) {
this.secondNavs = this.userInfo.MenuList.length > 0 ? this.userInfo.MenuList[i].SubList : [] this.secondNavs = this.userInfo.MenuList.length > 0 ? (this.userInfo.MenuList[i] && this.userInfo.MenuList[i]
.SubList ? this.userInfo.MenuList[i].SubList : []) : []
} }
this.$root.$on("goworkobj", (data)=>{ this.$root.$on("goworkobj", (data) => {
// this.setNavs(0) this.secondNavs = []
this.secondNavs=[]
}); });
this.getLogList(); this.getLogList();
this.getMsg(); this.getMsg();
...@@ -213,7 +215,7 @@ ...@@ -213,7 +215,7 @@
}) })
}, },
//获取日志列表 //获取日志列表
getLogList(){ getLogList() {
GetMsgLogList().then(res => { GetMsgLogList().then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.socektArr = res.Data; this.socektArr = res.Data;
...@@ -231,8 +233,8 @@ ...@@ -231,8 +233,8 @@
getDataFunc(e) { getDataFunc(e) {
if (e.data) { if (e.data) {
var newData = JSON.parse(e.data) var newData = JSON.parse(e.data)
if(newData.length>0){ if (newData.length > 0) {
for(var i=0;i<newData.length;i++){ for (var i = 0; i < newData.length; i++) {
this.socektArr.unshift(newData[i]) this.socektArr.unshift(newData[i])
} }
} }
......
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
ClassName: '', //班级名称 ClassName: '', //班级名称
StartTime: '', //开始时间 StartTime: '', //开始时间
EndTime: '', //结束时间 EndTime: '', //结束时间
School_Id: 0, //关联校区 School_Id: '', //关联校区
CouseId: 0, //课程id CouseId: 0, //课程id
Teacher_Id: 0, //教师id Teacher_Id: 0, //教师id
Q_CanApply: "0", //是否可以报名 1是 Q_CanApply: "0", //是否可以报名 1是
...@@ -407,10 +407,6 @@ ...@@ -407,10 +407,6 @@
if (!tempArray) { if (!tempArray) {
tempArray = []; tempArray = [];
} }
tempArray.unshift({
SId: 0,
SName: "不限"
})
this.schoolList = tempArray; this.schoolList = tempArray;
} }
}) })
......
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