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
5232448a
Commit
5232448a
authored
Oct 31, 2019
by
车宾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(avi)车间大屏样式调整,白名单,
parent
59f497ce
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
119 additions
and
33 deletions
+119
-33
index.js
config/index.js
+2
-2
permission.js
src/permission.js
+2
-1
index.js
src/router/index.js
+66
-3
index.vue
src/views/CenterControl/index.vue
+1
-0
applyArtificial.vue
src/views/Led/Station/applyArtificial.vue
+1
-0
electrophoresis.vue
src/views/Led/Station/electrophoresis.vue
+1
-0
floatingCoatRobot.vue
src/views/Led/Station/floatingCoatRobot.vue
+1
-0
insulatingAnticorrosive.vue
src/views/Led/Station/insulatingAnticorrosive.vue
+1
-0
paintingWorkShop.vue
src/views/Led/Station/paintingWorkShop.vue
+17
-16
putty.vue
src/views/Led/Station/putty.vue
+1
-1
surfaceVarnish.vue
src/views/Led/Station/surfaceVarnish.vue
+1
-1
ComplexionPaint.vue
src/views/Monitor/components/ComplexionPaint.vue
+1
-0
Electrophoresis.vue
src/views/Monitor/components/Electrophoresis.vue
+1
-0
FinishedCar.vue
src/views/Monitor/components/FinishedCar.vue
+1
-0
MiddleCoat.vue
src/views/Monitor/components/MiddleCoat.vue
+1
-0
Putty.vue
src/views/Monitor/components/Putty.vue
+1
-0
SealedAnticorrosion.vue
src/views/Monitor/components/SealedAnticorrosion.vue
+1
-0
SheetMetalCar.vue
src/views/Monitor/components/SheetMetalCar.vue
+1
-0
index.vue
src/views/Monitor/index.vue
+18
-9
No files found.
config/index.js
View file @
5232448a
...
@@ -13,9 +13,9 @@ module.exports = {
...
@@ -13,9 +13,9 @@ module.exports = {
// 代理后端服务器
// 代理后端服务器
proxyTable
:
{
proxyTable
:
{
'/host'
:
{
'/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.43.244:8888', // 东伟服务器地址
target
:
'http://192.168.0.126:8080'
,
// 训浩服务器
//
target: 'http://192.168.0.126:8080', // 训浩服务器
changeOrigin
:
true
,
changeOrigin
:
true
,
pathRewrite
:
{
pathRewrite
:
{
'^/host'
:
''
//这里理解成用‘/host’代替target里面的地址,后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add',直接写‘/api/user/add’即可
'^/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 = [
...
@@ -19,7 +19,8 @@ const whiteList = [
'/led/stationFloatingCoatRobot'
,
'/led/stationFloatingCoatRobot'
,
'/led/stationSurfaceVarnish'
,
'/led/stationSurfaceVarnish'
,
'/led/stationSprayDryingRoom'
,
'/led/stationSprayDryingRoom'
,
'/led/stationPaintingWorkShop'
'/led/stationPaintingWorkShop'
,
'/monitor/monitorIndex'
]
]
NProgress
.
configure
({
NProgress
.
configure
({
...
...
src/router/index.js
View file @
5232448a
...
@@ -22,7 +22,7 @@ import deviceRunningTimeRouter from './modules/deviceRunning'
...
@@ -22,7 +22,7 @@ import deviceRunningTimeRouter from './modules/deviceRunning'
// 基础数据
// 基础数据
import
basicRouter
from
'./modules/basic'
import
basicRouter
from
'./modules/basic'
// AVI大屏
// AVI大屏
import
monitorRouter
from
'./modules/monitor'
//
import monitorRouter from './modules/monitor'
// 监控大屏
// 监控大屏
import
centerControl
from
'./modules/centerControll'
import
centerControl
from
'./modules/centerControll'
// 系统管理
// 系统管理
...
@@ -63,7 +63,7 @@ export const constantRouterMap = [{
...
@@ -63,7 +63,7 @@ export const constantRouterMap = [{
{
{
path
:
'stationInsulatingAnticorrosive'
,
//隔热防腐
path
:
'stationInsulatingAnticorrosive'
,
//隔热防腐
component
:
()
=>
import
(
'@/views/Led/Station/insulatingAnticorrosive'
),
component
:
()
=>
import
(
'@/views/Led/Station/insulatingAnticorrosive'
),
name
:
'
s
tationInsulatingAnticorrosive'
,
name
:
'
S
tationInsulatingAnticorrosive'
,
meta
:
{
title
:
'stationInsulatingAnticorrosive'
,
icon
:
'template'
}
meta
:
{
title
:
'stationInsulatingAnticorrosive'
,
icon
:
'template'
}
},
},
{
{
...
@@ -103,6 +103,69 @@ export const constantRouterMap = [{
...
@@ -103,6 +103,69 @@ 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
}
]
}]
}]
// 业务级路由(后期可能在界面中动态配置)
// 业务级路由(后期可能在界面中动态配置)
...
@@ -112,7 +175,7 @@ export const asyncRouterMap = [
...
@@ -112,7 +175,7 @@ export const asyncRouterMap = [
laboratoryRouter
,
laboratoryRouter
,
deviceRunningTimeRouter
,
deviceRunningTimeRouter
,
basicRouter
,
basicRouter
,
monitorRouter
,
//
monitorRouter,
centerControl
,
centerControl
,
systemRouter
,
systemRouter
,
{
{
...
...
src/views/CenterControl/index.vue
View file @
5232448a
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
import
MachineWarning
from
'./components/MachineWarning'
import
MachineWarning
from
'./components/MachineWarning'
export
default
{
export
default
{
name
:
'CenterControl'
,
components
:
{
components
:
{
MachineUtilizationRate
,
MachineUtilizationRate
,
MachineFailureRate
,
MachineFailureRate
,
...
...
src/views/Led/Station/applyArtificial.vue
View file @
5232448a
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
import
{
swiper
,
swiperSlide
}
from
'vue-awesome-swiper'
import
{
swiper
,
swiperSlide
}
from
'vue-awesome-swiper'
import
Moment
from
'moment'
import
Moment
from
'moment'
export
default
{
export
default
{
name
:
'StationApplyArtificial'
,
components
:
{
components
:
{
swiper
,
swiper
,
swiperSlide
swiperSlide
...
...
src/views/Led/Station/electrophoresis.vue
View file @
5232448a
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
import
{
swiper
,
swiperSlide
}
from
'vue-awesome-swiper'
import
{
swiper
,
swiperSlide
}
from
'vue-awesome-swiper'
import
Moment
from
'moment'
import
Moment
from
'moment'
export
default
{
export
default
{
name
:
'StationElectrophoresis'
,
components
:
{
components
:
{
swiper
,
swiper
,
swiperSlide
swiperSlide
...
...
src/views/Led/Station/floatingCoatRobot.vue
View file @
5232448a
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
import
{
swiper
,
swiperSlide
}
from
'vue-awesome-swiper'
import
{
swiper
,
swiperSlide
}
from
'vue-awesome-swiper'
import
Moment
from
'moment'
import
Moment
from
'moment'
export
default
{
export
default
{
name
:
'StationFloatingCoatRobot'
,
components
:
{
components
:
{
swiper
,
swiper
,
swiperSlide
swiperSlide
...
...
src/views/Led/Station/insulatingAnticorrosive.vue
View file @
5232448a
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
import
{
swiper
,
swiperSlide
}
from
'vue-awesome-swiper'
import
{
swiper
,
swiperSlide
}
from
'vue-awesome-swiper'
import
Moment
from
'moment'
import
Moment
from
'moment'
export
default
{
export
default
{
name
:
'StationInsulatingAnticorrosive'
,
components
:
{
components
:
{
swiper
,
swiper
,
swiperSlide
swiperSlide
...
...
src/views/Led/Station/paintingWorkShop.vue
View file @
5232448a
<
template
>
<
template
>
<div
class=
"container"
>
<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=
"title-pack"
>
中通客车涂装车间
</div>
<div
class=
"table-pack"
>
<div
class=
"table-pack"
>
<div
class=
"tr clear-float"
>
<div
class=
"tr clear-float"
>
...
@@ -54,6 +54,7 @@
...
@@ -54,6 +54,7 @@
<
script
>
<
script
>
import
Moment
from
'moment'
import
Moment
from
'moment'
export
default
{
export
default
{
name
:
'StationPaintingWorkShop'
,
data
()
{
data
()
{
return
{
return
{
width
:
0
,
width
:
0
,
...
@@ -238,7 +239,7 @@
...
@@ -238,7 +239,7 @@
},
60000
)
},
60000
)
this
.
width
=
document
.
body
.
offsetWidth
this
.
width
=
document
.
body
.
offsetWidth
this
.
height
=
document
.
body
.
offsetHeight
this
.
height
=
document
.
body
.
offsetHeight
this
.
zoom
=
`scale(
${
this
.
width
/
1710
}
)`
//
this.zoom = `scale(${this.width / 1710})`
console
.
log
(
this
.
zoom
)
console
.
log
(
this
.
zoom
)
},
0
)
},
0
)
}
}
...
@@ -251,21 +252,21 @@
...
@@ -251,21 +252,21 @@
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
.page-pack
{
.page-pack
{
width
:
1
710
px
;
width
:
1
556
px
;
height
:
860
px
;
height
:
1037
px
;
background-color
:
#111
;
background-color
:
#111
;
.borderBot
{
.borderBot
{
border-bottom
:
2px
solid
yellow
;
border-bottom
:
2px
solid
yellow
;
}
}
.title-pack
{
.title-pack
{
width
:
1
710
px
;
width
:
1
556
px
;
height
:
1
00
px
;
height
:
1
34
px
;
text-align
:
center
;
text-align
:
center
;
color
:
yellow
;
color
:
yellow
;
line-height
:
1
00
px
;
line-height
:
1
34
px
;
font-weight
:
bold
;
font-weight
:
bold
;
font-size
:
5
0px
;
font-size
:
6
0px
;
}
}
.table-pack
{
.table-pack
{
...
@@ -275,29 +276,29 @@
...
@@ -275,29 +276,29 @@
.th-l
,
.th-2
,
.th-3
,
.th-4
{
.th-l
,
.th-2
,
.th-3
,
.th-4
{
width
:
30%
;
width
:
30%
;
height
:
90
px
;
height
:
110
.625
px
;
border-top
:
2px
solid
yellow
;
border-top
:
2px
solid
yellow
;
border-right
:
2px
solid
yellow
;
border-right
:
2px
solid
yellow
;
float
:
left
;
float
:
left
;
text-align
:
center
;
text-align
:
center
;
color
:
yellow
;
color
:
yellow
;
line-height
:
90
px
;
line-height
:
110
.625
px
;
font-weight
:
bold
;
font-weight
:
bold
;
font-size
:
4
0
px
;
font-size
:
4
8
px
;
}
}
.th-2
{
width
:
20%
;}
.th-2
{
width
:
20%
;
font-size
:
60px
}
.th-3
{
width
:
29
.5%
;}
.th-3
{
width
:
29
.5%
;}
.th-4
{
width
:
20%
;
border-right
:
none
}
.th-4
{
width
:
20%
;
border-right
:
none
;
font-size
:
60px
}
}
}
}
}
.time
{
.time
{
width
:
1710px
;
width
:
1710px
;
height
:
1
00
px
;
height
:
1
10
.625
px
;
border-top
:
2px
solid
yellow
;
border-top
:
2px
solid
yellow
;
color
:
yellow
;
color
:
yellow
;
font-weight
:
bold
;
font-weight
:
bold
;
line-height
:
1
00
px
;
line-height
:
1
10
.625
px
;
font-size
:
60
px
;
font-size
:
48
px
;
}
}
}
}
}
}
...
...
src/views/Led/Station/putty.vue
View file @
5232448a
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
import
{
swiper
,
swiperSlide
}
from
'vue-awesome-swiper'
import
{
swiper
,
swiperSlide
}
from
'vue-awesome-swiper'
import
Moment
from
'moment'
import
Moment
from
'moment'
export
default
{
export
default
{
name
:
'Station
SprayDryingRoom
'
,
name
:
'Station
Putty
'
,
components
:
{
components
:
{
swiper
,
swiper
,
swiperSlide
swiperSlide
...
...
src/views/Led/Station/surfaceVarnish.vue
View file @
5232448a
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
import
{
swiper
,
swiperSlide
}
from
'vue-awesome-swiper'
import
{
swiper
,
swiperSlide
}
from
'vue-awesome-swiper'
import
Moment
from
'moment'
import
Moment
from
'moment'
export
default
{
export
default
{
name
:
'StationS
prayDryingRoom
'
,
name
:
'StationS
urfaceVarnish
'
,
components
:
{
components
:
{
swiper
,
swiper
,
swiperSlide
swiperSlide
...
...
src/views/Monitor/components/ComplexionPaint.vue
View file @
5232448a
...
@@ -552,6 +552,7 @@
...
@@ -552,6 +552,7 @@
*/
*/
import
Tooltip
from
'./Tooltip'
;
import
Tooltip
from
'./Tooltip'
;
export
default
{
export
default
{
name
:
'MonitorComplexionPaint'
,
components
:
{
components
:
{
Tooltip
Tooltip
},
},
...
...
src/views/Monitor/components/Electrophoresis.vue
View file @
5232448a
...
@@ -448,6 +448,7 @@
...
@@ -448,6 +448,7 @@
<
script
>
<
script
>
import
Tooltip
from
'./Tooltip'
;
import
Tooltip
from
'./Tooltip'
;
export
default
{
export
default
{
name
:
'MonitorElectrophoresis'
,
components
:
{
components
:
{
Tooltip
Tooltip
},
},
...
...
src/views/Monitor/components/FinishedCar.vue
View file @
5232448a
...
@@ -149,6 +149,7 @@
...
@@ -149,6 +149,7 @@
<
script
>
<
script
>
import
Tooltip
from
'./Tooltip'
;
import
Tooltip
from
'./Tooltip'
;
export
default
{
export
default
{
name
:
'MonitorFinishedCar'
,
components
:
{
components
:
{
Tooltip
Tooltip
},
},
...
...
src/views/Monitor/components/MiddleCoat.vue
View file @
5232448a
...
@@ -198,6 +198,7 @@
...
@@ -198,6 +198,7 @@
*/
*/
import
Tooltip
from
'./Tooltip'
;
import
Tooltip
from
'./Tooltip'
;
export
default
{
export
default
{
name
:
'MonitorMiddleCoat'
,
components
:
{
components
:
{
Tooltip
Tooltip
},
},
...
...
src/views/Monitor/components/Putty.vue
View file @
5232448a
...
@@ -221,6 +221,7 @@
...
@@ -221,6 +221,7 @@
*/
*/
import
Tooltip
from
'./Tooltip'
;
import
Tooltip
from
'./Tooltip'
;
export
default
{
export
default
{
name
:
'MonitorPutty'
,
components
:
{
components
:
{
Tooltip
Tooltip
},
},
...
...
src/views/Monitor/components/SealedAnticorrosion.vue
View file @
5232448a
...
@@ -306,6 +306,7 @@
...
@@ -306,6 +306,7 @@
<
script
>
<
script
>
import
Tooltip
from
'./Tooltip'
;
import
Tooltip
from
'./Tooltip'
;
export
default
{
export
default
{
name
:
'MonitorSealedAnticorrosion'
,
components
:
{
components
:
{
Tooltip
Tooltip
},
},
...
...
src/views/Monitor/components/SheetMetalCar.vue
View file @
5232448a
...
@@ -299,6 +299,7 @@
...
@@ -299,6 +299,7 @@
<
script
>
<
script
>
import
Tooltip
from
'./Tooltip'
;
import
Tooltip
from
'./Tooltip'
;
export
default
{
export
default
{
name
:
'MonitorSheetMetalCar'
,
components
:
{
components
:
{
Tooltip
Tooltip
},
},
...
...
src/views/Monitor/index.vue
View file @
5232448a
...
@@ -1562,6 +1562,7 @@
...
@@ -1562,6 +1562,7 @@
<
script
>
<
script
>
export
default
{
export
default
{
name
:
'MonitorIndex'
,
data
()
{
data
()
{
return
{
return
{
// 筛选条件工单号
// 筛选条件工单号
...
@@ -1809,18 +1810,22 @@
...
@@ -1809,18 +1810,22 @@
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
html
{
html
{
position
:
relative
;
position
:
relative
;
// overflow-y: hidden;
}
}
@keyframes
identifier
{
@keyframes
identifier
{
0
%
{
transform
:
translateY
(
0px
);}
0
%
{
transform
:
translateY
(
0px
);}
30
%
{
transform
:
translateY
(
-10
0px
);}
20
%
{
transform
:
translateY
(
-7
0px
);}
60
%
{
transform
:
translateY
(
-20
0px
);}
40
%
{
transform
:
translateY
(
-14
0px
);}
// 75% { transform: translateY(-18
0px);}
60
%
{
transform
:
translateY
(
-21
0px
);}
100
%
{
transform
:
translateY
(
-30
0px
);}
80
%
{
transform
:
translateY
(
-28
0px
);}
// 100% { transform: translateY(-40
0px);}
100
%
{
transform
:
translateY
(
-35
0px
);}
// 100% {transform: translateY(-450px);}
// 100% {transform: translateY(-450px);}
};
}
.monitor-pack
{
.monitor-pack
{
overflow-x
:
hidden
;
overflow-y
:
visible
;
height
:
1400px
;
width
:
100%
;
width
:
100%
;
background-color
:
#001927
;
background-color
:
#001927
;
animation
:
identifier
10s
infinite
alternate
;
animation
:
identifier
10s
infinite
alternate
;
...
@@ -3708,7 +3713,7 @@
...
@@ -3708,7 +3713,7 @@
}
}
.no-message
{
.no-message
{
font-size
:
12
px
!
important
;
font-size
:
6
px
!
important
;
font-weight
:
400
;
font-weight
:
400
;
}
}
...
@@ -3789,6 +3794,10 @@
...
@@ -3789,6 +3794,10 @@
}
}
}
}
::-webkit-scrollbar
{
display
:
none
!
important
;
}
// 轻客车体样式
// 轻客车体样式
.monitor-car-external
{
.monitor-car-external
{
background
:
url('../../assets/images/Monitor/monitor_car_external.png')
!
important
;
background
:
url('../../assets/images/Monitor/monitor_car_external.png')
!
important
;
...
...
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