From bfb1606a202ecfb1523c1ac13ee5ae78dbf14528 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sun, 25 Apr 2021 14:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
public/map/widgets/supervisoryMap/SupervisoryMap.js | 86 ++++++++++++++++++++++++++----------------
1 files changed, 53 insertions(+), 33 deletions(-)
diff --git a/public/map/widgets/supervisoryMap/SupervisoryMap.js b/public/map/widgets/supervisoryMap/SupervisoryMap.js
index 32cbbc6..bf14d2f 100644
--- a/public/map/widgets/supervisoryMap/SupervisoryMap.js
+++ b/public/map/widgets/supervisoryMap/SupervisoryMap.js
@@ -364,7 +364,7 @@
break;
}
}
- console.log(b, id);
+ // console.log(b, id);
event.stopPropagation();
var winSize = [+window.innerHeight / 2 - 242 + 'px', +window.innerWidth - 380 + 'px'];
@@ -374,8 +374,10 @@
} else {
// console.log('有地图经纬度')
b.haveJW = '有地图经纬度';
- var lgtd = Number($(this).find('input').attr('lgtd'));
- var lttd = Number($(this).find('input').attr('lttd'));
+ // var lgtd = Number($(this).find('input').attr('lgtd'));
+ // var lttd = Number($(this).find('input').attr('lttd'));
+ var lgtd = Number(b.jd);
+ var lttd = Number(b.wd);
// console.log($(this).find('input').attr('lttd'));
var position = new esri.geometry.Point(lgtd, lttd, new esri.SpatialReference({ wkid: 4326 }));//根据输入坐标信息找地图上的点
that._map.centerAndZoom(position, 18);//缩放，10是缩放级别，可以自定义，数值越大缩放越大
@@ -392,7 +394,7 @@
extend: 'myskin/FlareClusterLayer.css'
});
that.layuiLayer.close(that.layuiLayer.index);
- that.layuiLayer.open({
+ that.layuiLayer.open({
title: '',
type: 2,
shadeClose: true,
@@ -447,6 +449,23 @@
break;
}
}
+
+ event.stopPropagation();
+ if (b.jd == '' || b.wd == '') {
+ // console.log('无地图经纬度');
+ b.haveJW = '无地图经纬度';
+ } else {
+ // console.log('有地图经纬度')
+ b.haveJW = '有地图经纬度';
+ var lgtd = Number(b.jd);
+ var lttd = Number(b.wd);
+ // console.log($(this).find('input').attr('lttd'));
+ var position = new esri.geometry.Point(lgtd, lttd, new esri.SpatialReference({ wkid: 4326 }));//根据输入坐标信息找地图上的点
+ that._map.centerAndZoom(position, 18);//缩放，10是缩放级别，可以自定义，数值越大缩放越大
+ }
+
+
+
console.log(b, id);
var winSize = [+window.innerHeight / 2 - 242 + 'px', +window.innerWidth - 380 + 'px'];
var as = b;
@@ -459,7 +478,7 @@
extend: 'myskin/FlareClusterLayer.css'
});
that.layuiLayer.close(that.layuiLayer.index);
- that.layuiLayer.open({
+ that.layuiLayer.open({
title: '',
type: 2,
shadeClose: true,
@@ -513,19 +532,6 @@
// });
// })
- event.stopPropagation();
- if (b.jd == '' || b.wd == '') {
- // console.log('无地图经纬度');
- b.haveJW = '无地图经纬度';
- } else {
- // console.log('有地图经纬度')
- b.haveJW = '有地图经纬度';
- var lgtd = Number($(this).find('input').attr('lgtd'));
- var lttd = Number($(this).find('input').attr('lttd'));
- // console.log($(this).find('input').attr('lttd'));
- var position = new esri.geometry.Point(lgtd, lttd, new esri.SpatialReference({ wkid: 4326 }));//根据输入坐标信息找地图上的点
- that._map.centerAndZoom(position, 18);//缩放，10是缩放级别，可以自定义，数值越大缩放越大
- }
// var y = +window.innerHeight / 2 + 200;
// var x = (+window.innerWidth - 360) / 2 + 360 + 70;
@@ -871,7 +877,7 @@
str += '<td title=' + result[i].waringType + '>' + result[i].waringType + '</td>';
str += '<td title=' + result[i].alarmPeople + '>' + result[i].alarmPeople + '</td>';
str += "<td><a href='javascript:;' title=" + time + ">" + y + ' ' + h + "</a></td>";
- str += "<td class='location' style='display: none'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
+ // str += "<td class='location' style='display: none'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
if (result[i].jtype == 0) {
str += "<td class='location'> <input style='color:#000000;background-color:#ffffff;background-image:linear-gradient(to right, #fffff , #fffff' type='button' value='未处理'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
} else {
@@ -935,17 +941,31 @@
dom.empty();
var that = this;
$.ajax({
- url: '/api/blade-jfpts/suser/suser/selectList?type=' + type + '&dj=' + dj,
- type: 'GET',
+ // url: '/api/blade-system/tenant/page',
+ // type: 'GET',
+ url: '/api/blade-system/tenant/selectListTe',
+ type: 'POST',
dataType: 'JSON',
success: function (data) {
// var result = data.data;
- var oldData = data.data
+ var oldData = data.data;
+ console.log(oldData)
var result = oldData;
that.Ydata = oldData;
var str = '';
that.entitysData = [];
that.analysisAddEntitys.clear();
+ var createD = (id, a, name, dj, type) => {
+ str += "<tr term-list=" + id + ">";
+ str += '<td>' + a + '</td>';
+ str += '<td>' + name + '</td>';
+ str += '<td>' + dj + '</td>';
+ str += '<td>' + type + '</td>';
+ // str += "<td class='location' style='display: none'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
+ str += '</tr>';
+ dom.append(str);
+ str = '';
+ }
for (var a, i = 0; i < result.length; i++) {
that.createEntitysAnalysis(that.analysisAddEntitys, that.entitysData, '业主信息', {
@@ -953,19 +973,19 @@
lttd: result[i].wd,
id: result[i].id
}, result[i].jd, result[i].wd, './images/owner.png');
-
+
a = Number(i) + 1;
- str += "<tr term-list=" + result[i].id + ">";
- str += '<td>' + a + '</td>';
- str += '<td>' + result[i].type + '</td>';
- str += '<td>' + result[i].dj + '</td>';
- str += '<td>' + result[i].yname + '</td>';
- str += "<td class='location' style='display: none'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
- str += '</tr>';
- dom.append(str);
- str = '';
- }
+ if (result[i].type === "0") {
+ createD(result[i].id, a, result[i].tenant_name, result[i].dj, '医院')
+ } else if (result[i].type === "1") {
+ createD(result[i].id, a, result[i].tenant_name, result[i].nature, '学校')
+ } else if (result[i].type === "2") {
+ createD(result[i].id, a, result[i].tenant_name, result[i].housetype, '小区')
+ } else {
+ createD(result[i].id, a, result[i].tenant_name, result[i].dj, '其他')
+ }
+ }
}
})
},
--
Gitblit v1.9.3