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] 冲突
---
public/map/widgets/alertSecurity/AlertSecurity.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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) {
--
Gitblit v1.9.3