xjc 4 年之前
父節點
當前提交
3e3aedeaa7
共有 3 個文件被更改,包括 26 次插入20 次删除
  1. 23 18
      src/views/Home.vue
  2. 2 1
      src/views/conference/Manage.vue
  3. 1 1
      src/views/system/Account.vue

+ 23 - 18
src/views/Home.vue

@@ -108,22 +108,19 @@ export default {
 				this.$router.push({path:'/'})
 			})
 		},
-		// permission(name){
-		// 	let permissions=this.info.permissions||[];
-		// 	let list=[];
-		// 	for(let i=0;i<permissions.length;i++){
-		// 		list.push(permissions[i].name)
-		// 	}
-		// 	if(list.indexOf(name)<0){
-		// 		return false;
-		// 	}else{
-		// 		return true;
-		// 	}	
-		// },
+		permission(name){
+			let permissions=this.info.permissions||[];
+			if(permissions.indexOf(name)<0){
+				return false;
+			}else{
+				return true;
+			}	
+		},
 		getData(){
 			this.$api.getAccountInfo().then(res=>{
 				if(!res.code){
-					this.info = res.data.data
+					this.info = res.data.data;
+					this.initNav()
 				}
 			})
 		},
@@ -137,7 +134,7 @@ export default {
 		initNav(){
 			let data = [
 				{ act: true, to: '/index/index', name: '首页' },
-				{ act: false, to: '/journal/journal', name: '群导览' },
+				{ act: false, to: '/journal/journal', name: '群导览' },
 				{ act: false, to: '/learning/activity', name: '学术交流' },
 				{ act: false, to: '/article/article', name: '精品导读' },
 				{ act: false, to: '/conference/conference', name: '会议系统' },
@@ -151,17 +148,25 @@ export default {
 				}else{
 					element.show = 1
 				}
+				// if(this.permission(element.name)){
+				// 	element.show = 1
+				// }else{
+				// 	element.show = 0
+				// }	
 			});
+			let navs = []
 			data.forEach(item =>{
-				if(mod == item.to.split("/")[1]) return item.act = true;
-				item.act = false;
+				// if(mod == item.to.split("/")[1]) return item.act = true;
+				// item.act = false;
+				if(this.permission(item.name)){
+					navs.push(item)
+				}
 			})
-			this.inDate = data;
+			this.inDate = navs;
 		},
 	},
 	
 	created(){
-		this.initNav()
 		this.getData()
 	}
 };

+ 2 - 1
src/views/conference/Manage.vue

@@ -75,7 +75,7 @@
             ><img width="100" :src="scope.row.img" alt=""
           /></template>
         </el-table-column>
-        <el-table-column prop="type" label="会议类型">
+        <el-table-column prop="contype" label="会议类型">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.contype == 'offline'">线下会议</el-tag>
             <el-tag v-else type="info">线上会议</el-tag>
@@ -361,6 +361,7 @@ export default {
             message: "删除成功",
             type: "success",
           });
+          this.getData();
           this.dialogVisible2 = false;
         });
     },

+ 1 - 1
src/views/system/Account.vue

@@ -24,7 +24,7 @@
                         <el-input clearable placeholder="请输入信息标题" v-model="form.name"></el-input>
                     </el-form-item>
                     <el-form-item label="">
-                        <el-select v-model="form.journal_id" placeholder="请选择期刊" clearable>
+                        <el-select v-model="form.journal_id" placeholder="请选择期刊" clearable filterable>
                             <el-option
                             v-for="item in journalsList"
                             :key="item.id"