Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
K
kd_control
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
zhanglw
kd_control
Commits
fa5eef01
Commit
fa5eef01
authored
Apr 18, 2023
by
zhanglw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人员轨迹回放
parent
8d42e2f3
Changes
8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
144 additions
and
1470 deletions
+144
-1470
mlargeScreen.css
src/assets/styles/mlargeScreen.css
+15
-15
carsEZUIKitJs.vue
src/components/ezuikit/carsEZUIKitJs.vue
+23
-1
Map2.vue
src/components/mars3d/Map2.vue
+18
-22
index.vue
...iews/MLargeScreen/components/intelligentSchedul/index.vue
+67
-67
DPcomputer16.vue
.../MLargeScreen/components/smallComponents/DPcomputer16.vue
+6
-29
DPcomputer16_.vue
...MLargeScreen/components/smallComponents/DPcomputer16_.vue
+0
-1330
index.vue
src/views/carManagement/carTrajectory/index.vue
+6
-6
index.vue
src/views/personnelPositioning/peopleLogData/index.vue
+9
-0
No files found.
src/assets/styles/mlargeScreen.css
View file @
fa5eef01
...
@@ -1097,21 +1097,21 @@
...
@@ -1097,21 +1097,21 @@
/* color: #31E5F5;*/
/* color: #31E5F5;*/
/* font-size: 16px;*/
/* font-size: 16px;*/
/*}*/
/*}*/
.el-cascader-panel
{
/*.el-cascader-panel{*/
background-color
:
#021445
!important
;
/* background-color: #021445 !important;*/
color
:
#31E5F5
;
/* color: #31E5F5;*/
font-size
:
16px
;
/* font-size: 16px;*/
}
/*}*/
.el-cascader-menu
{
/*.el-cascader-menu{*/
border
:
0px
;
/* border: 0px;*/
}
/*}*/
.el-cascader-menu__list
{
/*.el-cascader-menu__list{*/
color
:
#31E5F5
;
/* color: #31E5F5;*/
border
:
1px
solid
#01f5fe
;
/* border: 1px solid #01f5fe;*/
}
/*}*/
.el-cascader-node
:not
(
.is-disabled
)
:hover
,
.el-cascader-node
:not
(
.is-disabled
)
:focus
{
/*.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus{*/
background-color
:
#021445
!important
;
/* background-color: #021445 !important;*/
}
/*}*/
.intelligentSchScrView
.voiceAppContent_4_btns
{
.intelligentSchScrView
.voiceAppContent_4_btns
{
background-color
:
#112251
;
background-color
:
#112251
;
border
:
1px
solid
#00FCF9
;
border
:
1px
solid
#00FCF9
;
...
...
src/components/ezuikit/carsEZUIKitJs.vue
View file @
fa5eef01
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<video
id=
"videoRealtime"
class=
"video-js vjs-default-skin vjs-big-play-centered"
controls
preload=
"auto"
data-setup=
"
{}" style="width: 100%;height: 100%;">
<video
id=
"videoRealtime"
class=
"video-js vjs-default-skin vjs-big-play-centered"
controls
preload=
"auto"
data-setup=
"
{}" style="width: 100%;height: 100%;">
您的浏览器不支持:HTML5 video.
您的浏览器不支持:HTML5 video.
</video>
</video>
<el-select
v-model=
"cameraSrc"
class=
"noPtzCameraList"
@
change=
"videoPlay()"
>
<el-select
v-model=
"cameraSrc"
class=
"noPtzCameraList"
@
change=
"videoPlay()"
:popper-append-to-body=
"false"
>
<el-option
v-for=
"item in cameraList"
:key=
"item.id"
:label=
"item.monitorName"
:value=
"item.monitorUrl"
style=
"font-size:16px;font-weight:400"
></el-option>
<el-option
v-for=
"item in cameraList"
:key=
"item.id"
:label=
"item.monitorName"
:value=
"item.monitorUrl"
style=
"font-size:16px;font-weight:400"
></el-option>
</el-select>
</el-select>
<el-button
class=
"noPtzCloseStyle"
type=
"danger"
icon=
"el-icon-close"
@
click=
"noPtzCloseFn()"
size=
"mini"
>
关闭
</el-button>
<el-button
class=
"noPtzCloseStyle"
type=
"danger"
icon=
"el-icon-close"
@
click=
"noPtzCloseFn()"
size=
"mini"
>
关闭
</el-button>
...
@@ -1110,4 +1110,26 @@ export default {
...
@@ -1110,4 +1110,26 @@ export default {
font-weight
:
600
;
font-weight
:
600
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
.noPtzVideo1
.el-scrollbar
{
background-color
:
#021445
!important
;
}
.noPtzVideo1
.el-select-dropdown__item.hover
,
.el-select-dropdown__item
:hover
{
background-color
:
#021445
!important
;
color
:
#31E5F5
;
}
.noPtzVideo1
.el-select-dropdown__item.selected
{
background-color
:
#021445
!important
;
color
:
#31E5F5
;
font-weight
:
800
;
}
.noPtzVideo1
.el-select-dropdown__item
{
padding
:
0px
20px
;
box-sizing
:
border-box
;
background-color
:
#021445
!important
;
color
:
#31E5F5
;
font-size
:
16px
;
}
</
style
>
</
style
>
src/components/mars3d/Map2.vue
View file @
fa5eef01
...
@@ -350,30 +350,26 @@ export default {
...
@@ -350,30 +350,26 @@ export default {
var
graphic
=
new
mars3d
.
graphic
.
PathEntity
({
var
graphic
=
new
mars3d
.
graphic
.
PathEntity
({
position
:
property
,
position
:
property
,
orientation
:
new
Cesium
.
VelocityOrientationProperty
(
property
),
style
:
{
style
:
{
width
:
4
,
resolution
:
1
,
color
:
"
rgb(251,84,48)
"
,
leadTime
:
0
,
opacity
:
1.0
,
trailTime
:
3600
,
leadTime
:
0
,
// 前方的路线不显示
trailTime
:
0
,
//高亮时的样式(默认为鼠标移入,也可以指定type:'click'单击高亮),构造后也可以openHighlight、closeHighlight方法来手动调用
highlight
:
{
type
:
mars3d
.
EventType
.
click
,
color
:
"
#ff0000
"
,
color
:
"
#ff0000
"
,
},
width
:
3
},
},
label
:
{
//
label: {
//
text: truckName,
//
text: truckName,
font_size
:
22
,
// font_size: 18
,
font_family
:
"
楷体
"
,
//
font_family: "楷体",
color
:
Cesium
.
Color
.
AZURE
,
//
color: Cesium.Color.AZURE,
outline
:
true
,
//
outline: true,
outlineColor
:
Cesium
.
Color
.
BLACK
,
//
outlineColor: Cesium.Color.BLACK,
outlineWidth
:
2
,
//
outlineWidth: 2,
horizontalOrigin
:
Cesium
.
HorizontalOrigin
.
CENTER
,
//
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
verticalOrigin
:
Cesium
.
VerticalOrigin
.
BOTTOM
,
//
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
pixelOffset
:
new
Cesium
.
Cartesian2
(
1
0
,
-
25
),
//偏移量
// pixelOffset: new Cesium.Cartesian2(
0, -25), //偏移量
},
//
},
model
:
{
model
:
{
url
:
'
//data.mars3d.cn/gltf/mars/car/tufangche.glb
'
,
url
:
'
//data.mars3d.cn/gltf/mars/car/tufangche.glb
'
,
scale
:
0.1
,
scale
:
0.1
,
...
...
src/views/MLargeScreen/components/intelligentSchedul/index.vue
View file @
fa5eef01
...
@@ -1844,33 +1844,33 @@ dd>div{
...
@@ -1844,33 +1844,33 @@ dd>div{
color
:
#01f5fe
;
color
:
#01f5fe
;
border
:
2px
solid
#01f5fe
;
border
:
2px
solid
#01f5fe
;
}
}
.el-select-dropdown__list
{
/*.el-select-dropdown__list{*/
background-color
:
#021445
!important
;
/* background-color: #021445 !important;*/
border
:
1px
solid
#01f5fe
;
/* border: 1px solid #01f5fe;*/
color
:
#31E5F5
;
/* color: #31E5F5;*/
}
/*}*/
.el-select-dropdown__item.hover
,
.el-select-dropdown__item
:hover
{
/*.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{*/
background-color
:
#021445
!important
;
/* background-color: #021445 !important;*/
color
:
#31E5F5
;
/* color: #31E5F5;*/
}
/*}*/
.el-select-dropdown__item
{
/*.el-select-dropdown__item{*/
background-color
:
#021445
!important
;
/* background-color: #021445 !important;*/
color
:
#31E5F5
;
/* color: #31E5F5;*/
font-size
:
16px
;
/* font-size: 16px;*/
}
/*}*/
.el-cascader-panel
{
/*.el-cascader-panel{*/
background-color
:
#021445
!important
;
/* background-color: #021445 !important;*/
color
:
#31E5F5
;
/* color: #31E5F5;*/
font-size
:
16px
;
/* font-size: 16px;*/
}
/*}*/
.el-cascader-menu
{
/*.el-cascader-menu{*/
border
:
0px
;
/* border: 0px;*/
}
/*}*/
.el-cascader-menu__list
{
/*.el-cascader-menu__list{*/
color
:
#31E5F5
;
/* color: #31E5F5;*/
border
:
1px
solid
#01f5fe
;
/* border: 1px solid #01f5fe;*/
}
/*}*/
.el-cascader-node
:not
(
.is-disabled
)
:hover
,
.el-cascader-node
:not
(
.is-disabled
)
:focus
{
/*.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus{*/
background-color
:
#021445
!important
;
/* background-color: #021445 !important;*/
}
/*}*/
</
style
>
</
style
>
src/views/MLargeScreen/components/smallComponents/DPcomputer16.vue
View file @
fa5eef01
...
@@ -189,7 +189,7 @@
...
@@ -189,7 +189,7 @@
<!-- 录音弹窗 -->
<!-- 录音弹窗 -->
<div
class=
"peopleScheAssembly"
v-if=
"voiceViewShow"
>
<div
class=
"peopleScheAssembly"
v-if=
"voiceViewShow"
>
<div
style=
"color:white;font-size:14px;margin-bottom:1vh;font-size: 18px;font-weight: 600;"
>
车辆调度
<span
style=
"font-size:14px"
>
(
{{
curPaItem
.
pointName
}}
)
</span></div>
<div
style=
"color:white;font-size:14px;margin-bottom:1vh;font-size: 18px;font-weight: 600;"
>
车辆调度
<span
style=
"font-size:14px"
>
(
{{
curPaItem
.
pointName
}}
)
</span></div>
<el-select
v-show=
"actionType!=='通话'"
v-model=
"selectCarFleet"
placeholder=
"请选择车队"
style=
"width:100%;margin:5px"
@
change=
"toSearchFn()"
>
<el-select
v-show=
"actionType!=='通话'"
v-model=
"selectCarFleet"
placeholder=
"请选择车队"
style=
"width:100%;margin:5px"
@
change=
"toSearchFn()"
:popper-append-to-body=
"false"
>
<el-option
v-for=
"(item,index) in carFleetData"
:key=
"index"
:label=
"item.name"
:value=
"item.name"
style=
"font-size:14px;"
></el-option>
<el-option
v-for=
"(item,index) in carFleetData"
:key=
"index"
:label=
"item.name"
:value=
"item.name"
style=
"font-size:14px;"
></el-option>
</el-select>
</el-select>
<div
class=
"rolling"
>
<div
class=
"rolling"
>
...
@@ -1162,6 +1162,7 @@ export default {
...
@@ -1162,6 +1162,7 @@ export default {
padding
:
0
15%
10px
;
padding
:
0
15%
10px
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
}
</
style
>
</
style
>
<
style
>
<
style
>
...
@@ -1355,50 +1356,26 @@ export default {
...
@@ -1355,50 +1356,26 @@ export default {
background
:
#ededed
;
background
:
#ededed
;
border-radius
:
10px
;
border-radius
:
10px
;
}
}
.el-cascader-node.is-selectable.in-active-path
{
color
:
#1890ff
;
}
.
el-select-dropdown__list
{
.
DPcomputer16Box
.el-scrollbar
{
background-color
:
#021445
!important
;
background-color
:
#021445
!important
;
border
:
1px
solid
#01f5fe
;
color
:
#31E5F5
;
}
}
.el-select-dropdown__item.hover
,
.el-select-dropdown__item
:hover
{
.
DPcomputer16Box
.
el-select-dropdown__item.hover
,
.el-select-dropdown__item
:hover
{
background-color
:
#021445
!important
;
background-color
:
#021445
!important
;
color
:
#31E5F5
;
color
:
#31E5F5
;
}
}
.el-select-dropdown__item.selected
{
.
DPcomputer16Box
.
el-select-dropdown__item.selected
{
background-color
:
#021445
!important
;
background-color
:
#021445
!important
;
color
:
#31E5F5
;
color
:
#31E5F5
;
font-weight
:
800
;
font-weight
:
800
;
}
}
.el-select-dropdown__item
{
.
DPcomputer16Box
.
el-select-dropdown__item
{
padding
:
0px
20px
;
padding
:
0px
20px
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
background-color
:
#021445
!important
;
background-color
:
#021445
!important
;
color
:
#31E5F5
;
color
:
#31E5F5
;
font-size
:
16px
;
font-size
:
16px
;
}
}
.el-cascader-panel
{
background-color
:
#021445
!important
;
color
:
#31E5F5
;
font-size
:
16px
;
}
.el-cascader-menu
{
border
:
0px
;
}
.el-cascader-menu__list
{
color
:
#31E5F5
;
border
:
1px
solid
#01f5fe
;
}
.el-cascader-node
:not
(
.is-disabled
)
:hover
,
.el-cascader-node
:not
(
.is-disabled
)
:focus
{
background-color
:
#021445
!important
;
}
</
style
>
</
style
>
src/views/MLargeScreen/components/smallComponents/DPcomputer16_.vue
deleted
100644 → 0
View file @
8d42e2f3
This diff is collapsed.
Click to expand it.
src/views/carManagement/carTrajectory/index.vue
View file @
fa5eef01
...
@@ -95,7 +95,7 @@ export default {
...
@@ -95,7 +95,7 @@ export default {
//测距按钮是否能用
//测距按钮是否能用
measureDistanceDis
:
true
,
measureDistanceDis
:
true
,
//是否显示轨迹
//是否显示轨迹
leadTime
:
fals
e
,
leadTime
:
tru
e
,
//轨迹时间点
//轨迹时间点
trajectoryTimePoint
:
''
,
trajectoryTimePoint
:
''
,
trajectoryTimePointPlaceholder
:
'
轨迹时间点
'
,
trajectoryTimePointPlaceholder
:
'
轨迹时间点
'
,
...
...
src/views/personnelPositioning/peopleLogData/index.vue
View file @
fa5eef01
...
@@ -699,4 +699,13 @@ div::-webkit-scrollbar{
...
@@ -699,4 +699,13 @@ div::-webkit-scrollbar{
width
:
1160px
;
width
:
1160px
;
overflow
:
hidden
;
overflow
:
hidden
;
}
}
.mars3d-clockAnimate
{
position
:
absolute
;
bottom
:
0
;
left
:
0
;
height
:
28px
;
z-index
:
999
;
color
:
white
;
background
:
linear-gradient
(
to
bottom
,
rgba
(
116
,
117
,
119
,
1
)
0%
,
rgba
(
58
,
68
,
82
,
1
)
11%
,
rgba
(
46
,
50
,
56
,
1
)
46%
,
rgba
(
53
,
53
,
53
,
1
)
81%
,
rgba
(
53
,
53
,
53
,
1
)
100%
);
}
</
style
>
</
style
>
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