From dcb285ccc145fcbcb1302ca61c051b497df815a2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 10 Jun 2021 17:34:31 +0800
Subject: [PATCH] 目录树修改完善，天地图影像更换等
---
config.json | 98 +++++++++++----
widgets/CoorPosition/Widget.js | 1
widgets/Layermanagement/Widget.js | 1
widgets/plottingP/Widget.js | 1
widgets/RouteNavigate/Widget.js | 1
images/basemaps/gaode_vec_gd.png | 0
widgets/LeftNavigationBar/Widget.js | 163 ++++++++++++++++++++++----
widgets/LeftNavigationBar/css/style.css | 2
widgets/searchTabaPopup/Widget.js | 9 -
images/basemaps/gaode_img_gd.png | 0
images/basemaps/gaode_img_tx.png | 0
jimu.js/MapManager.js | 20 ++-
widgets/SceneMode/Widget.js | 1
images/basemaps/gaode_vec_tx.png | 0
widgets/searchL/Widget.js | 20 ---
15 files changed, 223 insertions(+), 94 deletions(-)
diff --git a/config.json b/config.json
index e43125c..b7887bb 100644
--- a/config.json
+++ b/config.json
@@ -91,16 +91,7 @@
"relativeTo": "map"
}
},
- {
- "uri": "widgets/ShowPosition/Widget",
- "position": {
- "right": 0,
- "bottom": 0,
- "width": "100%",
- "height": "25px",
- "relativeTo": "map"
- }
- },
+
{
"name": "图上量算",
"uri": "widgets/Measurement/Widget",
@@ -252,7 +243,7 @@
"layers": [{
"label": "天地图影像",
"type": "wmts",
- "url": "http://t0.tianditu.gov.cn/img_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
+ "url": "http://t7.tianditu.gov.cn/img_w/wmts?tk=9ae78c51a0a28f06444d541148496e36",
"layer": "img",
"style": "default",
"format": "tiles",
@@ -262,7 +253,7 @@
{
"label": "天地图影像标注",
"type": "wmts",
- "url": "http://t0.tianditu.gov.cn/cia_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
+ "url": "http://t7.tianditu.gov.cn/cia_w/wmts?tk=9ae78c51a0a28f06444d541148496e36",
"layer": "cia",
"style": "default",
"format": "tiles",
@@ -272,11 +263,35 @@
]
},
{
- "name": "高德地图影像",
- "tooltip": "高德地图全球影像服务",
- "iconUrl": "images/basemaps/tianditushiliang.png",
+ "name": "腾讯影像",
+ "tooltip": "腾讯全球影像服务",
+ "iconUrl": "images/basemaps/gaode_img_tx.png",
"layers": [{
- "label": "高德地图影像",
+ "label": "天地图影像",
+ "type": "wmts",
+ "url": "http://t7.tianditu.gov.cn/img_w/wmts?tk=9ae78c51a0a28f06444d541148496e36",
+ "layer": "img",
+ "style": "default",
+ "format": "tiles",
+ "tileMatrixSetID": "w",
+ "maximumLevel": 17
+ }, {
+ "label": "腾讯地图标注",
+ "type": "url",
+ "url": "https://rt3.map.gtimg.com/tile?z={z}&x={x}&y={reverseY}&styleid=2&version=297",
+ "layer": "tdtVecBasicLayer",
+ "style": "default",
+ "format": "image/png",
+ "tileMatrixSetID": "GoogleMapsCompatible",
+ "show": false
+ }]
+ },
+ {
+ "name": "高德电子",
+ "tooltip": "高德电子地图",
+ "iconUrl": "images/basemaps/gaode_vec_gd.png",
+ "layers": [{
+ "label": "高德电子地图",
"type": "url",
"url": "https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}",
"layer": "tdtVecBasicLayer",
@@ -286,9 +301,35 @@
"show": false
},
{
- "label": "高德地图标注",
+ "label": "高德电子标注",
"type": "url",
"url": "http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}",
+ "layer": "tdtVecBasicLayer",
+ "style": "default",
+ "format": "image/png",
+ "tileMatrixSetID": "GoogleMapsCompatible",
+ "show": false
+ }
+ ]
+ },
+ {
+ "name": "高德影像",
+ "tooltip": "高德全球影像服务",
+ "iconUrl": "images/basemaps/gaode_img_gd.png",
+ "layers": [{
+ "label": "高德影像地图",
+ "type": "url",
+ "url": "https://webst01.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}",
+ "layer": "tdtVecBasicLayer",
+ "style": "default",
+ "format": "image/png",
+ "tileMatrixSetID": "GoogleMapsCompatible",
+ "show": false
+ },
+ {
+ "label": "高德影像标注",
+ "type": "url",
+ "url": "http://webst01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}",
"layer": "tdtVecBasicLayer",
"style": "default",
"format": "image/png",
@@ -299,17 +340,18 @@
}
],
"terrainProviderViewModels": [{
- "name": "无地形",
- "tooltip": "WGS84标准球体",
- "iconUrl": "images/basemaps/TerrainEllipsoid.png",
- "url": ""
- },
- {
- "name": "鄱阳湖地形",
- "tooltip": "由 普适科技 提供的 鄱阳湖地形",
- "iconUrl": "images/basemaps/TerrainSTK.png",
- "url": "http://www.sw797.com:10011/gzsw3D/v2/data/gzdx"
- }],
+ "name": "无地形",
+ "tooltip": "WGS84标准球体",
+ "iconUrl": "images/basemaps/TerrainEllipsoid.png",
+ "url": ""
+ },
+ {
+ "name": "鄱阳湖地形",
+ "tooltip": "由 普适科技 提供的 鄱阳湖地形",
+ "iconUrl": "images/basemaps/TerrainSTK.png",
+ "url": "http://www.sw797.com:10011/gzsw3D/v2/data/gzdx"
+ }
+ ],
"mapOptions": {
"positionInfo": {
"xmin": 114.079032,
diff --git a/images/basemaps/gaode_img_gd.png b/images/basemaps/gaode_img_gd.png
new file mode 100644
index 0000000..d03c5a1
--- /dev/null
+++ b/images/basemaps/gaode_img_gd.png
Binary files differ
diff --git a/images/basemaps/gaode_img_tx.png b/images/basemaps/gaode_img_tx.png
new file mode 100644
index 0000000..d03c5a1
--- /dev/null
+++ b/images/basemaps/gaode_img_tx.png
Binary files differ
diff --git a/images/basemaps/gaode_vec_gd.png b/images/basemaps/gaode_vec_gd.png
new file mode 100644
index 0000000..acfbc81
--- /dev/null
+++ b/images/basemaps/gaode_vec_gd.png
Binary files differ
diff --git a/images/basemaps/gaode_vec_tx.png b/images/basemaps/gaode_vec_tx.png
new file mode 100644
index 0000000..acfbc81
--- /dev/null
+++ b/images/basemaps/gaode_vec_tx.png
Binary files differ
diff --git a/jimu.js/MapManager.js b/jimu.js/MapManager.js
index 4c7cd54..4d967a2 100644
--- a/jimu.js/MapManager.js
+++ b/jimu.js/MapManager.js
@@ -14,8 +14,8 @@
'./utils',
'jimu/dijit/Message'
], function (declare, lang, array, html, query, topic, on, aspect, keys, i18n, dojoConfig,
- require, jimuUtils,
- Message) {
+ require, jimuUtils,
+ Message) {
var instance = null,
clazz = declare(null, {
appConfig: null,
@@ -71,7 +71,7 @@
},
- _createMap: function (mode, appConfig) {//创建地图js
+ _createMap: function (mode, appConfig) { //创建地图js
Cesium.Ion.defaultAccessToken = appConfig.cesiumToken;
@@ -136,11 +136,16 @@
layer = new Cesium.WebMapTileServiceImageryProvider(layerConfig);
} else if (layerConfig.type == "SuperMap") {
layer = new Cesium.SuperMapImageryProvider(layerConfig);
+ } else if (layerConfig.type == "arcgis") {
+ layer = new Cesium.ArcGisMapServerImageryProvider(layerConfig);
}
+
+
+
layerArr.push(layer);
}
-
+
var pvm = new Cesium.ProviderViewModel({
name: imageryProviderViewModels[i].name,
tooltip: imageryProviderViewModels[i].tooltip,
@@ -166,8 +171,7 @@
ellipsoid: Cesium.Ellipsoid.WGS84
})
}
- })
- , new Cesium.ProviderViewModel({
+ }), new Cesium.ProviderViewModel({
name: "鄱阳湖地形",
tooltip: "由 普适科技 提供的鄱阳湖地区地形",
iconUrl: "images/basemaps/TerrainSTK.png",
@@ -279,7 +283,9 @@
var roll = mapOptions.positionInfo.roll;
setTimeout(lang.hitch(this, function () {
- this.map.camera.setView({destination: Cesium.Rectangle.fromDegrees(west, south, east, north)});
+ this.map.camera.setView({
+ destination: Cesium.Rectangle.fromDegrees(west, south, east, north)
+ });
}), 100);
diff --git a/widgets/CoorPosition/Widget.js b/widgets/CoorPosition/Widget.js
index 0596f8f..ba9db27 100644
--- a/widgets/CoorPosition/Widget.js
+++ b/widgets/CoorPosition/Widget.js
@@ -97,7 +97,6 @@
// 点击确定flyTo
$('.queDing').click(function () {
- console.log($('#jingdu-val').val());
var lng = $('#jingdu-val').val();
var lat = $('#weidu-val').val();
var gaodu = $('#gaodu-val').val();
diff --git a/widgets/Layermanagement/Widget.js b/widgets/Layermanagement/Widget.js
index 77e21db..bcea65b 100644
--- a/widgets/Layermanagement/Widget.js
+++ b/widgets/Layermanagement/Widget.js
@@ -300,7 +300,6 @@
return;
}
self.layermanagementId.push(id);
- console.log(id);
// 添加entity实体
self.map.entities.add({
id: id, // 实体ID
diff --git a/widgets/LeftNavigationBar/Widget.js b/widgets/LeftNavigationBar/Widget.js
index 737ff9e..de6441b 100644
--- a/widgets/LeftNavigationBar/Widget.js
+++ b/widgets/LeftNavigationBar/Widget.js
@@ -27,6 +27,7 @@
baseClass: 'jimu-widget-LeftNavigationBar',
name: 'LeftNavigationBar',
layers: {},
+ dataAllArray: [],
startup: function () {
// 暴露在外的接口
// this.begin(this.data);
@@ -58,12 +59,12 @@
$('.jimu-widget-instructions').css({
'left': '260px'
});
+
$('#left-navigation-bar-main-search').click(() => { //搜索事件
var val = $('#left-navigation-bar-main-input').val();
- if (val) {
+ if (val != '') {
var clearOur = () => {
let dom = $(`[data-id]`);
- // console.log(dom);
dom.removeClass('layui-tree-spread');
let domDiv = dom.find('.layui-tree-pack');
domDiv.css({
@@ -80,7 +81,6 @@
// var b = a.split('');
// for (var i in b) {
let id = that.father; //选中项的所有父级id
- // // console.log(id)
let dom = $(`[data-id='${id}']`);
dom.addClass('layui-tree-spread');
let domDiv = dom.find('.layui-tree-pack').eq(0);
@@ -88,18 +88,69 @@
'display': 'block'
})
// }
- console.log(a, that.father)
}
if (d[k].children) {
useit(d[k].children);
}
}
};
- clearOur();
- useit(that.data);
- } else {
+ that.changeData(that.dataAllArray, val); //重写数据
+ layui.use('tree', function () {
+ layui.tree.reload('demoId1', {
+ data: that.data
+ });
+ var jqDom = $("#left-tree-list > .layui-tree > div");
+ for (var i = 0; i < jqDom.length; i++) {
+ if ($(jqDom[i]).text().indexOf("三维倾斜数据") != -1) {
+ $(jqDom[i]).find('.layui-btn-group').remove()
+ }
+
+ var textList = $(jqDom[i]).find('.layui-tree-txt');
+
+ for (var j = 0; j < textList.length; j++) {
+ $(textList[j]).attr('title', $(textList[j]).text())
+
+ }
+
+ }
+
+ clearOur();
+ useit(that.data);
+ })
+
+ } else {}
+ })
+
+ $(".jimu-widget-LeftNavigationBar input[type='search']").bind('input propertychange', function () {
+ //做一些事情
+ var val = $(this).val();
+
+ if (val == '') {
+ that.changeData(that.dataAllArray, val); //重写数据
+ layui.use('tree', function () {
+ layui.tree.reload('demoId1', {
+ data: that.data
+ });
+
+ var jqDom = $("#left-tree-list > .layui-tree > div");
+
+ for (var i = 0; i < jqDom.length; i++) {
+ if ($(jqDom[i]).text().indexOf("三维倾斜数据") != -1) {
+ $(jqDom[i]).find('.layui-btn-group').remove()
+ }
+
+ var textList = $(jqDom[i]).find('.layui-tree-txt');
+
+ for (var j = 0; j < textList.length; j++) {
+ $(textList[j]).attr('title', $(textList[j]).text())
+
+ }
+
+ }
+ })
}
+
})
$(".jimu-widget-LeftNavigationBar .tree-layer-opcity .close").click(function () {
@@ -130,6 +181,7 @@
},
getData: function () {
+ var that = this;
var url = 'http://171.34.76.171:8880/pyh-wetResource/GeoData/queryGeoDataTree',
that = this;
@@ -139,17 +191,20 @@
}
}).then((res) => {
if (res.data.code == '200') {
- console.log(res, 'open', 898998)
- that.changeData(res.data.data); //重写数据
+ that.dataAllArray = res.data.data;
+ that.changeData(res.data.data, ''); //重写数据
+ that.begin(this.data);
}
})
},
- changeData: function (val) { //重写数据
+ changeData: function (val, type) { //重写数据
var data = [],
i = 1,
inits = (d, childData) => {
var b = childData || [];
for (var k in d) {
+
+
let a = {
title: d[k].name,
@@ -160,7 +215,8 @@
src: d[k].serviceUrl,
id: d[k].id,
serviceName: d[k].serviceName,
- alpha: 1
+ alpha: 1,
+ checked: d[k].menuStatus
}
if (d[k].serviceUrl.indexOf('.openrealspace') != -1) {
@@ -183,7 +239,6 @@
};
inits(val, data);
- // console.log(data)
// var i = 0,
// ccinit = (a) => {
@@ -191,15 +246,66 @@
// for (let k in a) {
// if (a[k].children) {
// a[k].who = i;
- // // console.log(a[k].id)
// ccinit(a[k].children)
// }
// }
// };
// ccinit(this.data);
- // console.log(this.data)
+
+ if (type != '') {
+
+ for (var i = 0; i < data.length; i++) {
+
+ if (data[i].children && data[i].children.length > 0) {
+
+ deWeight()
+
+ function deWeight() {
+ for (var j = 0; j < data[i].children.length; j++) {
+ if (data[i].children[j].title.indexOf(type) == -1) {
+ data[i].children.splice(j, 1);
+ deWeight();
+ break;
+
+ }
+ }
+ }
+
+ }
+
+
+
+
+
+ }
+ deParentWeight()
+
+ function deParentWeight() {
+ for (var i = 0; i < data.length; i++) {
+
+ if (data[i].children && data[i].children.length == 0) {
+ data.splice(i, 1)
+ deParentWeight();
+ break;
+ }
+
+ if (data[i].children == undefined && data[i].title.indexOf(type) == -1) {
+ data.splice(i, 1)
+ deParentWeight();
+ break;
+
+ }
+
+ }
+ }
+
+ }
+
+
+
this.data = data;
- this.begin(this.data);
+
+
},
begin: function (data) {
var that = this;
@@ -223,7 +329,6 @@
click: function (obj) {
var data = obj.data; //获取当前点击的节点数据
// layer.msg('状态：' + obj.state + '<br>节点数据：' + JSON.stringify(data));
- console.log(obj);
// 树点击三角形样式修改
// var ot = $('.layui-tree-iconArrow');
// ot.removeClass("left-navigation-bar-main-down");
@@ -237,7 +342,7 @@
},
showLine: false, //是否开启连接线
oncheck: function (obj) {
- console.log(obj.data.id, '--', obj.checked, obj); //得到当前点击的节点数据
+ // console.log(obj.data.id, '--', obj.checked, obj); //得到当前点击的节点数据
// console.log(obj.checked); //得到当前节点的展开状态：open、close、normal
// console.log(obj.elem); //得到当前节点元素
@@ -296,7 +401,7 @@
that[item.id] = that.map.imageryLayers.addImageryProvider(new Cesium.SuperMapImageryProvider({
url: res[0].path,
}));
- that[obj.data.id].alpha = item.alpha
+ that[item.id].alpha = item.alpha
}
})
});
@@ -373,7 +478,6 @@
type: 'get',
dataType: 'JSON',
success: function (res) {
- console.log(res, 123)
that[obj.data.id] = that.map.imageryLayers.addImageryProvider(new Cesium.SuperMapImageryProvider({
url: res[0].path,
@@ -415,9 +519,7 @@
$(".jimu-widget-LeftNavigationBar .tree-layer-opcity ul").empty();
-
-
- console.log(type, data, elem, depId, parentId)
+ // console.log(type, data, elem, depId, parentId)
if (data.children) {
@@ -441,7 +543,9 @@
value: item.alpha * 10,
step: 1,
theme: '#1E9FFF',
- showstep: true,
+ setTips: function (value) { //自定义提示文本
+ return value / 10;
+ },
change: function (value) {
item.alpha = value / 10
if (that[item.id]) {
@@ -471,7 +575,9 @@
value: data.alpha * 10,
step: 1,
theme: '#1E9FFF',
- showstep: true,
+ setTips: function (value) { //自定义提示文本
+ return value / 10;
+ },
change: function (value) {
data.alpha = value / 10
if (that[data.id]) {
@@ -489,14 +595,20 @@
});
- console.log($("#left-tree-list > .layui-tree > div"))
var jqDom = $("#left-tree-list > .layui-tree > div");
for (var i = 0; i < jqDom.length; i++) {
if ($(jqDom[i]).text().indexOf("三维倾斜数据") != -1) {
$(jqDom[i]).find('.layui-btn-group').remove()
+ }
+
+ var textList = $(jqDom[i]).find('.layui-tree-txt');
+
+ for (var j = 0; j < textList.length; j++) {
+ $(textList[j]).attr('title', $(textList[j]).text())
}
+
}
@@ -509,7 +621,6 @@
layer.alert(JSON.stringify(checkedData), {
shade: 0
});
- console.log(checkedData);
},
setChecked: function () {
tree.setChecked('demoId1', [12, 114]); //勾选指定节点
diff --git a/widgets/LeftNavigationBar/css/style.css b/widgets/LeftNavigationBar/css/style.css
index e881a05..e2fe027 100644
--- a/widgets/LeftNavigationBar/css/style.css
+++ b/widgets/LeftNavigationBar/css/style.css
@@ -1,7 +1,7 @@
.jimu-widget-LeftNavigationBar {
position: absolute !important;
/* font-size: 14px; */
- height: calc(100% - 25px) !important;
+ height: 100% !important;
/* height: calc(100%) !important; */
width: 250px !important;
right: auto !important;
diff --git a/widgets/RouteNavigate/Widget.js b/widgets/RouteNavigate/Widget.js
index ce8e74e..75e7702 100644
--- a/widgets/RouteNavigate/Widget.js
+++ b/widgets/RouteNavigate/Widget.js
@@ -1036,7 +1036,6 @@
async: false,
dataType: "xml",
success: function success(res) {
- console.log(res);
// 线路children
var items = $(res).find('simple').children('item');
for (var j = 0; j < items.length; j++) {
diff --git a/widgets/SceneMode/Widget.js b/widgets/SceneMode/Widget.js
index a4ad191..de6f64a 100644
--- a/widgets/SceneMode/Widget.js
+++ b/widgets/SceneMode/Widget.js
@@ -29,7 +29,6 @@
layers: {},
startup: function () {
var that = this;
- // console.log(that.map, 213)
$(".jimu-widget-SceneMode button").html("<img src='../../../images/2D.png' alt='' title='2D'>");
$(".jimu-widget-SceneMode button").click(function () {
diff --git a/widgets/plottingP/Widget.js b/widgets/plottingP/Widget.js
index 58d91b9..a68a7de 100644
--- a/widgets/plottingP/Widget.js
+++ b/widgets/plottingP/Widget.js
@@ -51,7 +51,6 @@
return;
}
plottingLayer = new cesium.PlottingLayer(scene, "plottingLayer");
- // console.log(scene)
// scene.plotLayers.add(plottingLayer);
scene.layers.add(plottingLayer);
plotEditControl = new cesium.PlotEditControl(scene, plottingLayer);//编辑控件
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index 43880d5..e2bb50b 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -35,7 +35,6 @@
//关键词&&坐标
$("#i-f-gjz").click(function () {
that.states = 'one';
- // console.log("gjz");
$("#i-f-zb").css({ 'backgroundColor': '#fff', 'color': '#000' });
$("#i-f-gjz").css({ 'backgroundColor': '#3E9FFC', 'color': '#fff' });
// $("#inputTwo").css({ 'display': 'none' });
@@ -45,7 +44,6 @@
})
$("#i-f-zb").click(function () {
that.states = 'two';
- // console.log("zb");
$("#i-f-gjz").css({ 'backgroundColor': '#fff', 'color': '#000' });
$("#i-f-zb").css({ 'backgroundColor': '#3E9FFC', 'color': '#fff' });
// $("#local_data").css({ 'display': 'none' });
@@ -55,9 +53,7 @@
})
$(".searchImg").click(function () {
- // console.log(2324345)
that.getInputData();
- // console.log(that.searchDatas)
if (typeof that.searchDatas == 'string') {
var han = /^[\u4e00-\u9fa5]+$/;
if (han.test(that.searchDatas) || that.searchDatas == ' ') {
@@ -76,7 +72,6 @@
}
} else {
if (that.searchDatas[0] && that.searchDatas[1]) {
- console.log(that.searchDatas);
} else {
layui.use(function () { //亦可加载特定模块：layui.use(['layer', 'laydate', function(){
//得到各种内置组件
@@ -104,7 +99,6 @@
getData: function (index, val) {
val = val == ' ' ? '' : val;
var d = $('.searchLMain').find('.layui-tab-item').hide;
- // console.log(d)
var that = this,
url = `http://171.34.76.171:8880/pyh-wetResource/monitorRecords/queryMonitorData?name=${val}&start&limit&type=${index}`
// url = `http://171.34.76.171:8880/pyh-wetResource/monitorRecords/queryMonitorData?name=&start&limit&type=${index}`
@@ -117,7 +111,6 @@
}).then((res) => {
if (res.data.code == 200) {
var data = res.data.data.panoramaList || res.data.data.stationList || res.data.data.videoList || [];
- // console.log(data)
var val = index;//数据的2和1对调
if (index == 1) {
@@ -150,7 +143,6 @@
this.shiti(d[k], +n + 1);
}
var data = d;
- console.log(data)
if (n == 0) {
this.beginLayUi(data);
} else if (n == 1) {
@@ -197,7 +189,6 @@
},
goOnPosition(arr, i, data) {
- console.log(data)
this.map.camera.flyTo({
// destination: Cesium.Cartesian3.fromDegrees(Number(lng), Number(lat), Number(gaodu))
destination: Cesium.Cartesian3.fromDegrees(Number(arr[0]), Number(arr[1]), Number(8000))
@@ -231,8 +222,8 @@
// image: 'images/addL/监测.png',
image: imgs,
// image: entityConfig.img,
- width: 40,
- // height: 80,
+ width: 27,
+ height: 40,
clampToGround: true,
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
disableDepthTestDistance: Number.POSITIVE_INFINITY,
@@ -241,8 +232,6 @@
})
},
beginLayUi: function (data = 1, data1 = 1, data2 = 1) {
- // data.push(...data)
- // console.log(data)
var that = this;
layui.use(function () {
var element = layui.element
@@ -285,7 +274,6 @@
if (layEvent === 'detail') {
// layer.msg('查看操作');
window.open(obj.data.panAddress);
- // console.log(obj.data.panAddress)
} else if (layEvent === 'edit') {
that.goOnPosition([obj.data.lon, obj.data.lat], 1, obj.data);
}
@@ -339,7 +327,6 @@
} else if (layEvent === 'edit') {
that.goOnPosition([obj.data.lon, obj.data.lat], 2, obj.data);
}
- // console.log(obj.data.name)
});
}
if (data2 != 1) {
@@ -380,15 +367,12 @@
// 监测、测站详情 表格
- // console.log(obj.data.stcd)
- // console.log(axios)
that.setXiangqing(obj);//渲染详情
that.getshuiwen(obj.data.stcd)//水文实时渲染
that.setbiaoti(obj.data)//表格各分部标题渲染
$('.jimu-widget-searchTabaPopup').css({ 'display': 'block' });
$('.jimu-widget-searchTabaPopup').find('.p-main').eq(1).css({ 'display': 'block' }).siblings().css({ 'display': 'none' });
- // console.log(obj.data.name)
} else if (layEvent === 'edit') {
that.goOnPosition([obj.data.lon, obj.data.lat], 3, obj.data);
}
diff --git a/widgets/searchTabaPopup/Widget.js b/widgets/searchTabaPopup/Widget.js
index 2f1aced..a8caac8 100644
--- a/widgets/searchTabaPopup/Widget.js
+++ b/widgets/searchTabaPopup/Widget.js
@@ -41,9 +41,7 @@
$('.jimu-widget-searchTabaPopup').find('#query').click(() => {
if (that.times[0] != 1) {
- // console.log(that.times);
var stcd = $('.jimu-widget-searchTabaPopup').find('#userMyStcd').val()
- console.log(stcd);
that.getOurData(that.times, stcd);
} else {
layui.use(function () { //亦可加载特定模块：layui.use(['layer', 'laydate', function(){
@@ -88,7 +86,6 @@
let begintime = value.substring(0, 19),
endtime = value.substring(22);
that.times = [begintime, endtime];
- // console.log(that.times)
}
});
// laydate.render({
@@ -112,7 +109,6 @@
this.myChart2 = echarts.init(dom);
},
getOurData: function (time, stcd) {
- console.log(time)
var that = this
, url = `http://171.34.76.171:8880/pyh-station/monitorData/queryStationHistoryMonitorData?stcd=${stcd}&startTime=${time[0]}&endTime=${time[1]}`,
token = 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJlY2hpc2FuIiwic3ViIjoiYWRtaW4iLCJpYXQiOjE2MjMyNDQxNDQsImV4cCI6MTYyNTgzNjE0NH0.wjtMw7hv8IYGxFKI9b1vo2ozMXD1pE0-02HinfPl-r8l0TYVg1YvMBxW_VzzFKoY1jeC6XByQQT-aC_mAvBnWA';
@@ -168,8 +164,6 @@
for (var i in ins) {
xDataair.push(ins[i].startTime);
}
- // console.log(shui);
- // console.log(seriesData);
// 渲染图表
that.getEchartsData(legendDataair, xDataair, seriesDataair, 2);//空气
@@ -195,8 +189,6 @@
for (var i in ins) {
xDataqi.push(ins[i].startTime);
}
- // console.log(shui);
- // console.log(seriesData);
// 渲染图表
that.getEchartsData(legendDataqi, xDataqi, seriesDataqi, 3);//气象
}
@@ -206,7 +198,6 @@
var that = this;
var option;
- // console.log(this.myChart);
option = {
// title: {
--
Gitblit v1.9.3