Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
This commit is contained in:
commit
ae490f9489
@ -4,7 +4,7 @@ NODE_ENV = 'development'
|
||||
# 本地环境接口地址(/api/index.ts文件中使用)
|
||||
# 后端本地
|
||||
# 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://192.168.34.221:28889'
|
||||
# VITE_API_URL = 'http://121.196.214.246/api'
|
||||
|
||||
BIN
src/assets/images/warning.gif
Normal file
BIN
src/assets/images/warning.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 MiB |
@ -69,7 +69,7 @@ const mqttMSG = () => {
|
||||
const result = JSON.parse(message);
|
||||
openPeopleCountDialog({
|
||||
index: 10,
|
||||
title: "查看",
|
||||
title: "人员呼叫",
|
||||
timeOut: 60,
|
||||
timeFlag: null,
|
||||
show: true,
|
||||
@ -90,7 +90,7 @@ onMounted(() => {
|
||||
// setTimeout(() => {
|
||||
// openPeopleCountDialog({
|
||||
// index: 10,
|
||||
// title: "查看",
|
||||
// title: "人员呼叫",
|
||||
// timeOut: 10,
|
||||
// timeFlag: null,
|
||||
// show: true,
|
||||
|
||||
@ -57,6 +57,7 @@
|
||||
<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="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="title-img"><img src="@/assets/images/titleIcon.png" alt="" /></div> -->
|
||||
<div class="title-text">
|
||||
@ -72,7 +73,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<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>
|
||||
@ -201,6 +202,17 @@ onMounted(async () => {
|
||||
</script>
|
||||
|
||||
<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 {
|
||||
display: -webkit-box;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user