admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add: 增加标准版安全帽地图展开功能

Browse Source
This commit is contained in:
Vce 2024-04-15 12:36:09 +08:00
parent 67c3cec8f4
commit 983078520d
6 changed files with 98 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -15,13 +15,13 @@ NODE_ENV = 'development'
# 演示平台 # 演示平台
# VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
# 百色七参数线上地址 # 百色七参数线上地址
# VITE_API_URL = 'http://101.43.164.214:11111' VITE_API_URL = 'http://101.43.164.214:11111'
# 七参数标准版(测试平台) # 七参数标准版(测试平台)
# VITE_API_URL = 'http://jxj.zhgdyun.com:15551' # VITE_API_URL = 'http://jxj.zhgdyun.com:15551'
# 七参数标准版(测试平台) # 七参数标准版(测试平台)
# VITE_API_URL = 'http://182.90.224.237:15551' # VITE_API_URL = 'http://182.90.224.237:15551'
# agjt # agjt
VITE_API_URL = 'http://47.93.215.234:9809' # VITE_API_URL = 'http://47.93.215.234:9809'
# 上传 # 上传
VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

4
.env.production
View File

@ -12,7 +12,7 @@ NODE_ENV = "production"
# VITE_API_URL = "http://183.249.224.118:9003" # VITE_API_URL = "http://183.249.224.118:9003"
# 百色 新项目通用地址 # 百色 新项目通用地址
# VITE_API_URL = 'http://101.43.164.214:11111' VITE_API_URL = 'http://101.43.164.214:11111'
# 七参数标准版(演示平台) # 七参数标准版(演示平台)
# VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
@ -21,7 +21,7 @@ NODE_ENV = "production"
# 七参数标准版(测试平台) # 七参数标准版(测试平台)
# VITE_API_URL = 'http://182.90.224.237:15551' # VITE_API_URL = 'http://182.90.224.237:15551'
# agjt # agjt
VITE_API_URL = 'http://47.93.215.234:9809' # VITE_API_URL = 'http://47.93.215.234:9809'
# 打包 # 打包
VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url=' VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url='

BIN
src/assets/images/enlarge-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/assets/images/not-enlarge-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

4
src/config/config.ts
View File

@ -25,8 +25,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// 项目环境标识配置 部署时需更改对应的项目 // 项目环境标识配置 部署时需更改对应的项目
// export const COMPANY: string = ""; //标准版 // export const COMPANY: string = ""; //标准版
// export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "as"; //鞍山项目
export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjt"; //鞍钢集团
// export const COMPANY: string = "hfqc"; //合肥启程项目 export const COMPANY: string = "hfqc"; //合肥启程项目
// export const COMPANY: string = "jsyc"; // 江苏盐城项目 // export const COMPANY: string = "jsyc"; // 江苏盐城项目
// export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页) // export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页)
// export const COMPANY: string = "jxwjj"; //嘉兴王江泾公用码头项目 (需要去src\routers\modules\staticRouter.ts更换首页) // export const COMPANY: string = "jxwjj"; //嘉兴王江泾公用码头项目 (需要去src\routers\modules\staticRouter.ts更换首页)

102
src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue
View File

@ -165,20 +165,28 @@
</div> </div>
<div class="right-data"> <div class="right-data">
<div class="map-top"> <div class="map-top" :style="enlarge ? 'height:108%' : ''">
<Card title="定位地图" style="width: 100%"> <Card title="定位地图" style="width: 100%">
<div class="map-box" id="mapContainer"></div> <div class="map-box" id="mapContainer"></div>
<div class="wei-lan" v-if="checked === 1"> <div class="wei-lan" v-if="checked === 1">
<div class="icon-off" v-if="!fenceShow" @click="openFence"> <div class="icon-off" v-if="!fenceShow" @click="openFence" :style="enlarge ? 'top:8%' : ''">
<img src="@/assets/images/carPosition/iconOff.png" alt="" /> <img src="@/assets/images/carPosition/iconOff.png" alt="" />
<div>围栏</div> <div>围栏</div>
</div> </div>
<div class="icon-on" v-if="fenceShow" @click="fenceShow = false"> <div class="icon-on" v-if="fenceShow" @click="fenceShow = false" :style="enlarge ? 'top:8%' : ''">
<img src="@/assets/images/carPosition/iconOn.png" alt="" /> <img src="@/assets/images/carPosition/iconOn.png" alt="" />
<div>围栏</div> <div>围栏</div>
</div> </div>
<div class="enlargeIconOff" v-if="!enlarge" @click="enlargeMap">
<img src="@/assets/images/enlarge-icon.png" alt="" />
<!-- <div>放大</div> -->
</div>
<div class="enlargeIconOn" v-if="enlarge" @click="notEnlargeMap" >
<img src="@/assets/images/not-enlarge-icon.png" alt="" />
<!-- <div>缩小</div> -->
</div>
<!-- **********************围栏弹窗******************************** --> <!-- **********************围栏弹窗******************************** -->
<div class="fenceDialog" v-if="fenceShow"> <div class="fenceDialog" v-if="fenceShow" :style="enlarge ? 'top:8%' : ''">
<!-- <div class="fence-dialog-modal" v-if="fenceCreateShow"></div> --> <!-- <div class="fence-dialog-modal" v-if="fenceCreateShow"></div> -->
<div class="fence-box"> <div class="fence-box">
<div class="close-icon" @click="closeFence"> <div class="close-icon" @click="closeFence">
@ -312,11 +320,19 @@
</div> </div>
<!-- **********************围栏弹窗******************************** --> <!-- **********************围栏弹窗******************************** -->
<div class="start-track" @click="startAnimation" v-if="checked === 2">开始轨迹动画</div> <div class="start-track" @click="startAnimation" v-if="checked === 2" :style="enlarge ? 'bottom:8%' : 'bottom:5%'">开始轨迹动画</div>
<div class="start-track-isEnlage" @click="enlargeMap" v-if="checked === 2 && !enlarge" :style="enlarge ? '' : 'bottom:5%'">
<!-- 放大 -->
<img src="@/assets/images/enlarge-icon.png" alt="" />
</div>
<div class="start-track-isEnlage" @click="notEnlargeMap" v-if="checked === 2 && enlarge" :style="enlarge ? 'bottom:8%' : ''">
<!-- 缩小 -->
<img src="@/assets/images/not-enlarge-icon.png" alt="" />
</div>
</Card> </Card>
</div> </div>
<!-- **********报警数据*********** --> <!-- **********报警数据*********** -->
<div class="right-bottom"> <div class="right-bottom" v-show="!enlarge">
<!-- <div class="hat-bottom"> <!-- <div class="hat-bottom">
<Card title="帽子总数"> <Card title="帽子总数">
<div class="hat-container"> <div class="hat-container">
@ -421,6 +437,7 @@ let fenceCreateShow = ref(false); //创建围栏弹窗
let fenceList = ref(["围栏1", "围栏2", "围栏3", "围栏4", "围栏5"]); let fenceList = ref(["围栏1", "围栏2", "围栏3", "围栏4", "围栏5"]);
let fenceSearch = ref(""); // 围栏搜索 let fenceSearch = ref(""); // 围栏搜索
let fenceShow = ref(false); //打开围栏弹窗 let fenceShow = ref(false); //打开围栏弹窗
let enlarge = ref(false); //放大地图
// let fenceShow = ref(true); //打开围栏弹窗 // let fenceShow = ref(true); //打开围栏弹窗
let dayValue = ref(new Date()); let dayValue = ref(new Date());
let nameOptions = ref([]) as any; let nameOptions = ref([]) as any;
@ -575,7 +592,12 @@ watch(choiceMonth, newVal => {
getDayRunData(); getDayRunData();
} }
}); });
function enlargeMap(){
enlarge.value = true
}
function notEnlargeMap(){
enlarge.value = false
}
let isOpenDetail = ref(false); let isOpenDetail = ref(false);
let workerListInFence = ref([]); let workerListInFence = ref([]);
function openDetail(item) { function openDetail(item) {
@ -2570,19 +2592,79 @@ function echoPersonMarker(item) {
margin: 0 auto; margin: 0 auto;
} }
} }
.enlargeIconOff {
position: absolute;
// padding-top: 5px;
bottom: 5%;
right: 1%;
text-align: center;
width: 38px;
height: 38px;
cursor: pointer;
font-size: 14px;
background: #ffffff;
// color: #5181f6;
border-radius: 2px 2px 2px 2px;
img {
width: 20px;
height: 22px;
margin: 8px auto;
}
}
.enlargeIconOn {
position: absolute;
// padding-top: 5px;
bottom: 8%;
right: 1%;
text-align: center;
width: 38px;
height: 38px;
cursor: pointer;
font-size: 14px;
background: #ffffff;
// color: #5181f6;
border-radius: 2px 2px 2px 2px;
img {
width: 20px;
height: 22px;
margin: 8px auto;
}
}
} }
.start-track { .start-track {
position: absolute; position: absolute;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 20px; // padding: 20px;
width: 108px;
height: 38px;
cursor: pointer; cursor: pointer;
font-size: 14px; font-size: 14px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 0px 10px 0px rgba(39, 45, 69, 0.2); box-shadow: 0px 0px 10px 0px rgba(39, 45, 69, 0.2);
bottom: 3%; bottom: 8%;
right: 3%; right: 5%;
}
.start-track-isEnlage {
position: absolute;
display: flex;
align-items: center;
justify-content: center;
// padding: 20px;
width: 38px;
height: 38px;
cursor: pointer;
font-size: 14px;
background: #ffffff;
box-shadow: 0px 0px 10px 0px rgba(39, 45, 69, 0.2);
bottom: 8%;
right: 1%;
img{
width: 20px;
height: 22px;
margin: 6px auto;
}
} }
} }