From 8a36b0206a25b16ac227629457c9e0279d832230 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 26 Jul 2019 11:24:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.js              |  5 +----
 src/router/index.js           | 32 +++++++++++++++++++++++++++++++-
 src/views/dashboard/index.vue |  5 +++--
 src/views/login/index.vue     |  2 +-
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/api/login.js b/src/api/login.js
index 973cb1c4..9faf8494 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -16,11 +16,8 @@ export function getInfo(token) {
     url: '',
     method: 'post',
     data: {
-      // type: '1',
-      // name: '菜单系统模块_项目角色模块列表_查询数据gj',
-      // param: `角色编号=${token}`
       type: '3',
-      name: `select * from 基础表_角色模块信息 inner join 基础表_模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id where 角色编号=${token}`
+      name: `select * from 基础表_角色模块信息 inner join 基础表_模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id where 角色编号=${token} order by 模块顺序`
     }
   })
 }
diff --git a/src/router/index.js b/src/router/index.js
index 5b19d1cd..e5a0832e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,7 +24,37 @@ import Layout from '../views/layout/Layout'
 export const constantRouterMap = [
   { path: '/login', component: () => import('@/views/login/index'), hidden: true },
   { path: '/404', component: () => import('@/views/404'), hidden: true },
-
+  {
+    path: '可视化中心',
+    component: Layout,
+    meta: { title: '可视化中心', icon: 'MaterialManagement' },
+    children: [
+      {
+        path: 'http://192.168.1.231:8005/#/TVF',
+        meta: { title: '设备运行监控', icon: 'MaterialManagement' }
+      },
+      {
+        path: 'http://192.168.1.231:8005/#/TVA',
+        meta: { title: 'MES工作站', icon: 'MaterialManagement' }
+      },
+      {
+        path: 'http://192.168.1.231:8005/#/TVD',
+        meta: { title: '设备状态监控', icon: 'MaterialManagement' }
+      },
+      {
+        path: 'http://192.168.1.231:8005/#/TVG',
+        meta: { title: '项目进度监控', icon: 'MaterialManagement' }
+      },
+      {
+        path: 'http://192.168.1.231:8005/#/TVB',
+        meta: { title: 'ANDON', icon: 'MaterialManagement' }
+      },
+      {
+        path: 'http://192.168.1.232:8001/webpage/GJLED.html',
+        meta: { title: 'LED屏幕', icon: 'MaterialManagement' }
+      }
+    ]
+  },
   {
     path: '/',
     component: Layout,
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index fa365f31..0448583e 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -4,10 +4,10 @@
       <div class="sudoku_row" >
         <div class="dashboard-text" style="color:white">用户名：{{ name }}</div>
         <el-divider content-position="right">消息通知</el-divider>
-        <el-card v-for="(sudoku,index) in sudokus" :class="curSelect==sudoku.id?'opacity':''" :key="index" shadow="hover" class="sudoku_item ">
+        <el-card v-for="(sudoku,index) in sudokus" :class="curSelect === sudoku.id?'opacity':''" :key="index+9999" shadow="hover" class="sudoku_item ">
           <div>
             <el-badge :value="sudoku.value">
-              <svg-icon :icon-class="sudoku.icon" style="border: 1px solid black;background-color: #555c66" />
+              <svg-icon :icon-class="sudoku.icon" style="" />
               <router-link :to="sudoku.router">{{ sudoku.name }}</router-link>
             </el-badge>
           </div>
@@ -117,6 +117,7 @@ export default {
         for (let i = 0; i < data.data.length; i++) {
           this.getMessageNum(data.data[i].消息通知来源, data.data[i].通知条件, data, i)
         }
+        console.log(this.sudokus)
       })
     },
     async getMessageNum(tableName, condition, rawData, i) {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index d774b930..eb19fd82 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -33,7 +33,7 @@
             <span class="show-pwd" @click="showPwd"><svg-icon icon-class="eye" /></span>
           </el-form-item>
           <div>
-            <el-checkbox v-model="loginForm.checked" class="remeberPassword">记住账号密码</el-checkbox>
+            <el-checkbox v-model="loginForm.checked" class="remeberPassword">记住密码</el-checkbox>
             <el-button type="text" style="margin-left: 224px" @click="handleEdit('form')">修改密码</el-button>
           </div>
           <el-button :loading="loading" class="signIn" type="primary" style="width:100%;" @click.native.prevent="handleLogin">