登录，密码修改

config/index.js

@@ -31,7 +31,7 @@ module.exports = {
     */
    // https://webpack.js.org/configuration/devtool/#development
    devtool: 'cheap-source-map',
    devtool: 'cheap-module-eval-source-map',
    // If you have problems debugging vue-files in devtools,
    // set this to false - it *may* help

src/api/login.js

@@ -1,26 +1,29 @@
import request from '@/utils/request'
export function login(params) {
export function login(account, pw, vc) {
  return request({
    url: '/ajax/sys/login',
    method: 'post',
    params
    data: {
      account,
      pw,
      vc
    }
  })
}
export function getInfo(params) {
export function getInfo() {
  return request({
    url: '/ajax/sys/user',
    method: 'get',
    params
    method: 'get'
  })
}
export function logout() {
  // return request({
  //   url: '/user/logout',
  //   method: 'post'
  // })
  return request({
    url: '/ajax/sys/logout',
    method: 'get'
  })
}
export function isReg(params) {
@@ -31,10 +34,35 @@ export function isReg(params) {
  })
}
export function getMsgPhone(params) {
// 找回密码
export function getResetMsgPhone(params) {
  return request({
    url: '/ajax/sys/resetPwMobile',
    method: 'get',
    params
  })
}
export function resetPwdByTel(pw, vc) {
  return request({
    url: '/ajax/sys/resetPasswordWithMobilePhone',
    method: 'post',
    data: {
      pw,
      vc
    }
  })
}
// 修改密码
export function changePw(id, oldPw, newPw) {
  return request({
    url: '/ajax/sys/changePw',
    method: 'post',
    data: {
      id,
      oldPw,
      newPw
    }
  })
}

src/api/pictureVc.js

@@ -1,5 +1,5 @@
import { comUrl } from '@/utils/index'
export function getPictureVC(flag) {
  return comUrl + '/ajax/PictureVC?' + new Date().getTime() + '&flag=' + flag
  return comUrl + '/ajax/PictureVC?t=' + new Date().getTime() + '&flag=' + flag
}

src/api/table.js

@@ -1,8 +1,40 @@
import request from '@/utils/request'
export function getList(params) {
export function getBridgeList(params) {
  return request({
    url: '/table/list',
    url: '/ajax/bridge/byUser',
    method: 'get',
    params
  })
}
export function getBridgeInfo(params) {
  return request({
    url: '/ajax/bridge/qo',
    method: 'get',
    params
  })
}
export function getBridgeServers(params) {
  return request({
    url: '/ajax/server/byBridge',
    method: 'get',
    params
  })
}
export function getBridgeDevices(params) {
  return request({
    url: '/ajax/device/byServer',
    method: 'get',
    params
  })
}
export function getBridgeSensors(params) {
  return request({
    url: '/ajax/transducer/byDevice',
    method: 'get',
    params
  })

src/permission.js

@@ -2,46 +2,55 @@ import router from './router'
import store from './store'
import NProgress from 'nprogress' // Progress 进度条
import 'nprogress/nprogress.css'// Progress 进度条样式
// import { Message } from 'element-ui'
// import { getToken } from '@/utils/auth' // 验权
import { Message } from 'element-ui'
import { getSession, getIfLoginUser } from '@/utils/auth' // 验权
NProgress.configure({ showSpinner: false })// NProgress Configuration
// const whiteList = ['/login'] // 不重定向白名单
const whiteList = ['/login', '/findPwd'] // 不重定向白名单
getIfLoginUser()
router.beforeEach((to, from, next) => {
  NProgress.start()
  // if (getToken()) {
  if (to.path === '/login') {
    // next({ path: '/' })
    NProgress.done() // if current page is dashboard will not trigger  afterEach hook, so manually handle it
  } else {
    if (store.getters.roles.length === 0) {
      store.dispatch('GetUserInfo').then(res => { // 拉取用户信息
        // next()
        const roles = '1' // note: roles must be a array! such as: ['editor','develop']
        store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
          router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
        })
      })
      // .catch((err) => {
      //   store.dispatch('FedLogOut').then(() => {
      //     // Message.error(err || 'Verification failed, please login again')
      //     next({ path: '/' })
      //   })
      // })
  setTimeout(() => {
    console.log(getSession())
    console.log(store.getters.logins)
    if (store.getters.logins) {
      if (to.path === '/login') {
        next({ path: '/' })
        NProgress.done()
        console.log(1111)
      } else {
        if (store.getters.roles.indexOf('1') >= 0) {
          console.log(2222)
          store.dispatch('GetUserInfo').then(res => { // 拉取用户信息
            const dataS = res.data
            const roles = [dataS.type.toString()]
            store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
              router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
              next({ ...to, replace: true })
            })
          }).catch(() => {
            store.dispatch('FedLogOut').then(() => {
              Message.error('登录状态超时，请重新登录')
              next({ path: '/' })
            })
          })
        } else {
          console.log(33333)
          next()
        }
      }
    } else {
      next()
      if (whiteList.indexOf(to.path) !== -1) {
        console.log(444444)
        next()
      } else {
        console.log(55555)
        next('/login')
        NProgress.done()
      }
    }
  }
  // } else {
  //   if (whiteList.indexOf(to.path) !== -1) {
  //     next()
  //   } else {
  //     // next('/login')
  //     NProgress.done()
  //   }
  // }
  }, 1000)
})
router.afterEach(() => {

src/router/index.js

@@ -8,7 +8,7 @@ Vue.use(Router)
/* Layout */
import Layout from '../views/layout/Layout'
// import LayoutC from '../views/layout/LayoutC'
import LayoutC from '../views/layout/LayoutC'
/** note: submenu only apppear when children.length>=1
*   detail see  https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
@@ -48,8 +48,25 @@ export const constantRouterMap = [
      name: 'dashboard',
      meta: { title: '主页', noCache: true }
    }]
  }
  },
  {
    path: '/bridgesConsole',
    component: LayoutC,
    redirect: '/bridgesConsole/bridgeDetail',
    name: 'bridgesConsole',
    meta: {
      noCache: true
    },
    children: [
      {
        path: 'bridgeDetail',
        name: 'bridgeDetail',
        component: () => import('@/views/bridgesConsole/bridgeDetail/index'),
        meta: { noCache: true }
      }
    ]
  }
]
// 实例化vue的时候只挂载constantRouter
@@ -72,7 +89,8 @@ export const asyncRouterMap = [
    meta: {
      title: '用户系统管理',
      icon: 'peoples',
      roles: ['1']
      roles: ['1'],
      noCache: true
    },
    alwaysShow: true,
    children: [
@@ -80,7 +98,7 @@ export const asyncRouterMap = [
        path: 'infoManage',
        name: 'infoManage',
        component: () => import('@/views/peoplesManage/infoManage/index'),
        meta: { title: '用户信息管理' }
        meta: { title: '用户信息管理', noCache: true }
      }
    ]
  },
@@ -92,48 +110,33 @@ export const asyncRouterMap = [
    meta: {
      title: '基础信息管理',
      icon: 'list',
      roles: ['1']
      roles: ['1'],
      noCache: true
    },
    children: [
      {
        path: 'bridgesInfo',
        name: 'BridgesInfo',
        component: () => import('@/views/baseInfoManage/bridgesInfo/index'),
        meta: { title: '桥梁信息管理' }
        meta: { title: '桥梁信息管理', noCache: true }
      },
      {
        path: 'serversConfig',
        name: 'ServersConfig',
        component: () => import('@/views/baseInfoManage/serversConfig/index'),
        meta: { title: '采集服务器配置' }
        meta: { title: '采集服务器配置', noCache: true }
      },
      {
        path: 'boxesConfig',
        name: 'BoxesConfig',
        component: () => import('@/views/baseInfoManage/boxesConfig/index'),
        meta: { title: '采集盒配置' }
        meta: { title: '采集盒配置', noCache: true }
      },
      {
        path: 'sensorsConfig',
        name: 'SensorsConfig',
        component: () => import('@/views/baseInfoManage/sensorsConfig/index'),
        meta: { title: '传感器配置' }
      }
    ]
  },
  {
    path: '/bridgesConsole',
    component: Layout,
    redirect: '/bridgesConsole/bridgeDetail',
    meta: {
      roles: ['0']
    },
    children: [
      {
        path: 'bridgeDetail',
        name: 'bridgeDetail',
        component: () => import('@/views/bridgesConsole/bridgeDetail/index')
        meta: { title: '传感器配置', noCache: true }
      }
    ]
  },

src/store/getters.js

@@ -1,8 +1,11 @@
const getters = {
  sidebar: state => state.app.sidebar,
  device: state => state.app.device,
  userid: state => state.user.userid,
  name: state => state.user.name,
  roles: state => state.user.roles,
  logins: state => state.user.logins,
  session: state => state.user.session,
  permission_routers: state => state.permission.routers,
  addRouters: state => state.permission.addRouters
}

src/store/modules/user.js

@@ -1,41 +1,51 @@
import { login, logout } from '@/api/login'
// import { getToken, setToken, removeToken } from '@/utils/auth'
import { login, logout, getInfo } from '@/api/login'
import { getSession, removeSession } from '@/utils/auth'
const user = {
  state: {
    userid: '',
    name: '',
    roles: []
    roles: [],
    logins: '',
    session: getSession()
  },
  mutations: {
    SET_USERID: (state, userid) => {
      state.userid = userid
    },
    SET_NAME: (state, name) => {
      state.name = name
    },
    SET_ROLES: (state, roles) => {
      state.roles = roles
    },
    SET_LOGIN: (state, logins) => {
      state.logins = logins
    },
    SET_SESSION: (state, session) => {
      state.session = session
    }
  },
  actions: {
    // 用户名登录
    LoginByUsername({ commit }, userInfo) {
      console.log(userInfo)
      const account = userInfo.username.trim()
      const pw = userInfo.password.trim()
      const vc = userInfo.imgVerifyCode.trim()
      const param = {
        account,
        pw,
        vc
      }
      const pw = userInfo.password
      const vc = userInfo.imgVerifyCode.toLocaleUpperCase()
      return new Promise((resolve, reject) => {
        login(param).then(response => {
          console.log(response)
          // if (response.success) {
          //   const data = response.data
          // }
          // setToken(response.data.type)
          resolve()
        login(account, pw, vc).then((response) => {
          if (response.success) {
            if (response.data) {
              const dataS = response.data
              if (dataS.active) {
                commit('SET_USERID', dataS.id)
                commit('SET_ROLES', [dataS.type.toString()])
                commit('SET_NAME', dataS.name)
              }
            }
          }
          resolve(response)
        }).catch(error => {
          reject(error)
        })
@@ -44,32 +54,35 @@ const user = {
    // 获取用户信息
    GetUserInfo({ commit, state }) {
      commit('SET_ROLES', '0')
      // return new Promise((resolve, reject) => {
      //   getInfo().then(response => {
      //     if (response.success) {
      //       console.log(response)
      //     }
      //     const data = response.data
      //     if (data.type) {
      //       commit('SET_ROLES', data.type)
      //     }
      //     // commit('SET_NAME', data.name)
      //     // commit('SET_AVATAR', data.avatar)
      //     resolve(response)
      //   }).catch(error => {
      //     reject(error)
      //   })
      // })
      return new Promise((resolve, reject) => {
        getInfo().then(response => {
          commit('SET_LOGIN', response.success)
          if (response.success) {
            if (response.data) {
              const dataS = response.data
              if (dataS.active) {
                commit('SET_USERID', dataS.id)
                commit('SET_ROLES', [dataS.type.toString()])
                commit('SET_NAME', dataS.name)
              }
            }
          }
          resolve(response)
        }).catch(error => {
          reject(error)
        })
      })
    },
    // 登出
    LogOut({ commit, state }) {
      return new Promise((resolve, reject) => {
        logout(state.token).then(() => {
          commit('SET_ROLES', '')
          // removeToken()
        logout().then(() => {
          commit('SET_USERID', '')
          commit('SET_ROLES', [])
          commit('SET_NAME', '')
          commit('SET_SESSION', '')
          removeSession()
          resolve()
        }).catch(error => {
          reject(error)
@@ -80,7 +93,8 @@ const user = {
    // 前端 登出
    FedLogOut({ commit }) {
      return new Promise(resolve => {
        // removeToken()
        commit('SET_SESSION', '')
        removeSession()
        resolve()
      })
    }

src/styles/loginform.scss

@@ -18,28 +18,6 @@ $light_black:#555;
    background-image: url('/static/touchwave.png');
    background-size: 320px 30px;
  }
  .form-wrapper{
    width:100%;
    height:100%;
    display:flex;
    justify-content: center;
    align-items: center;
    .form-contain {
      width:420px;
      padding:30px 20px;
      .form-title {
        font-size: 22px;
        line-height: 36px;
        color:$light_gray;
        text-align:center;
        margin-bottom:40px;
      }
      .el-button--primary{
        width:100%;
      }
    }
  }
  .step-wrapper{
    margin-bottom:30px;
    .el-step__head.is-process{
@@ -81,6 +59,9 @@ $light_black:#555;
    width: 520px;
    padding: 50px 35px 15px 35px;
    margin: 120px auto;
    .log-btn.el-button--primary {
      width:100%;
    }
  }
  .el-input {
    display: inline-block;

src/utils/auth.js

@@ -1,15 +1,15 @@
// import Cookies from 'js-cookie'
import store from '@/store'
import Cookies from 'js-cookie'
// const TokenKey = 'Admin-Token'
export function getSession() {
  return Cookies.get('JSESSIONID')
}
// export function getToken() {
//   return Cookies.get(TokenKey)
// }
export function removeSession() {
  return Cookies.remove('JSESSIONID')
}
// export function setToken(token) {
//   return Cookies.set(TokenKey, token)
// }
// export function removeToken() {
//   return Cookies.remove(TokenKey)
// }
export function getIfLoginUser() {
  store.dispatch('GetUserInfo').then(res => { // 判断是否有登录用户
  })
}

src/utils/index.js

@@ -1,5 +1,5 @@
/**
 * Created by jiachenpan on 16/11/18.
 * Created by luyanan on 18/8/13.
 */
export const comUrl = 'http://localhost:90'

src/utils/request.js

@@ -3,12 +3,15 @@ import qs from 'qs'
import { comUrl } from '@/utils/index'
// import { Message } from 'element-ui'
// import store from '@/store'
// import { getToken } from '@/utils/auth'
// import { getSession } from '@/utils/auth'
// 创建axios实例
const service = axios.create({
  baseURL: comUrl // api的base_url
  baseURL: comUrl, // api的base_url
  // timeout: 5000 // 请求超时时间
  paramsSerializer: function(params) {
    return qs.stringify(params, { arrayFormat: 'repeat' })
  }
})
// request拦截器
@@ -16,15 +19,13 @@ service.interceptors.request.use(config => {
  // 配置config
  config.headers.Accept = 'application/json'
  if (config.method === 'post') {
    // if (config.url !== http.sample.list && config.url !== http.manage.kit.save) {
    config.data = qs.stringify(config.data)
    // 处理后后台无需添加RequestBody
    config.headers['Content-Type'] = 'application/x-www-form-urlencoded charset=UTF-8'
    // }
    config.headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8'
  }
  if (localStorage.token) {
    config.headers.Authorization = localStorage.token
  }
  // if (store.getters.token) {
  //   config.headers['X-Token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
  // }
  return config
}, error => {
  // Do something with request error
@@ -46,18 +47,6 @@ service.interceptors.response.use(response => {
  //       duration: 5 * 1000
  //     })
  //     // 50008:非法的token 50012:其他客户端登录了  50014:Token 过期了
  //     if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
  //       MessageBox.confirm('你已被登出，可以取消继续留在该页面，或者重新登录', '确定登出', {
  //         confirmButtonText: '重新登录',
  //         cancelButtonText: '取消',
  //         type: 'warning'
  //       }).then(() => {
  //         store.dispatch('FedLogOut').then(() => {
  //           location.reload()// 为了重新实例化vue-router对象 避免bug
  //         })
  //       })
  //     }
  //     return Promise.reject('error')
  //   } else {
  //     return response.data
@@ -76,7 +65,7 @@ service.interceptors.response.use(response => {
      // 判断data不是Object时，解析成Object
      // data = JSON.parse(data)
    }
    return data
    return response.data
  } else {
    // 业务异常
    console.log(response)
@@ -88,7 +77,4 @@ service.interceptors.response.use(response => {
  return Promise.reject(error)
})
export default {
  service,
  comUrl
}
export default service

src/utils/validate.js

@@ -1,5 +1,5 @@
/**
 * Created by jiachenpan on 16/11/18.
 * Created by luyanan on 18/8/13.
 */
export function isvalidUsername(str) {

src/views/bridgesConsole/birdgeLists/index.vue

@@ -1,101 +0,0 @@
<template>
  <div class="dashboard-editor-container">
    <el-row class="panel-group" :gutter="40">
      <el-col :xs="24" :sm="12" :lg="6" class="card-panel-col" v-for="item in [0,1,2,3,4]" :key="item.id" @click.native="goToDashboardC">
        <div class='card-panel'>
          <div class="card-panel-icon-wrapper">
            <div class="card-image" style="background-image: url(/static/touchwave.png);"></div>
          </div>
          <div class="card-panel-description">
            <div class="card-panel-text">桥梁名称 <span>山东青岛跨海大桥A段</span></div>
            <div class="card-panel-text">未读报警 10条</div>
          </div>
        </div>
      </el-col>
    </el-row>
    <div class="pagination-container">
      <el-pagination background current-page="1" :page-sizes="[10,20,30, 50]" page-size="20" layout="total, sizes, prev, pager, next, jumper" total="60">
      </el-pagination>
    </div>
  </div>
</template>
<script>
export default {
  components: {
  },
  methods: {
    goToDashboardC() {
      this.$router.push({ path: 'dashboardC' })
    }
    // @size-change="handleSizeChange" @current-change="handleCurrentChange"
    // handleSizeChange(val) {
    //   this.listQuery.limit = val
    //   this.getList()
    // },
    // handleCurrentChange(val) {
    //   this.listQuery.page = val
    //   this.getList()
    // }
  }
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
.dashboard-editor-container{
  padding: 32px;
  .panel-group {
    margin-top: 18px;
    .card-panel-col{
      margin-bottom: 32px;
    }
    .card-panel {
      cursor: pointer;
      padding: 15px;
      font-size: 12px;
      position: relative;
      overflow: hidden;
      color: #666;
      background: #fff;
      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
      border-color: rgba(0, 0, 0, .05);
      &:hover {
        .card-panel-icon-wrapper {
          color: #fff;
        }
      }
      .card-panel-icon-wrapper {
        margin: 10px 0;
        transition: all 0.38s ease-out;
        border-radius: 6px;
      }
      .card-image{
        width: 100%;
        max-width: 280px;
        margin: auto;
        height: 160px;
        border: 1px solid #d0d0d0;
        background-position: center;
        background-size: cover;
      }
      .card-panel-icon {
        font-size: 48px;
      }
      .card-panel-description {
        font-weight: bold;
        margin-top:12px;
        .card-panel-text {
          line-height: 24px;
          color: rgba(0, 0, 0, 0.45);
          font-size: 16px;
        }
        .card-panel-num {
          font-size: 20px;
        }
      }
    }
  }
}
</style>

src/views/bridgesConsole/bridgeDetail/components/BInfoDialog01.vue

@@ -5,59 +5,47 @@
        <el-col :xs="24" :sm="18" :lg="16">
          <el-row>
            <el-col :span="12">
              <el-form-item label="桥梁编号">000000001</el-form-item>
              <el-form-item label="桥梁编号">{{dataInfo.code}}</el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="桥梁简称">青岛跨海大桥A段</el-form-item>
              <el-form-item label="桥梁简称">{{dataInfo.shortName}}</el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item label="桥梁全称">山东省青岛市胶州跨海大桥A段</el-form-item>
              <el-form-item label="桥梁全称">{{dataInfo.name}}</el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item label="桥梁位置信息">山东省青岛市胶州</el-form-item>
              <el-form-item label="桥梁位置信息">{{dataInfo.addrCode}}</el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="地理位置信息">青岛跨海大桥南侧</el-form-item>
              <el-form-item label="地理位置信息">{{dataInfo.location}}</el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="桥梁开通日期">2018/07/21</el-form-item>
              <el-form-item label="桥梁开通日期">{{dataInfo.serviceDay}}</el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item label="维护单位">青岛拉升阶段拉升阶段是觉得了科技有限公司</el-form-item>
              <el-form-item label="维护单位">{{dataInfo.org}}</el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="维护单位电话">40988923-328</el-form-item>
              <el-form-item label="维护单位电话">{{dataInfo.phone}}</el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="维护单位电邮">23142121@163.com</el-form-item>
              <el-form-item label="维护单位电邮">{{dataInfo.email}}</el-form-item>
            </el-col>
          </el-row>
        </el-col>
        <el-col :xs="24" :sm="6" :lg="8">
          <div style="width:100%">
            <img src="/static/touchwave.png" alt="桥梁图片" width="90%">
            <img :src="dataInfo.img" alt="桥梁图片" width="90%">
          </div>
        </el-col>
      </el-row>
      <el-table :data="tableData" border style="width: 100%;margin:15px 0">
        <el-table-column v-for="item in tableRow" :key="item.id"
          :prop="item.prop"
          :label="item.label">
        </el-table-column>
      </el-table>
      <el-row>
        <el-col :span="24">
        <el-col :span="24" v-if="dataInfo.descp">
          <el-form-item label="大桥描述" class="el-to-block"><br />
            <div class="textarea-div">
            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus pronin sapien nunc accuan eget.
            </div>
            <div class="textarea-div">{{dataInfo.descp}}</div>
          </el-form-item>
        </el-col>
        <el-col :span="24">
        <el-col :span="24" v-if="dataInfo.remark">
          <el-form-item label="备注" class="el-to-block"><br />
            <div class="textarea-div">
            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus pronin sapien nunc accuan eget.
            </div>
            <div class="textarea-div">{{dataInfo.remark}}</div>
          </el-form-item>
        </el-col>
        <el-col :span="24" class="el-btn-col">
@@ -71,50 +59,34 @@
</template>
<script>
import { getBridgeInfo } from '@/api/table'
export default {
  props: {
    bridgeId: {
      type: String
    }
  },
  data() {
    return {
      dialogTableVisible: false,
      tableRow: [{
        prop: 'date',
        label: '维护负责人'
      }, {
        prop: 'name',
        label: '职位'
      }, {
        prop: 'address',
        label: '所在机构'
      }, {
        prop: 'address2',
        label: '联系电话'
      }, {
        prop: 'address3',
        label: '联系邮箱'
      }],
      tableData: [{
        date: '王明',
        name: '工程师',
        address: '上海市普陀区金沙江路 1518 弄',
        address2: '15795223636',
        address3: '26586466@qq.com'
      }, {
        date: '王明',
        name: '工程师',
        address: '上海市普陀区金沙江路 1518 弄',
        address2: '15795223636',
        address3: '26586466@qq.com'
      }, {
        date: '王明',
        name: '工程师',
        address: '上海市普陀区金沙江路 1518 弄',
        address2: '15795223636',
        address3: '26586466@qq.com'
      }]
      dataInfo: ''
    }
  },
  created() {
    this.bridgeInfo()
  },
  methods: {
    bridgeInfo() {
      const param = {
        id: this.bridgeId
      }
      getBridgeInfo(param).then(res => {
        if (res.success) {
          this.dataInfo = res.data
        }
      })
    }
  }
}
</script>

src/views/bridgesConsole/bridgeDetail/components/BInfoDialog02.vue

@@ -6,19 +6,17 @@
          <div class="list-item">
            <el-row>
              <el-col :span="12">
                <el-form-item label="服务器编号">000000001</el-form-item>
                <el-form-item label="服务器编号">{{item.code}}</el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="采集器数量">2</el-form-item>
                <el-form-item label="采集器数量">{{item.devices}}</el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="所属桥梁">青岛跨海大桥</el-form-item>
                <el-form-item label="所属桥梁">{{item.bridgeId}}</el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="备注" class="el-to-block"><br />
                  <div class="textarea-div">
                  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus pronin sapien nunc accuan eget.
                  </div>
                  <div class="textarea-div">{{item.remark}}</div>
                </el-form-item>
              </el-col>
            </el-row>

src/views/bridgesConsole/bridgeDetail/components/updateLoginPwd.vue

@@ -1,6 +1,9 @@
<template>
  <el-dialog title="修改登录密码" ref="ruleForm" :visible.sync="dialogTableVisible" width="460px">
    <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="demo-ruleForm">
      <el-form-item prop="oldpass">
        <el-input type="password" v-model="ruleForm2.oldpass" placeholder="请输入您的旧密码" auto-complete="off"></el-input>
      </el-form-item>
      <el-form-item prop="pass">
        <el-input type="password" v-model="ruleForm2.pass" placeholder="请设置您的新密码" auto-complete="off"></el-input>
      </el-form-item>
@@ -18,6 +21,8 @@
</template>
<script>
import { changePw } from '@/api/login'
import { Alert } from 'element-ui'
export default {
  data() {
@@ -45,10 +50,14 @@ export default {
    return {
      dialogTableVisible: false,
      ruleForm2: {
        oldpass: '',
        pass: '',
        checkPass: ''
      },
      rules2: {
        oldpass: [
          { required: true, message: '请输入您的旧密码', trigger: 'blur' }
        ],
        pass: [
          { validator: validatePass, trigger: 'blur' }
        ],
@@ -62,41 +71,24 @@ export default {
    resetPwd(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          // this.$axios.post(httpUrl.hQuery.sign.resetpw, {
          //   code: this.resetCode,
          //   pw: this.ruleForm2.pass
          // }).then(res => {
          //   console.log(res);
          //   if (res.success) {
          //     this.$alert('您可以使用新密码登录您的账户了', '恭喜您，您的密码重置成功！', {
          //       confirmButtonText: '重新登录',
          //       type: 'success',
          //       center: true,
          //       callback: action => {
          //         if (action === 'confirm') {
          //           this.$router.push({path: '/loginPlat'});
          //         };
          //       }
          //     });
          //   } else {
          //     if (res.code === -600001) {
          //       this.$alert('小提示：邮件内的链接有效时长为10分钟', '很抱歉，当前的链接已失效。', {
          //         confirmButtonText: '重新找回密码',
          //         type: 'warning',
          //         center: true,
          //         callback: action => {
          //           if (action === 'confirm') {
          //             this.stepFisrt = true;
          //             this.stepSecond = false;
          //             this.stepThird = false;
          //             this.stepVal = 0;
          //           };
          //         }
          //       });
          //       return;
          //     };
          //   };
          // });
          const params = {
            oldPw: this.ruleForm2.oldpass,
            newpw: this.ruleForm2.checkPass
          }
          changePw(params).then((res) => {
            if (res.success) {
              Alert('提示', '密码修改成功！', {
                confirmButtonText: '确定',
                type: 'success',
                center: true
                // callback: action => {
                //   if (action === 'confirm') {
                //     this.$router.push({path: '/loginPlat'})
                //   }
                // }
              })
            }
          })
        } else {
          return false
        }

src/views/bridgesConsole/bridgeDetail/index.vue

@@ -24,7 +24,7 @@
            <span>实时监测</span>
          </div>
          <el-row>
            <line-chart :chart-data="lineChartData"></line-chart>
            <!-- <line-chart :chart-data="lineChartData"></line-chart> -->
          </el-row>
        </el-card>
      </el-col>

src/views/dashboard/admin/index.vue

@@ -1,70 +1,17 @@
<template>
  <div class="dashboard-editor-container">
  超级管理员，欢迎您
   <!--  <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
      <line-chart :chart-data="lineChartData"></line-chart>
    </el-row> -->
   <!--  <el-row :gutter="32">
      <el-col :xs="24" :sm="24" :lg="8">
        <div class="chart-wrapper">
          <raddar-chart></raddar-chart>
        </div>
      </el-col>
      <el-col :xs="24" :sm="24" :lg="8">
        <div class="chart-wrapper">
          <pie-chart></pie-chart>
        </div>
      </el-col>
      <el-col :xs="24" :sm="24" :lg="8">
        <div class="chart-wrapper">
          <bar-chart></bar-chart>
        </div>
      </el-col>
    </el-row> -->
    超级管理员，欢迎您
  </div>
</template>
<script>
import LineChart from './components/LineChart'
const lineChartData = {
  newVisitis: {
    expectedData: [100, 120, 161, 134, 105, 160, 165],
    actualData: [120, 82, 91, 154, 162, 140, 145]
  },
  messages: {
    expectedData: [200, 192, 120, 144, 160, 130, 140],
    actualData: [180, 160, 151, 106, 145, 150, 130]
  },
  purchases: {
    expectedData: [80, 100, 121, 104, 105, 90, 100],
    actualData: [120, 90, 100, 138, 142, 130, 130]
  },
  shoppings: {
    expectedData: [130, 140, 141, 142, 145, 150, 160],
    actualData: [120, 82, 91, 154, 162, 140, 130]
  }
}
export default {
  name: 'dashboard-admin',
  components: {
    LineChart
  },
  created() {
    this.toPath()
  },
  data() {
    return {
      lineChartData: lineChartData.newVisitis
    }
  },
  methods: {
    handleSetLineChartData(type) {
      this.lineChartData = lineChartData[type]
    },
    toPath() {
      this.$router.push({ path: '/peoplesManage/infoManage' })
    }

src/views/dashboard/index.vue

@@ -23,7 +23,7 @@ export default {
    ])
  },
  created() {
    if (this.roles.includes('0')) {
    if (this.roles.indexOf('1') === -1) {
      this.currentRole = 'otherDashboard'
    }
  }

src/views/dashboard/other/index.vue

@@ -1,13 +1,13 @@
<template>
  <div class="dashboard-editor-container">
    <el-row class="panel-group" :gutter="40">
      <el-col :xs="24" :sm="12" :lg="6" class="card-panel-col" v-for="item in [0,1,2,3,4]" :key="item.id" @click.native="goToDashboardC">
      <el-col :xs="24" :sm="12" :lg="6" class="card-panel-col" v-for="item in dataList" :key="item.index" @click.native="goToDashboardC(item.id)">
        <div class='card-panel'>
          <div class="card-panel-icon-wrapper">
            <div class="card-image" style="background-image: url(/static/touchwave.png);"></div>
            <div class="card-image" :style="{ backgroundImage: 'url(/data/bridge'+ item.img +')'}"></div>
          </div>
          <div class="card-panel-description">
            <div class="card-panel-text">桥梁名称 <span>山东青岛跨海大桥A段</span></div>
            <div class="card-panel-text">桥梁名称 <span>{{item.shortName}}</span></div>
            <div class="card-panel-text">未读报警 10条</div>
          </div>
        </div>
@@ -16,37 +16,62 @@
    <div class="pagination-container">
      <el-pagination
        background
        @size-change="handleSizeChange"
        @current-change="handleCurrentChange"
        :current-page.sync="currentPage"
        :page-size="4"
        :page-size="9"
        layout="prev, pager, next, jumper"
        :total="10">
        :total="total">
      </el-pagination>
    </div>
  </div>
</template>
<script>
import { getBridgeList } from '@/api/table'
export default {
  data() {
    return {
      currentPage: 1
      listParameters: {},
      total: 0,
      dataList: [],
      ifDefault: false
    }
  },
  created() {
    this.listParameters = {
      active: 1,
      pageSize: 10,
      pageNo: 1
    }
    this.getBridgeLists()
  },
  components: {
  },
  methods: {
    goToDashboardC() {
      this.$router.push({ path: '/bridgesConsole' })
    getBridgeLists() {
      const param = this.listParameters
      getBridgeList(param).then(res => {
        if (res.success) {
          if (res.data.data.length === 0) {
            this.ifDefault = true
          } else {
            this.ifDefault = false
          }
          this.dataList = res.data.data
          // this.disposeData(res.data.data);
          this.total = res.data.total
        }
      })
    },
    handleSizeChange(val) {
      console.log(`每页 ${val} 条`)
    goToDashboardC(id) {
      this.$router.push({
        path: '/bridgesConsole/bridgeDetail',
        query: { bridgeId: id }
      })
    },
    handleCurrentChange(val) {
      console.log(`当前页: ${val}`)
      this.expertParameters.pageNo = val
      this.getBridgeLists()
    }
  }
}

src/views/findPwd/index.vue

@@ -2,8 +2,8 @@
  <div class="login-container">
    <div class="logo-wrapper"></div>
    <div class="form-wrapper">
      <div class="form-contain">
        <p class="form-title">找回密码</p>
      <div class="form-contain login-form">
        <h3 class="title">找回密码</h3>
        <div class="step-wrapper">
          <el-steps :active="stepVal" finish-status="success" align-center>
            <el-step title="输入手机号"></el-step>
@@ -25,13 +25,13 @@
             </el-input>
            </el-form-item>
            <el-form-item>
              <el-button type="primary" :disabled="isDisabl" @click="nextStep('ruleForm')">下一步</el-button>
              <el-button class="log-btn" type="primary" :disabled="isDisabl" @click="nextStep('ruleForm')">下一步</el-button>
            </el-form-item>
            <el-form-item class="el-form-find">
              <el-button type="text" @click="goLogin">又想起来了</el-button>
            </el-form-item>
          </el-form>
          <el-form v-show="stepThird" :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="demo-ruleForm">
          <el-form v-show="stepSecond" :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="demo-ruleForm">
            <el-form-item prop="pass">
              <el-input type="password" v-model="ruleForm2.pass" placeholder="请设置您的新密码" auto-complete="off"></el-input>
            </el-form-item>
@@ -39,7 +39,7 @@
              <el-input type="password" v-model="ruleForm2.checkPass" placeholder="请再次输入密码确认" auto-complete="off"></el-input>
            </el-form-item>
            <el-form-item>
              <el-button type="primary" :disabled="isDisabl" @click="resetPwd('ruleForm2')">重置密码</el-button>
              <el-button type="primary" :disabled="isDisabl" @click.native.prevent="resetPwd('ruleForm2')">重置密码</el-button>
            </el-form-item>
          </el-form>
        </div>
@@ -49,7 +49,7 @@
</template>
<script>
  import { isReg, getMsgPhone } from '@/api/login'
  import { isReg, getResetMsgPhone, resetPwdByTel } from '@/api/login'
  import '@/styles/loginform.scss'
  export default {
@@ -94,7 +94,7 @@
        resetCode: '',
        stepVal: 0,
        stepFisrt: true,
        stepThird: false,
        stepSecond: false,
        isDisabl: false,
        ruleForm: {
          phoneNum: '',
@@ -122,66 +122,65 @@
        }
      }
    },
    created() {
      // this.platId = Cookies.get('platId')
      // this.resetStepNum = util.urlParse('step')
      // this.resetCode = util.urlParse('sc')
      if (this.resetStepNum === '2') {
        this.stepFisrt = false
        this.stepThird = true
        this.stepVal = 2
      }
    },
    methods: {
      nextStep(formName) {
        this.$refs[formName].validate((valid) => {
          if (valid) {
            // this.$axios.post(httpUrl.hQuery.sign.reqResetPw, {
            //   id: this.platId,
            //   mail: this.ruleForm.mail,
            //   url: httpUrl.platUrl + '/#/findPwd?step=2&sc'
            // }).then(res => {
            //   console.log(res)
            //   if (res.success) {
            //     this.stepFisrt = false
            //     this.stepVal = 1
            //   } else {
            //     let errorCode = [{
            //       code: -600001,
            //       msg: '用户不存在'
            //     }, {
            //       code: -600002,
            //       msg: '发送邮箱错误'
            //     }]
            //     for (let i = 0 i < errorCode.length i++) {
            //       if (res.code === errorCode[i].code) {
            //         this.$message.error(errorCode[i].msg)
            //         return
            //       }
            //     }
            //   }
            // })
            this.stepFisrt = false
            this.stepSecond = true
            this.stepVal = 1
          } else {
            return false
          }
        })
      },
      userRegisterOk() {
        isReg(this.ruleForm.phoneNum).then(res => {
        const me = this
        const account = this.ruleForm.phoneNum
        isReg({ account }).then(res => {
          if (res.success) {
            if (res.data === true) {
              this.$message({
              me.sendMsgDisabled = false
              me.phoneCodeBol = false
              me.$message({
                message: '该账号不存在，请检查后重试',
                type: 'warning'
              })
            } else {
              me.getResetMsgPhone()
              me.sendMsgDisabled = true
              me.phoneCodeBol = true
              const interval = window.setInterval(function() {
                if ((me.seconds--) <= 0) {
                  me.seconds = 60
                  me.sendMsgDisabled = false
                  me.phoneCodeBol = false
                  window.clearInterval(interval)
                }
              }, 1000)
            }
          }
        })
      },
      getPhoneLogin() {
        getMsgPhone(this.ruleForm.phoneNum, true).then((res) => {
          if (res.success) {
            this.phoneResBackLogin = res.data
      getResetMsgMsgPhone() {
        const me = this
        const account = this.ruleForm.phoneNum
        const checkExists = true
        getResetMsgPhone({ account, checkExists }).then((res) => {
          if (!res.success) {
            if (res.code === -60000) {
              me.sendMsgDisabled = false
              me.phoneCodeBol = false
              me.$message({
                message: '该账号不存在，请检查后重试',
                type: 'warning'
              })
            } else {
              me.$message({
                message: res.detailMsg,
                type: 'warning'
              })
            }
          }
        })
      },
@@ -215,40 +214,34 @@
      resetPwd(formName) {
        this.$refs[formName].validate((valid) => {
          if (valid) {
            // this.$axios.post(httpUrl.hQuery.sign.resetpw, {
            //   code: this.resetCode,
            //   pw: this.ruleForm2.pass
            // }).then(res => {
            //   console.log(res)
            //   if (res.success) {
            //     this.$alert('您可以使用新密码登录您的账户了', '恭喜您，您的密码重置成功！', {
            //       confirmButtonText: '重新登录',
            //       type: 'success',
            //       center: true,
            //       callback: action => {
            //         if (action === 'confirm') {
            //           this.$router.push({path: '/loginPlat'})
            //         }
            //       }
            //     })
            //   } else {
            //     if (res.code === -600001) {
            //       this.$alert('小提示：邮件内的链接有效时长为10分钟', '很抱歉，当前的链接已失效。', {
            //         confirmButtonText: '重新找回密码',
            //         type: 'warning',
            //         center: true,
            //         callback: action => {
            //           if (action === 'confirm') {
            //             this.stepFisrt = true
            //             this.stepThird = false
            //             this.stepVal = 0
            //           }
            //         }
            //       })
            //       return
            //     }
            //   }
            // })
            resetPwdByTel(this.ruleForm.msgVC, this.ruleForm2.pass).then((res) => {
              if (res.success) {
                this.$alert('提示', '密码已重置，快去登录吧！', {
                  confirmButtonText: '确定',
                  type: 'success',
                  center: true,
                  callback: action => {
                    if (action === 'confirm') {
                      this.$router.push({ path: '/login' })
                    }
                  }
                })
              } else {
                this.$alert('提示', '密码重置失败！', {
                  confirmButtonText: '重新找回密码',
                  type: 'warning',
                  center: true,
                  callback: action => {
                    if (action === 'confirm') {
                      this.stepFisrt = true
                      this.stepSecond = false
                      this.stepVal = 0
                    }
                  }
                })
                return
              }
            })
          } else {
            return false
          }

src/views/layout/components/AppMain.vue

@@ -1,8 +1,8 @@
<template>
  <section class="app-main">
    <transition name="fade" mode="out-in">
      <!-- <router-view :key="key"></router-view> -->
      <router-view></router-view>
      <router-view :key="key"></router-view>
      <!-- <router-view></router-view> -->
    </transition>
  </section>
</template>
@@ -11,9 +11,9 @@
export default {
  name: 'AppMain',
  computed: {
    // key() {
    //   return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
    // }
    key() {
      return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
    }
  }
}
</script>

src/views/layout/components/TopNavbar.vue

@@ -5,7 +5,7 @@
    </div>
    <el-dropdown class="avatar-container" trigger="click">
      <div class="avatar-wrapper">
      	<div>您好，{ name }</div>
      	<div>您好，{{ name }}</div>
        <i class="el-icon-caret-bottom"></i>
      </div>
      <el-dropdown-menu class="user-dropdown" slot="dropdown">

src/views/login/index.vue

@@ -13,7 +13,7 @@
        <span class="svg-container">
          <svg-icon icon-class="password"></svg-icon>
        </span>
        <el-input name="password" :type="pwdType" @keyup.enter.native="handleLogin" v-model="loginForm.password" autoComplete="on"
        <el-input name="password" :type="pwdType" v-model="loginForm.password" autoComplete="on"
          placeholder="请输入登录密码"></el-input>
          <span class="show-pwd" @click="showPwd"><svg-icon icon-class="eye" /></span>
      </el-form-item>
@@ -25,7 +25,7 @@
        <img slot="append" :src="imgVcUrl" @click="changeImgVc" /></el-input>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">登录</el-button>
        <el-button class="log-btn" type="primary" :loading="loading" @click.native.prevent="handleLogin" @keyup.enter.native="handleLogin">登录</el-button>
      </el-form-item>
      <el-form-item class="el-form-find">
        <el-button type="text" @click.native.prevent="goBackPwd">忘记密码？</el-button>
@@ -35,7 +35,7 @@
</template>
<script>
// import { isvalidUsername } from '@/utils/validate'
import { Message } from 'element-ui'
import { getPictureVC } from '@/api/pictureVc'
import '@/styles/loginform.scss'
@@ -83,14 +83,44 @@ export default {
      }
    },
    handleLogin() {
      alert(111)
      this.$refs.loginForm.validate(valid => {
        if (valid) {
          this.loading = true
          this.$store.dispatch('LoginByUsername', this.loginForm).then(() => {
            alert(333)
          this.$store.dispatch('LoginByUsername', this.loginForm).then((response) => {
            this.loading = false
            this.$router.push({ path: '/' })
            if (response.success) {
              if (response.data) {
                const dataS = response.data
                if (dataS.active) {
                  this.$store.dispatch('GetUserInfo').then(res => {
                  })
                  this.$router.push({ path: '/' })
                } else {
                  Message.error('您的账号已经被禁用')
                  return
                }
              } else {
                Message.error('登录账号与密码不匹配')
                return
              }
            } else {
              const errorCode = [{
                code: -60001,
                msg: '图形验证码不存在'
              }, {
                code: -60002,
                msg: '图形验证码超时'
              }, {
                code: -60003,
                msg: '图形验证码不正确'
              }]
              for (let i = 0; i < errorCode.length; i++) {
                if (response.code === errorCode[i].code) {
                  Message.error(errorCode[i].msg)
                  return
                }
              }
            }
          }).catch(() => {
            this.loading = false
          })