From 7b94ecb73a12f8804191966da512dc2943225564 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 02 Feb 2021 17:15:21 +0800
Subject: [PATCH] 警情调度与分析研判相关接口，样式调整
---
public/map/popup/js/personnel-information-management.js | 4 +-
public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js | 25 +++++-------
public/map/widgets/aPoliceTeam/APoliceTeam.js | 12 +++---
public/map/popup/style/personnel-information-management.css | 4 +-
public/map/lib/layui/css/modules/layer/myskin/personnel-information-management.css | 15 +++----
public/map/widgets/patrolManagement/PatrolManagement.js | 12 +++---
public/map/widgets/policeDispatching/PoliceDispatching.js | 10 ++--
7 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/public/map/lib/layui/css/modules/layer/myskin/personnel-information-management.css b/public/map/lib/layui/css/modules/layer/myskin/personnel-information-management.css
index 3ffb016..e515623 100644
--- a/public/map/lib/layui/css/modules/layer/myskin/personnel-information-management.css
+++ b/public/map/lib/layui/css/modules/layer/myskin/personnel-information-management.css
@@ -1,20 +1,19 @@
.personnel-information-management {
background: transparent;
+ border-radius: 10px;
}
+
.personnel-information-management .layui-layer-title {
padding: 0 80px;
text-align: center;
- background: rgba(12, 25, 49, 0.8);
+ background: #fff;
border: none;
- color: #fff;
+ color: #677788;
font-size: 20px;
-}
-
-.personnel-information-management .layui-layer-setwin .layui-layer-close1 {
- background-position: -80px -40px;
+ border-radius: 10px 10px 0 0;
}
.personnel-information-management .layui-layer-content {
- background: rgba(12, 25, 49, 0.8);
-
+ background: #fff;
+ border-radius: 0 0 10px 10px;
}
\ No newline at end of file
diff --git a/public/map/popup/js/personnel-information-management.js b/public/map/popup/js/personnel-information-management.js
index 86aad4d..b6d9da8 100644
--- a/public/map/popup/js/personnel-information-management.js
+++ b/public/map/popup/js/personnel-information-management.js
@@ -5,7 +5,7 @@
var viewVideoLayer = null;
// 查看保安人员的详细信息
$.ajax({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/blade-user/selectInfo?id=' + code,
+ url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/security/security/selectInfo?snumber=' + code,
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -13,7 +13,7 @@
var str = '';
result = data.data[0];
- str += "<tr> <td>人员名称：</td> <td>" + result.realName + "</td> </tr>";
+ str += "<tr> <td>人员名称：</td> <td>" + result.sname + "</td> </tr>";
str += "<tr> <td>联系电话：</td> <td>" + result.phone + "</td> </tr>";
str += "<tr> <td>性别：</td> <td>" + (result.sex == 1 ? '女' : '男') + "</td> </tr>";
str += "<tr> <td>是否出警：</td> <td>" + (result.type == 1 ? '是' : '否') + "</td> </tr>";
diff --git a/public/map/popup/style/personnel-information-management.css b/public/map/popup/style/personnel-information-management.css
index 442de05..63c0abb 100644
--- a/public/map/popup/style/personnel-information-management.css
+++ b/public/map/popup/style/personnel-information-management.css
@@ -16,7 +16,7 @@
width: 100%;
height: 100%;
box-sizing: border-box;
- color: #fff;
+ color:#677788;
}
.personnel-information-management-box table {
@@ -33,7 +33,7 @@
.personnel-information-management-box table td {
flex: 1;
padding: 0 10px;
- border: 1px solid rgb(255, 255, 255);
+ border: 1px solid rgba(231, 234, 243, 0.7);
width: 25%;
height: auto !important;
line-height: 36px;
diff --git a/public/map/widgets/aPoliceTeam/APoliceTeam.js b/public/map/widgets/aPoliceTeam/APoliceTeam.js
index 2eeade3..85722b1 100644
--- a/public/map/widgets/aPoliceTeam/APoliceTeam.js
+++ b/public/map/widgets/aPoliceTeam/APoliceTeam.js
@@ -709,7 +709,7 @@
that._map.centerAndZoom(position, 18);//缩放，10是缩放级别，可以自定义，数值越大缩放越大
- var snumber = $(this).attr('term-id');
+ var snumber = $(this).attr('term-snumber');
var url = './popup/html/personnel-information-management.html?id=' + snumber;
layui.use('layer', function () {
@@ -1136,7 +1136,7 @@
});
});
- that.getPoliceTable($('.police-container-distribute').find('.tbody tbody'), $('#dispatchingStartTime').val(), $('#dispatchingEndTime').val(), '', '', '');
+ // that.getPoliceTable($('.police-container-distribute').find('.tbody tbody'), $('#dispatchingStartTime').val(), $('#dispatchingEndTime').val(), '', '', '');
that.clickHand();
@@ -1610,7 +1610,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/blade-user/selectList',
+ url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/security/security/selectList',
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -1634,10 +1634,10 @@
entityData = result[i].coordinate.match(/\(([^)]*)\)/);
a = Number(i) + 1;
- str += "<tr term-id=" + result[i].id + " lgtd=" + result[i].jd + " lttd=" + result[i].wd + ">";
+ str += "<tr term-snumber=" + result[i].snumber + " lgtd=" + result[i].jd + " lttd=" + result[i].wd + ">";
str += '<td>' + a + '</td>';
- str += '<td title=' + result[i].code + '>' + result[i].code + '</td>';
- str += '<td title=' + result[i].realName + '>' + result[i].realName + '</td>';
+ str += '<td title=' + result[i].snumber + '>' + result[i].snumber + '</td>';
+ str += '<td title=' + result[i].sname + '>' + result[i].sname + '</td>';
str += '<td title=' + result[i].phone + '>' + result[i].phone + '</td>';
str += "<td> <input type='button' value='编辑' resultid=" + result[i].id + "> </td>";
str += '</tr>';
diff --git a/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
index e20c9c0..0f47dff 100644
--- a/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
+++ b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
@@ -693,12 +693,12 @@
beginTime: beginTime,
endTime: endTime,
waringType: waringType,
- addvcd: addvcd
+ addvcd: addvcd,
+ type: ''
},
success: function (data) {
var result = data.data;
var str = '';
- var lgtdOrLttd = null;
that.entitysData = [];
that.analysisAddEntitys.clear();
for (var a, time, t, e, y, h, i = 0; i < result.length; i++) {
@@ -779,17 +779,15 @@
success: function (data) {
var result = data.data;
var str = '';
- var lgtdOrLttd = null;
that.entitysData = [];
that.analysisAddEntitys.clear();
for (var a, i = 0; i < result.length; i++) {
- lgtdOrLttd = result[i].coordinate.substring(6, result[i].coordinate.length - 1).split(' ');
that.createEntitysAnalysis(that.analysisAddEntitys, that.entitysData, '业主信息', {
- lgtd: lgtdOrLttd[0],
- lttd: lgtdOrLttd[1],
+ lgtd: result[i].jd,
+ lttd: result[i].wd,
id: result[i].id
- }, lgtdOrLttd[0], lgtdOrLttd[1], './images/owner.png');
+ }, result[i].jd, result[i].wd, './images/owner.png');
a = Number(i) + 1;
str += "<tr term-list=" + result[i].id + ">";
@@ -797,7 +795,7 @@
str += '<td>' + result[i].type + '</td>';
str += '<td>' + result[i].dj + '</td>';
str += '<td>' + result[i].yname + '</td>';
- str += "<td class='location'> <input type='button' value='定位'" + ' lgtd=' + lgtdOrLttd[0] + ' lttd=' + lgtdOrLttd[1] + "></td>";
+ str += "<td class='location'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
str += '</tr>';
dom.append(str);
str = '';
@@ -817,17 +815,16 @@
success: function (data) {
var result = data.data;
var str = '';
- var lgtdOrLttd = null;
that.entitysData = [];
that.analysisAddEntitys.clear();
for (var a, i = 0; i < result.length; i++) {
- lgtdOrLttd = result[i].coordinate.substring(6, result[i].coordinate.length - 1).split(' ');
+
that.createEntitysAnalysis(that.analysisAddEntitys, that.entitysData, '设备信息', {
- lgtd: lgtdOrLttd[0],
- lttd: lgtdOrLttd[1],
+ lgtd: result[i].jd,
+ lttd: result[i].wd,
id: result[i].id
- }, lgtdOrLttd[0], lgtdOrLttd[1], './images/ceshi.png');
+ }, result[i].jd, result[i].wd, './images/ceshi.png');
a = Number(i) + 1;
str += "<tr term-listid=" + result[i].id + ">";
@@ -835,7 +832,7 @@
str += '<td title=' + result[i].deviceName + '>' + result[i].deviceName + '</td>';
str += '<td title=' + result[i].deviceType + '>' + result[i].deviceType + '</td>';
str += '<td>' + result[i].deviceNumber + '</td>';
- str += "<td class='location'> <input type='button' value='定位'" + ' lgtd=' + lgtdOrLttd[0] + ' lttd=' + lgtdOrLttd[1] + "></td>";
+ str += "<td class='location'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
str += '</tr>';
dom.append(str);
str = '';
diff --git a/public/map/widgets/patrolManagement/PatrolManagement.js b/public/map/widgets/patrolManagement/PatrolManagement.js
index 59ab764..75520b9 100644
--- a/public/map/widgets/patrolManagement/PatrolManagement.js
+++ b/public/map/widgets/patrolManagement/PatrolManagement.js
@@ -709,7 +709,7 @@
that._map.centerAndZoom(position, 18);//缩放，10是缩放级别，可以自定义，数值越大缩放越大
- var snumber = $(this).attr('term-id');
+ var snumber = $(this).attr('term-snumber');
var url = './popup/html/personnel-information-management.html?id=' + snumber;
layui.use('layer', function () {
@@ -1136,7 +1136,7 @@
});
});
- that.getPoliceTable($('.police-container-distribute').find('.tbody tbody'), $('#dispatchingStartTime').val(), $('#dispatchingEndTime').val(), '', '', '');
+ // that.getPoliceTable($('.police-container-distribute').find('.tbody tbody'), $('#dispatchingStartTime').val(), $('#dispatchingEndTime').val(), '', '', '');
that.clickHand();
@@ -1614,7 +1614,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/blade-user/selectList',
+ url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/security/security/selectList',
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -1638,10 +1638,10 @@
entityData = result[i].coordinate.match(/\(([^)]*)\)/);
a = Number(i) + 1;
- str += "<tr term-id=" + result[i].id + " lgtd=" + result[i].jd + " lttd=" + result[i].wd + ">";
+ str += "<tr term-snumber=" + snumber + " lgtd=" + result[i].jd + " lttd=" + result[i].wd + ">";
str += '<td>' + a + '</td>';
- str += '<td title=' + result[i].code + '>' + result[i].code + '</td>';
- str += '<td title=' + result[i].realName + '>' + result[i].realName + '</td>';
+ str += '<td title=' + result[i].snumber + '>' + result[i].snumber + '</td>';
+ str += '<td title=' + result[i].sname + '>' + result[i].sname + '</td>';
str += '<td title=' + result[i].phone + '>' + result[i].phone + '</td>';
str += "<td> <input type='button' value='编辑' resultid=" + result[i].id + "> </td>";
str += '</tr>';
diff --git a/public/map/widgets/policeDispatching/PoliceDispatching.js b/public/map/widgets/policeDispatching/PoliceDispatching.js
index 4335aa5..62bc16a 100644
--- a/public/map/widgets/policeDispatching/PoliceDispatching.js
+++ b/public/map/widgets/policeDispatching/PoliceDispatching.js
@@ -709,7 +709,7 @@
that._map.centerAndZoom(position, 18);//缩放，10是缩放级别，可以自定义，数值越大缩放越大
- var snumber = $(this).attr('term-id');
+ var snumber = $(this).attr('term-snumber');
var url = './popup/html/personnel-information-management.html?id=' + snumber;
layui.use('layer', function () {
@@ -1607,7 +1607,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/blade-user/selectList',
+ url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/security/security/selectList',
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -1631,10 +1631,10 @@
entityData = result[i].coordinate.match(/\(([^)]*)\)/);
a = Number(i) + 1;
- str += "<tr term-id=" + result[i].id + " lgtd=" + result[i].jd + " lttd=" + result[i].wd + ">";
+ str += "<tr term-snumber=" + snumber + " lgtd=" + result[i].jd + " lttd=" + result[i].wd + ">";
str += '<td>' + a + '</td>';
- str += '<td title=' + result[i].code + '>' + result[i].code + '</td>';
- str += '<td title=' + result[i].realName + '>' + result[i].realName + '</td>';
+ str += '<td title=' + result[i].snumber + '>' + result[i].snumber + '</td>';
+ str += '<td title=' + result[i].sname + '>' + result[i].sname + '</td>';
str += '<td title=' + result[i].phone + '>' + result[i].phone + '</td>';
str += "<td> <input type='button' value='编辑' resultid=" + result[i].id + "> </td>";
str += '</tr>';
--
Gitblit v1.9.3