From d03f87c702dbe7456b5e7bedca0fdcae041f16f4 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 13 Mar 2021 18:10:26 +0800
Subject: [PATCH] mainMapWidget
---
public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js | 20 +++++-----
public/map/widgets/alertSecurity/AlertSecurity.js | 46 ++++++++++++++++------
public/map/index.html | 2
src/views/distribution/index.vue | 13 +++---
4 files changed, 51 insertions(+), 30 deletions(-)
diff --git a/public/map/index.html b/public/map/index.html
index f2c7eca..8f218cd 100644
--- a/public/map/index.html
+++ b/public/map/index.html
@@ -54,7 +54,7 @@
_AppEvent.addAppEventListener("mapLoad", function(map){
if (locationObj && locationObj != null) {
- map.centerAndZoom(new esri.geometry.Point(locationObj.x,locationObj.y, new esri.SpatialReference({ wkid: 4326 })), 14);
+ map.centerAndZoom(new esri.geometry.Point(locationObj.x,locationObj.y, new esri.SpatialReference({ wkid: 4326 })), 16);
}
});
if (openId) showFun(openId);
diff --git a/public/map/widgets/alertSecurity/AlertSecurity.js b/public/map/widgets/alertSecurity/AlertSecurity.js
index 662b2c2..4123c68 100644
--- a/public/map/widgets/alertSecurity/AlertSecurity.js
+++ b/public/map/widgets/alertSecurity/AlertSecurity.js
@@ -184,19 +184,9 @@
startup: function () {
objThis._map.addLayer(objThis._siteLayer);
- var that = this;
-
- var openid = that.getQueryStringByKey('id');
- $.ajax({
- url: "http://web.byisf.com/api/blade-jfpts/jingdan/jingdan/detail?id=" + openid,
- type: 'get',
- dataType: 'JSON',
- success: function (data) {
- that.addPoint(that.addEntitys, data.data.jd, data.data.wd)
- }
- })
+
},
@@ -205,7 +195,37 @@
},
open: function () {
+
var that = this;
+
+ var openid = that.getQueryStringByKey('id');
+ var lgtd = that.getQueryStringByKey('jd');
+ var lttd = that.getQueryStringByKey('wd');
+
+ $.ajax({
+ url: "https://web.byisf.com/api/blade-jfpts/jingdan/jingdan/detail?id=" + openid,
+ type: 'get',
+ dataType: 'JSON',
+ success: function (data) {
+ that.addPoint(that.addEntitys, data.data.jd, data.data.wd, './images/jingbaored.png')
+ }
+ })
+
+ $.ajax({
+ url: "https://web.byisf.com/api/blade-jfpts/position/position/selectfj",
+ type: 'POST',
+ dataType: 'JSON',
+ data: {
+ jd: lgtd,
+ wd: lttd
+ },
+ success: function (data) {
+ console.log(data)
+ data.data.forEach(item => {
+ that.addPoint(that.addEntitys, item.jd, item.wd, './images/security.png')
+ })
+ }
+ })
},
close: function () {
@@ -262,8 +282,8 @@
entityContent.push(item);
},
- addPoint: function (entitys, lgtd, lttd) {
- var symbol = new esri.symbol.PictureMarkerSymbol('./images/jingbaored.png', 20, 20);
+ addPoint: function (entitys, lgtd, lttd, img) {
+ var symbol = new esri.symbol.PictureMarkerSymbol(img, 20, 20);
var pt = new Point(lgtd, lttd, new SpatialReference({
wkid: 4326
}));
diff --git a/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
index b1fd5c3..13c1dba 100644
--- a/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
+++ b/public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
@@ -663,7 +663,7 @@
dom.children('.select-list').children('ul').append($("<li areaid='all'>全部</li>"));
var that = this;
$.ajax({
- url: 'http://web.byisf.com/api/blade-system/region/select?code=3601',
+ url: 'https://web.byisf.com/api/blade-system/region/select?code=3601',
type: 'GET',
dataType: 'JSON',
success: function (data) {
@@ -686,7 +686,7 @@
dom.empty();
var that = this;
$.ajax({
- url: 'http://web.byisf.com/api/blade-jfpts/jingdan/jingdan/selectList',
+ url: 'https://web.byisf.com/api/blade-jfpts/jingdan/jingdan/selectList',
type: 'POST',
dataType: 'JSON',
data: {
@@ -710,11 +710,11 @@
}, result[i].jd, result[i].wd, './images/police-situation.png');
- t = result[i].handleTime.substr(0, 10);
- e = result[i].handleTime.substr(11);
+ t = result[i].galarmTime.substr(0, 10);
+ e = result[i].galarmTime.substr(11);
time = t + ' ' + e;
- y = result[i].handleTime.substr(5, 5);
- h = result[i].handleTime.substr(11, 5);
+ y = result[i].galarmTime.substr(5, 5);
+ h = result[i].galarmTime.substr(11, 5);
a = Number(i) + 1;
str += '<tr term-list=' + result[i].id + '>';
str += '<td>' + a + '</td>';
@@ -741,7 +741,7 @@
dom.children('.select-list').children('ul').empty();
dom.children('.select-list').children('ul').append($("<li ownerid='all'>全部</li>"));
$.ajax({
- url: 'http://web.byisf.com/api/blade-jfpts/lx/lx/seleclx',
+ url: 'https://web.byisf.com/api/blade-jfpts/lx/lx/seleclx',
type: 'GET',
dataType: 'JSON',
success: function (data) {
@@ -757,7 +757,7 @@
dom.children('.select-list').children('ul').empty();
dom.children('.select-list').children('ul').append($("<li>全部</li>"));
$.ajax({
- url: 'http://web.byisf.com/api/blade-jfpts/dj/dj/selectName?tnumbers=' + tnumbers,
+ url: 'https://web.byisf.com/api/blade-jfpts/dj/dj/selectName?tnumbers=' + tnumbers,
type: 'GET',
dataType: 'JSON',
success: function (data) {
@@ -773,7 +773,7 @@
dom.empty();
var that = this;
$.ajax({
- url: 'http://web.byisf.com/api/blade-jfpts/suser/suser/selectList?type=' + type + '&dj=' + dj,
+ url: 'https://web.byisf.com/api/blade-jfpts/suser/suser/selectList?type=' + type + '&dj=' + dj,
type: 'GET',
dataType: 'JSON',
success: function (data) {
@@ -809,7 +809,7 @@
dom.empty();
var that = this;
$.ajax({
- url: 'http://web.byisf.com/api/blade-jfpts/equipment/equipment/selectList?deviceType=' + deviceType,
+ url: 'https://web.byisf.com/api/blade-jfpts/equipment/equipment/selectList?deviceType=' + deviceType,
type: 'GET',
dataType: 'JSON',
success: function (data) {
diff --git a/src/views/distribution/index.vue b/src/views/distribution/index.vue
index 7f6282f..8459fab 100644
--- a/src/views/distribution/index.vue
+++ b/src/views/distribution/index.vue
@@ -78,7 +78,7 @@
></el-input> </el-form-item
></el-col>
<el-col span="12"
- ><el-form-item class="distribution-form-label" label="警情类别">
+ ><el-form-item class="distribution-form-label" label="警情类别">t
<el-input
disabled="true"
v-model="form.waringType"
@@ -107,6 +107,7 @@
<el-col span="12"
><el-form-item class="distribution-form-label" label="处理人">
<el-select
+ style="width: 100%"
v-model="form.handName"
@change="selectChange"
placeholder="请选择处理人"
@@ -216,13 +217,13 @@
selectOptions: [],
form: {},
baseUrl: "",
- processmode: "提示业主",
+ processmode: "派发保安",
ref: this.$refs,
};
},
created() {
this.form = this.$route.query;
- this.form.handletype = 1;
+ this.form.handletype = 0;
console.log(this.form);
if (this.form.type == 0) {
@@ -231,7 +232,7 @@
}
this.getSelectOptions();
- this.baseUrl = `/map/index.html?openid=AlertSecurity&id=${this.form.id}&jd=${this.form.jd}&wd=${this.form.wd}}`;
+ this.baseUrl = `/map/index.html?ISinit=1&openid=AlertSecurity&id=${this.form.id}&jd=${this.form.jd}&wd=${this.form.wd}`;
var arr = [];
var flag = false;
@@ -269,7 +270,7 @@
}
var newAxios = axios.create({
- baseURL: "http://web.byisf.com",
+ baseURL: "https://web.byisf.com",
withCredentials: false,
headers: {},
});
@@ -304,7 +305,7 @@
getSelectOptions() {
var newAxios = axios.create({
- baseURL: "http://web.byisf.com",
+ baseURL: "https://web.byisf.com",
withCredentials: false,
headers: {},
});
--
Gitblit v1.9.3