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/analysisAndJudgment/AnalysisAndJudgment.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
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) {
--
Gitblit v1.9.3