Browse Source

click logo router

lyn7568 6 years ago
parent
commit
e32944168b

+ 6 - 1
src/styles/index.scss

@ -102,4 +102,9 @@ a:hover {
102 102
}
103 103
.load-box{
104 104
  min-height:160px;
105
}
105
}
106
.main-info{
107
  margin:10px 20px;
108
  padding:4px 20px 20px;
109
  background: #fff;
110
}

+ 6 - 5
src/views/home/loginedHome.vue

@ -1,10 +1,10 @@
1 1
<template>
2
  <div style="margin:10px 20px;">
2
  <div class="main-info">
3 3
    <el-tabs :tab-position="tabPosition">
4 4
      <el-tab-pane label="站点列表"></el-tab-pane>
5 5
    </el-tabs>
6 6
    <el-row :gutter="10">
7
      <el-col :xs="24" :sm="24" :md="24" :lg="22" :xl="20">
7
      <el-col :span="24">
8 8
        <ul class="site" v-if="siteList.length">
9 9
          <li v-for="item in siteList" :key="item.id">
10 10
            <div class="name">{{item.name}}<span class="state">{{item.open ? '公开' : '未公开'}}</span></div>
@ -65,6 +65,8 @@
65 65
66 66
<style rel="stylesheet/scss" lang="scss">
67 67
  .site {
68
    padding: 10px;
69
    margin: 0;
68 70
    li {
69 71
      margin-bottom: 15px;
70 72
      padding: 20px 20px;
@ -91,8 +93,7 @@
91 93
      }
92 94
    }
93 95
  }
94
95
  .v-modal {
96
    z-index: 2 !important;
96
  .el-tabs__nav-wrap{
97
    z-index: 0;
97 98
  }
98 99
</style>

+ 4 - 5
src/views/home/unloginHome.vue

@ -1,8 +1,8 @@
1 1
<template>
2
  <div>
2
  <div class="main-info">
3 3
    <div class="messModule">
4 4
      <baidu-map class="map" center="中国" :zoom="4" :scroll-wheel-zoom="true" style="display: flex; flex-direction: column">
5
        <p style="padding: 0 10px;position: absolute;top:10px;">站点地图</p>
5
        <p style="padding: 0 10px;position: absolute;top:0;">站点地图</p>
6 6
        <bm-city-list anchor="BMAP_ANCHOR_TOP_LEFT"></bm-city-list>
7 7
        <bm-point-collection :points="points" shape="BMAP_POINT_SHAPE_WATERDROP" color="red" size="BMAP_POINT_SIZE_SMALL"
8 8
          @click="clickHandler">
@ -110,11 +110,11 @@
110 110
    margin-top: 20px;
111 111
112 112
    .map {
113
      padding-top: 20px;
113
      position: relative;
114
      padding-top: 46px;
114 115
      width: 35%;
115 116
      min-width: 500px;
116 117
      height: 450px;
117
      margin-left: 40px;
118 118
      box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
119 119
      float: left;
120 120
    }
@ -122,7 +122,6 @@
122 122
    .mess {
123 123
      overflow: hidden;
124 124
      padding-left: 20px;
125
      margin-right: 20px;
126 125
127 126
      .mess-header {
128 127
        display: flex;

+ 31 - 27
src/views/layout/components/TopNavbar.vue

@ -1,22 +1,24 @@
1 1
<template>
2
  <div class="topnavbar">
3
    <div class="logo-container">
4
      <div class="logo-wrapper" @click="toHome">
5
        <div class="logo-img"></div>
2
  <div>
3
    <div class="topnavbar">
4
      <div class="logo-container">
5
        <div class="logo-wrapper" @click="toHome">
6
          <div class="logo-img"></div>
7
        </div>
8
      </div>
9
      <div class="name-box">
10
        <el-dropdown @command="handleCommand" v-if="name">
11
          <span class="el-dropdown-link" style="color:#fff;">
12
            您好,{{ name }}<i class="el-icon-arrow-down el-icon--right"></i>
13
          </span>
14
          <el-dropdown-menu slot="dropdown">
15
            <el-dropdown-item command="a" v-if="rolesNormal">修改账户资料</el-dropdown-item>
16
            <el-dropdown-item command="b" v-if="rolesNormal">修改密码</el-dropdown-item>
17
            <el-dropdown-item command="c">退出</el-dropdown-item>
18
          </el-dropdown-menu>
19
        </el-dropdown>
20
        <div class="pleaseLogin" v-else @click="login">请登录</div>
6 21
      </div>
7
    </div>
8
    <div class="name-box">
9
      <el-dropdown @command="handleCommand" v-if="name">
10
        <span class="el-dropdown-link" style="color:#fff;">
11
          您好,{{ name }}<i class="el-icon-arrow-down el-icon--right"></i>
12
        </span>
13
        <el-dropdown-menu slot="dropdown">
14
          <el-dropdown-item command="a" v-if="roles.indexOf('0')>-1">修改账户资料</el-dropdown-item>
15
          <el-dropdown-item command="b" v-if="roles.indexOf('0')>-1">修改密码</el-dropdown-item>
16
          <el-dropdown-item command="c">退出</el-dropdown-item>
17
           </el-dropdown-menu>
18
      </el-dropdown>
19
      <div class="pleaseLogin" v-else @click="login">请登录</div>
20 22
    </div>
21 23
    <updateLoginPwd ref="loginPwd"></updateLoginPwd>
22 24
    <updatePersonInfo ref="modifyUser"></updatePersonInfo>
@ -30,13 +32,6 @@
30 32
  import updatePersonInfo from '@/views/home/updatePersonInfo'
31 33
32 34
  export default {
33
    data() {
34
      return {
35
        activeName: 'second',
36
        bridgeId: '',
37
        showName: ''
38
      }
39
    },
40 35
    computed: {
41 36
      ...mapGetters([
42 37
        'name',
@ -50,6 +45,9 @@
50 45
      updatePersonInfo
51 46
    },
52 47
    methods: {
48
      rolesNormal() {
49
        return this.roles.indexOf('0') > -1
50
      },
53 51
      login() {
54 52
        this.$router.push('/login')
55 53
      },
@ -67,12 +65,18 @@
67 65
        }
68 66
      },
69 67
      toHome() {
70
        this.$router.replace({ path: '/' })
68
        if (this.rolesNormal()) {
69
          if (this.name) {
70
            this.$router.replace({ path: '/loginedHome' })
71
          } else {
72
            this.$router.replace({ path: '/' })
73
          }
74
        } else {
75
          this.$router.replace({ path: '/infoManage' })
76
        }
71 77
      },
72 78
      logout() {
73 79
        MessageBox.confirm('您确认要退出登录吗?', '提示', {
74
          confirmButtonText: '确定',
75
          cancelButtonText: '取消',
76 80
          type: 'warning',
77 81
          center: true
78 82
        }).then(() => {

+ 1 - 1
src/views/timeMonitoring/component/download.vue

@ -1,5 +1,5 @@
1 1
<template>
2
  <el-dialog title="下载数据" :visible.sync="dialogTableVisible" width="460px" @close='closed'>
2
  <el-dialog title="下载数据" :visible.sync="dialogTableVisible" width="460px" @close='closed' style="z-index: 2009">
3 3
    <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="demo-ruleForm">
4 4
      <el-form-item prop="dateTime">
5 5
        <el-date-picker v-model="ruleForm2.dateTime" type="datetimerange" align="right" start-placeholder="开始日期"

+ 1 - 1
src/views/timeMonitoring/index.vue

@ -1,5 +1,5 @@
1 1
<template>
2
  <div>
2
  <div class="main-info">
3 3
    <breadcrumb></breadcrumb>
4 4
    <div class="timeModule">
5 5
      <div class="time-header">