feat(工位级大屏)：功能联调。 项目白名单添加。路由添加权限。

debug.log

 [0408/142129.522:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
 [0425/144329.683:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
 [0514/182116.443:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
+[1024/194707.205:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)

src/lang/zh/route.js

@@ -42,6 +42,7 @@ export default {
     StationFloatingCoatRobot: '中涂机器人',
     StationSurfaceVarnish: '面/清漆',
     StationSprayDryingRoom: '喷漆/烘干室',
+    StationPaintingWorkShop: '涂装车间',
     // 监控大屏
     CenterControl: '监控大屏',
     CenterControlIndex: '监控大屏'

src/permission.js

@@ -18,7 +18,8 @@ const whiteList = [
     '/led/stationApplyArtificial',
     '/led/stationFloatingCoatRobot',
     '/led/stationSurfaceVarnish',
-    '/led/stationSprayDryingRoom'
+    '/led/stationSprayDryingRoom',
+    '/led/stationPaintingWorkShop'
 ]
 
 NProgress.configure({

src/router/index.js

@@ -95,6 +95,12 @@ export const constantRouterMap = [{
             component: () => import('@/views/Led/Station/sprayDryingRoom'),
             name: 'StationSprayDryingRoom',
             meta: { title: 'StationSprayDryingRoom', icon: 'template' }
+        },
+        {
+            path: 'stationPaintingWorkShop', //涂装车间
+            component: () => import('@/views/Led/Station/paintingWorkShop'),
+            name: 'StationPaintingWorkShop',
+            meta: { title: 'StationPaintingWorkShop', icon: 'template' }
         }
     ]
 }]

src/router/modules/basic.js

@@ -18,13 +18,13 @@ export default {
             path: 'deviceBasic',
             component: () => import('@/views/Basic/DeviceBasic/list'),
             name: 'DeviceBasic',
-            meta: {title: 'DeviceBasic', icon: 'document', noCache: false}
+            meta: {title: 'DeviceBasic', icon: 'document', noCache: false, mark: '/Basic/DeviceBasic/list'}
         },
         {
             path: 'laneBasic',
             component: () => import('@/views/Basic/LaneBasic/list'),
             name: 'LaneBasic',
-            meta: {title: 'LaneBasic', icon: 'document', noCache: false}
+            meta: {title: 'LaneBasic', icon: 'document', noCache: false,  mark: '/Basic/LaneBasic/list'}
         }
     ]
 }

src/router/modules/centerControll.js

@@ -10,7 +10,7 @@ export default {
             path: 'index',
             component: () => import('@/views/CenterControl/index'),
             name: 'CenterControlIndex',
-            meta: { title: 'CenterControlIndex', icon: 'template' }
+            meta: { title: 'CenterControlIndex', icon: 'template', mark: '/CenterControl/index' }
         }
     ]
 }

src/router/modules/deviceRunning.js

@@ -12,13 +12,13 @@ export default {
             path: 'deviceRunningTime',
             component: () => import('@/views/DeviceRunning/DeviceRunningTime/list'),
             name: 'DeviceRunningTime',
-            meta: { title: 'DeviceRunningTime', icon: 'repairApplication', noCache: false }
+            meta: { title: 'DeviceRunningTime', icon: 'repairApplication', noCache: false, mark: '/DeviceRunning/DeviceRunningTime/list' }
         },
         {
             path: 'deviceFaultRecord',
             component: () => import('@/views/DeviceRunning/DeviceFaultRecord/list'),
             name: 'DeviceFaultRecord',
-            meta: { title: 'DeviceFaultRecord', icon: 'repairApplication', noCache: false }
+            meta: { title: 'DeviceFaultRecord', icon: 'repairApplication', noCache: false, mark: '/DeviceRunning/DeviceFaultRecord/list' }
         }
     ]
 }

src/router/modules/laboratory.js

@@ -9,19 +9,19 @@ export default {
             path: 'pickling',
             component: () => import('@/views/Laboratory/Pickling/list'),
             name: 'Pickling',
-            meta: { title: 'Pickling', icon: 'template', noCache: false }
+            meta: { title: 'Pickling', icon: 'template', noCache: false, mark: '/Laboratory/Pickling/list' }
         },
         {
             path: 'electrophoresisTank',
             component: () => import('@/views/Laboratory/ElectrophoresisTank/list'),
             name: 'ElectrophoresisTank',
-            meta: { title: 'ElectrophoresisTank', icon: 'template', noCache: false }
+            meta: { title: 'ElectrophoresisTank', icon: 'template', noCache: false,  mark: '/Laboratory/ElectrophoresisTank/list' }
         },
         {
             path: 'pretreatment',
             component: () => import('@/views/Laboratory/Pretreatment/list'),
             name: 'Pretreatment',
-            meta: { title: 'Pretreatment', icon: 'template', noCache: false }
+            meta: { title: 'Pretreatment', icon: 'template', noCache: false, mark: '/Laboratory/Pretreatment/list' }
         }
     ]
 }

src/router/modules/monitor.js

@@ -11,7 +11,7 @@ export default {
             path: 'monitorIndex',
             component: () => import('@/views/Monitor/index'),
             name: 'MonitorIndex',
-            meta: { title: 'MonitorIndex', icon: 'kanban' }
+            meta: { title: 'MonitorIndex', icon: 'kanban', mark: '/Monitor/index' }
         },
         {
             path: 'monitorPutty',

src/router/modules/workshop.js

@@ -12,37 +12,37 @@ export default {
             path: 'parts',
             component: () => import('@/views/Workshop/Parts/list'),
             name: 'Parts',
-            meta: { title: 'Parts', icon: 'wareHouse', noCache: false }
+            meta: { title: 'Parts', icon: 'wareHouse', noCache: false, mark: '/Workshop/Parts/list' }
         },
         {
             path: 'welding',
             component: () => import('@/views/Workshop/Welding/list'),
             name: 'Welding',
-            meta: { title: 'Welding', icon: 'wareHouse', noCache: false }
+            meta: { title: 'Welding', icon: 'wareHouse', noCache: false, mark: '/Workshop/Welding/list' }
         },
         {
             path: 'painting',
             component: () => import('@/views/Workshop/Painting/list'),
             name: 'Painting',
-            meta: { title: 'Painting', icon: 'wareHouse', noCache: false }
+            meta: { title: 'Painting', icon: 'wareHouse', noCache: false, mark: '/Workshop/Painting/list' }
         },
         {
             path: 'chassis',
             component: () => import('@/views/Workshop/Chassis/list'),
             name: 'Chassis',
-            meta: { title: 'Chassis', icon: 'wareHouse', noCache: false }
+            meta: { title: 'Chassis', icon: 'wareHouse', noCache: false, mark: '/Workshop/Chassis/list' }
         },
         {
             path: 'final',
             component: () => import('@/views/Workshop/Final/list'),
             name: 'Final',
-            meta: { title: 'Final', icon: 'wareHouse', noCache: false }
+            meta: { title: 'Final', icon: 'wareHouse', noCache: false, mark: '/Workshop/Final/list' }
         },
         {
             path: 'trial',
             component: () => import('@/views/Workshop/Trial/list'),
             name: 'Trial',
-            meta: { title: 'Trial', icon: 'wareHouse', noCache: false }
+            meta: { title: 'Trial', icon: 'wareHouse', noCache: false,  mark: '/Workshop/Trial/list' }
         }
     ]
 }

src/views/Led/Station/applyArtificial.vue

 <template>
+  <div class="container">
       <div class="page-pack" :style="{transform: zoom}" style="transform-origin: 0 0">
       <div class="title-pack">{{timmingData.name}}</div>
       <div class="table-pack">
@@ -17,7 +18,8 @@
                    <swiper-slide v-for="(item, index) in warningList" :key="index">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{warningList[index].name}}：{{warningList[index].info}}</swiper-slide>
               </swiper>
           </div>
-          <div class="time">时间：{{ formatTime(timeNow,'YYYY-MM-DD HH:mm:ss') }}</div>
+          <div class="time">时间：{{ timeNow }}</div>
+      </div>
   </div>
   </div>
 </template>
@@ -35,7 +37,7 @@
                 // 实时数据
                 timmingData: {},
                 // 报警数据
-                warningList: {},
+                warningList: [],
                 width: 0,
                 height: 0,
                 zoom: 'scale(0)',
@@ -54,13 +56,12 @@
             }
         },
         methods: {
-            // 时间日期格式化
-            formatTime (time, format) {
-                if (time !== null && time !== '') {
-                    return Moment(time).format(format)
-                } else {
-                    return '暂无'
-                }
+            // 实时时间
+            judgeTimeNow () {
+                this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
+                this.timer = setInterval(() => {
+                    this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
+                }, 1000)
             },
             //获取工位实时信息
             getData () {
@@ -72,20 +73,18 @@
             }
         },
         mounted () {
+            setTimeout(() => {
                 this.getData()
+                // 实时时间
+                this.judgeTimeNow()
                 this.dataTimer = setInterval(() => {
                     this.getData()
                 }, 60000)
-            let vm = this
-            // 模拟时间运作
-            this.timer = setInterval(() => {
-                vm.timeNow = vm.formatTime()
-            }, 1000)
-            setTimeout(() => {
                 this.width = document.body.offsetWidth
                 this.height = document.body.offsetHeight
                 this.zoom = `scale(${this.width / 1710})`
-            }, 3000)
+                console.log(this.zoom)
+            }, 0)
         },
         beforeDestroy () {
             if (this.timer) {
@@ -99,6 +98,10 @@
 </script>
 
 <style lang="scss" scoped>
+    .container {
+        width: 100%;
+        height: 100%;
+        background-color: #111;
             .page-pack {
             width: 1710px;
             height: 860px;
@@ -155,6 +158,10 @@
                     color: yellow;
                     font-weight: bold;
                     font-size: 60px;
+                    .swiper-slide{
+                        word-wrap: break-word;
+                        word-break: break-all;
+                    }
                 }
 
                 .time {
@@ -168,4 +175,5 @@
                 }
             }
         }
+    }
 </style>
\ No newline at end of file

src/views/Led/Station/electrophoresis.vue

 <template>
+<div class="container">
     <div class="page-pack" :style="{transform: zoom}" style="transform-origin: 0 0;">
       <div class="title-pack">{{timmingData.name}}</div>
       <div class="table-pack">
@@ -17,9 +18,11 @@
                    <swiper-slide v-for="(item, index) in warningList" :key="index">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{warningList[index].name}}：{{warningList[index].info}}</swiper-slide>
               </swiper>
           </div>
-          <div class="time">时间：{{ formatTime(timeNow,'YYYY-MM-DD HH:mm:ss') }}</div>
+          <div class="time">时间：{{ timeNow }}</div>
       </div>
   </div>
+</div>
+  
 </template>
 
 <script>
@@ -35,7 +38,7 @@
                 // 工位实时数据
                 timmingData: {},
                 // 报警数据
-                warningList: {},
+                warningList: [],
                 width: 0,
                 height: 0,
                 zoom: 'scale(0)',
@@ -54,14 +57,6 @@
             }
         },
         methods: {
-            // 时间日期格式化
-            formatTime (time, format) {
-                if (time !== null && time !== '') {
-                    return Moment(time).format(format)
-                } else {
-                    return '暂无'
-                }
-            },
             //获取工位实时信息
             getData () {
                 this.$fetch('led-controller/ledInfo-get', {ledNo: '2'}).then(res => {
@@ -69,19 +64,26 @@
                     this.warningList = res.warningList;
                     // console.log(this.warningList)
                     console.log(res)
+                    console.log(this.width)
+                    console.log(this.height)
                 })
+            },
+            // 实时时间
+            judgeTimeNow () {
+                this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
+                this.timer = setInterval(() => {
+                    this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
+                }, 1000)
             }
         },
         mounted () {
+            setTimeout(() => {
                 this.getData()
+                // 实时时间
+                this.judgeTimeNow()
                 this.dataTimer = setInterval(() => {
                     this.getData()
                 }, 60000)
-            // 模拟时间运作
-            this.timer = setInterval(() => {
-                this.timeNow = this.formatTime()
-            }, 1000)
-            setTimeout(() => {
                 this.width = document.body.offsetWidth
                 this.height = document.body.offsetHeight
                 this.zoom = `scale(${this.width / 1710})`
@@ -100,6 +102,10 @@
 </script>
 
 <style lang="scss" scoped>
+    .container {
+        width: 100%;
+        height: 100%;
+        background-color: #111;
             .page-pack {
             width: 1710px;
             height: 860px;
@@ -156,6 +162,10 @@
                     color: yellow;
                     font-weight: bold;
                     font-size: 60px;
+                    .swiper-slide{
+                        word-wrap: break-word;
+                        word-break: break-all;
+                    }
                 }
 
                 .time {
@@ -169,4 +179,5 @@
                 }
             }
         }
+    }
 </style>
\ No newline at end of file

src/views/Led/Station/floatingCoatRobot.vue

 <template>
+  <div class="container">
       <div class="page-pack" :style="{transform: zoom}" style="transform-origin: 0 0">
       <div class="title-pack">{{ timmingData.name }}</div>
       <div class="table-pack">
@@ -17,7 +18,8 @@
                    <swiper-slide v-for="(item, index) in warningList" :key="index">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{warningList[index].name}}：{{warningList[index].info}}</swiper-slide>
               </swiper>
           </div>
-          <div class="time">时间：{{ formatTime(timeNow,'YYYY-MM-DD HH:mm:ss') }}</div>
+          <div class="time">时间：{{ timeNow }}</div>
+      </div>
   </div>
   </div>
 </template>
@@ -38,7 +40,7 @@
                 // 工位实时数据
                 timmingData: {},
                 // 报警数据
-                warningList: {},
+                warningList: [],
                 // 屏幕显示当前时间
                 timeNow: '',
                 // 定时器
@@ -54,13 +56,12 @@
             }
         },
         methods: {
-            // 时间日期格式化
-            formatTime (time, format) {
-                if (time !== null && time !== '') {
-                    return Moment(time).format(format)
-                } else {
-                    return '暂无'
-                }
+            // 实时时间
+            judgeTimeNow () {
+                this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
+                this.timer = setInterval(() => {
+                    this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
+                }, 1000)
             },
             //获取工位实时信息
             getData () {
@@ -72,19 +73,18 @@
             }
         },
         mounted () {
+            setTimeout(() => {
                 this.getData()
+                // 实时时间
+                this.judgeTimeNow()
                 this.dataTimer = setInterval(() => {
                     this.getData()
                 }, 60000)
-            this.timer = setInterval(() => {
-                this.timeNow = this.formatTime()
-                // console.log(this.timeNow)
-            }, 1000)
-            setTimeout(() => {
                 this.width = document.body.offsetWidth
                 this.height = document.body.offsetHeight
                 this.zoom = `scale(${this.width / 1710})`
-            }, 3000)
+                console.log(this.zoom)
+            }, 0)
         },
         beforeDestroy () {
             if (this.timer) {
@@ -98,6 +98,10 @@
 </script>
 
 <style lang="scss" scoped>
+    .container {
+        width: 100%;
+        height: 100%;
+        background-color: #111;
             .page-pack {
             width: 1710px;
             height: 860px;
@@ -154,6 +158,11 @@
                     color: yellow;
                     font-weight: bold;
                     font-size: 60px;
+
+                    .swiper-slide{
+                        word-wrap: break-word;
+                        word-break: break-all;
+                    }
                 }
 
                 .time {
@@ -167,4 +176,5 @@
                 }
             }
         }
+    }
 </style>
\ No newline at end of file

src/views/Led/Station/insulatingAnticorrosive.vue

 <template>
+  <div class="container">
       <div class="page-pack" :style="{transform: zoom}" style="transform-origin: 0 0;">
       <div class="title-pack">{{timmingData.name}}</div>
       <div class="table-pack">
@@ -17,7 +18,8 @@
                    <swiper-slide v-for="(item, index) in warningList" :key="index">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{warningList[index].name}}：{{warningList[index].info}}</swiper-slide>
               </swiper>
           </div>
-          <div class="time">时间：{{ formatTime(timeNow,'YYYY-MM-DD HH:mm:ss') }}</div>
+          <div class="time">时间：{{ timeNow }}</div>
+      </div>
   </div>
   </div>
 </template>
@@ -54,13 +56,12 @@
             }
         },
         methods: {
-            // 时间日期格式化
-            formatTime (time, format) {
-                if (time !== null && time !== '') {
-                    return Moment(time).format(format)
-                } else {
-                    return '暂无'
-                }
+            // 实时时间
+            judgeTimeNow () {
+                this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
+                this.timer = setInterval(() => {
+                    this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
+                }, 1000)
             },
             //获取工位实时信息
             getData () {
@@ -73,20 +74,18 @@
             }
         },
         mounted () {
+            setTimeout(() => {
                 this.getData()
+                // 实时时间
+                this.judgeTimeNow()
                 this.dataTimer = setInterval(() => {
                     this.getData()
                 }, 60000)
-            // 模拟时间运作
-            this.timer = setInterval(() => {
-                this.timeNow = this.formatTime()
-            }, 1000)
-            setTimeout(() => {
                 this.width = document.body.offsetWidth
                 this.height = document.body.offsetHeight
                 this.zoom = `scale(${this.width / 1710})`
-                console.log(`scale(${this.width / 1710})`)
-            }, 3000)
+                console.log(this.zoom)
+            }, 0)
         },
         beforeDestroy () {
             if (this.timer) {
@@ -100,6 +99,10 @@
 </script>
 
 <style lang="scss" scoped>
+    .container {
+        width: 100%;
+        height: 100%;
+        background-color: #111;
             .page-pack {
             width: 1710px;
             height: 860px;
@@ -156,6 +159,10 @@
                     color: yellow;
                     font-weight: bold;
                     font-size: 60px;
+                    .swiper-slide{
+                        word-wrap: break-word;
+                        word-break: break-all;
+                    }
                 }
 
                 .time {
@@ -169,4 +176,5 @@
                 }
             }
         }
+    }
 </style>
\ No newline at end of file