From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/home/map_realtime.html | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/home/map_realtime.html b/src/main/webapp/views/home/map_realtime.html
index 4a6ce22..039c98f 100644
--- a/src/main/webapp/views/home/map_realtime.html
+++ b/src/main/webapp/views/home/map_realtime.html
@@ -381,7 +381,7 @@
</head>
<body>
<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: wrap;" @click="bgClick()">
- <div style="flex: 12;display: flex;" :style="{scale:showScale/100.0,marginTop:(showScale-100)*0.7 + 'px'}">
+ <div style="flex: 18;display: flex;justify-content: center;" :style="{zoom:showScale/100.0,marginTop:(showScale)*4 + 'px'}">
<div style="margin-top: -110px;">
<div class="pointContainer" v-for="(x,index) in map" :key="index">
<div v-if="index != 0 && (index != map.length-1)" v-for="(y,idx) in x" :key="idx">
@@ -423,8 +423,12 @@
</div>
</div>
+ <div>
+ <div style="margin-top: 20px;"><button class="layui-btn" @click="resetMap">閲嶇疆鍦板浘</button></div>
+ </div>
+
</div>
- <div style="padding: 40px 20px 10px 10px;flex: 5;margin-top: -70px;">
+ <div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2000 ? 'margin-top: 0px;' : 'flex: 5;margin-top: -70px;'">
<el-slider v-model="showScale" :marks="showScaleMarks"></el-slider>
<div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
<div class="hoverCard">
@@ -475,6 +479,18 @@
<input id="03" type="radio" v-model="currentLev" name="r" value="3">
<label for="04">4F</label>
<input id="04" type="radio" v-model="currentLev" name="r" value="4">
+ <label for="05">5F</label>
+ <input id="05" type="radio" v-model="currentLev" name="r" value="5">
+ <label for="06">6F</label>
+ <input id="06" type="radio" v-model="currentLev" name="r" value="6">
+ <label for="07">7F</label>
+ <input id="07" type="radio" v-model="currentLev" name="r" value="7">
+ <label for="08">8F</label>
+ <input id="08" type="radio" v-model="currentLev" name="r" value="8">
+ <label for="09">9F</label>
+ <input id="09" type="radio" v-model="currentLev" name="r" value="9">
+ <label for="10">10F</label>
+ <input id="10" type="radio" v-model="currentLev" name="r" value="10">
</div>
</div>
</div>
@@ -548,7 +564,7 @@
searchLocNo: "",
outSite: null,
outSites: null,
- showScale: 80, //鎺у埗鍦板浘鏄剧ず澶у皬姣斾緥
+ showScale: 65, //鎺у埗鍦板浘鏄剧ず澶у皬姣斾緥
showScaleMarks: {//姣斾緥婊戝姩鏉℃樉绀烘爣璁�
0: "0%",
50: {
@@ -1114,6 +1130,29 @@
}
})
},
+ resetMap() {
+ let that = this
+ $.ajax({
+ url: baseUrl + "/map/resetMap/" + this.currentLev + "/auth",
+ headers: {'token': localStorage.getItem('token')},
+ dataType: 'json',
+ data: {},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ that.currentLev++;
+ if (that.currentLev > 4) {
+ that.currentLev = 1
+ }
+ $layui.layer.msg("鎿嶄綔鎴愬姛");
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ $layui.layer.msg(res.msg);
+ }
+ }
+ })
+ },
}
})
--
Gitblit v1.9.1