Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zhongtong-avi-web
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
中通客车项目
zhongtong-avi-web
Commits
205bbe15
Commit
205bbe15
authored
Nov 02, 2019
by
李志鸣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fea(avi大屏): 7个详情工作区新增点击上方标题返回首页功能
parent
0f3e1429
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
129 additions
and
77 deletions
+129
-77
index.js
src/router/index.js
+3
-66
ComplexionPaint.vue
src/views/Monitor/components/ComplexionPaint.vue
+17
-0
Electrophoresis.vue
src/views/Monitor/components/Electrophoresis.vue
+19
-6
FinishedCar.vue
src/views/Monitor/components/FinishedCar.vue
+17
-0
MiddleCoat.vue
src/views/Monitor/components/MiddleCoat.vue
+17
-0
Putty.vue
src/views/Monitor/components/Putty.vue
+18
-0
SealedAnticorrosion.vue
src/views/Monitor/components/SealedAnticorrosion.vue
+17
-0
SheetMetalCar.vue
src/views/Monitor/components/SheetMetalCar.vue
+20
-4
index.vue
src/views/Monitor/index.vue
+1
-1
No files found.
src/router/index.js
View file @
205bbe15
...
...
@@ -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'
// 系统管理
...
...
@@ -54,7 +54,7 @@ export const constantRouterMap = [{
component
:
()
=>
import
(
'@/views/Layout/lsd'
),
redirect
:
'/led/stationElectrophoresis'
,
meta
:
{
title
:
'Led'
,
icon
:
'template'
,
openNewWindow
:
true
},
//
hidden: true,
hidden
:
true
,
children
:
[
{
path
:
'stationElectrophoresis'
,
//电泳
...
...
@@ -105,69 +105,6 @@ 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
}
]
}]
// 业务级路由(后期可能在界面中动态配置)
...
...
@@ -178,7 +115,7 @@ export const asyncRouterMap = [
basicRouter
,
laboratoryRouter
,
productionPlanRouter
,
//
monitorRouter,
monitorRouter
,
centerControl
,
systemRouter
,
{
...
...
src/views/Monitor/components/ComplexionPaint.vue
View file @
205bbe15
<
template
>
<div
class=
"page-body"
>
<div
class=
"paint-content"
>
<div
class=
"return-pack"
@
click=
"doReturnMonitorIndex"
></div>
<!-- 第一行 -->
<div
class=
"paint-row-1-0"
...
...
@@ -644,6 +645,12 @@ export default {
}
);
},
// 点击返回AVI大屏首页
doReturnMonitorIndex
()
{
this
.
$router
.
push
({
path
:
'/monitor/monitorIndex'
})
},
// 轮询请求接口
pollingGetInterface
()
{
// 查询车辆定位
...
...
@@ -1048,6 +1055,16 @@ export default {
background-size
:
35px
18px
;
background-position
:
0
16px
;
}
// 返回首页
.return-pack
{
position
:
absolute
;
cursor
:
pointer
;
width
:
450px
;
height
:
90px
;
top
:
0
;
left
:
575px
;
background-image
:
none
;
}
}
}
</
style
>
src/views/Monitor/components/Electrophoresis.vue
View file @
205bbe15
...
...
@@ -2,6 +2,7 @@
<!-- 电泳工作区 -->
<div
class=
"page-pack"
>
<div
class=
"elect-content"
>
<div
class=
"return-pack"
@
click=
"doReturnMonitorIndex"
></div>
<!-- 第 1 行 -->
<div
class=
"elect-row-1-1"
...
...
@@ -542,6 +543,12 @@ export default {
}
);
},
// 点击返回AVI大屏首页
doReturnMonitorIndex
()
{
this
.
$router
.
push
({
path
:
'/monitor/monitorIndex'
})
},
// 轮询请求接口
pollingGetInterface
()
{
// 查询车辆定位
...
...
@@ -584,8 +591,7 @@ export default {
margin
:
0
auto
;
width
:
1600px
;
height
:
900px
;
background
:
url("../../../assets/images/Monitor/monitor_electrophoresis.png")
no-repeat
;
background
:
url("../../../assets/images/Monitor/monitor_electrophoresis.png")
no-repeat
;
.elect-row-1-1
,
.elect-row-1-2
,
.elect-row-1-3
,
...
...
@@ -863,17 +869,24 @@ export default {
left
:
830px
;
}
.carOutFactory
{
background
:
url("../../../assets/images/Monitor/monitor_car_external.png")
no-repeat
;
background
:
url("../../../assets/images/Monitor/monitor_car_external.png")
no-repeat
;
background-size
:
35px
18px
;
background-position
:
0
16px
;
}
.isPositioned
{
background
:
url("../../../assets/images/Monitor/monitor_position_car.gif")
no-repeat
;
background
:
url("../../../assets/images/Monitor/monitor_position_car.gif")
no-repeat
;
background-size
:
35px
18px
;
background-position
:
0
16px
;
}
// 返回首页
.return-pack
{
position
:
absolute
;
cursor
:
pointer
;
width
:
450px
;
height
:
90px
;
top
:
0
;
left
:
575px
;
}
}
}
</
style
>
src/views/Monitor/components/FinishedCar.vue
View file @
205bbe15
...
...
@@ -2,6 +2,7 @@
<!-- 成品车存放区 -->
<div
class=
"page-pack"
>
<div
class=
"container-pack"
>
<div
class=
"return-pack"
@
click=
"doReturnMonitorIndex"
></div>
<!-- 第一行 -->
<div
class=
"finished-row-1-1"
...
...
@@ -239,6 +240,12 @@ export default {
}
);
},
// 点击返回AVI大屏首页
doReturnMonitorIndex
()
{
this
.
$router
.
push
({
path
:
'/monitor/monitorIndex'
})
},
// 轮询请求接口
pollingGetInterface
()
{
// 查询车辆定位
...
...
@@ -387,6 +394,16 @@ export default {
background-size
:
35px
18px
;
background-position
:
0
16px
;
}
// 返回首页
.return-pack
{
position
:
absolute
;
cursor
:
pointer
;
width
:
450px
;
height
:
90px
;
top
:
0
;
left
:
575px
;
background-image
:
none
;
}
}
}
</
style
>
src/views/Monitor/components/MiddleCoat.vue
View file @
205bbe15
<
template
>
<div
class=
"page-body"
>
<div
class=
"coat-content"
>
<div
class=
"return-pack"
@
click=
"doReturnMonitorIndex"
></div>
<div
class=
"coat-row-1-1"
@
click=
"doCarStationClick(query['HDG1-115'].busNo)"
...
...
@@ -288,6 +289,12 @@ export default {
}
);
},
// 点击返回AVI大屏首页
doReturnMonitorIndex
()
{
this
.
$router
.
push
({
path
:
'/monitor/monitorIndex'
})
},
// 轮询请求接口
pollingGetInterface
()
{
// 查询车辆定位
...
...
@@ -476,6 +483,16 @@ export default {
background-size
:
35px
18px
;
background-position
:
0
16px
;
}
// 返回首页
.return-pack
{
position
:
absolute
;
cursor
:
pointer
;
width
:
450px
;
height
:
90px
;
top
:
0
;
left
:
575px
;
background-image
:
none
;
}
}
}
</
style
>
src/views/Monitor/components/Putty.vue
View file @
205bbe15
<
template
>
<!-- 腻子作业区 -->
<div
class=
"page-body"
>
<div
class=
"putty-content"
>
<div
class=
"return-pack"
@
click=
"doReturnMonitorIndex"
></div>
<div
class=
"putty-row-1-1"
@
click=
"doCarStationClick(query['HDG1-95'].busNo)"
...
...
@@ -305,6 +307,12 @@ export default {
}
);
},
// 点击返回AVI大屏首页
doReturnMonitorIndex
()
{
this
.
$router
.
push
({
path
:
'/monitor/monitorIndex'
})
},
// 轮询请求接口
pollingGetInterface
()
{
// 查询车辆定位
...
...
@@ -501,6 +509,16 @@ export default {
background-size
:
35px
18px
;
background-position
:
0
16px
;
}
// 返回首页
.return-pack
{
position
:
absolute
;
cursor
:
pointer
;
width
:
450px
;
height
:
90px
;
top
:
0
;
left
:
575px
;
background-image
:
none
;
}
}
}
</
style
>
src/views/Monitor/components/SealedAnticorrosion.vue
View file @
205bbe15
...
...
@@ -2,6 +2,7 @@
<!-- 密封防腐作业区 -->
<div
class=
"page-pack"
>
<div
class=
"container-pack"
>
<div
class=
"return-pack"
@
click=
"doReturnMonitorIndex"
></div>
<!-- 第一行 -->
<div
class=
"sealed-row-1-1"
...
...
@@ -378,6 +379,12 @@ export default {
}
);
},
// 点击返回AVI大屏首页
doReturnMonitorIndex
()
{
this
.
$router
.
push
({
path
:
'/monitor/monitorIndex'
})
},
// 轮询查询区域实时信息
pollingGetAreaRealTimeData
()
{
// 获取密封防腐作业区实时数据
...
...
@@ -598,6 +605,16 @@ export default {
top
:
688px
;
left
:
1318px
;
}
// 返回首页
.return-pack
{
position
:
absolute
;
cursor
:
pointer
;
width
:
450px
;
height
:
90px
;
top
:
0
;
left
:
575px
;
background-image
:
none
;
}
}
}
...
...
src/views/Monitor/components/SheetMetalCar.vue
View file @
205bbe15
...
...
@@ -2,6 +2,7 @@
<!-- 钣金车存放区 -->
<div
class=
"page-pack"
>
<div
class=
"container-pack"
>
<div
class=
"return-pack"
@
click=
"doReturnMonitorIndex"
></div>
<!--第一行-->
<div
class=
"sheet-row-1-1"
...
...
@@ -393,12 +394,17 @@ export default {
}
);
},
// 点击返回AVI大屏首页
doReturnMonitorIndex
()
{
this
.
$router
.
push
({
path
:
'/monitor/monitorIndex'
})
},
// 轮询请求接口
pollingGetInterface
()
{
// 查询车辆定位
if
(
this
.
$route
.
query
.
hasOwnProperty
(
'orderNo'
)
||
this
.
$route
.
query
.
hasOwnProperty
(
'workOrderNo'
)
this
.
$route
.
query
.
hasOwnProperty
(
'orderNo'
)
||
this
.
$route
.
query
.
hasOwnProperty
(
'workOrderNo'
)
)
{
this
.
getCarPostion
();
}
...
...
@@ -418,6 +424,7 @@ export default {
.page-pack
{
min-height
:
100%
;
background
:
rgba
(
0
,
7
,
12
,
1
);
position
:
relative
;
.onlineNum
{
position
:
absolute
;
right
:
300px
;
...
...
@@ -442,8 +449,7 @@ export default {
width
:
140px
;
height
:
50px
;
cursor
:
pointer
;
background
:
url("../../../assets/images/Monitor/monitor_car.png")
no-repeat
;
background
:
url("../../../assets/images/Monitor/monitor_car.png")
no-repeat
;
background-size
:
35px
18px
;
background-position
:
0
16px
;
...
...
@@ -647,6 +653,16 @@ export default {
background-size
:
35px
18px
;
background-position
:
0
16px
;
}
// 返回首页
.return-pack
{
position
:
absolute
;
cursor
:
pointer
;
width
:
450px
;
height
:
90px
;
top
:
0
;
left
:
575px
;
background-image
:
none
;
}
}
}
</
style
>
src/views/Monitor/index.vue
View file @
205bbe15
...
...
@@ -1828,7 +1828,7 @@
height
:
1400px
;
width
:
100%
;
background-color
:
#001927
;
animation
:
identifier
10s
infinite
alternate
;
//
animation: identifier 10s infinite alternate;
// animation: identifier 8s infinite cubic-bezier(1,0,0.5,0);
.view-pack
{
margin
:
0
auto
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment