From a7a86324ae4e519b8ee0a3fa3038f3afa2e14dec Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 04 Feb 2021 13:49:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
public/map/controls/toolbar/tools/LocationTool.js | 28 ++++----
src/views/realTimePolice/real.vue | 17 +++--
src/views/home/home.vue | 10 +++
public/map/config.json | 16 ++--
public/map/widgets/map/MapWidget.js | 37 ++++-------
public/map/index.html | 17 ++---
src/views/clientManagement/clientManagement.vue | 4
src/page/index/logo.vue | 30 ++++++++--
8 files changed, 88 insertions(+), 71 deletions(-)
diff --git a/public/map/config.json b/public/map/config.json
index 96bd0d8..57ec7df 100644
--- a/public/map/config.json
+++ b/public/map/config.json
@@ -1,16 +1,16 @@
{
"basemap": {
"initExtent": [
- 115.62627608398445,
- 28.628863800659224,
- 116.20493819335945,
- 28.71788357604985
+ 12881727,
+ 3326410,
+ 12918360,
+ 3344162
],
"fullExtent": [
- 115.60864000000008,
- 28.447970000000055,
- 116.33494000000007,
- 28.965810000000033
+ 12881727,
+ 3326410,
+ 12918360,
+ 3344162
],
"maplogo": false,
"wkid": 102100,
diff --git a/public/map/controls/toolbar/tools/LocationTool.js b/public/map/controls/toolbar/tools/LocationTool.js
index b8d4a01..01c3ce5 100644
--- a/public/map/controls/toolbar/tools/LocationTool.js
+++ b/public/map/controls/toolbar/tools/LocationTool.js
@@ -3,8 +3,8 @@
* @Version: 1.0
* @Author: yangsx
* @Date: 2019-12-09 19:01:40
- * @LastEditors: yangsx
- * @LastEditTime: 2019-12-14 10:47:05
+ * @LastEditors: song
+ * @LastEditTime: 2021-02-03 17:11:24
*/
/**
* 位置查询工具
@@ -30,12 +30,12 @@
activate: function(args) {
this.inherited(arguments);
var extent = new Extent({
- xmin: 117.32627608398445,
- ymin: 26.028863800659224,
- xmax: 119.20493819335945,
- ymax: 27.11788357604985,
- spatialReference: { wkid: 4326 }
- });
+ "xmin": 12881727,
+ "ymin": 3326410,
+ "xmax": 12918360,
+ "ymax": 3344162,
+ "spatialReference": { "wkid": 102100 }
+ });
console.log(1234,extent);
this._map.setExtent(extent);
@@ -46,12 +46,12 @@
deactivate: function() {
this.inherited(arguments);
var extent = new Extent({
- xmin: 117.32627608398445,
- ymin: 26.028863800659224,
- xmax: 119.20493819335945,
- ymax: 27.11788357604985,
- spatialReference: { wkid: 4326 }
- });
+ "xmin": 12881727,
+ "ymin": 3326410,
+ "xmax": 12918360,
+ "ymax": 3344162,
+ "spatialReference": { "wkid": 102100 }
+ });
console.log(1234,extent);
this._map.setExtent(extent);
}
diff --git a/public/map/index.html b/public/map/index.html
index 8edea66..1de1918 100644
--- a/public/map/index.html
+++ b/public/map/index.html
@@ -1,11 +1,3 @@
-<!--
- * @Description: 地图
- * @Version: 1.0
- * @Author: yangsx
- * @Date: 2019-11-28 09:50:16
- * @LastEditors: song
- * @LastEditTime: 2021-02-01 17:14:21
- -->
<!DOCTYPE html>
<html lang="zh">
@@ -42,6 +34,7 @@
<script>
var _framework = null;
var _AppEvent = null;
+ var locationObj = null
function init(openId) {
if (openId && _AppEvent != null) {
@@ -55,6 +48,7 @@
_framework.onSiderContainerShow();
_framework.resize();
_AppEvent = AppEvent;
+ _AppEvent.addAppEventListener("mapLoad", mapLoad);
if (openId) showFun(openId);
}
);
@@ -64,9 +58,12 @@
_AppEvent.dispatchAppEvent(_AppEvent.RUN_WIDGET, id);
}
- function dw(x,y) {
- _AppEvent.dispatchAppEvent("goto", {x:x,y:y});
+ function mapLoad(map) {
+ if(locationObj) {
+ map.centerAndZoom(new esri.geometry.Point(locationObj.x,locationObj.y, new esri.SpatialReference({ wkid: 4326 })), 14);
+ }
}
+
</script>
</head>
diff --git a/public/map/widgets/map/MapWidget.js b/public/map/widgets/map/MapWidget.js
index 3b6a8d4..a7e1d18 100644
--- a/public/map/widgets/map/MapWidget.js
+++ b/public/map/widgets/map/MapWidget.js
@@ -1,8 +1,3 @@
-/**
- * 富地图widget
- * @author Liuyl
- * @date 2015/10/20
- */
define([
"dojo/_base/declare",
"dojo/_base/lang",
@@ -100,7 +95,7 @@
this.map = new Map(this.mapBoxDom.id, {
logo: this._parseResult.maplogo,
showAttribution: true,
- extent: this._parseResult.extent,
+ extent: extent,
maxZoom: 17,
minZoom: 0,
navigationMode: "classic"
@@ -124,10 +119,6 @@
this._eventHandlers.push(this.map.on("mouse-move", lang.hitch(this, this._onMouseMove)));
AppEvent.addAppEventListener(AppEvent.SWITCH_BASEMAP, lang.hitch(this, this.onSwitchBaseMap));
AppEvent.addAppEventListener(AppEvent.ADD_TOP_MOST_LAYER, lang.hitch(this, this.onAddTopMostLayer));
- AppEvent.addAppEventListener("goto", lang.hitch(this, this.goto));
- },
- goto: function (evt) {
- this.map.centerAndZoom(new Point(evt.x,evt.y, new SpatialReference({ wkid: 4326 })), 14);
},
onload: function () {
//var listNode = this.map.attribution.listNode;
@@ -157,11 +148,11 @@
}, listNode);
on(locationb, 'click', lang.hitch(this, function () {
var extent = new Extent({
- "xmin": 117.32627608398445,
- "ymin": 26.028863800659224,
- "xmax": 119.20493819335945,
- "ymax": 27.11788357604985,
- "spatialReference": { "wkid": 4326 }
+ "xmin": 12881727,
+ "ymin": 3326410,
+ "xmax": 12918360,
+ "ymax": 3344162,
+ "spatialReference": { "wkid": 102100 }
});
this.map.setExtent(extent);
}));
@@ -245,7 +236,7 @@
}
}
}))
-
+ AppEvent.dispatchAppEvent("mapLoad", this.map);
return this.map
},
appendToolHandler: function (data) {
@@ -312,7 +303,7 @@
});
this.map.addLayer(cycleMap);
- this.map.centerAndZoom(new Point(115.806669,28.68635, new SpatialReference({ wkid: 4326 })), 14);
+ //this.map.centerAndZoom(new Point(115.806669,28.68635, new SpatialReference({ wkid: 4326 })), 14);
// //添加多时相图层
@@ -380,13 +371,13 @@
},
_getStartExtent: function () {
- return new esri.geometry.Extent({
- "xmin": ConfigData.basemap.initExtent[0],
- "ymin": ConfigData.basemap.initExtent[1],
- "xmax": ConfigData.basemap.initExtent[2],
- "ymax": ConfigData.basemap.initExtent[3],
+ return new Extent({
+ "xmin": Number(ConfigData.basemap.initExtent[0]),
+ "ymin": Number(ConfigData.basemap.initExtent[1]),
+ "xmax": Number(ConfigData.basemap.initExtent[2]),
+ "ymax": Number(ConfigData.basemap.initExtent[3]),
"spatialReference": {
- "wkid": ConfigData.basemap.wkid
+ "wkid": Number(ConfigData.basemap.wkid)
}
});
},
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 3fe81c5..06f09ad 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -16,7 +16,7 @@
<audio ref='realAudio' loop>
</audio>
<div>
- <el-dialog class="real-dialog" title="实时警情" :visible.sync="dialogTableVisible" append-to-body="true" @close='closeDialog'>
+ <el-dialog class="real-dialog" title="实时警情" center="true" :visible.sync="dialogTableVisible" top="190px" append-to-body="true" @close='closeDialog'>
<el-form :model="form" label-position="right" size="mini" label-width="100px">
<el-row>
<el-col span="12">
@@ -138,7 +138,7 @@
var that = this;
axios({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/getLimit',
+ url: '/api/blade-jfpts/alarm/alarm/getLimit',
method: 'get',
}).then(function (response) {
that.deviceId = response.data.data[0].id;
@@ -152,7 +152,7 @@
window.clearTimeout(window.realTimeQuery);
window.realTimeQuery = setInterval(function () {
axios({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/selecttx?id='+that.deviceId,
+ url: '/api/blade-jfpts/alarm/alarm/selecttx?id='+that.deviceId,
method: 'post',
}).then(function (response) {
if (response.data.data.length > 0){
@@ -181,7 +181,7 @@
});
}else{
axios({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/jingdan/jingdan/submit',
+ url: '/api/blade-jfpts/jingdan/jingdan/submit',
method: 'post',
data: {
rName: row.rname,
@@ -224,7 +224,7 @@
revoke(row){
var that = this;
axios({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/deletejj?id='+row.id,
+ url: '/api/blade-jfpts/alarm/alarm/deletejj?id='+row.id,
method: 'post',
}).then(function () {
that.dialogTableVisible = false;
@@ -236,7 +236,7 @@
},updateJtyep(row){
var that = this;
axios({
- url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/updateJtype?id='+row.id+"&czTime="+row.czTime+"&bz="+row.bz,
+ url: '/api/blade-jfpts/alarm/alarm/updateJtype?id='+row.id+"&czTime="+row.czTime+"&bz="+row.bz,
method: 'post',
}).then(function () {
});
@@ -301,4 +301,22 @@
}
+ .real-dialog .el-dialog__header{
+ padding-top: 10px;
+ background: linear-gradient(45deg, #ff0000, #ff3c3c);
+ border-radius: 10px 10px 0 0;
+ }
+
+ .real-dialog .el-dialog__header .el-dialog__title{
+ color: white;
+ }
+ .real-dialog .el-dialog__header .el-dialog__headerbtn{
+ top: 15px;
+ }
+
+ .real-dialog .el-dialog{
+ border-radius: 10px 10px 10px 10px;
+ }
+
+
</style>
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 78c2d1f..1943b1c 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -64,7 +64,7 @@
</basic-container>
</el-col>
- <el-dialog title="缴费提醒" :visible.sync="dialogTableVisible" custom-class="payWin" append-to-body="true">
+ <el-dialog title="缴费提醒" :visible.sync="dialogTableVisible" top="280px" custom-class="payWin" append-to-body="true">
<el-table :data="gridData">
<el-table-column property="xb" label="序号" width="50"></el-table-column>
<el-table-column property="deviceName" label="设备名称" width="150"></el-table-column>
@@ -145,7 +145,7 @@
label: "设备名称",
width: 130,
prop: "deviceName",
- searchPlaceholder: "请输入设备名称/编号",
+ searchPlaceholder: "设备名称/编号",
search: true,
},
{
diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index c0286c8..c61ec8e 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -1,6 +1,14 @@
+<!--
+ * @Descripttion:
+ * @version:
+ * @Author: song
+ * @Date: 2021-01-26 08:56:33
+ * @LastEditors: song
+ * @LastEditTime: 2021-02-03 16:46:44
+-->
<template>
<iframe v-show="iframeState" id="show-iframe" frameborder=0 name="showHere" scrolling=auto
- src="https://s16s652780.51mypc.cn/bigScreen/view/1349193280059879426"></iframe>
+ src="http://s16s652780.51mypc.cn/bigScreen/view/1349193280059879426"></iframe>
</template>
<script>
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index d633cf1..186e280 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -281,7 +281,8 @@
>
<iframe
id="mapDiv"
- src="https://s16s652780.51mypc.cn/jfpt/map/index.html"
+ ref="mapDiv"
+ src="http://s16s652780.51mypc.cn/jfpt/map/index.html"
frameborder="0"
width="100%"
height="100%"
@@ -776,9 +777,11 @@
},
handleMap(row) {
this.showMap = true;
- debugger;
- var sddsds = document.getElementById("mapDiv");
- document.getElementById("mapDiv").contentWindow.dw(row.jd,row.wd)
+ this.$nextTick(() => {
+ this.$refs.mapDiv.onload = () => {
+ window.frames[0].locationObj = {x:row.jd,y:row.wd};
+ };
+ })
},
handleManage(row) {
this.form = row;
@@ -794,7 +797,7 @@
} else {
axios({
url:
- "https://s16s652780.51mypc.cn/api/blade-jfpts/jingdan/jingdan/submit",
+ "/api/blade-jfpts/jingdan/jingdan/submit",
method: "post",
data: {
rName: row.rname,
@@ -836,7 +839,7 @@
var that = this;
axios({
url:
- "https://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/deletejj?id=" +
+ "/api/blade-jfpts/alarm/alarm/deletejj?id=" +
row.id,
method: "post"
}).then(function() {
@@ -848,7 +851,7 @@
var that = this;
axios({
url:
- "https://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/updateJtype?id=" +
+ "/api/blade-jfpts/alarm/alarm/updateJtype?id=" +
row.id +
"&czTime=" +
row.czTime +
--
Gitblit v1.9.3