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

Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev

Browse Source
This commit is contained in:
kun 2024-06-12 11:29:39 +08:00
commit ae490f9489
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -4,7 +4,7 @@ NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
# 后端本地 # 后端本地
# VITE_API_URL = 'http://192.168.34.221:19111' # VITE_API_URL = 'http://192.168.34.221:19111'
# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程
# VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://192.168.34.221:28889'
# VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://121.196.214.246/api'

BIN
src/assets/images/warning.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 MiB

4
src/views/commandScreen/commandCenter/index.vue
View File

@ -69,7 +69,7 @@ const mqttMSG = () => {
const result = JSON.parse(message); const result = JSON.parse(message);
openPeopleCountDialog({ openPeopleCountDialog({
index: 10, index: 10,
title: "查看", title: "人员呼叫",
timeOut: 60, timeOut: 60,
timeFlag: null, timeFlag: null,
show: true, show: true,
@ -90,7 +90,7 @@ onMounted(() => {
// setTimeout(() => { // setTimeout(() => {
// openPeopleCountDialog({ // openPeopleCountDialog({
// index: 10, // index: 10,
// title: "查看", // title: "人员呼叫",
// timeOut: 10, // timeOut: 10,
// timeFlag: null, // timeFlag: null,
// show: true, // show: true,

14
src/views/commandScreen/dialogCompnnents/data-dialog.vue
View File

@ -57,6 +57,7 @@
<div v-else-if="showIndex == 10"> <div v-else-if="showIndex == 10">
<div class="list-detail" v-for="ele in mapsDetail.filter((option: any) => option.show)" :key="ele.id"> <div class="list-detail" v-for="ele in mapsDetail.filter((option: any) => option.show)" :key="ele.id">
<div :class="postData.type == 1 ? 'dialog-content' : postData.type == 2 ? 'dialog-content-show' : 'dialog-content-more'"> <div :class="postData.type == 1 ? 'dialog-content' : postData.type == 2 ? 'dialog-content-show' : 'dialog-content-more'">
<div class="warning-bg"></div>
<div class="dialog-title"> <div class="dialog-title">
<!-- <div class="title-img"><img src="@/assets/images/titleIcon.png" alt="" /></div> --> <!-- <div class="title-img"><img src="@/assets/images/titleIcon.png" alt="" /></div> -->
<div class="title-text"> <div class="title-text">
@ -72,7 +73,7 @@
</div> </div>
</div> </div>
<div class="political-outlook"> <div class="political-outlook">
<myMap :mapsDetail="ele" :key="ele.id" tip="查看"></myMap> <myMap :mapsDetail="ele" :key="ele.id" :tip="ele.title"></myMap>
</div> </div>
</div> </div>
</div> </div>
@ -201,6 +202,17 @@ onMounted(async () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.warning-bg {
width: 200px;
height: 200px;
background-image: url(@/assets/images/warning.gif);
background-repeat: no-repeat;
background-size: 100% 100%;
position: absolute;
top: -190px;
left: 50%;
transform: translateX(-50%);
}
.flex { .flex {
display: -webkit-box; display: -webkit-box;
} }