Skip to content

9
912project
提交 5c7fc06a authored 作者: zax's avatar zax
浏览文件
操作

Merge branch 'master' into 'zax'

# Conflicts: # src/components/sidebar/sidebar.vue
上级 9d1605f7 bfa99b4a
隐藏空白字符变更
内嵌 并排
正在显示 包含 231 行增加 和 35 行删除
src/components/header/header.css
浏览文件 @ 5c7fc06a
......@@ -75,13 +75,30 @@
font-size: 18px;
line-height: 40px;
display: inline-block;
background: url("./img/listVal.png") no-repeat;
background-size: 100% 100%;
text-align: center;
width: 160px;
color: #fff;
color: rgba(71,119,231,0.6);
}
.headerAll .listVal>span:hover{
color: #4777e7;
font-weight: bold;
}
.headerAll .menuTitle{
margin: 0 20px 0 20px;
display: inline-block;
font-size: 20px;
cursor: default;
color: #4765A4;
}
.headerAll .menuClick{
color: #4777e7;
font-weight: bold;
}
.headerAll .listVal>span{
cursor: pointer;
}
.headerAll .listVal>img{
margin: 0 20px 0 20px;
}
.headerAll .right .login{
margin-right: 25px;
color: #4777e7;
......
src/components/header/header.vue
浏览文件 @ 5c7fc06a
......@@ -13,22 +13,27 @@
<img src="./img/toHome.png">
<span class="font">综合展现</span>
</span>
<!-- <span class="user">-->
<!-- <span class="admin">-->
<!-- <img src="./img/admin.png">-->
<!-- <span class="font">管理员</span>-->
<!-- </span>-->
<!-- <span class="line"></span>-->
<!-- <span class="logout">退出</span>-->
<!-- </span>-->
<span class="user">
<span class="user" v-if="this.$store.getters.getUserData.name !== undefined">
<span class="admin">
<img src="./img/admin.png">
<span class="font">{{this.$store.getters.getUserData.name}}</span>
</span>
<span class="line"></span>
<span class="logout">退出</span>
</span>
<span class="user" v-if="this.$store.getters.getUserData.name === undefined">
<span class="admin login" @click="jump('login')">请登录</span>
</span>
</span>
</div>
<div style="height: 40px;background: #fff;">
<div style="height: 40px;background: #fff;" v-if="this.$route.path !== '/firstHome'">
<p class="list">
<span v-for="item of sidebar" class="listVal" @click="jump(item.path)">{{item.name}}</span>
<span class="menuTitle">{{sidebar.name}}</span>
<span v-for="(item,index) of sidebar.menu" class="listVal" @click="jump(item.path, index)">
<span>{{item.name}}</span>
<img src="./img/line.png" v-show="index !== sidebar.menu.length - 1">
</span>
</p>
</div>
</div>
......@@ -37,6 +42,7 @@
<script>
import {mapGetters} from 'vuex';
import $ from 'jquery';
export default {
data () {
return {
......@@ -51,6 +57,7 @@ export default {
setInterval(function () {
that.timeDayFilter()
},1000)
console.log(this.$store.getters.getUserData)
},
methods: {
// 时间
......@@ -82,8 +89,13 @@ export default {
+ ' ' + h + seperator2 + m + seperator2 + s;
},
// 跳转
jump(path){
jump(path, index){
this.$router.push({name: path});
if (index !== undefined) {
let va = '.listVal:nth-child(' + (index + 1) + ')>span';
$('.listVal>span').removeClass('menuClick')
$(va).addClass('menuClick')
}
}
},
computed: {
......
src/components/home/home.vue 0 → 100644
浏览文件 @ 5c7fc06a
<!--首页-->
<template>
<div class="firstHome">
<el-row>
<el-col :span="24">
test
</el-col>
</el-row>
</div>
</template>
<script>
export default {
data () {
return {
}
},
created() {
},
mounted(){
},
methods: {
},
components: {
},
watch: {
}
}
</script>
<style scoped>
.firstHome{
background: #ebf0f8;
}
</style>
src/components/login/login.vue
浏览文件 @ 5c7fc06a
......@@ -39,8 +39,9 @@ export default {
}
this.$server.postUserLogin(data).then(res => {
if (res.data.code === 200) {
console.log(res.data.data)
this.$store.commit('changeUserData', res.data.data);
this.$router.push({name: 'XCalliance'})
this.$router.push({name: 'home'})
} else {
this.$message.error(res.data.msg);
}
......
src/components/sidebar/sidebar.vue
浏览文件 @ 5c7fc06a
......@@ -7,21 +7,51 @@
<span class="icon">
<img src="./img/JD.png">
</span>
<span class="font">基地建设管理</span>
<span class="font">基地建设</span>
</p>
</div>
<div>
<div v-if="this.$store.getters.getUserData.type === 1">
<span class="line"></span>
<p class="menu" style="margin-top: 0">
<span class="icon">
<img src="./img/XM.png">
</span>
<span class="font">项目管理</span>
</p>
</div>
<div v-if="this.$store.getters.getUserData.type !== 1">
<span class="line"></span>
<p class="menu" style="margin-top: 0">
<span class="icon">
<img src="./img/XM.png">
</span>
<span class="font">项目建设管理</span>
<span class="font">我的项目</span>
</p>
</div>
<div v-if="this.$store.getters.getUserData.type !== 1">
<span class="line"></span>
<p class="menu" style="margin-top: 0">
<span class="icon">
<img src="./img/JC.png">
</span>
<span class="font">国家名录</span>
</p>
</div>
<div @click="clickMenu('role',3,'基础资料管理')">
<div v-if="this.$store.getters.getUserData.type !== 1">
<span class="line"></span>
<p class="menu" style="margin-top: 0">
<span class="icon">
<img src="./img/JC.png">
</span>
<span class="font">市级名录</span>
</p>
</div>
<div @click="clickMenu('role',3,'基础资料管理')" v-if="this.$store.getters.getUserData.type === 1">
<span class="line"></span>
<p class="menu" style="margin-top: 0">
<span class="icon">
......@@ -31,17 +61,27 @@
</p>
</div>
<div @click="clickMenu('product',4,'市准入管理')">
<div @click="clickMenu('product',4,'市级准入管理')" v-if="this.$store.getters.getUserData.type === 1">
<span class="line"></span>
<p class="menu" style="margin-top: 0">
<span class="icon">
<img src="./img/ZR.png">
</span>
<span class="font">市准入管理</span>
<span class="font">市级准入管理</span>
</p>
</div>
<div @click="clickMenu('complaintManagement',5,'投诉管理')" v-if="this.$store.getters.getUserData.type === 1">
<span class="line"></span>
<p class="menu" style="margin-top: 0">
<span class="icon">
<img src="./img/KT.png">
</span>
<span class="font">投诉管理</span>
</p>
</div>
<div @click="clickMenu('complaint',5,'投诉管理')">
<div @click="clickMenu('complaint',5,'意见建议')" v-if="this.$store.getters.getUserData.type !== 1">
<span class="line"></span>
<p class="menu" style="margin-top: 0">
<span class="icon">
......@@ -51,6 +91,16 @@
</p>
</div>
<div>
<span class="line"></span>
<p class="menu" style="margin-top: 0">
<span class="icon">
<img src="./img/KT.png">
</span>
<span class="font">课题攻关</span>
</p>
</div>
<div @click="clickMenu('XCalliance',6,'信创联盟')">
<span class="line"></span>
<p class="menu" style="margin-top: 0">
......@@ -102,6 +152,14 @@ export default {
{
name: '基础资料管理',
menuList: [
{
name: '单位管理',
path: 'company'
},
{
name: '产品管理',
path: ''
},
{
name: '角色管理',
path: 'role'
......@@ -109,43 +167,86 @@ export default {
{
name: '人员管理',
path: 'person'
},
}
]
},
{
name: '市准入管理',
menuList: [
{
name: '单位管理',
path: 'company'
path: ''
},
{
name: '产品管理',
path: ''
},
{
name: '技术路线',
path: ''
}
]
},
{
name: '市准入管理',
name: '国家名录',
menuList: [
{
name: '技术路线',
name: '单位名录',
path: ''
},
{
name: '产品名录',
path: ''
}
]
},
{
name: '市级名录',
menuList: [
{
name: '单位管理',
path: 'admittanceCompany'
path: ''
},
{
name: '产品管理',
path: 'product'
path: ''
},
{
name: '技术路线',
path: ''
}
]
},
{
name: '投诉管理',
name: '意见建议',
menuList: [
{
name: '投诉列表',
name: '意见建议列表',
path: 'complaint'
}
]
}
},
{
name: '投诉管理',
menuList: [
{
name: '投诉管理列表',
path: 'complaintManagement'
}
]
},
{
name: '课题攻关',
menuList: []
},
{
name: '项目管理',
menuList: []
},
{
name: '我的项目',
menuList: []
},
]
}
},
......@@ -168,7 +269,11 @@ export default {
$(icon).addClass('iconClick');
for (let item of this.menu) {
if (item.name === title) {
this.$store.commit('changeSidebar', item.menuList);
let val = {
name: title,
menu: item.menuList
}
this.$store.commit('changeSidebar', val);
}
}
this.$router.push({name: name});
......
src/firstHome.vue 0 → 100644
浏览文件 @ 5c7fc06a
<template>
<div>
<app-header></app-header>
<home></home>
</div>
</template>
<script>
import appHeader from './components/header/header';
import home from './components/home/home';
export default {
data () {
return {
}
},
components: {
appHeader,
home
}
}
</script>
src/router/index.js
浏览文件 @ 5c7fc06a
......@@ -15,6 +15,11 @@ export default new Router({
name: 'login',
component: resolve => require(['../components/login/login.vue'], resolve)
},
{
path: '/firstHome',
name: 'firstHome',
component: resolve => require(['../firstHome.vue'], resolve)
},
{
path: '/home',
name: 'home',
......
src/store/state.js
浏览文件 @ 5c7fc06a
const state = {
sidebar: [],
sidebar: [], // 子菜单
userData: {} // 登录用户信息
};
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论