Commit 205bbe15 authored by 李志鸣's avatar 李志鸣

fea(avi大屏): 7个详情工作区新增点击上方标题返回首页功能

parent 0f3e1429
...@@ -24,7 +24,7 @@ import laboratoryRouter from './modules/laboratory' ...@@ -24,7 +24,7 @@ import laboratoryRouter from './modules/laboratory'
// 涂装生产计划 // 涂装生产计划
import productionPlanRouter from './modules/productionPlan' import productionPlanRouter from './modules/productionPlan'
// AVI大屏 // AVI大屏
// import monitorRouter from './modules/monitor' import monitorRouter from './modules/monitor'
// 监控大屏 // 监控大屏
import centerControl from './modules/centerControll' import centerControl from './modules/centerControll'
// 系统管理 // 系统管理
...@@ -54,7 +54,7 @@ export const constantRouterMap = [{ ...@@ -54,7 +54,7 @@ export const constantRouterMap = [{
component: () => import('@/views/Layout/lsd'), component: () => import('@/views/Layout/lsd'),
redirect: '/led/stationElectrophoresis', redirect: '/led/stationElectrophoresis',
meta: { title: 'Led', icon: 'template', openNewWindow: true }, meta: { title: 'Led', icon: 'template', openNewWindow: true },
// hidden: true, hidden: true,
children: [ children: [
{ {
path: 'stationElectrophoresis', //电泳 path: 'stationElectrophoresis', //电泳
...@@ -105,69 +105,6 @@ export const constantRouterMap = [{ ...@@ -105,69 +105,6 @@ export const constantRouterMap = [{
meta: { title: 'StationPaintingWorkShop', icon: 'template' } 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
}
]
}] }]
// 业务级路由(后期可能在界面中动态配置) // 业务级路由(后期可能在界面中动态配置)
...@@ -178,7 +115,7 @@ export const asyncRouterMap = [ ...@@ -178,7 +115,7 @@ export const asyncRouterMap = [
basicRouter, basicRouter,
laboratoryRouter, laboratoryRouter,
productionPlanRouter, productionPlanRouter,
// monitorRouter, monitorRouter,
centerControl, centerControl,
systemRouter, systemRouter,
{ {
......
<template> <template>
<div class="page-body"> <div class="page-body">
<div class="paint-content"> <div class="paint-content">
<div class="return-pack" @click="doReturnMonitorIndex"></div>
<!-- 第一行 --> <!-- 第一行 -->
<div <div
class="paint-row-1-0" class="paint-row-1-0"
...@@ -644,6 +645,12 @@ export default { ...@@ -644,6 +645,12 @@ export default {
} }
); );
}, },
// 点击返回AVI大屏首页
doReturnMonitorIndex () {
this.$router.push({
path: '/monitor/monitorIndex'
})
},
// 轮询请求接口 // 轮询请求接口
pollingGetInterface () { pollingGetInterface () {
// 查询车辆定位 // 查询车辆定位
...@@ -1048,6 +1055,16 @@ export default { ...@@ -1048,6 +1055,16 @@ export default {
background-size: 35px 18px; background-size: 35px 18px;
background-position: 0 16px; background-position: 0 16px;
} }
// 返回首页
.return-pack {
position: absolute;
cursor: pointer;
width: 450px;
height: 90px;
top: 0;
left: 575px;
background-image: none;
}
} }
} }
</style> </style>
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<!-- 电泳工作区 --> <!-- 电泳工作区 -->
<div class="page-pack"> <div class="page-pack">
<div class="elect-content"> <div class="elect-content">
<div class="return-pack" @click="doReturnMonitorIndex"></div>
<!-- 第 1 行 --> <!-- 第 1 行 -->
<div <div
class="elect-row-1-1" class="elect-row-1-1"
...@@ -542,6 +543,12 @@ export default { ...@@ -542,6 +543,12 @@ export default {
} }
); );
}, },
// 点击返回AVI大屏首页
doReturnMonitorIndex () {
this.$router.push({
path: '/monitor/monitorIndex'
})
},
// 轮询请求接口 // 轮询请求接口
pollingGetInterface () { pollingGetInterface () {
// 查询车辆定位 // 查询车辆定位
...@@ -584,8 +591,7 @@ export default { ...@@ -584,8 +591,7 @@ export default {
margin: 0 auto; margin: 0 auto;
width: 1600px; width: 1600px;
height: 900px; height: 900px;
background: url("../../../assets/images/Monitor/monitor_electrophoresis.png") background: url("../../../assets/images/Monitor/monitor_electrophoresis.png") no-repeat;
no-repeat;
.elect-row-1-1, .elect-row-1-1,
.elect-row-1-2, .elect-row-1-2,
.elect-row-1-3, .elect-row-1-3,
...@@ -863,17 +869,24 @@ export default { ...@@ -863,17 +869,24 @@ export default {
left: 830px; left: 830px;
} }
.carOutFactory { .carOutFactory {
background: url("../../../assets/images/Monitor/monitor_car_external.png") background: url("../../../assets/images/Monitor/monitor_car_external.png") no-repeat;
no-repeat;
background-size: 35px 18px; background-size: 35px 18px;
background-position: 0 16px; background-position: 0 16px;
} }
.isPositioned { .isPositioned {
background: url("../../../assets/images/Monitor/monitor_position_car.gif") background: url("../../../assets/images/Monitor/monitor_position_car.gif") no-repeat;
no-repeat;
background-size: 35px 18px; background-size: 35px 18px;
background-position: 0 16px; background-position: 0 16px;
} }
// 返回首页
.return-pack {
position: absolute;
cursor: pointer;
width: 450px;
height: 90px;
top: 0;
left: 575px;
}
} }
} }
</style> </style>
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<!-- 成品车存放区 --> <!-- 成品车存放区 -->
<div class="page-pack"> <div class="page-pack">
<div class="container-pack"> <div class="container-pack">
<div class="return-pack" @click="doReturnMonitorIndex"></div>
<!-- 第一行 --> <!-- 第一行 -->
<div <div
class="finished-row-1-1" class="finished-row-1-1"
...@@ -239,6 +240,12 @@ export default { ...@@ -239,6 +240,12 @@ export default {
} }
); );
}, },
// 点击返回AVI大屏首页
doReturnMonitorIndex () {
this.$router.push({
path: '/monitor/monitorIndex'
})
},
// 轮询请求接口 // 轮询请求接口
pollingGetInterface () { pollingGetInterface () {
// 查询车辆定位 // 查询车辆定位
...@@ -387,6 +394,16 @@ export default { ...@@ -387,6 +394,16 @@ export default {
background-size: 35px 18px; background-size: 35px 18px;
background-position: 0 16px; background-position: 0 16px;
} }
// 返回首页
.return-pack {
position: absolute;
cursor: pointer;
width: 450px;
height: 90px;
top: 0;
left: 575px;
background-image: none;
}
} }
} }
</style> </style>
<template> <template>
<div class="page-body"> <div class="page-body">
<div class="coat-content"> <div class="coat-content">
<div class="return-pack" @click="doReturnMonitorIndex"></div>
<div <div
class="coat-row-1-1" class="coat-row-1-1"
@click="doCarStationClick(query['HDG1-115'].busNo)" @click="doCarStationClick(query['HDG1-115'].busNo)"
...@@ -288,6 +289,12 @@ export default { ...@@ -288,6 +289,12 @@ export default {
} }
); );
}, },
// 点击返回AVI大屏首页
doReturnMonitorIndex () {
this.$router.push({
path: '/monitor/monitorIndex'
})
},
// 轮询请求接口 // 轮询请求接口
pollingGetInterface () { pollingGetInterface () {
// 查询车辆定位 // 查询车辆定位
...@@ -476,6 +483,16 @@ export default { ...@@ -476,6 +483,16 @@ export default {
background-size: 35px 18px; background-size: 35px 18px;
background-position: 0 16px; background-position: 0 16px;
} }
// 返回首页
.return-pack {
position: absolute;
cursor: pointer;
width: 450px;
height: 90px;
top: 0;
left: 575px;
background-image: none;
}
} }
} }
</style> </style>
<template> <template>
<!-- 腻子作业区 -->
<div class="page-body"> <div class="page-body">
<div class="putty-content"> <div class="putty-content">
<div class="return-pack" @click="doReturnMonitorIndex"></div>
<div <div
class="putty-row-1-1" class="putty-row-1-1"
@click="doCarStationClick(query['HDG1-95'].busNo)" @click="doCarStationClick(query['HDG1-95'].busNo)"
...@@ -305,6 +307,12 @@ export default { ...@@ -305,6 +307,12 @@ export default {
} }
); );
}, },
// 点击返回AVI大屏首页
doReturnMonitorIndex () {
this.$router.push({
path: '/monitor/monitorIndex'
})
},
// 轮询请求接口 // 轮询请求接口
pollingGetInterface () { pollingGetInterface () {
// 查询车辆定位 // 查询车辆定位
...@@ -501,6 +509,16 @@ export default { ...@@ -501,6 +509,16 @@ export default {
background-size: 35px 18px; background-size: 35px 18px;
background-position: 0 16px; background-position: 0 16px;
} }
// 返回首页
.return-pack {
position: absolute;
cursor: pointer;
width: 450px;
height: 90px;
top: 0;
left: 575px;
background-image: none;
}
} }
} }
</style> </style>
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<!-- 密封防腐作业区 --> <!-- 密封防腐作业区 -->
<div class="page-pack"> <div class="page-pack">
<div class="container-pack"> <div class="container-pack">
<div class="return-pack" @click="doReturnMonitorIndex"></div>
<!-- 第一行 --> <!-- 第一行 -->
<div <div
class="sealed-row-1-1" class="sealed-row-1-1"
...@@ -378,6 +379,12 @@ export default { ...@@ -378,6 +379,12 @@ export default {
} }
); );
}, },
// 点击返回AVI大屏首页
doReturnMonitorIndex () {
this.$router.push({
path: '/monitor/monitorIndex'
})
},
// 轮询查询区域实时信息 // 轮询查询区域实时信息
pollingGetAreaRealTimeData () { pollingGetAreaRealTimeData () {
// 获取密封防腐作业区实时数据 // 获取密封防腐作业区实时数据
...@@ -598,6 +605,16 @@ export default { ...@@ -598,6 +605,16 @@ export default {
top: 688px; top: 688px;
left: 1318px; left: 1318px;
} }
// 返回首页
.return-pack {
position: absolute;
cursor: pointer;
width: 450px;
height: 90px;
top: 0;
left: 575px;
background-image: none;
}
} }
} }
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<!-- 钣金车存放区 --> <!-- 钣金车存放区 -->
<div class="page-pack"> <div class="page-pack">
<div class="container-pack"> <div class="container-pack">
<div class="return-pack" @click="doReturnMonitorIndex"></div>
<!--第一行--> <!--第一行-->
<div <div
class="sheet-row-1-1" class="sheet-row-1-1"
...@@ -393,12 +394,17 @@ export default { ...@@ -393,12 +394,17 @@ export default {
} }
); );
}, },
// 点击返回AVI大屏首页
doReturnMonitorIndex () {
this.$router.push({
path: '/monitor/monitorIndex'
})
},
// 轮询请求接口 // 轮询请求接口
pollingGetInterface () { pollingGetInterface () {
// 查询车辆定位 // 查询车辆定位
if ( if (
this.$route.query.hasOwnProperty('orderNo') || this.$route.query.hasOwnProperty('orderNo') || this.$route.query.hasOwnProperty('workOrderNo')
this.$route.query.hasOwnProperty('workOrderNo')
) { ) {
this.getCarPostion(); this.getCarPostion();
} }
...@@ -418,6 +424,7 @@ export default { ...@@ -418,6 +424,7 @@ export default {
.page-pack { .page-pack {
min-height: 100%; min-height: 100%;
background: rgba(0, 7, 12, 1); background: rgba(0, 7, 12, 1);
position: relative;
.onlineNum { .onlineNum {
position: absolute; position: absolute;
right: 300px; right: 300px;
...@@ -442,8 +449,7 @@ export default { ...@@ -442,8 +449,7 @@ export default {
width: 140px; width: 140px;
height: 50px; height: 50px;
cursor: pointer; cursor: pointer;
background: url("../../../assets/images/Monitor/monitor_car.png") background: url("../../../assets/images/Monitor/monitor_car.png") no-repeat;
no-repeat;
background-size: 35px 18px; background-size: 35px 18px;
background-position: 0 16px; background-position: 0 16px;
...@@ -647,6 +653,16 @@ export default { ...@@ -647,6 +653,16 @@ export default {
background-size: 35px 18px; background-size: 35px 18px;
background-position: 0 16px; background-position: 0 16px;
} }
// 返回首页
.return-pack {
position: absolute;
cursor: pointer;
width: 450px;
height: 90px;
top: 0;
left: 575px;
background-image: none;
}
} }
} }
</style> </style>
...@@ -1828,7 +1828,7 @@ ...@@ -1828,7 +1828,7 @@
height: 1400px; height: 1400px;
width: 100%; width: 100%;
background-color: #001927; background-color: #001927;
animation: identifier 10s infinite alternate; // animation: identifier 10s infinite alternate;
// animation: identifier 8s infinite cubic-bezier(1,0,0.5,0); // animation: identifier 8s infinite cubic-bezier(1,0,0.5,0);
.view-pack { .view-pack {
margin: 0 auto; margin: 0 auto;
......
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