Merge branch 'dev' into feature-electrophoresis

src/lang/zh/route.js

@@ -27,5 +27,8 @@ export default {
     LaneBasic: '车道基础数据',
     // AVI大屏
     Monitor: 'AVI大屏',
-    MonitorIndex: 'AVI大屏'
+    MonitorIndex: 'AVI大屏',
+    // Led
+    Led: 'Led大屏',
+    StationElectrophoresis: 'Led大屏'
 }

src/permission.js

@@ -9,7 +9,7 @@ import router from './router'
 import store from './store'
 
 // 免登陆白名单
-const whiteList = ['/', '/monitoring', '/monitoring/ovenIcebox', '/monitoring/dataBoard']
+const whiteList = ['/', '/led', '/led/stationElectrophoresis']
 
 NProgress.configure({
     showSpinner: false

src/router/index.js

@@ -42,6 +42,21 @@ export const constantRouterMap = [{
     path: '/401',
     component: () => import('@/views/ErrorPage/401'),
     hidden: true
+},
+{
+    path: '/led',
+    component: () => import('@/views/Layout/lsd'),
+    redirect: '/led/stationElectrophoresis',
+    meta: { title: 'Led', icon: 'template', openNewWindow: true },
+    hidden: true,
+    children: [
+        {
+            path: 'stationElectrophoresis',
+            component: () => import('@/views/Led/Station/electrophoresis'),
+            name: 'StationElectrophoresis',
+            meta: { title: 'StationElectrophoresis', icon: 'template' }
+        }
+    ]
 }]
 
 // 业务级路由（后期可能在界面中动态配置）

src/router/modules/led.js

+/**
+ * Led
+ */
+export default {
+    path: '/led',
+    component: () => import('@/views/Layout/lsd'),
+    redirect: '/led/stationElectrophoresis',
+    meta: { title: 'Led', icon: 'template', openNewWindow: true },
+    children: [
+        {
+            path: 'stationElectrophoresis',
+            component: () => import('@/views/Led/Station/electrophoresis'),
+            name: 'StationElectrophoresis',
+            meta: { title: 'StationElectrophoresis', icon: 'template' }
+        }
+    ]
+}

src/views/Led/Station/electrophoresis.vue

+<template>
+  <div class="page-pack">
+      <div class="title-pack">电泳</div>
+      <div class="table-pack">
+          <div class="tr">
+              <div class="th-l">钣金车进车数</div>
+              <div class="th-r">{{width}}</div>
+          </div>
+          <div class="tr">
+              <div class="th-l">电泳完工挂数</div>
+              <div class="th-r">{{height}}</div>
+          </div>
+          <div class="info">
+              设备报警信息：
+          </div>
+          <div class="time">时间：2019-08-29 09:00:00</div>
+      </div>
+  </div>
+</template>
+
+<script>
+    export default {
+        data () {
+            return {
+                width: 0,
+                height: 0
+            }
+        },
+        methods: {},
+        mounted () {
+            setTimeout(() => {
+                this.width = document.body.offsetWidth
+                this.height = document.body.offsetHeight
+            }, 3000)
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .page-pack {
+        width: 1710px;
+        height: 860px;
+        background-color: #111;
+
+        .title-pack {
+            width: 1710px;
+            height: 100px;
+            text-align: center;
+            color: yellow;
+            line-height: 100px;
+            font-weight: bold;
+            font-size: 60px;
+        }
+
+        .table-pack {
+            overflow: hidden;
+
+            .tr {
+                width: 1710px;
+                height: 102px;
+
+                .th-l {
+                    width: 853px;
+                    height: 100px;
+                    border-top: 2px solid yellow;
+                    border-right: 2px solid yellow;
+                    float: left;
+                    text-align: center;
+                    color: yellow;
+                    line-height: 100px;
+                    font-weight: bold;
+                    font-size: 60px;
+                }
+
+                .th-r {
+                    width: 855px;
+                    height: 100px;
+                    border-top: 2px solid yellow;
+                    float: left;
+                    text-align: center;
+                    color: yellow;
+                    line-height: 100px;
+                    font-weight: bold;
+                    font-size: 60px;
+                }
+
+            }
+
+            .info {
+                width: 1710px;
+                height: 454px;
+                border-top: 2px solid yellow;
+                color: yellow;
+                font-weight: bold;
+                font-size: 60px;
+            }
+
+            .time {
+                width: 1710px;
+                height: 100px;
+                border-top: 2px solid yellow;
+                color: yellow;
+                font-weight: bold;
+                line-height: 100px;
+                font-size: 60px;
+            }
+        }
+    }
+</style>
\ No newline at end of file