Skip to content

Z
zhongtong-avi-web
Commit 5232448a authored by 车宾's avatar 车宾
Browse files
Options

feat（avi）车间大屏样式调整，白名单，

parent 59f497ce
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 33 deletions
config/index.js
View file @ 5232448a
......@@ -13,9 +13,9 @@ module.exports = {
// 代理后端服务器
proxyTable: {
'/host': {
// target: 'http://10.100.172.150:9108', //设置你调用的接口域名和端口号 别忘了加http
target: 'http://10.100.172.150:9108', //设置你调用的接口域名和端口号 别忘了加http
// target: 'http://192.168.43.244:8888', // 东伟服务器地址
target: 'http://192.168.0.126: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’即可
......
src/permission.js
View file @ 5232448a
......@@ -19,7 +19,8 @@ const whiteList = [
'/led/stationFloatingCoatRobot',
'/led/stationSurfaceVarnish',
'/led/stationSprayDryingRoom',
'/led/stationPaintingWorkShop'
'/led/stationPaintingWorkShop',
'/monitor/monitorIndex'
]
NProgress.configure({
......
src/router/index.js
View file @ 5232448a
......@@ -22,7 +22,7 @@ import deviceRunningTimeRouter from './modules/deviceRunning'
// 基础数据
import basicRouter from './modules/basic'
// AVI大屏
import monitorRouter from './modules/monitor'
// import monitorRouter from './modules/monitor'
// 监控大屏
import centerControl from './modules/centerControll'
// 系统管理
......@@ -63,7 +63,7 @@ export const constantRouterMap = [{
{
path: 'stationInsulatingAnticorrosive', //隔热防腐
component: () => import('@/views/Led/Station/insulatingAnticorrosive'),
name: 'stationInsulatingAnticorrosive',
name: 'StationInsulatingAnticorrosive',
meta: { title: 'stationInsulatingAnticorrosive', icon: 'template' }
},
{
......@@ -103,6 +103,69 @@ export const constantRouterMap = [{
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
}
]
}]
// 业务级路由（后期可能在界面中动态配置）
......@@ -112,7 +175,7 @@ export const asyncRouterMap = [
laboratoryRouter,
deviceRunningTimeRouter,
basicRouter,
monitorRouter,
// monitorRouter,
centerControl,
systemRouter,
{
......
src/views/CenterControl/index.vue
View file @ 5232448a
......@@ -43,6 +43,7 @@
import MachineWarning from './components/MachineWarning'
export default {
name: 'CenterControl',
components: {
MachineUtilizationRate,
MachineFailureRate,
......
src/views/Led/Station/applyArtificial.vue
View file @ 5232448a
......@@ -28,6 +28,7 @@
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import Moment from 'moment'
export default {
name: 'StationApplyArtificial',
components: {
swiper,
swiperSlide
......
src/views/Led/Station/electrophoresis.vue
View file @ 5232448a
......@@ -29,6 +29,7 @@
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import Moment from 'moment'
export default {
name: 'StationElectrophoresis',
components: {
swiper,
swiperSlide
......
src/views/Led/Station/floatingCoatRobot.vue
View file @ 5232448a
......@@ -28,6 +28,7 @@
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import Moment from 'moment'
export default {
name: 'StationFloatingCoatRobot',
components: {
swiper,
swiperSlide
......
src/views/Led/Station/insulatingAnticorrosive.vue
View file @ 5232448a
......@@ -28,6 +28,7 @@
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import Moment from 'moment'
export default {
name: 'StationInsulatingAnticorrosive',
components: {
swiper,
swiperSlide
......
src/views/Led/Station/paintingWorkShop.vue
View file @ 5232448a
<template>
<div class="container">
<div class="page-pack" :style="{transform: zoom}" style="transform-origin: 0 0">
<div class="page-pack" style="transform-origin: 0 0">
<div class="title-pack">中通客车涂装车间</div>
<div class="table-pack">
<div class="tr clear-float">
......@@ -54,6 +54,7 @@
<script>
import Moment from 'moment'
export default {
name: 'StationPaintingWorkShop',
data () {
return {
width: 0,
......@@ -238,7 +239,7 @@
}, 60000)
this.width = document.body.offsetWidth
this.height = document.body.offsetHeight
this.zoom = `scale(${this.width / 1710})`
// this.zoom = `scale(${this.width / 1710})`
console.log(this.zoom)
}, 0)
}
......@@ -251,21 +252,21 @@
width: 100%;
height: 100%;
.page-pack {
width: 1710px;
height: 860px;
width: 1556px;
height: 1037px;
background-color: #111;
.borderBot {
border-bottom: 2px solid yellow;
}
.title-pack {
width: 1710px;
height: 100px;
width: 1556px;
height: 134px;
text-align: center;
color: yellow;
line-height: 100px;
line-height: 134px;
font-weight: bold;
font-size: 50px;
font-size: 60px;
}
.table-pack {
......@@ -275,29 +276,29 @@
.th-l,.th-2,.th-3,.th-4 {
width: 30%;
height: 90px;
height: 110.625px;
border-top: 2px solid yellow;
border-right: 2px solid yellow;
float: left;
text-align: center;
color: yellow;
line-height: 90px;
line-height: 110.625px;
font-weight: bold;
font-size: 40px;
font-size: 48px;
}
.th-2 {width: 20%;}
.th-2 {width: 20%; font-size:60px }
.th-3 {width: 29.5%;}
.th-4 {width: 20%;border-right: none}
.th-4 {width: 20%;border-right: none; font-size:60px}
}
}
.time {
width: 1710px;
height: 100px;
height: 110.625px;
border-top: 2px solid yellow;
color: yellow;
font-weight: bold;
line-height: 100px;
font-size: 60px;
line-height: 110.625px;
font-size: 48px;
}
}
}
......
src/views/Led/Station/putty.vue
View file @ 5232448a
......@@ -54,7 +54,7 @@
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import Moment from 'moment'
export default {
name: 'StationSprayDryingRoom',
name: 'StationPutty',
components: {
swiper,
swiperSlide
......
src/views/Led/Station/surfaceVarnish.vue
View file @ 5232448a
......@@ -54,7 +54,7 @@
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import Moment from 'moment'
export default {
name: 'StationSprayDryingRoom',
name: 'StationSurfaceVarnish',
components: {
swiper,
swiperSlide
......
src/views/Monitor/components/ComplexionPaint.vue
View file @ 5232448a
......@@ -552,6 +552,7 @@
*/
import Tooltip from './Tooltip';
export default {
name: 'MonitorComplexionPaint',
components: {
Tooltip
},
......
src/views/Monitor/components/Electrophoresis.vue
View file @ 5232448a
......@@ -448,6 +448,7 @@
<script>
import Tooltip from './Tooltip';
export default {
name: 'MonitorElectrophoresis',
components: {
Tooltip
},
......
src/views/Monitor/components/FinishedCar.vue
View file @ 5232448a
......@@ -149,6 +149,7 @@
<script>
import Tooltip from './Tooltip';
export default {
name: 'MonitorFinishedCar',
components: {
Tooltip
},
......
src/views/Monitor/components/MiddleCoat.vue
View file @ 5232448a
......@@ -198,6 +198,7 @@
*/
import Tooltip from './Tooltip';
export default {
name: 'MonitorMiddleCoat',
components: {
Tooltip
},
......
src/views/Monitor/components/Putty.vue
View file @ 5232448a
......@@ -221,6 +221,7 @@
*/
import Tooltip from './Tooltip';
export default {
name: 'MonitorPutty',
components: {
Tooltip
},
......
src/views/Monitor/components/SealedAnticorrosion.vue
View file @ 5232448a
......@@ -306,6 +306,7 @@
<script>
import Tooltip from './Tooltip';
export default {
name: 'MonitorSealedAnticorrosion',
components: {
Tooltip
},
......
src/views/Monitor/components/SheetMetalCar.vue
View file @ 5232448a
......@@ -299,6 +299,7 @@
<script>
import Tooltip from './Tooltip';
export default {
name: 'MonitorSheetMetalCar',
components: {
Tooltip
},
......
src/views/Monitor/index.vue
View file @ 5232448a
......@@ -1562,6 +1562,7 @@
<script>
export default {
name: 'MonitorIndex',
data () {
return {
// 筛选条件工单号
......@@ -1807,20 +1808,24 @@
</script>
<style lang="scss" scoped>
html {
html {
position: relative;
// overflow-y: hidden;
}
@keyframes identifier {
0% { transform: translateY(0px);}
30% { transform: translateY(-100px);}
60% { transform: translateY(-200px);}
// 75% { transform: translateY(-180px);}
100% { transform: translateY(-300px);}
// 100% { transform: translateY(-400px);}
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;
......@@ -3708,7 +3713,7 @@
}
.no-message {
font-size: 12px !important;
font-size: 6px !important;
font-weight: 400;
}
......@@ -3789,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