Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zhengyuan-danger-chemistry-manage
Project
Project
Details
Activity
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
耿迪迪
zhengyuan-danger-chemistry-manage
Commits
399c8cc9
Commit
399c8cc9
authored
Sep 30, 2022
by
纪泽龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改设备位置,更改厂房位置
parent
ab94a6c0
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
193 additions
and
85 deletions
+193
-85
cesiumClass.js
danger-manage-web/src/utils/cesium/cesiumClass.js
+19
-12
index.vue
danger-manage-web/src/views/dangerControl/monitor/index.vue
+49
-6
index.vue
danger-manage-web/src/views/dangerScale/profile/index.vue
+22
-22
Right.vue
...rc/views/educationPlanExam/myLessons/components/Right.vue
+34
-18
index.vue
danger-manage-web/src/views/index.vue
+69
-27
No files found.
danger-manage-web/src/utils/cesium/cesiumClass.js
View file @
399c8cc9
/*
* @Author: your name
* @Date: 2021-12-07 14:19:18
* @LastEditTime: 2022-09-30 1
3:32:44
* @LastEditTime: 2022-09-30 1
6:21:39
* @LastEditors: 纪泽龙 jizelong@qq.com
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /cesium-vue/src/utils/seieumClass.js
...
...
@@ -207,10 +207,10 @@ export default class CreateCesium {
// this.viewer.imageryLayers.addImageryProvider(layer);
this
.
scene
=
this
.
viewer
.
scene
;
this
.
scene
.
globe
.
show
=
false
;
//不显示地球,这条和地球透明度选一个就可以
this
.
scene
.
sun
.
show
=
false
;
//在Cesium1.6(不确定)之后的版本会显示太阳和月亮,不关闭会影响展示
this
.
scene
.
moon
.
show
=
false
;
this
.
scene
.
skyBox
.
show
=
false
;
//关闭天空盒,否则会显示天空颜色
//
this.scene.globe.show = false; //不显示地球,这条和地球透明度选一个就可以
//
this.scene.sun.show = false; //在Cesium1.6(不确定)之后的版本会显示太阳和月亮,不关闭会影响展示
//
this.scene.moon.show = false;
//
this.scene.skyBox.show = false; //关闭天空盒,否则会显示天空颜色
// 得到三维场景的球体
this
.
ellipsoid
=
this
.
scene
.
globe
.
ellipsoid
;
...
...
@@ -261,7 +261,7 @@ export default class CreateCesium {
* @param {Boolean} main 主场景 true 非主场景 false
* @return {*}
*/
addtiles
(
urlArr
,
main
)
{
a
sync
a
ddtiles
(
urlArr
,
main
)
{
urlArr
.
forEach
((
url
)
=>
{
const
tileset
=
new
Cesium
.
Cesium3DTileset
({
url
,
...
...
@@ -276,7 +276,7 @@ export default class CreateCesium {
const
longitudeString
=
Cesium
.
Math
.
toDegrees
(
cartographic
.
longitude
);
const
latitudeString
=
Cesium
.
Math
.
toDegrees
(
cartographic
.
latitude
);
var
gps
=
[
longitudeString
,
latitudeString
];
console
.
log
(
"tileset加载完毕"
);
console
.
log
(
"tileset加载完毕"
,
gps
);
// 阻塞转换成高德坐标
let
gaodeLnglat
=
(
await
this
.
gpsToGaode
(
gps
))[
0
];
console
.
log
(
"坐标换算完毕"
,
gaodeLnglat
);
...
...
@@ -293,10 +293,15 @@ export default class CreateCesium {
0.0
);
let
offset
=
Cesium
.
Cartesian3
.
fromRadians
(
Cesium
.
Math
.
toRadians
(
g
aodeLnglat
.
lng
),
Cesium
.
Math
.
toRadians
(
g
aodeLnglat
.
lat
),
Cesium
.
Math
.
toRadians
(
g
ps
[
0
]
),
Cesium
.
Math
.
toRadians
(
g
ps
[
1
]
),
-
160
);
// let offset = Cesium.Cartesian3.fromRadians(
// Cesium.Math.toRadians(gaodeLnglat.lng),
// Cesium.Math.toRadians(gaodeLnglat.lat),
// -160
// );
let
translation
=
Cesium
.
Cartesian3
.
subtract
(
offset
,
surface
,
...
...
@@ -316,8 +321,10 @@ export default class CreateCesium {
setTimeout
(()
=>
{
this
.
viewer
.
scene
.
camera
.
flyTo
({
destination
:
Cesium
.
Cartesian3
.
fromDegrees
(
114.08722973596568
,
38.251679644548084
,
// 114.08722973596568,
114.08026526196012
,
38.25051773015095
,
// 38.251679644548084,
784
),
//定位坐标点,建议使用谷歌地球坐标位置无偏差
orientation
:
{
...
...
@@ -327,7 +334,7 @@ export default class CreateCesium {
// heading: Cesium.Math.toRadians(20.0), // 方向
// pitch: Cesium.Math.toRadians(-90.0,), // 倾斜角度
// roll: 1.3,
heading
:
Cesium
.
Math
.
toRadians
(
177
),
// 方向
heading
:
Cesium
.
Math
.
toRadians
(
0
),
// 方向
pitch
:
Cesium
.
Math
.
toRadians
(
-
81.61
),
// 倾斜角度
// roll: 1.3,
},
...
...
danger-manage-web/src/views/dangerControl/monitor/index.vue
View file @
399c8cc9
...
...
@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-06-16 15:03:40
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-09-
29 20:51:09
* @LastEditTime: 2022-09-
30 17:16:23
* @FilePath: /danger-manage-web/src/views/bigwindow/index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
...
...
@@ -45,18 +45,60 @@ export default {
data1
:
[
{
deviceType
:
11
,
longitude
:
114.0
8572154613417
,
latitude
:
38.2
512726708146
6
,
longitude
:
114.0
7848044941088
,
latitude
:
38.2
483098537292
6
,
shortNum
:
10
,
title
:
"视频1"
,
},
{
deviceType
:
11
,
longitude
:
114.0
8582661394571
,
latitude
:
38.24
947844110259
6
,
longitude
:
114.0
7858975280202
,
latitude
:
38.24
85387790884
6
,
shortNum
:
16
,
title
:
"视频2"
,
},
{
deviceType
:
11
,
longitude
:
114.0788726514246
,
latitude
:
38.24854905109693
,
shortNum
:
16
,
title
:
"视频3"
,
},
{
deviceType
:
11
,
longitude
:
114.07933673582353
,
latitude
:
38.24932372451273
,
shortNum
:
10
,
title
:
"视频4"
,
},
{
deviceType
:
11
,
longitude
:
114.07943113040781
,
latitude
:
38.249634714126636
,
shortNum
:
16
,
title
:
"视频5"
,
},
{
deviceType
:
11
,
longitude
:
114.08000305885355
,
latitude
:
38.2494852174479
,
shortNum
:
16
,
title
:
"视频6"
,
},
{
deviceType
:
11
,
longitude
:
114.08007200486942
,
latitude
:
38.249835018521594
,
shortNum
:
16
,
title
:
"视频7"
,
},
{
deviceType
:
11
,
longitude
:
114.07771206027549
,
latitude
:
38.252223651533114
,
shortNum
:
16
,
title
:
"视频8"
,
},
],
data2
:
[
{
...
...
@@ -95,6 +137,7 @@ export default {
// this.Cesium.addDanger(item, Danger);
// });
this
.
data1
.
forEach
((
item
)
=>
{
item
.
config
=
{
scale
:
1
,
textHeight
:
-
32
};
this
.
Cesium
.
addDevice
(
item
,
"pic"
,
Video
);
});
this
.
data2
.
forEach
((
item
)
=>
{
...
...
@@ -111,7 +154,7 @@ export default {
beforeDestroy
()
{
// 挂掉该关的 infowindow 跟计算infowindow位置的计时器
this
.
Cesium
.
clearInfoWindow
();
this
.
Cesium
.
destroy
()
this
.
Cesium
.
destroy
()
;
},
};
</
script
>
...
...
danger-manage-web/src/views/dangerScale/profile/index.vue
View file @
399c8cc9
...
...
@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-06-16 15:03:40
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-09-30 1
1:22:07
* @LastEditTime: 2022-09-30 1
7:23:18
* @FilePath: /danger-manage-web/src/views/bigwindow/index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
...
...
@@ -63,8 +63,8 @@ export default {
data2
:
[
{
deviceType
:
2
,
longitude
:
114.08
2098206648
2
,
latitude
:
38.2
500435240177
,
longitude
:
114.08
143634104326
2
,
latitude
:
38.2
4983817327583
,
shortNum
:
7
,
title
:
"锅炉点火"
,
wxymc
:
"煤气管道"
,
...
...
@@ -80,9 +80,9 @@ export default {
},
{
deviceType
:
2
,
longitude
:
114.0
8743529141078
,
latitude
:
38.2
5117222006519
,
shortNum
:
3
,
longitude
:
114.0
7705728663734
,
latitude
:
38.2
49097661403205
,
shortNum
:
6
,
title
:
"有害气体"
,
wxymc
:
"氮气储罐"
,
gtrl
:
"2万m3"
,
...
...
@@ -101,10 +101,10 @@ export default {
danger
:
[
{
lnglatArr
:
[
[
114.0
8693257466244
,
38.2512282512827
6
],
[
114.0
8837308345032
,
38.2512545673699
7
],
[
114.0
8840384602489
,
38.25162426832718
],
[
114.0
8696540004983
,
38.25155912109927
],
[
114.0
7699224128288
,
38.2491786442156
6
],
[
114.0
7647701382231
,
38.2491631122554
7
],
[
114.0
7651429608312
,
38.24895731354076
],
[
114.0
7708709377842
,
38.248960473114614
],
],
colorNum
:
1
,
fxlb
:
"高风险区域"
,
...
...
@@ -125,10 +125,10 @@ export default {
},
{
lnglatArr
:
[
[
114.0
8840968324529
,
38.250338608553484
],
[
114.0
8705000996402
,
38.25027411252165
],
[
114.0
8700204531098
,
38.25062619768719
],
[
114.0
8841768197132
,
38.2506235240410
5
],
[
114.0
7806724970564
,
38.25034815051717
],
[
114.0
7639696862833
,
38.2502261900133
],
[
114.0
7639078797055
,
38.24993383198078
],
[
114.0
78151284626
,
38.2500019618047
5
],
],
colorNum
:
2
,
fxlb
:
"中风险区域"
,
...
...
@@ -149,10 +149,10 @@ export default {
},
{
lnglatArr
:
[
[
114.0
845936659788
,
38.25105615106475
],
[
114.0
829142987991
,
38.25093102454791
],
[
114.0
8281445503589
,
38.251806239979324
],
[
114.0
845864560673
,
38.251975928617924
],
[
114.0
777392710896
,
38.250782019890394
],
[
114.0
7734950538038
,
38.250761421969486
],
[
114.0
773933590535
,
38.25022891713582
],
[
114.0
7777116413182
,
38.250232988449945
],
],
colorNum
:
3
,
fxlb
:
"低风险区域"
,
...
...
@@ -173,10 +173,10 @@ export default {
},
{
lnglatArr
:
[
[
114.08
289927467062
,
38.2501295102271
9
],
[
114.08
105697693159
,
38.25003862859106
],
[
114.08100
925876086
,
38.25057715370437
],
[
114.08
286147538506
,
38.2507022435366
],
[
114.08
185866090808
,
38.2498514267747
9
],
[
114.08
093871524032
,
38.24985819653048
],
[
114.08100
272185587
,
38.249491674544146
],
[
114.08
185575292462
,
38.24951700145305
],
],
colorNum
:
4
,
fxlb
:
"中低风险区域"
,
...
...
danger-manage-web/src/views/educationPlanExam/myLessons/components/Right.vue
View file @
399c8cc9
...
...
@@ -3,7 +3,7 @@
<div
class=
"top flex"
>
<div
class=
"title"
>
通知
</div>
<div
class=
"content-wrapper flex"
>
<div
v-for=
"item in
5
"
:key=
"item + ''"
class=
"content flex"
>
<div
v-for=
"item in
[]
"
:key=
"item + ''"
class=
"content flex"
>
<div
class=
"left zzz"
>
啥啊啥飒哈市罚款收到回复夹寒暑假电烤炉付货款静安荟SDK复活卡开始了东航飞机好看的发
</div>
...
...
@@ -19,14 +19,29 @@
<div
class=
"right"
>
得分
</div>
</div>
<div
v-for=
"item in list"
:key=
"item.courseId"
class=
"td flex"
>
<div
class=
"left zzz"
>
{{
item
.
courseName
}}
</div>
<div
class=
"middle zzz"
:title=
"item.examinationTime"
>
{{
item
.
examinationTime
}}
</div>
<div
v-for=
"item in list"
:key=
"item.courseId"
class=
"td flex"
style=
""
>
<div
class=
"left zzz"
>
{{
item
.
courseName
}}
</div>
<div
class=
"middle zzz"
:title=
"item.examinationTime"
>
{{
item
.
examinationTime
}}
</div>
<div
class=
"right flex"
>
<div
class=
"a"
><span
class=
"text"
:class=
"
{red:item.examinationResult
<item
.
qualifiedNum
}"
>
{{
Math
.
floor
(
item
.
examinationResult
/
item
.
topicNum
*
100
)
}}
</span>
/
<span>
100
</span></div>
<div
class=
"a"
>
<span
class=
"text"
:class=
"
{ red: item.examinationResult
<
item
.
qualifiedNum
}"
>
{{
(
item
.
examinationResult
&&
item
.
topicNum
)?
Math
.
floor
((
item
.
examinationResult
/
item
.
topicNum
)
*
100
):
0
}}
</span
>
/
<span>
100
</span>
</div>
<div
class=
"b flex"
>
<div
style=
"width:60px"
>
<el-progress
:percentage=
"Math.floor(item.examinationResult/item.topicNum*100)"
:show-text=
"false"
></el-progress>
<div
style=
"width: 60px"
>
<el-progress
:percentage=
"
Math.floor((item.examinationResult / item.topicNum) * 100)
"
:show-text=
"false"
></el-progress>
</div>
</div>
</div>
...
...
@@ -36,16 +51,15 @@
</
template
>
<
script
>
export
default
{
name
:
"lession-right"
,
props
:{
list
:{
type
:
Array
,
default
:
()
=>
{
return
[]
}
}
props
:
{
list
:
{
type
:
Array
,
default
:
()
=>
{
return
[]
;
}
,
}
,
},
data
()
{
return
{};
...
...
@@ -57,7 +71,7 @@ export default {
.lession-right-wrapper
{
width
:
100%
;
height
:
100%
;
flex-direction
:
column
;
;
flex-direction
:
column
;
>
div
{
border
:
1px
solid
#BBBBBB
;
border-radius
:
5px
;
...
...
@@ -158,17 +172,19 @@ export default {
}
&
.right
{
width
:
30%
;
overflow
:
hidden
;
justify-content
:
space-between
;
.a
{
// width: 20px;
// overflow: hidden;
margin-right
:
5px
;
text-align
:
right
;
flex
:
1
;
flex
:
1
;
.text
{
color
:
#32be0f
;
&
.red
{
color
:
#d11414
;
}
}
}
.b
{
...
...
danger-manage-web/src/views/index.vue
View file @
399c8cc9
...
...
@@ -2,7 +2,7 @@
* @Author: 纪泽龙 jizelong@qq.com
* @Date: 2022-09-03 10:51:24
* @LastEditors: 纪泽龙 jizelong@qq.com
* @LastEditTime: 2022-09-
29 20:25:44
* @LastEditTime: 2022-09-
30 17:23:02
* @FilePath: /danger-manage-web/src/views/index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
...
...
@@ -54,8 +54,8 @@ export default {
data2
:
[
{
deviceType
:
2
,
longitude
:
114.082098206648
2
,
latitude
:
38.2
500435240177
,
longitude
:
114.08143634104326
2
,
latitude
:
38.2
4983817327583
,
shortNum
:
7
,
title
:
"锅炉点火"
,
wxymc
:
"煤气管道"
,
...
...
@@ -71,9 +71,9 @@ export default {
},
{
deviceType
:
2
,
longitude
:
114.08743529141078
,
latitude
:
38.2
5117222006519
,
shortNum
:
3
,
longitude
:
114.07705728663734
,
latitude
:
38.2
49097661403205
,
shortNum
:
6
,
title
:
"有害气体"
,
wxymc
:
"氮气储罐"
,
gtrl
:
"2万m3"
,
...
...
@@ -92,10 +92,10 @@ export default {
danger
:
[
{
lnglatArr
:
[
[
114.0
8693257466244
,
38.2512282512827
6
],
[
114.0
8837308345032
,
38.2512545673699
7
],
[
114.0
8840384602489
,
38.25162426832718
],
[
114.0
8696540004983
,
38.25155912109927
],
[
114.0
7699224128288
,
38.2491786442156
6
],
[
114.0
7647701382231
,
38.2491631122554
7
],
[
114.0
7651429608312
,
38.24895731354076
],
[
114.0
7708709377842
,
38.248960473114614
],
],
colorNum
:
1
,
fxlb
:
"高风险区域"
,
...
...
@@ -116,10 +116,10 @@ export default {
},
{
lnglatArr
:
[
[
114.0
8840968324529
,
38.250338608553484
],
[
114.0
8705000996402
,
38.25027411252165
],
[
114.0
8700204531098
,
38.25062619768719
],
[
114.0
8841768197132
,
38.2506235240410
5
],
[
114.0
7806724970564
,
38.25034815051717
],
[
114.0
7639696862833
,
38.2502261900133
],
[
114.0
7639078797055
,
38.24993383198078
],
[
114.0
78151284626
,
38.2500019618047
5
],
],
colorNum
:
2
,
fxlb
:
"中风险区域"
,
...
...
@@ -140,10 +140,10 @@ export default {
},
{
lnglatArr
:
[
[
114.0
845936659788
,
38.25105615106475
],
[
114.0
829142987991
,
38.25093102454791
],
[
114.0
8281445503589
,
38.251806239979324
],
[
114.0
845864560673
,
38.251975928617924
],
[
114.0
777392710896
,
38.250782019890394
],
[
114.0
7734950538038
,
38.250761421969486
],
[
114.0
773933590535
,
38.25022891713582
],
[
114.0
7777116413182
,
38.250232988449945
],
],
colorNum
:
3
,
fxlb
:
"低风险区域"
,
...
...
@@ -164,10 +164,10 @@ export default {
},
{
lnglatArr
:
[
[
114.08
289927467062
,
38.2501295102271
9
],
[
114.08
105697693159
,
38.25003862859106
],
[
114.08100
925876086
,
38.25057715370437
],
[
114.08
286147538506
,
38.2507022435366
],
[
114.08
185866090808
,
38.2498514267747
9
],
[
114.08
093871524032
,
38.24985819653048
],
[
114.08100
272185587
,
38.249491674544146
],
[
114.08
185575292462
,
38.24951700145305
],
],
colorNum
:
4
,
fxlb
:
"中低风险区域"
,
...
...
@@ -190,18 +190,60 @@ export default {
data11
:
[
{
deviceType
:
11
,
longitude
:
114.0
8572154613417
,
latitude
:
38.2
512726708146
6
,
longitude
:
114.0
7848044941088
,
latitude
:
38.2
483098537292
6
,
shortNum
:
10
,
title
:
"视频1
231231231231
"
,
title
:
"视频1"
,
},
{
deviceType
:
11
,
longitude
:
114.0
8579042117636
,
latitude
:
38.24
949662796779
,
longitude
:
114.0
7858975280202
,
latitude
:
38.24
853877908846
,
shortNum
:
16
,
title
:
"视频2"
,
},
{
deviceType
:
11
,
longitude
:
114.0788726514246
,
latitude
:
38.24854905109693
,
shortNum
:
16
,
title
:
"视频3"
,
},
{
deviceType
:
11
,
longitude
:
114.07933673582353
,
latitude
:
38.24932372451273
,
shortNum
:
10
,
title
:
"视频4"
,
},
{
deviceType
:
11
,
longitude
:
114.07943113040781
,
latitude
:
38.249634714126636
,
shortNum
:
16
,
title
:
"视频5"
,
},
{
deviceType
:
11
,
longitude
:
114.08000305885355
,
latitude
:
38.2494852174479
,
shortNum
:
16
,
title
:
"视频6"
,
},
{
deviceType
:
11
,
longitude
:
114.08007200486942
,
latitude
:
38.249835018521594
,
shortNum
:
16
,
title
:
"视频7"
,
},
{
deviceType
:
11
,
longitude
:
114.07771206027549
,
latitude
:
38.252223651533114
,
shortNum
:
16
,
title
:
"视频8"
,
},
],
data12
:
[
{
...
...
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