From a63c2a38c1de7f9131c81bdcdcbe6a84b9ca6113 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 03 Nov 2021 16:30:20 +0800
Subject: [PATCH] +
---
pages/grabOrders/map.vue | 7 ++-
grabOrdersMap/js/vueMain.js | 59 +++++++++++++++--------------
2 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/grabOrdersMap/js/vueMain.js b/grabOrdersMap/js/vueMain.js
index 1d40e1a..5123035 100644
--- a/grabOrdersMap/js/vueMain.js
+++ b/grabOrdersMap/js/vueMain.js
@@ -32,24 +32,25 @@
oldlat: '',
oldlng: '',
haveJDWD: true,
- data: {
- type: 0,
- city: "南昌市",
- content: "按路线巡逻",
- district: "青山湖区",
- id: 5,
- integral: "14",
- jnum: 2,
- line: "LINESTRING(115.88518439579809 28.67705200351289,115.89115548582284 28.677382855466767,115.89148633777671 28.675523782583074,115.88565704144649 28.675145666064356,115.88521590550799 28.67700473894805,115.88521590550799 28.67700473894805)",
- num: 0,
- province: "江西省",
- raddress: null,
- rname: "巡逻任务",
- rtype: "0",
- serid: null,
- time: "2021-11-17 00:00:00",
- url: "http://223.82.109.183:2081/zhba/upload/20211102/07fe327a76a43fa8d3431c73febade22.jpg",
- }
+ data:{}
+ // {
+ // type: 0,
+ // city: "南昌市",
+ // content: "按路线巡逻",
+ // district: "青山湖区",
+ // id: 5,
+ // integral: "14",
+ // jnum: 2,
+ // line: "LINESTRING(115.88518439579809 28.67705200351289,115.89115548582284 28.677382855466767,115.89148633777671 28.675523782583074,115.88565704144649 28.675145666064356,115.88521590550799 28.67700473894805,115.88521590550799 28.67700473894805)",
+ // num: 0,
+ // province: "江西省",
+ // raddress: null,
+ // rname: "巡逻任务",
+ // rtype: "0",
+ // serid: null,
+ // time: "2021-11-17 00:00:00",
+ // url: "http://223.82.109.183:2081/zhba/upload/20211102/07fe327a76a43fa8d3431c73febade22.jpg",
+ // }
},
methods: {
getDataList() {
@@ -57,17 +58,17 @@
that.beginCome();
},
beginCome() {
- var data = [{
- "id": '100000',
- "place": '无数据',
- "state": '0',
- "dtype": '0',
- "size": '300',
- "jd": "114.91385",
- "wd": "25.81051"
- }]
+ // var data = [{
+ // "id": '100000',
+ // "place": '无数据',
+ // "state": '0',
+ // "dtype": '0',
+ // "size": '300',
+ // "jd": "114.91385",
+ // "wd": "25.81051"
+ // }]
//url解码
- // this.data = this.getQueryVariable('data') || data;
+ this.data = this.getQueryVariable('data') || data;
// this.getdata = data;
// this.changeDom(this.getdata[0]);//改变地图高度
// console.log(this.getdata[0]);
@@ -151,7 +152,7 @@
var createMap = () => {
map = L.map('map', { //初始化地图
center: center,
- zoom: 15,
+ zoom: 14,
// crs: crs,
minZoom: 2,
maxZoom: 17,
diff --git a/pages/grabOrders/map.vue b/pages/grabOrders/map.vue
index dd339b2..9288e85 100644
--- a/pages/grabOrders/map.vue
+++ b/pages/grabOrders/map.vue
@@ -23,14 +23,15 @@
} else {
data = options.data;
}
- // console.log(data);
+ console.log(data);
// return
// console.log(options.html)
// var a = options.html != undefined ? options.html : "xcxMapJQ/xcxmap.html";
// console.log(a)
- let a = "grabOrdersMap/xcxmap.html";
+ // let a = "grabOrdersMap/xcxmap.html";
// this.urls = "http://223.82.109.183:2082/" + a + "?data=" + data;
- this.urls = "/api/" + a + "?data=" + data;
+ this.urls = "http://127.0.0.1:8848/qfqk-android/grabOrdersMap/xcxmap.html?data=" + data;
+ // http://127.0.0.1:8848/qfqk-android/grabOrdersMap/xcxmap.html
// this.dataList = data;
// console.log(this.urls);
},
--
Gitblit v1.9.3