Skip to content

Z
zhongtong-avi-web
Commit d08ca234 authored by 李志鸣's avatar 李志鸣
Browse files
Options

fea(LED权限): 新增LED权限

parents 7fad61e5 5232448a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1504 additions and 585 deletions
config/index.js
View file @ d08ca234
......@@ -15,7 +15,7 @@ module.exports = {
'/host': {
target: 'http://10.100.172.150:9108', //设置你调用的接口域名和端口号 别忘了加http
// target: 'http://192.168.43.244:8888', // 东伟服务器地址
// target: 'http://192.168.0.199:8080', // 训浩服务器
// target: 'http://192.168.0.126:8080', // 训浩服务器
changeOrigin: true,
pathRewrite: {
'^/host': ''//这里理解成用‘/host’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可
......
debug.log
View file @ d08ca234
[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
View file @ d08ca234
......@@ -45,6 +45,7 @@ export default {
StationFloatingCoatRobot: '中涂机器人',
StationSurfaceVarnish: '面/清漆',
StationSprayDryingRoom: '喷漆/烘干室',
StationPaintingWorkShop: '涂装车间',
// 监控大屏
CenterControl: '监控大屏',
CenterControlIndex: '监控大屏'
......
src/permission.js
View file @ d08ca234
......@@ -18,7 +18,9 @@ const whiteList = [
'/led/stationApplyArtificial',
'/led/stationFloatingCoatRobot',
'/led/stationSurfaceVarnish',
'/led/stationSprayDryingRoom'
'/led/stationSprayDryingRoom',
'/led/stationPaintingWorkShop',
'/monitor/monitorIndex'
]
NProgress.configure({
......
src/router/index.js
View file @ d08ca234
......@@ -24,7 +24,7 @@ import laboratoryRouter from './modules/laboratory'
// 涂装生产计划
import productionPlanRouter from './modules/productionPlan'
// AVI大屏
import monitorRouter from './modules/monitor'
// import monitorRouter from './modules/monitor'
// 监控大屏
import centerControl from './modules/centerControll'
// 系统管理
......@@ -65,7 +65,7 @@ export const constantRouterMap = [{
{
path: 'stationInsulatingAnticorrosive', //隔热防腐
component: () => import('@/views/Led/Station/insulatingAnticorrosive'),
name: 'stationInsulatingAnticorrosive',
name: 'StationInsulatingAnticorrosive',
meta: { title: 'stationInsulatingAnticorrosive', icon: 'template' }
},
{
......@@ -97,6 +97,75 @@ 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' }
}
]
},
{
path: '/monitor',
component: () => import('@/views/Layout/lsd'),
redirect: '/monitor/index',
meta: { title: 'Monitor', icon: 'kanban', openNewWindow: true },
children: [
{
path: 'monitorIndex',
component: () => import('@/views/Monitor/index'),
name: 'MonitorIndex',
meta: { title: 'MonitorIndex', icon: 'kanban', mark: '/Monitor/index' }
},
{
path: 'monitorPutty',
component: () => import('@/views/Monitor/components/Putty'),
name: 'MonitorPutty',
meta: { title: 'MonitorPutty', icon: 'kanban' },
hidden: true
},
{
path: 'monitorMiddleCoat',
component: () => import('@/views/Monitor/components/MiddleCoat'),
name: 'MonitorMiddleCoat',
meta: { title: 'MonitorMiddleCoat', icon: 'kanban' },
hidden: true
},
{
path: 'monitorComplexionPaint',
component: () => import('@/views/Monitor/components/ComplexionPaint'),
name: 'MonitorComplexionPaint',
meta: { title: 'MonitorComplexionPaint', icon: 'kanban' },
hidden: true
},
{
path: 'monitorElectrophoresis',
component: () => import('@/views/Monitor/components/Electrophoresis'),
name: 'MonitorElectrophoresis',
meta: { title: 'MonitorElectrophoresis', icon: 'kanban' },
hidden: true
},
{
path: 'monitorFinishedCar',
component: () => import('@/views/Monitor/components/FinishedCar'),
name: 'MonitorFinishedCar',
meta: { title: 'MonitorFinishedCar', icon: 'kanban' },
hidden: true
},
{
path: 'monitorSealedAnticorrosion',
component: () => import('@/views/Monitor/components/SealedAnticorrosion'),
name: 'MonitorSealedAnticorrosion',
meta: { title: 'MonitorSealedAnticorrosion', icon: 'kanban' },
hidden: true
},
{
path: 'monitorSheetMetalCar',
component: () => import('@/views/Monitor/components/SheetMetalCar'),
name: 'MonitorSheetMetalCar',
mate: { title: 'MonitorSheetMetalCar', icon: 'kanban' },
hidden: true
}
]
}]
......
src/router/modules/basic.js
View file @ d08ca234
......@@ -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
View file @ d08ca234
......@@ -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
View file @ d08ca234
......@@ -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
View file @ d08ca234
......@@ -9,19 +9,19 @@ export default {
path: 'pickling',
component: () => import('@/views/Laboratory/Pickling/list'),
name: 'Pickling',
meta: { title: 'Pickling', icon: 'deal', 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: 'deal', 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: 'deal', noCache: false }
meta: { title: 'Pretreatment', icon: 'template', noCache: false, mark: '/Laboratory/Pretreatment/list' }
}
]
}
src/router/modules/monitor.js
View file @ d08ca234
......@@ -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
View file @ d08ca234
......@@ -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/CenterControl/index.vue
View file @ d08ca234
......@@ -43,6 +43,7 @@
import MachineWarning from './components/MachineWarning'
export default {
name: 'CenterControl',
components: {
MachineUtilizationRate,
MachineFailureRate,
......
src/views/Led/Station/applyArtificial.vue
View file @ d08ca234
<template>
<div class="page-pack" :style="{transform: zoom}" style="transform-origin: 0 0">
<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">
<div class="tr">
......@@ -17,15 +18,17 @@
<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>
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import Moment from 'moment'
export default {
name: 'StationApplyArtificial',
components: {
swiper,
swiperSlide
......@@ -35,7 +38,7 @@
// 实时数据
timmingData: {},
// 报警数据
warningList: {},
warningList: [],
width: 0,
height: 0,
zoom: 'scale(0)',
......@@ -54,13 +57,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 +74,18 @@
}
},
mounted () {
this.getData()
this.dataTimer = setInterval(() => {
this.getData()
}, 60000)
let vm = this
// 模拟时间运作
this.timer = setInterval(() => {
vm.timeNow = vm.formatTime()
}, 1000)
setTimeout(() => {
this.getData()
// 实时时间
this.judgeTimeNow()
this.dataTimer = setInterval(() => {
this.getData()
}, 60000)
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,72 +99,81 @@
</script>
<style lang="scss" scoped>
.page-pack {
width: 1710px;
height: 860px;
.container {
width: 100%;
height: 100%;
background-color: #111;
.title-pack {
.page-pack {
width: 1710px;
height: 100px;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
}
height: 860px;
background-color: #111;
.table-pack {
overflow: hidden;
.tr {
.title-pack {
width: 1710px;
height: 102px;
height: 100px;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
}
.th-l {
width: 853px;
height: 100px;
.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: 353px;
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;
.swiper-slide{
word-wrap: break-word;
word-break: break-all;
}
}
.th-r {
width: 855px;
.time {
width: 1710px;
height: 100px;
border-top: 2px solid yellow;
float: left;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
line-height: 100px;
font-size: 60px;
}
}
.info {
width: 1710px;
height: 353px;
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;
}
}
}
......
src/views/Led/Station/electrophoresis.vue
View file @ d08ca234
<template>
<div class="page-pack" :style="{transform: zoom}" style="transform-origin: 0 0;">
<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">
<div class="tr">
......@@ -17,15 +18,18 @@
<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>
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import Moment from 'moment'
export default {
name: 'StationElectrophoresis',
components: {
swiper,
swiperSlide
......@@ -35,7 +39,7 @@
// 工位实时数据
timmingData: {},
// 报警数据
warningList: {},
warningList: [],
width: 0,
height: 0,
zoom: 'scale(0)',
......@@ -54,14 +58,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 +65,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 () {
this.getData()
this.dataTimer = setInterval(() => {
this.getData()
}, 60000)
// 模拟时间运作
this.timer = setInterval(() => {
this.timeNow = this.formatTime()
}, 1000)
setTimeout(() => {
this.getData()
// 实时时间
this.judgeTimeNow()
this.dataTimer = setInterval(() => {
this.getData()
}, 60000)
this.width = document.body.offsetWidth
this.height = document.body.offsetHeight
this.zoom = `scale(${this.width / 1710})`
......@@ -100,72 +103,81 @@
</script>
<style lang="scss" scoped>
.page-pack {
width: 1710px;
height: 860px;
.container {
width: 100%;
height: 100%;
background-color: #111;
.title-pack {
.page-pack {
width: 1710px;
height: 100px;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
}
.table-pack {
overflow: hidden;
height: 860px;
background-color: #111;
.tr {
.title-pack {
width: 1710px;
height: 102px;
height: 100px;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
}
.th-l {
width: 853px;
height: 100px;
.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;
border-right: 2px solid yellow;
float: left;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
.swiper-slide{
word-wrap: break-word;
word-break: break-all;
}
}
.th-r {
width: 855px;
.time {
width: 1710px;
height: 100px;
border-top: 2px solid yellow;
float: left;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
line-height: 100px;
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;
}
}
}
......
src/views/Led/Station/floatingCoatRobot.vue
View file @ d08ca234
<template>
<div class="page-pack" :style="{transform: zoom}" style="transform-origin: 0 0">
<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">
<div class="tr">
......@@ -17,15 +18,17 @@
<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>
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import Moment from 'moment'
export default {
name: 'StationFloatingCoatRobot',
components: {
swiper,
swiperSlide
......@@ -38,7 +41,7 @@
// 工位实时数据
timmingData: {},
// 报警数据
warningList: {},
warningList: [],
// 屏幕显示当前时间
timeNow: '',
// 定时器
......@@ -54,13 +57,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 +74,18 @@
}
},
mounted () {
this.getData()
this.dataTimer = setInterval(() => {
this.getData()
}, 60000)
this.timer = setInterval(() => {
this.timeNow = this.formatTime()
// console.log(this.timeNow)
}, 1000)
setTimeout(() => {
this.getData()
// 实时时间
this.judgeTimeNow()
this.dataTimer = setInterval(() => {
this.getData()
}, 60000)
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,72 +99,82 @@
</script>
<style lang="scss" scoped>
.page-pack {
width: 1710px;
height: 860px;
.container {
width: 100%;
height: 100%;
background-color: #111;
.title-pack {
.page-pack {
width: 1710px;
height: 100px;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
}
height: 860px;
background-color: #111;
.table-pack {
overflow: hidden;
.tr {
.title-pack {
width: 1710px;
height: 102px;
height: 100px;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
}
.th-l {
width: 853px;
height: 100px;
.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: 353px;
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;
.swiper-slide{
word-wrap: break-word;
word-break: break-all;
}
}
.th-r {
width: 855px;
.time {
width: 1710px;
height: 100px;
border-top: 2px solid yellow;
float: left;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
line-height: 100px;
font-size: 60px;
}
}
.info {
width: 1710px;
height: 353px;
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;
}
}
}
......
src/views/Led/Station/insulatingAnticorrosive.vue
View file @ d08ca234
<template>
<div class="page-pack" :style="{transform: zoom}" style="transform-origin: 0 0;">
<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">
<div class="tr">
......@@ -17,15 +18,17 @@
<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>
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import Moment from 'moment'
export default {
name: 'StationInsulatingAnticorrosive',
components: {
swiper,
swiperSlide
......@@ -54,13 +57,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 +75,18 @@
}
},
mounted () {
this.getData()
this.dataTimer = setInterval(() => {
this.getData()
}, 60000)
// 模拟时间运作
this.timer = setInterval(() => {
this.timeNow = this.formatTime()
}, 1000)
setTimeout(() => {
this.getData()
// 实时时间
this.judgeTimeNow()
this.dataTimer = setInterval(() => {
this.getData()
}, 60000)
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,72 +100,81 @@
</script>
<style lang="scss" scoped>
.page-pack {
width: 1710px;
height: 860px;
.container {
width: 100%;
height: 100%;
background-color: #111;
.title-pack {
.page-pack {
width: 1710px;
height: 100px;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
}
height: 860px;
background-color: #111;
.table-pack {
overflow: hidden;
.tr {
.title-pack {
width: 1710px;
height: 102px;
height: 100px;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
}
.th-l {
width: 853px;
height: 100px;
.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;
border-right: 2px solid yellow;
float: left;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
font-size: 60px;
.swiper-slide{
word-wrap: break-word;
word-break: break-all;
}
}
.th-r {
width: 855px;
.time {
width: 1710px;
height: 100px;
border-top: 2px solid yellow;
float: left;
text-align: center;
color: yellow;
line-height: 100px;
font-weight: bold;
line-height: 100px;
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;
}
}
}
......
src/views/Led/Station/paintingWorkShop.vue 0 → 100644
View file @ d08ca234
This diff is collapsed.
src/views/Led/Station/putty.vue
View file @ d08ca234
This diff is collapsed.
src/views/Led/Station/sprayDryingRoom.vue
View file @ d08ca234
This diff is collapsed.
src/views/Led/Station/surfaceVarnish.vue
View file @ d08ca234
This diff is collapsed.
src/views/Monitor/components/ComplexionPaint.vue
View file @ d08ca234
......@@ -552,6 +552,7 @@
*/
import Tooltip from './Tooltip';
export default {
name: 'MonitorComplexionPaint',
components: {
Tooltip
},
......
src/views/Monitor/components/Electrophoresis.vue
View file @ d08ca234
......@@ -448,6 +448,7 @@
<script>
import Tooltip from './Tooltip';
export default {
name: 'MonitorElectrophoresis',
components: {
Tooltip
},
......
src/views/Monitor/components/FinishedCar.vue
View file @ d08ca234
......@@ -149,6 +149,7 @@
<script>
import Tooltip from './Tooltip';
export default {
name: 'MonitorFinishedCar',
components: {
Tooltip
},
......
src/views/Monitor/components/MiddleCoat.vue
View file @ d08ca234
......@@ -198,6 +198,7 @@
*/
import Tooltip from './Tooltip';
export default {
name: 'MonitorMiddleCoat',
components: {
Tooltip
},
......
src/views/Monitor/components/Putty.vue
View file @ d08ca234
......@@ -221,6 +221,7 @@
*/
import Tooltip from './Tooltip';
export default {
name: 'MonitorPutty',
components: {
Tooltip
},
......
src/views/Monitor/components/SealedAnticorrosion.vue
View file @ d08ca234
......@@ -306,6 +306,7 @@
<script>
import Tooltip from './Tooltip';
export default {
name: 'MonitorSealedAnticorrosion',
components: {
Tooltip
},
......
src/views/Monitor/components/SheetMetalCar.vue
View file @ d08ca234
......@@ -299,6 +299,7 @@
<script>
import Tooltip from './Tooltip';
export default {
name: 'MonitorSheetMetalCar',
components: {
Tooltip
},
......
src/views/Monitor/index.vue
View file @ d08ca234
......@@ -1562,6 +1562,7 @@
<script>
export default {
name: 'MonitorIndex',
data () {
return {
// 筛选条件工单号
......@@ -1807,10 +1808,28 @@
</script>
<style lang="scss" scoped>
html {
position: relative;
}
@keyframes identifier {
0% { transform: translateY(0px);}
20% { transform: translateY(-70px);}
40% { transform: translateY(-140px);}
60% { transform: translateY(-210px);}
80% { transform: translateY(-280px);}
100% { transform: translateY(-350px);}
// 100% {transform: translateY(-450px);}
}
.monitor-pack {
overflow-x: hidden;
overflow-y: visible;
height: 1400px;
width: 100%;
background-color: #001927;
animation: identifier 10s infinite alternate;
// animation: identifier 8s infinite cubic-bezier(1,0,0.5,0);
.view-pack {
margin: 0 auto;
width: 1600px;
......@@ -3694,7 +3713,7 @@
}
.no-message {
font-size: 12px !important;
font-size: 6px !important;
font-weight: 400;
}
......@@ -3775,6 +3794,10 @@
}
}
::-webkit-scrollbar {
display: none ! important;
}
// 轻客车体样式
.monitor-car-external {
background: url('../../assets/images/Monitor/monitor_car_external.png') !important;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment