From 3516f02277035cdc7ff137422709b16efe97ca4a Mon Sep 17 00:00:00 2001
From: 15832144755 <67030627+15832144755@users.noreply.github.com>
Date: 星期五, 27 八月 2021 11:27:21 +0800
Subject: [PATCH] 8.27
---
src/main/webapp/hxzk/mapshow/mapShow.jsp | 63 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/hxzk/mapshow/mapShow.jsp b/src/main/webapp/hxzk/mapshow/mapShow.jsp
index 1359327..8c0cd4c 100644
--- a/src/main/webapp/hxzk/mapshow/mapShow.jsp
+++ b/src/main/webapp/hxzk/mapshow/mapShow.jsp
@@ -7,7 +7,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, shrink-to-fit=no">
- <title>鍗庢槦鏅烘帶瀹氫綅绠＄悊绯荤粺 </title>
+ <title>鍒囨崲鍦板浘</title>
<link rel="icon" type="image/x-icon" href="/hxzkoa/hxzk/assets/img/favicon.ico" />
<link href="/hxzkoa/hxzk/assets/css/loader.css" rel="stylesheet" type="text/css" />
<script src="/hxzkoa/hxzk/assets/js/loader.js"></script>
@@ -161,6 +161,7 @@
<div class='panel-head' id="mapname0">鍦板浘0</div>
<div style="width:100%; height:400px; float:left" id="wrap0">
<canvas id="draw0"></canvas>
+ <p style="z-index: 9999;" id="jiazai0">姝ｅ湪鍔犺浇鍦板浘......</p>
</div>
</div>
</div>
@@ -170,6 +171,7 @@
<div class='panel-head' id="mapname1">鍦板浘1</div>
<div style="width:100%; height:400px;float:left" id="wrap1">
<canvas id="draw1"></canvas>
+ <p style="z-index: 9999;" id="jiazai1">姝ｅ湪鍔犺浇鍦板浘......</p>
</div>
</div>
</div>
@@ -179,6 +181,7 @@
<div class='panel-head' id="mapname2">鍦板浘2</div>
<div style="width:100%; height:400px;float:left" id="wrap2">
<canvas id="draw2"></canvas>
+ <p style="z-index: 9999;" id="jiazai2">姝ｅ湪鍔犺浇鍦板浘......</p>
</div>
</div>
</div>
@@ -189,6 +192,7 @@
<div class='panel-head' id="mapname3">鍦板浘4</div>
<div style="width:100%; height:400px;float:left" id="wrap3">
<canvas id="draw3"></canvas>
+ <p style="z-index: 9999;" id="jiazai3">姝ｅ湪鍔犺浇鍦板浘......</p>
</div>
</div>
</div>
@@ -204,7 +208,13 @@
<!-- END CONTENT PART -->
<!-- END MAIN CONTAINER -->
-
+ <%
+ String username=(String)session.getAttribute("username");
+ if(username==null || username.equals("")){
+ request.getRequestDispatcher("/hxzk/login.jsp").forward(request,response);
+ return;
+ }
+ %>
<!-- BEGIN GLOBAL MANDATORY SCRIPTS -->
<script src="/hxzkoa/hxzk/assets/js/libs/jquery-3.1.1.min.js"></script>
<script src="/hxzkoa/hxzk/bootstrap/js/popper.min.js"></script>
@@ -221,7 +231,7 @@
<script>
var result;
$(document).ready(function () {
- App.init(); $.ajax({ async: false, type: "POST", url: "/hxzkoa/getSysSetting_list.do", data: {}, dataType: "json", success: function (data) { title = data[0].title; document.title = title; }, });
+ App.init(); $.ajax({ async: false, type: "POST", url: "/hxzkoa/getSysSetting_list.do", data: {}, dataType: "json", success: function (data) { /* title = data[0].title; document.title = title; */ }, });
result = getAllMap(); //result["mapname"]=mapnamelist, ['floor']=floorlist
diaoyonghuatu(result);
});
@@ -235,7 +245,6 @@
<script>
-
//棣栭〉鍦板浘鎺у埗
var full_screen = false;
var timer_list = [];
@@ -822,7 +831,7 @@
_this.context = _this.canvas.getContext('2d');
_this.canvas.height = wrap.offsetHeight;
_this.canvas.width = wrap.offsetWidth;
-
+
loadImages(imgList, function (images) {
for (var key in images) {
if (key == 'map') {
@@ -854,6 +863,11 @@
//鐢诲湴鍥�
can.drawImage(_this.img, 0, 0, _this.img.naturalWidth, _this.img.naturalHeight, _this.imgXList['map'], _this.imgYList['map'], _this.img.naturalWidth * _this.imgScaleList['map'] * _this.rateNumList['map'], _this.img.naturalHeight * _this.imgScaleList['map'] * _this.rateNumList['map']);
+ $("#jiazai0").remove()
+ $("#jiazai1").remove()
+ $("#jiazai2").remove()
+ $("#jiazai3").remove()
+
//瀹為檯涓庡浘鐗囩殑姣斾緥灏�
_this.x_ratio = new Number(_this.imgLoadList['map'].naturalWidth / _this.trueLength);
_this.y_ratio = new Number(_this.imgLoadList['map'].naturalHeight / _this.trueWidth);
@@ -978,7 +992,6 @@
for (var key in images) {
if (key == "icon" && _this.playMark) {
for (var i = 0; i < _this.playMark.length; i++) {
- //_this.trackNow = [];
var tagzhuangtai = _this.playMark[i][3]; //鍦ㄧ嚎鐘舵��
var shipinzhuangtai = _this.playMark[i][9];
if (shipinka) {
@@ -1059,7 +1072,7 @@
};
can.closePath();
can.stroke();
- //_this.trackNow.push([trackNow]);
+ trackNow = null;
}
setTimeout(ftn(current_floor, _this.playMark[i], _this.trackNow, _this.real_trak_time, _this.context, _this.real_trak_color, _this.imgXList['map'], _this.imgYList['map'], _this.imgScaleList['map'], _this.rateNumList['map'], _this.x_ratio, _this.y_ratio, _this.x_x0, _this.y_y0), 5);
//var trackNow = getTracknow( _this.playMark[i][0], _this.real_trak_time);//鑾峰彇鎸囧畾鏃堕棿娈靛唴璇agid鐨勬暟鎹繘琛岀粯鍒�
@@ -1102,12 +1115,20 @@
can.fillStyle = 'white';
can.font = '13px sans-serif';
if (_this.viewTagid == '1') { //鏄惁鏄剧ず鏍囩id
- fillRoundRect(can, x_cor_now - 40, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 2, 20, 4, '#32CD32');
+ if (_this.playMark[i][2] <= 10) {
+ fillRoundRect(can, x_cor_now - 40, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 2, 20, 4, '#FF0000');
+ } else {
+ fillRoundRect(can, x_cor_now - 40, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 2, 20, 4, '#32CD32');
+ }
can.fillStyle = 'white';
can.fillText(_this.playMark[i][1], x_cor_now - 38, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 3);
can.fillText(_this.playMark[i][0], x_cor_now + 5, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 3);
} else {
- fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#32CD32');
+ if (_this.playMark[i][2] <= 10) {
+ fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#FF0000');
+ } else {
+ fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#32CD32');
+ }
can.fillStyle = 'white';
can.fillText(_this.playMark[i][1], x_cor_now - 19, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 3);
}
@@ -1115,7 +1136,11 @@
can.font = '13px sans-serif';
can.fillStyle = 'white';
if (_this.viewTagid == '1') {
- fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#32CD32');
+ if (_this.playMark[i][2] <= 10) {
+ fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#FF0000');
+ } else {
+ fillRoundRect(can, x_cor_now - 20, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 18, images[key].naturalHeight * 1.1, 20, 4, '#32CD32');
+ }
can.fillStyle = 'white';
can.fillText(_this.playMark[i][0], x_cor_now - 14, y_cor_now - images[key].naturalHeight * _this.imgScaleList[key] * _this.rateNumList[key] - 3);
}
@@ -1182,7 +1207,7 @@
for (var i = 0; i < _this.fenceMarkCount.length; i++) {
can.beginPath();
can.fillStyle = getDrawColor(_this.FenceColor[i]);
- can.fillStyle = "yellow";
+ can.fillStyle = "rgba(255,255,0,0.7)";
can.font = "15px Verdana";
can.fillText(_this.realFenceList[i][0] + ":" + _this.fenceMarkCount[i], 34, 36 + 40 * k);
can.closePath();
@@ -1378,7 +1403,18 @@
// clearInterval(timer_screen);
// timer = setInterval(fn, t);
// }
- _this.timer = setInterval(fn, t);
+ // var mapa0 = document.getElementById("wrap0")
+ // mapa0.value = "姝ｅ湪鍔犺浇鍦板浘......"
+ // var mapa0 = document.getElementById("wrap0")
+ // var tt = document.createElement("p");
+ // tt.value="姝ｅ湪鍔犺浇鍦板浘......"
+ // tt.style=""
+ // mapa0.appendChild(tt)
+ setTimeout(fnnn, 3000)
+ function fnnn(){
+ _this.timer = setInterval(fn, t);
+ }
+ // _this.timer = setInterval(fn, t);
timer_list.push(_this.timer);
},
/*璁＄畻褰撳墠榧犳爣浣嶇疆璺濈canvas鐨勫亸绉婚噺*/
@@ -1413,6 +1449,8 @@
for (var i = 0; i < 4; i++) {
if (String(i) != id) {
var str = "map" + i;
+ // document.getElementById(str).style.position = "fixed";
+ // document.getElementById(str).style.left = "100%";
document.getElementById(str).style.display = "none";
}
};
@@ -1424,6 +1462,7 @@
clearInterval(timer_list[i]);
}
timer_list = [];
+ console.log(result)
diaoyonghuatu(result);
} else if ((event.type == "dblclick") && (full_screen == true)) {
_this.expand = false;
--
Gitblit v1.10.0