From 17bed3a7f7e90b23afb5def223fd7a285ff6cc24 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 10 Aug 2021 08:40:56 +0800
Subject: [PATCH] 冲突
---
vue.config.js | 5
public/map/widgets/aPoliceTeam/APoliceTeam.js | 38 ++--
src/router/views/index.js | 28 ++++
src/views/system/user.vue | 3
public/map/popup/js/owner-details.js | 2
public/map/widgets/patrolManagement/PatrolManagement.js | 40 ++--
public/map/widgets/policeDispatching/PoliceDispatching.js | 36 ++--
public/map/popup/js/routename-and-peoplename.js | 2
src/views/realTimePolice/real.vue | 1
public/map/widgets/securityMap/SecurityMap_copy1.js | 2
public/map/widgets/securityMap/SecurityMap.js | 2
src/views/zc/zc.vue | 97 +++++++++----
public/map/widgets/realTimePolice/RealTimePolice.js | 14 +-
public/map/popup/js/personnel-information-management.js | 2
public/map/widgets/patrolManagement/PatrolManagement_copy.js | 38 ++--
src/views/system/dept.vue | 2
public/map/popup/js/realtime-police-details.js | 8
src/api/alarm/alarm.js | 1
src/api/zc/zc.js | 2
public/map/popup/js/realtime-equipment-history.js | 2
public/map/popup/js/equipment-history.js | 2
src/views/system/menu.vue | 2
public/map/popup/js/police-details.js | 2
public/map/widgets/patrolManagement/PatrolManagement01.js | 40 ++--
src/styles/element-ui.scss | 9 +
public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js | 12
public/map/popup/js/route-name-layer.js | 2
src/views/feedbackReport/feedbackReport.vue | 3
public/map/popup/js/equipment-details.js | 2
public/map/widgets/alertSecurity/AlertSecurity.js | 4
public/map/widgets/patrolManagement/template_copy.html | 0
public/map/popup/js/clientPopup.js | 4
32 files changed, 245 insertions(+), 162 deletions(-)
diff --git a/public/map/popup/js/clientPopup.js b/public/map/popup/js/clientPopup.js
index c0f2887..14329b7 100644
--- a/public/map/popup/js/clientPopup.js
+++ b/public/map/popup/js/clientPopup.js
@@ -31,7 +31,7 @@
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/equipment/equipment/detail?id=' + code,
+ url: 'http://223.82.109.183:2082/api/equipment/equipment/detail?id=' + code,
type: 'GET',
dataType: 'JSON',
success: function (data) {
@@ -73,7 +73,7 @@
$("#client_bc").off("click").click(function () {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/equipment/equipment/updateClinent?',
+ url: 'http://223.82.109.183:2082/api/equipment/equipment/updateClinent?',
data: {
"id": code,
diff --git a/public/map/popup/js/equipment-details.js b/public/map/popup/js/equipment-details.js
index c248866..7d0427b 100644
--- a/public/map/popup/js/equipment-details.js
+++ b/public/map/popup/js/equipment-details.js
@@ -4,7 +4,7 @@
// 查看设备的详细信息
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/equipment/equipment/detail?id=' + code,
+ url: 'http://223.82.109.183:2082/api/equipment/equipment/detail?id=' + code,
type: 'GET',
dataType: 'JSON',
success: function (data) {
diff --git a/public/map/popup/js/equipment-history.js b/public/map/popup/js/equipment-history.js
index c007cd0..90b0009 100644
--- a/public/map/popup/js/equipment-history.js
+++ b/public/map/popup/js/equipment-history.js
@@ -3,7 +3,7 @@
console.log(code, 1212121);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=' + code,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=' + code,
type: 'POST',
dataType: 'JSON',
success: function (data) {
diff --git a/public/map/popup/js/owner-details.js b/public/map/popup/js/owner-details.js
index 94118da..bd4d8e0 100644
--- a/public/map/popup/js/owner-details.js
+++ b/public/map/popup/js/owner-details.js
@@ -4,7 +4,7 @@
// 查看警情的详细信息
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/suser/suser/detail?id=' + code,
+ url: 'http://223.82.109.183:2082/api/suser/suser/detail?id=' + code,
type: 'GET',
dataType: 'JSON',
success: function (data) {
diff --git a/public/map/popup/js/personnel-information-management.js b/public/map/popup/js/personnel-information-management.js
index 70d9056..d7bd66e 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: 'http://s16s652780.51mypc.cn/api/security/security/selectInfo?snumber=' + code,
+ url: 'http://223.82.109.183:2082/api/security/security/selectInfo?snumber=' + code,
type: 'POST',
dataType: 'JSON',
success: function (data) {
diff --git a/public/map/popup/js/police-details.js b/public/map/popup/js/police-details.js
index 66cd43a..f7fd30d 100644
--- a/public/map/popup/js/police-details.js
+++ b/public/map/popup/js/police-details.js
@@ -4,7 +4,7 @@
// 查看警情的详细信息
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + code,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + code,
type: 'POST',
dataType: 'JSON',
success: function (data) {
diff --git a/public/map/popup/js/realtime-equipment-history.js b/public/map/popup/js/realtime-equipment-history.js
index e24a73f..d70a533 100644
--- a/public/map/popup/js/realtime-equipment-history.js
+++ b/public/map/popup/js/realtime-equipment-history.js
@@ -3,7 +3,7 @@
console.log(code, 1212121);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=' + code,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=' + code,
type: 'POST',
dataType: 'JSON',
success: function (data) {
diff --git a/public/map/popup/js/realtime-police-details.js b/public/map/popup/js/realtime-police-details.js
index 72bed99..3680d95 100644
--- a/public/map/popup/js/realtime-police-details.js
+++ b/public/map/popup/js/realtime-police-details.js
@@ -19,7 +19,7 @@
// 查看警情的详细信息
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/selectInfo?id=' + code,
+ url: 'http://223.82.109.183:2082/api/alarm/alarm/selectInfo?id=' + code,
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -123,7 +123,7 @@
return
}
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/saves',
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/saves',
type: 'POST',
data: {
rName: result.rname,
@@ -285,7 +285,7 @@
layer.confirm('确定撤销该警情?', { icon: 3, title: '提示' }, function (index) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/deletejj',
+ url: 'http://223.82.109.183:2082/api/alarm/alarm/deletejj',
type: 'POST',
data: {
id: id
@@ -320,7 +320,7 @@
function updateJType(id, czTime, bz, jjTime) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/updateJtype',
+ url: 'http://223.82.109.183:2082/api/alarm/alarm/updateJtype',
type: 'POST',
data: {
id: id,
diff --git a/public/map/popup/js/route-name-layer.js b/public/map/popup/js/route-name-layer.js
index a1eecc1..8225b1f 100644
--- a/public/map/popup/js/route-name-layer.js
+++ b/public/map/popup/js/route-name-layer.js
@@ -16,7 +16,7 @@
// 查看保安人员下拉
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/security/security/selectry',
+ url: 'http://223.82.109.183:2082/api/security/security/selectry',
type: 'GET',
dataType: 'JSON',
success: function (data) {
diff --git a/public/map/popup/js/routename-and-peoplename.js b/public/map/popup/js/routename-and-peoplename.js
index 5eca5bd..ff2e4ea 100644
--- a/public/map/popup/js/routename-and-peoplename.js
+++ b/public/map/popup/js/routename-and-peoplename.js
@@ -27,7 +27,7 @@
// 查看保安人员下拉
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/security/security/selectry',
+ url: 'http://223.82.109.183:2082/api/security/security/selectry',
type: 'GET',
dataType: 'JSON',
success: function (data) {
diff --git a/public/map/widgets/aPoliceTeam/APoliceTeam.js b/public/map/widgets/aPoliceTeam/APoliceTeam.js
index b904e18..c869856 100644
--- a/public/map/widgets/aPoliceTeam/APoliceTeam.js
+++ b/public/map/widgets/aPoliceTeam/APoliceTeam.js
@@ -264,7 +264,7 @@
$('.police-container-distribute-details .content table tbody').empty();
var str = '';
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -295,7 +295,7 @@
var str = '';
$('.police-container-distribute-details .security-guard-nearby .security-staff-content tbody').empty();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/position/position/selectry',
+ url: 'http://223.82.109.183:2082/api/position/position/selectry',
type: 'POST',
data: {
coordinate: "point(" + $(this).attr('lgtd') + "," + $(this).attr('lttd') + ")"
@@ -363,7 +363,7 @@
}
// 发送请求修改警单数据
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/updateInfo',
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/updateInfo',
type: 'POST',
data: {
id: id,
@@ -402,7 +402,7 @@
var str = '';
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -769,7 +769,7 @@
if ($(this).index() == 1) {
$('.police-dispatching .police-container .police-container-patrol .main-content .select-list ul').empty();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/selectqy',
type: 'GET',
dataType: 'JSON',
success: function (res) {
@@ -929,7 +929,7 @@
that.layuiLayer.msg('人员未更改!');
} else {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/duty/duty/updatedtInfo',
+ url: 'http://223.82.109.183:2082/api/duty/duty/updatedtInfo',
type: 'POST',
data: {
rid: routeId,
@@ -1019,7 +1019,7 @@
if (that.tabIndex == 1) {
if (that.patrolIndex == 1) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/insertlx',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/insertlx',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1035,7 +1035,7 @@
that.polygonData = [];
that.getRouteInformation($('.police-dispatching .police-container .police-container-patrol .table .tbody tbody'), '');
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/duty/duty/insertduty',
+ url: 'http://223.82.109.183:2082/api/duty/duty/insertduty',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1059,7 +1059,7 @@
// that.pepleRealId = pepleRealId;
} else {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/insterqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/insterqy',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1078,7 +1078,7 @@
}
} else if (that.tabIndex == 2) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/insertes',
+ url: 'http://223.82.109.183:2082/api/enclosure/enclosure/insertes',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1116,7 +1116,7 @@
$('.police-dispatching .police-container .distribute-district .select-list ul').empty();
$('.police-dispatching .police-container .distribute-district .select-list ul').append("<li key='addvcd' addvcd=''>全部</li>");
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/district/district/selectList',
+ url: 'http://223.82.109.183:2082/api/district/district/selectList',
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -1472,7 +1472,7 @@
dom.empty();
var that = this;
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectList',
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1535,7 +1535,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectList',
+ url: 'http://223.82.109.183:2082/api/regions/regions/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1579,7 +1579,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/selectList',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1622,7 +1622,7 @@
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/queryBa',
+ url: 'http://223.82.109.183:2082/api/alarm/alarm/queryBa',
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -1670,7 +1670,7 @@
}
})
// $.ajax({
- // url: 'http://s16s652780.51mypc.cn/api/security/security/selectList',
+ // url: 'http://223.82.109.183:2082/api/security/security/selectList',
// type: 'POST',
// dataType: 'JSON',
// success: function (data) {
@@ -1905,7 +1905,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/updatelx',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/updatelx',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1953,7 +1953,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/updateqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/updateqy',
type: 'POST',
dataType: 'JSON',
data: {
@@ -2009,7 +2009,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/updatee',
+ url: 'http://223.82.109.183:2082/api/enclosure/enclosure/updatee',
type: 'POST',
dataType: 'JSON',
data: {
diff --git a/public/map/widgets/alertSecurity/AlertSecurity.js b/public/map/widgets/alertSecurity/AlertSecurity.js
index 39ebf23..cc90787 100644
--- a/public/map/widgets/alertSecurity/AlertSecurity.js
+++ b/public/map/widgets/alertSecurity/AlertSecurity.js
@@ -200,7 +200,7 @@
if (baid != null && baid != "") {
$.ajax({
- url: "http://s16s652780.51mypc.cn/api/routeIn/routein/selectList?id=" + baid,
+ url: "http://223.82.109.183:2082/api/routeIn/routein/selectList?id=" + baid,
type: 'post',
dataType: 'JSON',
success: function (res) {
@@ -229,7 +229,7 @@
that.createTwinkleEntitys(that.addEntitys, lgtd, lttd, './images/real-time-callPolice-opcity.png');
// console.log(deptId,153454)
$.ajax({
- url: "http://s16s652780.51mypc.cn/api/blade-user/pages?current=1&size=9999&work_status=&deptId=" + deptId,
+ url: "http://223.82.109.183:2082/api/blade-user/pages?current=1&size=9999&work_status=&deptId=" + deptId,
type: 'get',
dataType: 'JSON',
success: function (res) {
diff --git a/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
index ddbf7d7..0e26c70 100644
--- a/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
+++ b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
@@ -661,7 +661,7 @@
dom.children('.select-list').children('ul').append($("<li areaid='all'>全部</li>"));
var that = this;
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/blade-system/region/select?code=3601',
+ url: 'http://223.82.109.183:2082/api/blade-system/region/select?code=3601',
type: 'GET',
dataType: 'JSON',
success: function (data) {
@@ -684,7 +684,7 @@
dom.empty();
var that = this;
$.ajax({
- url: "http://s16s652780.51mypc.cn/api/alarm/alarm/page?current=1&size=99999&waringType=&beginTime=" + beginTime + "&endTime=" +endTime +"&province=36&city=3601&district=" + addvcd,
+ url: "http://223.82.109.183:2082/api/alarm/alarm/page?current=1&size=99999&waringType=&beginTime=" + beginTime + "&endTime=" +endTime +"&province=36&city=3601&district=" + addvcd,
type: 'get',
dataType: 'JSON',
success: function (data) {
@@ -735,7 +735,7 @@
dom.children('.select-list').children('ul').empty();
dom.children('.select-list').children('ul').append($("<li ownerid='all'>全部</li>"));
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/lx/lx/seleclx',
+ url: 'http://223.82.109.183:2082/api/lx/lx/seleclx',
type: 'GET',
dataType: 'JSON',
success: function (data) {
@@ -751,7 +751,7 @@
dom.children('.select-list').children('ul').empty();
dom.children('.select-list').children('ul').append($("<li>全部</li>"));
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/dj/dj/selectName?tnumbers=' + tnumbers,
+ url: 'http://223.82.109.183:2082/api/dj/dj/selectName?tnumbers=' + tnumbers,
type: 'GET',
dataType: 'JSON',
success: function (data) {
@@ -767,7 +767,7 @@
dom.empty();
var that = this;
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/suser/suser/selectList?type=' + type + '&dj=' + dj,
+ url: 'http://223.82.109.183:2082/api/suser/suser/selectList?type=' + type + '&dj=' + dj,
type: 'GET',
dataType: 'JSON',
success: function (data) {
@@ -803,7 +803,7 @@
dom.empty();
var that = this;
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/equipment/equipment/selectList?deviceType=' + deviceType,
+ url: 'http://223.82.109.183:2082/api/equipment/equipment/selectList?deviceType=' + deviceType,
type: 'GET',
dataType: 'JSON',
success: function (data) {
diff --git a/public/map/widgets/patrolManagement/PatrolManagement.js b/public/map/widgets/patrolManagement/PatrolManagement.js
index 210c298..c07147b 100644
--- a/public/map/widgets/patrolManagement/PatrolManagement.js
+++ b/public/map/widgets/patrolManagement/PatrolManagement.js
@@ -509,7 +509,7 @@
$('.police-container-distribute-details .content table tbody').empty();
var str = '';
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
type: 'POST',
dataType: 'JSON',
success: function(data) {
@@ -540,7 +540,7 @@
var str = '';
$('.police-container-distribute-details .security-guard-nearby .security-staff-content tbody').empty();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/position/position/selectry',
+ url: 'http://223.82.109.183:2082/api/position/position/selectry',
type: 'POST',
data: {
coordinate: "point(" + $(this).attr('lgtd') + "," + $(this).attr('lttd') + ")"
@@ -608,7 +608,7 @@
}
// 发送请求修改警单数据
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/updateInfo',
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/updateInfo',
type: 'POST',
data: {
id: id,
@@ -647,7 +647,7 @@
var str = '';
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
type: 'POST',
dataType: 'JSON',
success: function(data) {
@@ -1014,7 +1014,7 @@
if ($(this).index() == 1) {
$('.police-dispatching .police-container .police-container-patrol .main-content .select-list ul').empty();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/selectqy',
type: 'GET',
dataType: 'JSON',
success: function(res) {
@@ -1177,7 +1177,7 @@
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/duty/duty/updatedtInfo',
+ url: 'http://223.82.109.183:2082/api/duty/duty/updatedtInfo',
type: 'POST',
data: {
rid: routeId,
@@ -1269,7 +1269,7 @@
if (that.tabIndex == 1) {
if (that.patrolIndex == 1) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/insertlx',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/insertlx',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1306,7 +1306,7 @@
// that.pepleRealId = pepleRealId;
} else {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/insterqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/insterqy',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1325,7 +1325,7 @@
}
} else if (that.tabIndex == 2) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/insertes',
+ url: 'http://223.82.109.183:2082/api/enclosure/enclosure/insertes',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1357,7 +1357,7 @@
// $('.police-dispatching .police-container .police-container-patrol .main-content .select-list ul').empty();
// $.ajax({
- // url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectqy',
+ // url: 'http://223.82.109.183:2082/api/regions/regions/selectqy',
// type: 'GET',
// dataType: 'JSON',
// success: function (res) {
@@ -1390,7 +1390,7 @@
$('.police-dispatching .police-container .distribute-district .select-list ul').append("<li key='addvcd' addvcd=''>全部</li>");
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/selectqy',
type: 'GET',
dataType: 'JSON',
success: function(res) {
@@ -1403,7 +1403,7 @@
})
that.getRouteInformation($('.police-dispatching .police-container .police-container-patrol .main-content>li:eq(1) .table .tbody tbody'), '');
// $.ajax({
- // url: 'http://s16s652780.51mypc.cn/api/district/district/selectList',
+ // url: 'http://223.82.109.183:2082/api/district/district/selectList',
// type: 'POST',
// dataType: 'JSON',
// success: function (data) {
@@ -1771,7 +1771,7 @@
dom.empty();
var that = this;
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectList',
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1834,7 +1834,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectList',
+ url: 'http://223.82.109.183:2082/api/regions/regions/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1878,7 +1878,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/selectList',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1920,7 +1920,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/security/security/selectList',
+ url: 'http://223.82.109.183:2082/api/security/security/selectList',
type: 'POST',
dataType: 'JSON',
success: function(data) {
@@ -2155,7 +2155,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/updatelx',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/updatelx',
type: 'POST',
dataType: 'JSON',
data: {
@@ -2211,7 +2211,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/updateqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/updateqy',
type: 'POST',
dataType: 'JSON',
data: {
@@ -2267,7 +2267,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/updatee',
+ url: 'http://223.82.109.183:2082/api/enclosure/enclosure/updatee',
type: 'POST',
dataType: 'JSON',
data: {
@@ -2371,4 +2371,4 @@
});
return Widget;
-});
\ No newline at end of file
+});
diff --git a/public/map/widgets/patrolManagement/PatrolManagement01.js b/public/map/widgets/patrolManagement/PatrolManagement01.js
index c94831a..beb7560 100644
--- a/public/map/widgets/patrolManagement/PatrolManagement01.js
+++ b/public/map/widgets/patrolManagement/PatrolManagement01.js
@@ -264,7 +264,7 @@
$('.police-container-distribute-details .content table tbody').empty();
var str = '';
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -295,7 +295,7 @@
var str = '';
$('.police-container-distribute-details .security-guard-nearby .security-staff-content tbody').empty();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/position/position/selectry',
+ url: 'http://223.82.109.183:2082/api/position/position/selectry',
type: 'POST',
data: {
coordinate: "point(" + $(this).attr('lgtd') + "," + $(this).attr('lttd') + ")"
@@ -363,7 +363,7 @@
}
// 发送请求修改警单数据
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/updateInfo',
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/updateInfo',
type: 'POST',
data: {
id: id,
@@ -402,7 +402,7 @@
var str = '';
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -769,7 +769,7 @@
if ($(this).index() == 1) {
$('.police-dispatching .police-container .police-container-patrol .main-content .select-list ul').empty();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/selectqy',
type: 'GET',
dataType: 'JSON',
success: function (res) {
@@ -932,7 +932,7 @@
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/duty/duty/updatedtInfo',
+ url: 'http://223.82.109.183:2082/api/duty/duty/updatedtInfo',
type: 'POST',
data: {
rid: routeId,
@@ -1024,7 +1024,7 @@
if (that.tabIndex == 1) {
if (that.patrolIndex == 1) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/insertlx',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/insertlx',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1040,7 +1040,7 @@
that.polygonData = [];
that.getRouteInformation($('.police-dispatching .police-container .police-container-patrol .table .tbody tbody'), '');
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/duty/duty/insertduty',
+ url: 'http://223.82.109.183:2082/api/duty/duty/insertduty',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1064,7 +1064,7 @@
// that.pepleRealId = pepleRealId;
} else {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/insterqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/insterqy',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1083,7 +1083,7 @@
}
} else if (that.tabIndex == 2) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/insertes',
+ url: 'http://223.82.109.183:2082/api/enclosure/enclosure/insertes',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1115,7 +1115,7 @@
// $('.police-dispatching .police-container .police-container-patrol .main-content .select-list ul').empty();
// $.ajax({
- // url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectqy',
+ // url: 'http://223.82.109.183:2082/api/regions/regions/selectqy',
// type: 'GET',
// dataType: 'JSON',
// success: function (res) {
@@ -1148,7 +1148,7 @@
$('.police-dispatching .police-container .distribute-district .select-list ul').append("<li key='addvcd' addvcd=''>全部</li>");
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/selectqy',
type: 'GET',
dataType: 'JSON',
success: function (res) {
@@ -1161,7 +1161,7 @@
})
that.getRouteInformation($('.police-dispatching .police-container .police-container-patrol .main-content>li:eq(1) .table .tbody tbody'), '');
// $.ajax({
- // url: 'http://s16s652780.51mypc.cn/api/district/district/selectList',
+ // url: 'http://223.82.109.183:2082/api/district/district/selectList',
// type: 'POST',
// dataType: 'JSON',
// success: function (data) {
@@ -1521,7 +1521,7 @@
dom.empty();
var that = this;
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectList',
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1584,7 +1584,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectList',
+ url: 'http://223.82.109.183:2082/api/regions/regions/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1628,7 +1628,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/selectList',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1670,7 +1670,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/security/security/selectList',
+ url: 'http://223.82.109.183:2082/api/security/security/selectList',
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -1905,7 +1905,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/updatelx',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/updatelx',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1953,7 +1953,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/updateqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/updateqy',
type: 'POST',
dataType: 'JSON',
data: {
@@ -2009,7 +2009,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/updatee',
+ url: 'http://223.82.109.183:2082/api/enclosure/enclosure/updatee',
type: 'POST',
dataType: 'JSON',
data: {
diff --git a/public/map/widgets/patrolManagement/PatrolManagement copy.js b/public/map/widgets/patrolManagement/PatrolManagement_copy.js
similarity index 97%
rename from public/map/widgets/patrolManagement/PatrolManagement copy.js
rename to public/map/widgets/patrolManagement/PatrolManagement_copy.js
index 5a6e6ce..5202140 100644
--- a/public/map/widgets/patrolManagement/PatrolManagement copy.js
+++ b/public/map/widgets/patrolManagement/PatrolManagement_copy.js
@@ -284,7 +284,7 @@
$('.police-container-distribute-details .content table tbody').empty();
var str = '';
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
type: 'POST',
dataType: 'JSON',
success: function(data) {
@@ -315,7 +315,7 @@
var str = '';
$('.police-container-distribute-details .security-guard-nearby .security-staff-content tbody').empty();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/position/position/selectry',
+ url: 'http://223.82.109.183:2082/api/position/position/selectry',
type: 'POST',
data: {
coordinate: "point(" + $(this).attr('lgtd') + "," + $(this).attr('lttd') + ")"
@@ -383,7 +383,7 @@
}
// 发送请求修改警单数据
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/updateInfo',
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/updateInfo',
type: 'POST',
data: {
id: id,
@@ -422,7 +422,7 @@
var str = '';
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
type: 'POST',
dataType: 'JSON',
success: function(data) {
@@ -785,7 +785,7 @@
if ($(this).index() == 1) {
$('.police-dispatching .police-container .police-container-patrol .main-content .select-list ul').empty();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/selectqy',
type: 'GET',
dataType: 'JSON',
success: function(res) {
@@ -945,7 +945,7 @@
that.layuiLayer.msg('人员未更改!');
} else {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/duty/duty/updatedtInfo',
+ url: 'http://223.82.109.183:2082/api/duty/duty/updatedtInfo',
type: 'POST',
data: {
rid: routeId,
@@ -1035,7 +1035,7 @@
if (that.tabIndex == 1) {
if (that.patrolIndex == 1) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/insertlx',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/insertlx',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1051,7 +1051,7 @@
that.polygonData = [];
that.getRouteInformation($('.police-dispatching .police-container .police-container-patrol .table .tbody tbody'), '');
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/duty/duty/insertduty',
+ url: 'http://223.82.109.183:2082/api/duty/duty/insertduty',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1076,7 +1076,7 @@
// that.pepleRealId = pepleRealId;
} else {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/insterqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/insterqy',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1095,7 +1095,7 @@
}
} else if (that.tabIndex == 2) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/insertes',
+ url: 'http://223.82.109.183:2082/api/enclosure/enclosure/insertes',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1133,7 +1133,7 @@
$('.police-dispatching .police-container .distribute-district .select-list ul').empty();
$('.police-dispatching .police-container .distribute-district .select-list ul').append("<li key='addvcd' addvcd=''>全部</li>");
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/district/district/selectList',
+ url: 'http://223.82.109.183:2082/api/district/district/selectList',
type: 'POST',
dataType: 'JSON',
success: function(data) {
@@ -1493,7 +1493,7 @@
dom.empty();
var that = this;
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectList',
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1556,7 +1556,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectList',
+ url: 'http://223.82.109.183:2082/api/regions/regions/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1600,7 +1600,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/selectList',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1642,7 +1642,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/security/security/selectList',
+ url: 'http://223.82.109.183:2082/api/security/security/selectList',
type: 'POST',
dataType: 'JSON',
success: function(data) {
@@ -1873,7 +1873,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/updatelx',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/updatelx',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1921,7 +1921,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/updateqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/updateqy',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1977,7 +1977,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/updatee',
+ url: 'http://223.82.109.183:2082/api/enclosure/enclosure/updatee',
type: 'POST',
dataType: 'JSON',
data: {
@@ -2068,4 +2068,4 @@
});
return Widget;
-});
\ No newline at end of file
+});
diff --git a/public/map/widgets/patrolManagement/template copy.html b/public/map/widgets/patrolManagement/template_copy.html
similarity index 100%
rename from public/map/widgets/patrolManagement/template copy.html
rename to public/map/widgets/patrolManagement/template_copy.html
diff --git a/public/map/widgets/policeDispatching/PoliceDispatching.js b/public/map/widgets/policeDispatching/PoliceDispatching.js
index e6febcb..c514549 100644
--- a/public/map/widgets/policeDispatching/PoliceDispatching.js
+++ b/public/map/widgets/policeDispatching/PoliceDispatching.js
@@ -256,7 +256,7 @@
$('.police-container-distribute-details .content table tbody').empty();
var str = '';
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -287,7 +287,7 @@
var str = '';
$('.police-container-distribute-details .security-guard-nearby .security-staff-content tbody').empty();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/position/position/selectry',
+ url: 'http://223.82.109.183:2082/api/position/position/selectry',
type: 'POST',
data: {
coordinate: "point(" + $(this).attr('lgtd') + "," + $(this).attr('lttd') + ")"
@@ -355,7 +355,7 @@
}
// 发送请求修改警单数据
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/updateInfo',
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/updateInfo',
type: 'POST',
data: {
id: id,
@@ -394,7 +394,7 @@
var str = '';
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectdInfo?deviceNumber=&id=' + id,
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -757,7 +757,7 @@
if ($(this).index() == 1) {
$('.police-dispatching .police-container .police-container-patrol .main-content .select-list ul').empty();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/selectqy',
type: 'GET',
dataType: 'JSON',
success: function (res) {
@@ -917,7 +917,7 @@
that.layuiLayer.msg('人员未更改!');
} else {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/duty/duty/updatedtInfo',
+ url: 'http://223.82.109.183:2082/api/duty/duty/updatedtInfo',
type: 'POST',
data: {
rid: routeId,
@@ -1007,7 +1007,7 @@
if (that.tabIndex == 1) {
if (that.patrolIndex == 1) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/insertlx',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/insertlx',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1023,7 +1023,7 @@
that.polygonData = [];
that.getRouteInformation($('.police-dispatching .police-container .police-container-patrol .table .tbody tbody'), '');
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/duty/duty/insertduty',
+ url: 'http://223.82.109.183:2082/api/duty/duty/insertduty',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1047,7 +1047,7 @@
// that.pepleRealId = pepleRealId;
} else {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/insterqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/insterqy',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1066,7 +1066,7 @@
}
} else if (that.tabIndex == 2) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/insertes',
+ url: 'http://223.82.109.183:2082/api/enclosure/enclosure/insertes',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1104,7 +1104,7 @@
$('.police-dispatching .police-container .distribute-district .select-list ul').empty();
$('.police-dispatching .police-container .distribute-district .select-list ul').append("<li key='addvcd' addvcd=''>全部</li>");
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/district/district/selectList',
+ url: 'http://223.82.109.183:2082/api/district/district/selectList',
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -1457,7 +1457,7 @@
dom.empty();
var that = this;
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/selectList',
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1520,7 +1520,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/selectList',
+ url: 'http://223.82.109.183:2082/api/regions/regions/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1564,7 +1564,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/selectList',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1606,7 +1606,7 @@
that.currentDrawing = [];
that.entityPolygonAll.clear();
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/security/security/selectList',
+ url: 'http://223.82.109.183:2082/api/security/security/selectList',
type: 'POST',
dataType: 'JSON',
success: function (data) {
@@ -1837,7 +1837,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/routeIn/routein/updatelx',
+ url: 'http://223.82.109.183:2082/api/routeIn/routein/updatelx',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1885,7 +1885,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/regions/regions/updateqy',
+ url: 'http://223.82.109.183:2082/api/regions/regions/updateqy',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1941,7 +1941,7 @@
dataStr = dataStr.substring(0, dataStr.length - 1);
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/enclosure/enclosure/updatee',
+ url: 'http://223.82.109.183:2082/api/enclosure/enclosure/updatee',
type: 'POST',
dataType: 'JSON',
data: {
diff --git a/public/map/widgets/realTimePolice/RealTimePolice.js b/public/map/widgets/realTimePolice/RealTimePolice.js
index 24b588b..cf278ef 100644
--- a/public/map/widgets/realTimePolice/RealTimePolice.js
+++ b/public/map/widgets/realTimePolice/RealTimePolice.js
@@ -474,7 +474,7 @@
}
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/jingdan/jingdan/saves',
+ url: 'http://223.82.109.183:2082/api/jingdan/jingdan/saves',
type: 'POST',
data: {
rName: $(_self).data('rname'),
@@ -586,7 +586,7 @@
// 行政区
// $.ajax({
- // url: 'http://s16s652780.51mypc.cn/api/district/district/selectList',
+ // url: 'http://223.82.109.183:2082/api/district/district/selectList',
// type: 'POST',
// dataType: 'JSON',
// success: function (data) {
@@ -603,7 +603,7 @@
// // 警情类型下拉
// $.ajax({
- // url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/selectScount',
+ // url: 'http://223.82.109.183:2082/api/alarm/alarm/selectScount',
// type: 'GET',
// dataType: 'JSON',
// success: function (data) {
@@ -633,7 +633,7 @@
that.updateRealTable = table.render({
elem: '#real_time_table'
, height: (layerTabHei - 20)
- , url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/selectList' //数据接口
+ , url: 'http://223.82.109.183:2082/api/alarm/alarm/selectList' //数据接口
, method: "post"
, where: { jtype: '', beginTime: that.realBeginTime, endTime: that.realEndTime }
, parseData: function (res) { //res 即为原始返回的数据
@@ -1049,7 +1049,7 @@
that.realTimeQuery = setInterval(function () {
if (that.historyPoliceId != null) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/selecttx',
+ url: 'http://223.82.109.183:2082/api/alarm/alarm/selecttx',
type: 'POST',
dataType: 'JSON',
data: {
@@ -1340,7 +1340,7 @@
layer.confirm('确定撤销该警情?', { icon: 3, title: '提示' }, function (index) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/deletejj',
+ url: 'http://223.82.109.183:2082/api/alarm/alarm/deletejj',
type: 'POST',
data: {
id: id
@@ -1443,7 +1443,7 @@
updateJType: function (id, czTime, bz, jjTime) {
$.ajax({
- url: 'http://s16s652780.51mypc.cn/api/alarm/alarm/updateJtype',
+ url: 'http://223.82.109.183:2082/api/alarm/alarm/updateJtype',
type: 'POST',
data: {
id: id,
diff --git a/public/map/widgets/securityMap/SecurityMap.js b/public/map/widgets/securityMap/SecurityMap.js
index c93be8b..ae7aec9 100644
--- a/public/map/widgets/securityMap/SecurityMap.js
+++ b/public/map/widgets/securityMap/SecurityMap.js
@@ -161,7 +161,7 @@
//基础路径
//pathUrl: "http://localhost:89",
- pathUrl: "http://s16s652780.51mypc.cn/api/blade-jfpts",
+ pathUrl: "http://223.82.109.183:2082/api/blade-jfpts",
// 电子围栏需要新增的Id
newElectronicFenceId: null,
diff --git a/public/map/widgets/securityMap/SecurityMap_copy1.js b/public/map/widgets/securityMap/SecurityMap_copy1.js
index 2a08208..daaba5e 100644
--- a/public/map/widgets/securityMap/SecurityMap_copy1.js
+++ b/public/map/widgets/securityMap/SecurityMap_copy1.js
@@ -165,7 +165,7 @@
//基础路径
pathUrl: "http://localhost:89",
- //pathUrl: "http://s16s652780.51mypc.cn/api/blade-jfpts",
+ //pathUrl: "http://223.82.109.183:2082/api/blade-jfpts",
// 电子围栏需要新增的Id
newElectronicFenceId: null,
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index ad5bc81..d1ac26b 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -8,6 +8,7 @@
...params,
current,
size,
+
}
})
}
diff --git a/src/api/zc/zc.js b/src/api/zc/zc.js
index 014907b..a4fe5f8 100644
--- a/src/api/zc/zc.js
+++ b/src/api/zc/zc.js
@@ -2,7 +2,7 @@
export const getList = (current, size, params) => {
return request({
- url: '/api/zc/list',
+ url: '/api/zc/page',
method: 'get',
params: {
...params,
diff --git a/src/router/views/index.js b/src/router/views/index.js
index d4b84f9..0a8ab3c 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -483,6 +483,34 @@
component: () =>
import( /* webpackChunkName: "views" */ '@/components/real-popup/kongbai')
}]
+ },
+ {
+ path: '/role',
+ redirect: '/role/index',
+ component: Layout,
+ children: [{
+ path: 'index',
+ name: '权限管理',
+ meta: {
+ i18n: 'index'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/authority/role')
+ }]
+ },
+ {
+ path: '/zc',
+ redirect: '/zc/index',
+ component: Layout,
+ children: [{
+ path: 'index',
+ name: '注册审核',
+ meta: {
+ i18n: 'index'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/zc/zc')
+ }]
}
]
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 3deeb9c..be569e2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -421,3 +421,12 @@
background-color: transparent !important;
border-bottom: 1px solid $mainB !important;
}
+//菜单scroll
+.menuClass .el-card{
+ height: auto !important;
+}
+
+//机构管理
+.deptClass .el-card{
+ height: auto !important;
+}
diff --git a/src/views/feedbackReport/feedbackReport.vue b/src/views/feedbackReport/feedbackReport.vue
index 26caf76..bd72cc1 100644
--- a/src/views/feedbackReport/feedbackReport.vue
+++ b/src/views/feedbackReport/feedbackReport.vue
@@ -431,8 +431,7 @@
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
+ cancelButtonText: "取消", type: "warning",
})
.then(() => {
return remove(row.id);
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 4e13817..1d7bcd8 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -780,7 +780,6 @@
};
}
}
-
if (releaseTimeRange) {
values = {
...params,
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index c29a095..158ce85 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -1,5 +1,5 @@
<template>
- <basic-container>
+ <basic-container class="deptClass">
<avue-crud
:option="option"
:table-loading="loading"
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 53ae66c..135e8b0 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -1,5 +1,5 @@
<template>
- <basic-container>
+ <basic-container class="menuClass">
<avue-crud :option="option"
:table-loading="loading"
:data="data"
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index ad554a6..7f43053 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -388,11 +388,13 @@
label: "所属客户",
prop: "tenantId",
type: "tree",
+ display:false,
dicUrl: "/api/blade-system/tenant/select",
props: {
label: "tenantName",
value: "tenantId",
},
+ value:"000000",
hide: !website.tenantMode,
addDisplay: website.tenantMode,
editDisplay: website.tenantMode,
@@ -610,6 +612,7 @@
label: "所属岗位",
prop: "postId",
type: "tree",
+ display: false,
multiple: true,
dicData: [],
props: {
diff --git a/src/views/zc/zc.vue b/src/views/zc/zc.vue
index 715bd4d..ae68a79 100644
--- a/src/views/zc/zc.vue
+++ b/src/views/zc/zc.vue
@@ -27,15 +27,23 @@
@click="handleDelete">删 除
</el-button>
</template>
- <template slot-scope="{row}" slot="type">
+ <template slot-scope="{row}" slot="type">
<el-tag>{{row.type==='0'?'未审核':row.type==='1'?'审核通过':'审核未通过'}}</el-tag>
</template>
+ <template slot-scope="{ row }" slot="examination_type">
+ 正常
+ </template>
+
+ <template slot-scope="{ row }" slot="examination_mx">
+ 正常
+ </template>
+
<template slot-scope="{row}"
slot="roleName">
<el-tag>{{row.roleName}}</el-tag>
</template>
<template slot-scope="scope" slot="menu">
- <el-button icon="el-icon-check" size="small" @click.stop="handleEdit(scope.row,scope.index)">审核</el-button>
+ <el-button icon="el-icon-check" size="small" @click.stop="handleEdit(scope.row,scope.index)">审核</el-button>
</template>
</avue-crud>
@@ -61,11 +69,11 @@
},
selectionList: [],
option: {
- height:'auto',
+ height: 'auto',
calcHeight: 54,
tip: false,
searchShow: true,
- searchMenuSpan: 6,
+ searchMenuSpan: 4,
border: true,
index: true,
viewBtn: true,
@@ -76,8 +84,10 @@
column: [
{
label: "账号",
+ search: true,
+ searchSpan: 4,
display: false,
- disabled:true,
+ disabled: true,
prop: "username",
},
{
@@ -90,13 +100,17 @@
{
label: "姓名",
display: false,
- disabled:true,
+ searchSpan: 4,
+ search: true,
+ disabled: true,
prop: "sname",
},
{
label: "性别",
display: false,
- disabled:true,
+ searchSpan: 4,
+ search: true,
+ disabled: true,
prop: "sex",
type: "select",
dicData: [
@@ -108,40 +122,43 @@
label: "女",
value: "2"
}
- ],
+ ],
},
{
label: "手机号码",
- disabled:true,
+ disabled: true,
display: false,
prop: "phone",
},
{
label: "部门",
- disabled:true,
- display: false,
- prop: "deptid",
- type: "tree",
- dicUrl: "/api/blade-system/dept/selectInfo",
- props: {
- label: "dept_name",
- value: "deptid"
- },
+ prop: "deptName",
+ // type: "tree",
+ // dicUrl: "/api/blade-system/dept/selectInfo",
+ // props: {
+ // label: "title",
+ // value: "value"
+ // },
+ }, {
+ label: "辖区",
+ prop: "jurisdiction",
},
{
label: "角色",
- prop: "parentId",
- hide: true,
- dicData: [],
type: "tree",
+ prop: "parentId",
+ dicUrl: "/api/blade-system/role/tree",
props: {
- label: "title"
+ label: "title",
+ value: "value"
},
},
{
label: "审核状态",
prop: "type",
+ search: true,
slot: true,
+ searchSpan: 4,
type: "select",
dicData: [
{
@@ -158,7 +175,31 @@
}
],
+ }, {
+ label: "审查状态",
+ prop: "examination_type",
+ slot: true,
+ search: true,
+ searchSpan: 4,
+ display: false,
+ type: "select",
+ dicData: [
+ {
+ label: "正常",
+ value: "0",
+ },
+ {
+ label: "异常",
+ value: "1",
+ },
+ ],
},
+ {
+ label: "审查明细",
+ prop: "examination_mx",
+ display: false,
+ slot: true,
+ }
]
},
data: []
@@ -168,7 +209,7 @@
...mapGetters(["permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.zc_add, false),
+ addBtn: this.vaildData(this.permission.zc_add, false),
viewBtn: this.vaildData(this.permission.zc_view, true),
delBtn: this.vaildData(this.permission.zc_delete, false),
editBtn: this.vaildData(this.permission.zc_edit, false)
@@ -183,14 +224,14 @@
}
},
methods: {
- initData(){
+ initData() {
getRoleTree().then(res => {
const column = this.findObject(this.option.column, "parentId");
column.dicData = res.data.data;
});
},
- handleEdit (row, index) {
- this.initData();
+ handleEdit(row, index) {
+ // this.initData();
this.$refs.crud.rowEdit(row, index);
},
rowSave(row, done, loading) {
@@ -283,10 +324,10 @@
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
- currentChange(currentPage){
+ currentChange(currentPage) {
this.page.currentPage = currentPage;
},
- sizeChange(pageSize){
+ sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
diff --git a/vue.config.js b/vue.config.js
index d10d054..3512ad2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,10 +36,13 @@
proxy: {
'/api': {
//本地服务接口地址
- target: 'http://s16s652780.51mypc.cn/api/',
+ // target: 'http://s16s652780.51mypc.cn/api/',
// target: 'http://192.168.0.114:82/',
// target: 'http://192.168.0.111:83/',
//target: 'http://localhost:82/',
+ //target: 'http://s16s652780.51mypc.cn/api/',
+ //target: 'http://223.82.109.183:83/',
+ target: 'http://localhost:82/',
//target: 'https://web.byisf.com/api/',
//远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.vip/api',
--
Gitblit v1.9.3