From 4876b42b3e559170636fa61e3a7a26e6c5e3c7d6 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期日, 26 九月 2021 09:34:32 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai
---
js/function.js | 628 ++++++++++++++++++++++++--------------
data/getLayerListByUserid.json | 175 ++++++++++
widgetsTS/dataTime/widget.js | 32 +
widgets/manageLayers_style/view.js | 17
index.html | 2
config/widget.json | 6
config/config.json | 78 ----
js/index.js | 6
8 files changed, 606 insertions(+), 338 deletions(-)
diff --git a/config/config.json b/config/config.json
index abee3ed..3dfc268 100644
--- a/config/config.json
+++ b/config/config.json
@@ -88,7 +88,6 @@
],
"layers": [
{ "id": 50, "name": "杈呭姪鍥惧眰", "type": "group" },
- { "pid": 50, "type": "graticule", "name": "缁忕含缃�" },
{
"pid": 50,
"name": "琛屾斂鍖哄垝鐣岀嚎",
@@ -108,82 +107,7 @@
"minimumLevel": 4,
"proxy": "//server.mars3d.cn/proxy/",
"mapSplit": false
- },
-
- { "id": 60, "name": "鍦板舰", "type": "group" },
- { "pid": 60, "type": "terrain", "name": "Cesium鍦板舰", "terrain": { "type": "ion" }, "radio": true },
- { "pid": 60, "type": "terrain", "name": "Mars3D鍦板舰", "terrain": { "type": "xyz", "url": "{dataServer}/terrain" }, "radio": true },
- {
- "pid": 60,
- "type": "terrain",
- "name": "ArcGIS鍦板舰",
- "terrain": { "type": "arcgis", "url": "https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer" },
- "radio": true
- },
- { "pid": 60, "type": "terrain", "name": "鏃犲湴褰�", "terrain": { "type": "none" }, "radio": true },
-
- {
- "pid": 2040,
- "type": "geojson",
- "name": "涓婃捣閬撹矾",
- "url": "data/roads-gcj.json",
- "symbol": {
- "styleOptions": {
- "color": "#ffffff",
- "width": 2,
- "opacity": 0.8,
- "label": {
- "text": "{name}",
- "position": "center",
- "font_size": 30,
- "color": "#ffffff",
- "outline": true,
- "outlineColor": "#000000",
- "scaleByDistance": true,
- "scaleByDistance_far": 60000000,
- "scaleByDistance_farValue": 0.2,
- "scaleByDistance_near": 1000000,
- "scaleByDistance_nearValue": 1,
- "distanceDisplayCondition": true,
- "distanceDisplayCondition_far": 12000000,
- "distanceDisplayCondition_near": 0
- }
- }
- },
- "show": false,
- "flyTo": true
- },
-
- { "id": 2040, "pid": 20, "name": "鍩庡競鐧芥ā", "type": "group" },
- {
- "id": 204012,
- "pid": 2040,
- "type": "3dtiles",
- "name": "涓婃捣甯傚尯",
- "url": "{dataServer}/3dtiles/jzw-shanghai/tileset.json",
- "maximumScreenSpaceError": 4,
- "maximumMemoryUsage": 1024,
- "style": {
- "color": {
- "conditions": [
- ["${floor} >= 200", "rgba(45, 0, 75, 0.5)"],
- ["${floor} >= 100", "rgb(170, 162, 204)"],
- ["${floor} >= 50", "rgb(224, 226, 238)"],
- ["${floor} >= 25", "rgb(252, 230, 200)"],
- ["${floor} >= 10", "rgb(248, 176, 87)"],
- ["${floor} >= 5", "rgb(198, 106, 11)"],
- ["true", "rgb(127, 59, 8)"]
- ]
- }
- },
- "highlight": { "type": "click", "color": "#FFFF00" },
- "popup": [
- { "field": "name", "name": "鍚嶇О" },
- { "field": "floor", "name": "妤煎眰" }
- ],
- "center": { "lat": 31.257341, "lng": 121.466139, "alt": 2170.8, "heading": 122.2, "pitch": -31.8 }
- },
-
+ },
{ "id": 99, "name": "鏁版嵁鍥惧眰", "type": "group" },
{ "id": 1006, "pid": 99, "name": "鐩戞祴鍖哄煙", "type": "group" }
]
diff --git a/config/widget.json b/config/widget.json
index 3af2504..739d220 100644
--- a/config/widget.json
+++ b/config/widget.json
@@ -51,11 +51,7 @@
{
"name": "宸︿笂瑙扡OGO",
"uri": "widgetsTS/logoAndMenu/widget.js"
- },
- {
- "name": "鍑虹杞﹀浘灞�",
- "uri": "widgetsTS/taxi_layer/widget.js"
- }
+ }
],
"widgets": [
diff --git a/data/getLayerListByUserid.json b/data/getLayerListByUserid.json
new file mode 100644
index 0000000..e75daeb
--- /dev/null
+++ b/data/getLayerListByUserid.json
@@ -0,0 +1,175 @@
+锘縶
+ "data": [
+ {
+ "id": 1001,
+ "pid":99,
+ "name": "鍥芥帶鐐�",
+ "type": "div",
+ "geoname_prefix":"",
+ "style_prefix":"",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":true
+ },
+ {
+ "id": 1002,
+ "pid":99,
+ "name": "寰珯",
+ "type": "wms",
+ "geoname_prefix":"vis_weizhan_",
+ "style_prefix":"point_weizhan_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 1003,
+ "pid":99,
+ "name": "鐩戞祴鐐�",
+ "type": "wms",
+ "geoname_prefix":"vis_jiance_",
+ "style_prefix":"point_jiance_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 1004,
+ "pid":99,
+ "name": "绉诲姩鐩戞祴鐐�",
+ "type": "taxi",
+ "geoname_prefix":"",
+ "style_prefix":"",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 1005,
+ "pid":99,
+ "name": "閬撹矾璺",
+ "type": "wms",
+ "geoname_prefix":"vis_roadsection_",
+ "style_prefix":"polyline_road_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 100600,
+ "pid":1006,
+ "name": "鏈哄満",
+ "type": "wms",
+ "geoname_prefix":"vis_region_100600_",
+ "style_prefix":"polygon_region_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 100601,
+ "pid":1006,
+ "name": "鐮佸ご",
+ "type": "wms",
+ "geoname_prefix":"vis_region_100601_",
+ "style_prefix":"polygon_region_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 100602,
+ "pid":1006,
+ "name": "鐜嚎",
+ "type": "wms",
+ "geoname_prefix":"vis_region_100602_",
+ "style_prefix":"polygon_region_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 100603,
+ "pid":1006,
+ "name": "宸ヤ笟鍥尯",
+ "type": "wms",
+ "geoname_prefix":"vis_region_100603_",
+ "style_prefix":"polygon_region_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 100604,
+ "pid":1006,
+ "name": "杩涘崥浼�",
+ "type": "wms",
+ "geoname_prefix":"vis_region_100604_",
+ "style_prefix":"polygon_region_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 100605,
+ "pid":1006,
+ "name": "杈圭晫",
+ "type": "wms",
+ "geoname_prefix":"vis_region_100605_",
+ "style_prefix":"polygon_region_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 100607,
+ "pid":1006,
+ "name": "鍟嗗湀",
+ "type": "wms",
+ "geoname_prefix":"vis_region_100607_",
+ "style_prefix":"polygon_region_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 1006010,
+ "pid":1006,
+ "name": "琛屾斂鍖�",
+ "type": "wms",
+ "geoname_prefix":"vis_region_100610_",
+ "style_prefix":"polygon_region_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 100611,
+ "pid":1006,
+ "name": "琛楅亾",
+ "type": "wms",
+ "geoname_prefix":"vis_region_100611_",
+ "style_prefix":"polygon_region_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 3002,
+ "pid":1006,
+ "name": "缃戞牸1000绫�",
+ "type": "wms",
+ "geoname_prefix":"vis_grid1000_",
+ "style_prefix":"vis_grid100_1000_5000_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 3003,
+ "pid":1006,
+ "name": "缃戞牸5000绫�",
+ "type": "wms",
+ "geoname_prefix":"vis_grid5000_",
+ "style_prefix":"vis_grid100_1000_5000_",
+ "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
+ "show":false
+ },
+ {
+ "id": 2001,
+ "pid":99,
+ "name": "瀹炴椂椋庡満",
+ "type": "wind",
+ "geoname_prefix":"",
+ "style_prefix":"",
+ "styleoptions": [],
+ "show":false,
+ "color":"#ffffff"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/index.html b/index.html
index 7fe95bd..78dbe42 100644
--- a/index.html
+++ b/index.html
@@ -27,7 +27,7 @@
type="text/javascript"
src="lib/include-lib.js?time=20210803"
libpath="lib/"
- include="jquery,jquery.range,jedate,bootstrap,bootstrap-checkbox,font-awesome,web-icons,layer,haoutil,localforage,nprogress,toastr,admui,turf,mars3d,mars3d-widget,mars3d-wind"
+ include="jquery,jquery.range,bootstrap,bootstrap-checkbox,font-awesome,web-icons,layer,haoutil,localforage,nprogress,toastr,admui,turf,mars3d,mars3d-widget,mars3d-wind"
></script>
<link href="css/style.css?time=20210803" rel="stylesheet" />
<link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
diff --git a/js/function.js b/js/function.js
index 53f7f34..e8edd0f 100644
--- a/js/function.js
+++ b/js/function.js
@@ -1,42 +1,6 @@
"use script"; //寮�鍙戠幆澧冨缓璁紑鍚弗鏍兼ā寮�
//绯荤粺 鍔熻兘鍏ュ彛
-var userid = '2';
-
-var Vec_annoTileLayer;
-var Img_annoTileLayer;
-
-var queryDataType = 'hour';
-var queryDataTStart = '2021-09-08 12:00:00'; //getDefaultDateTime(); // format "yyyy-MM-dd hh:00:00"
-var queryDataTEnd = '';
-
-
-var layer_1001_guokong;
-var layer_1002_weizhan;
-var layer_1003_jiance;
-var layer_1004_taxi;
-var layer_1005_roadsection;
-
-var layer_1006_region;
-var layer_100600_jichang;
-var layer_100601_matou;
-var layer_100602_huanxian;
-var layer_100603_yuanqu;
-var layer_100604_jinbo;
-var layer_100605_bianjie;
-var layer_100607_quan;
-var layer_100610_qu;
-var layer_100611_jiedao;
-
-
-var layer_wind;
-var layer_grid_100;
-var layer_grid_1000;
-var layer_grid_5000;
-
-
-
-
function getDefaultDateTime() {
var date = new Date;
date.setHours(date.getHours() - 2);
@@ -49,6 +13,7 @@
(day > 9 ? day : ("0" + day)) + " " +
(hours > 9 ? hours : ("0" + hours)) + ":00:00";
}
+<<<<<<< HEAD
// console.log(mars3d.global_variables);
mars3d.global_variables = { geoserver_url_predix: 'http://58.246.27.194:7011/', userid: 2, queryDataType: 'hour' };
mars3d.global_variables.queryDataTStart = getDefaultDateTime();
@@ -74,30 +39,88 @@
// addJiedaoLayer();
// }
// };
+=======
+mars3d.global_variables = { geoserver_url_predix: 'http://58.246.27.194:7011/', nodejs_url_predix: 'http://58.246.27.194:7012/', userid: 2, queryDataType: 'hour' };
+mars3d.global_variables.queryDataTStart = getDefaultDateTime();
+mars3d.global_variables.queryDataTEnd = getDefaultDateTime();
-function addTDTAnnoLayer() {
- Img_annoTileLayer = new mars3d.layer.TdtLayer({
- name: "褰卞儚娉ㄨ",
- layer: "img_z",
- key: mars3d.Token.tiandituArr,
+
+function initLayersByUserid() {
+
+ //addMaskShanghai();
+ addTDTAnnoLayer();
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
+
+ $.getJSON("data/getLayerListByUserid.json", { userid: mars3d.global_variables.userid }, (result) => {
+ result.data.forEach((item) => {
+ if ([item['type']] == 'wms') {
+ addWMSLayer(item);
+ } else if ([item['type']] == 'wind') {
+ console.log('wind')
+ addWindLayer(item);
+ } else if ([item['type']] == 'div') {
+ addGuokongLayer(item);
+ } else if ([item['type']] == 'taxi') {
+ addTaxiLayer(item);
+ }
+ });
});
- Img_annoTileLayer.show = false;
- Img_annoTileLayer.pid = 50;
- map.addLayer(Img_annoTileLayer);
- Vec_annoTileLayer = new mars3d.layer.TdtLayer({
- name: "鐭㈤噺鍥炬敞璁�",
- layer: "vec_z",
- key: mars3d.Token.tiandituArr,
- });
- Vec_annoTileLayer.show = false;
- Vec_annoTileLayer.pid = 50;
- map.addLayer(Vec_annoTileLayer);
}
-function addguokongLayers(datatime) {
+function addWMSLayer(item) {
+ var wmsLyer = new mars3d.layer.WmsLayer({
+ id: item.id,
+ pid: item.pid,
+ name: item.name,
+ type: "wms",
+ url: mars3d.global_variables.geoserver_url_predix + "/geoserver/konglu_58/wms",
+ layers: "konglu_58:" + item.geoname_prefix + mars3d.global_variables.queryDataType,
+ crs: "EPSG:4326",
+ parameters: {
+ "styles": item.style_prefix + item.styleoptions[0],
+ "transparent": "true",
+ "format": "image/png",
+ "viewparams": "userid:" + mars3d.global_variables.userid + ";datatime:" + mars3d.global_variables.queryDataTStart
+ },
+ center: { "lat": 30.487351, "lng": 121.613269, "alt": 54033, "heading": 359, "pitch": -40 },
+ noCenter: true,
+ getFeatureInfoParameters: {
+ feature_count: 10
+ },
+ //鍗曞嚮楂樹寒鍙婂叾鏍峰紡
+ highlight: {
+ type: "wallP",
+ diffHeight: 300,
+ material: mars3d.MaterialUtil.createMaterial(mars3d.MaterialType.LineFlow, {
+ image: "img/textures/fence.png",
+ color: "#ffff00",
+ speed: 10, //閫熷害锛屽缓璁彇鍊艰寖鍥�1-100
+ axisY: true,
+ }),
+ },
+ popup: "all",
+ show: item.show,
+ geoname_prefix: item.geoname_prefix,
+ style_prefix: item.style_prefix,
+ style_options: item.styleoptions,
+ flyTo: false
+ });
+
+ //鍗曞嚮浜嬩欢
+ wmsLyer.on(mars3d.EventType.click, function (event) {
+ console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+ });
+
+ map.addLayer(wmsLyer);
+
+}
+
+function addGuokongLayer(item) {
+
+<<<<<<< HEAD
let Layer = map.getLayerById(1001);
if (Layer) {
mars3d.global_variables.layer1002_conifg.show = Layer.options.show;
@@ -119,22 +142,25 @@
mars3d.global_variables.layer1001_conifg.selectedstyle = new_style;
addguokongLayers();
}
+=======
+ var guokongLayer = new mars3d.layer.DivLayer({
+ id: item.id,
+ pid: item.pid, //鍥惧眰绠＄悊 涓娇鐢紝鐖惰妭鐐筰d
+ name: item.name,
+ style_options: item.styleoptions
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
});
- map.addLayer(layer_1001_guokong);
+ map.addLayer(guokongLayer);
- layer_1001_guokong.on(mars3d.EventType.click, function (event) {
+ guokongLayer.on(mars3d.EventType.click, function (event) {
console.log("鐩戝惉layer锛屽崟鍑讳簡鐭㈤噺瀵硅薄", event);
-
console.log(event.graphic?.attr)
-
var item = event.graphic?.attr;
-
//haoutil.msg('鍗曞嚮浜嗭細' + item['楂樻牎鍚嶇О'])
-
});
- layer_1001_guokong.bindPopup(function (event) {
+ guokongLayer.bindPopup(function (event) {
let item = event.graphic?.attr;
var html =
"绔欑偣鍚嶇О锛�" +
@@ -167,8 +193,6 @@
style: {
color: clr,
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
- // html: '<div class="mars3d-animation-point" style="color:' + clr + ';"><p></p></div>',
- // html: '<div><p><img src="img/marker/mark1.png"></p></div>',
highlight: {
type: "divLightPoint",
diffHeight: 600,
@@ -183,14 +207,15 @@
show: true,
attr: item,
});
- layer_1001_guokong.addGraphic(graphic);
+ guokongLayer.addGraphic(graphic);
}
});
}
-function addWeizhanLayer() {
+function addWindLayer(item) {
+<<<<<<< HEAD
let Layer = map.getLayerById(1002);
if (Layer) {
mars3d.global_variables.layer1002_conifg.show = Layer.options.show;
@@ -246,14 +271,41 @@
//鍗曞嚮浜嬩欢
layer_1002_weizhan.on(mars3d.EventType.click, function (event) {
console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+=======
+ $.getJSON("data/getWindParametersByTime.json", { datatype: mars3d.global_variables.queryDataType, datatime: mars3d.global_variables.queryDataTStart }, (result) => {
+ console.log(result);
+
+ var layer_wind = new mars3d.layer.CanvasWindLayer({
+ id: item.id,
+ pid: item.pid,
+ name: item.name,
+ color: item.color,
+ frameRate: 20, //姣忕鍒锋柊娆℃暟
+ speedRate: 60, //椋庡墠杩涢�熺巼
+ particlesNumber: 1000,
+ maxAge: 60,
+ lineWidth: 1,
+ reverseY: true
+ });
+ layer_wind.show = item.show;
+ map.addLayer(layer_wind);
+
+ layer_wind.data = convertWindData(result.data);
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
});
-
- map.addLayer(layer_1002_weizhan);
-
}
-function addJianceLayer() {
+function convertWindData(arr) {
+ var arrU = [];
+ var arrV = [];
+
+ var xmin = arr[0].x;
+ var xmax = arr[0].x;
+ var ymin = arr[0].y;
+ var ymax = arr[0].y;
+
+<<<<<<< HEAD
let Layer = map.getLayerById(1003);
if (Layer) {
mars3d.global_variables.layer1002_conifg.show = Layer.options.show;
@@ -305,19 +357,62 @@
addJianceLayer();
}
});
+=======
+ // 椋庡悜鏄互y杞存鏂瑰悜涓洪浂搴﹂『鏃堕拡杞紝0搴﹁〃绀哄寳椋庛��90搴﹁〃绀轰笢椋庛��
+ // u琛ㄧず缁忓害鏂瑰悜涓婄殑椋庯紝u涓烘锛岃〃绀鸿タ椋庯紝浠庤タ杈瑰惞鏉ョ殑椋庛��
+ // v琛ㄧず绾害鏂瑰悜涓婄殑椋庯紝v涓烘锛岃〃绀哄崡椋庯紝浠庡崡杈瑰惞鏉ョ殑椋庛��
+ for (let i = 0, len = arr.length; i < len; i++) {
+ const item = arr[i];
+ if (xmin > item.x) {
+ xmin = item.x;
+ }
+ if (xmax < item.x) {
+ xmax = item.x;
+ }
+ if (ymin > item.y) {
+ ymin = item.y;
+ }
+ if (ymax < item.y) {
+ ymax = item.y;
+ }
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
- //鍗曞嚮浜嬩欢
- layer_1003_jiance.on(mars3d.EventType.click, function (event) {
- console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
- });
+ var u = mars3d.WindUtil.getU(item.speed, item.dir);
+ arrU.push(u);
- map.addLayer(layer_1003_jiance);
+ var v = mars3d.WindUtil.getV(item.speed, item.dir);
+ arrV.push(v);
+ }
+ var rows = getKeyNumCount(arr, "y"); //璁＄畻 琛屾暟
+ var cols = getKeyNumCount(arr, "x"); //璁＄畻 鍒楁暟
+
+ return {
+ xmin: xmin,
+ xmax: xmax,
+ ymax: ymax,
+ ymin: ymin,
+ rows: rows,
+ cols: cols,
+ udata: arrU, //妯悜椋庨��
+ vdata: arrV, //绾靛悜椋庨��
+ };
}
+function getKeyNumCount(arr, key) {
+ var obj = {};
+ arr.forEach((item) => {
+ obj[item[key]] = true;
+ });
-function addRoadLayer() {
+ var count = 0;
+ for (let col in obj) {
+ count++;
+ }
+ return count;
+}
+<<<<<<< HEAD
let Layer = map.getLayerById(1005);
if (Layer) {
mars3d.global_variables.layer1002_conifg.show = Layer.options.show;
@@ -368,21 +463,126 @@
mars3d.global_variables.layer1005_conifg.selectedstyle = new_style;
addRoadLayer();
}
+=======
+
+function addTaxiLayer(item) {
+
+
+ map.clock.shouldAnimate = true;
+
+ map.clock.startTime = Cesium.JulianDate.fromDate(new Date("2021-07-01 10:00:00"));
+ map.clock.currentTime = Cesium.JulianDate.fromDate(new Date("2021-07-01 10:00:00"));
+ map.clock.stopTime = Cesium.JulianDate.fromDate(new Date("2021-07-01 10:15:00"));
+ map.clock.multiplier = 5.0;
+ map.clock.clockRange = Cesium.ClockRange.LOOP_STOP;
+
+ var taxi_layer = new mars3d.layer.GraphicLayer({
+ id: item.id,
+ name: item.name,
+ pid: item.pid, //鍥惧眰绠＄悊 涓娇鐢紝鐖惰妭鐐筰d
+ center: { "lat": 30.62156, "lng": 121.44918, "alt": 48716, "heading": 359, "pitch": -40 },
+ noCenter: true,
+ show: true,
+ onWidget: "widgetsTS/taxi_layer_setting/widget.js",
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
+ });
+ map.addLayer(taxi_layer);
+
+ taxi_layer.on(mars3d.EventType.click, function (event) {
+ console.log("鐩戝惉layer锛屽崟鍑讳簡鐭㈤噺瀵硅薄", event);
+ var item = event.graphic?.attr;
+ });
+ taxi_layer.bindPopup(function (event) {
+ let item = event.graphic?.attr;
+ var html =
+ "<br/>绫诲瀷锛� " +
+ item["code"].substring(0, 2) == "BS" ? "鍏氦杞�" : "鍑虹杞�" +
+ "<br />杞﹁締缂栧彿锛� " +
+ item["code"] +
+ "<br/>鏁版嵁鏃堕棿锛� " +
+ item["datatime"] +
+ "<br />鐬椂杞﹂�燂細 " +
+ item["speed"] + " (km/h)" +
+ "<br />绮夊皹PM2.5锛� " +
+ item["pm25"] + " (ug/m3)" +
+ "<br />绮夊皹PM10锛� " +
+ item["pm10"] + " (ug/m3)" +
+ "<br />NO娴撳害锛� " +
+ item["no"] + " (ug/m3)" +
+ "<br />NO2娴撳害锛� " +
+ item["no2"] + " (ug/m3)" +
+ "<br />NO+NO2娴撳害锛� " +
+ item["nox"] + " (ug/m3)" +
+ "<br />CO娴撳害鍊�: " +
+ item["co"] + " (mg/m3)" +
+ "<br /><br /><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["code"] + "\")' ><span style='color:#ff00ff'>鍘嗗彶杞ㄨ抗鍥炴斁</span></a></p>";
+ return html;
});
- //鍗曞嚮浜嬩欢
- layer_1005_roadsection.on(mars3d.EventType.click, function (event) {
- console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+ $.getJSON("http://58.246.27.194:7012/dataapi/Bdata?bid=get_1004_list_by_userid&userid=2", (result) => {
+ for (var i = 0, len = result.data.result.length; i < len; i++) {
+ let item = result.data.result[i];
+ addItemToLayer(item, taxi_layer);
+ }
});
-
- map.addLayer(layer_1005_roadsection);
}
+function addItemToLayer(item, target_layer) {
+ $.getJSON("http://58.246.27.194:7012/dataapi/Bdata?bid=get_1004_single_path&siteid=" + item["code"], {
+ datatime1: "2021-07-01 10:00:00",
+ datatime2: "2021-07-01 10:15:00"
+ }, (result) => {
+ if (result.data.result.length > 0) {
+ var tmpPositionProperty = new Cesium.SampledPositionProperty();
+ for (var i = 0, len = result.data.result.length; i < len; i++) {
+ let item = result.data.result[i];
+ //console.log(item);
+ tmpPositionProperty.addSample(Cesium.JulianDate.fromDate(new Date(item["datatime"])), Cesium.Cartesian3.fromDegrees(item["lon"], item["lat"], 0.2))
+ }
-function addJichangLayer() {
+ let graphic = new mars3d.graphic.ModelEntity({
+ attr: result.data.result[0],
+ style: {
+ url: "gltf/" + (item["code"]).substring(0, 2) + ".gltf",
+ scale: 0.5,
+ minimumPixelSize: 20,
+ highlight: {
+ type: mars3d.EventType.click,
+ silhouette: true,
+ silhouetteColor: "#ff0000",
+ silhouetteSize: 4,
+ },
+ label: {
+ //涓嶉渶瑕佹枃瀛楁椂锛屽幓鎺塴abel閰嶇疆鍗冲彲
+ text: item["code"],
+ font_size: 16,
+ // TODO need to be changed according to qindex color.
+ color: "#ff00ff",
+ outline: true,
+ outlineColor: "#000000",
+ pixelOffsetY: -20,
+ distanceDisplayCondition: true,
+ distanceDisplayCondition_far: 50000,
+ distanceDisplayCondition_near: 0,
+ },
+ },
+ });
+ graphic.position = tmpPositionProperty;
+ target_layer.addGraphic(graphic);
+ }
+ });
+}
+function reLoadLayers() {
+
+ var layers = map.getLayers({ layers: true });
+
+ layers.forEach((layer) => {
+ console.log(layer.name+":"+layer.type);
+
+<<<<<<< HEAD
let Layer = map.getLayerById(100600);
if (Layer) {
mars3d.global_variables.layer1002_conifg.show = Layer.options.show;
@@ -497,16 +697,20 @@
addMatouLayer();
}
});
+=======
+ if ([layer.type] == 'wms') {
- //鍗曞嚮浜嬩欢
- layer_100601_matou.on(mars3d.EventType.click, function (event) {
- console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+ layer.options.layers = "konglu_58:" + layer.options.geoname_prefix + mars3d.global_variables.queryDataType;
+ layer.options.parameters.viewparams = "userid:" + mars3d.global_variables.userid + ";datatime:" + mars3d.global_variables.queryDataTStart;
+ layer.reload();
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
+
+ }
});
-
- map.addLayer(layer_100601_matou);
}
+<<<<<<< HEAD
function addHuanxianLayer() {
let Layer = map.getLayerById(100602);
@@ -567,10 +771,15 @@
});
map.addLayer(layer_100602_huanxian);
+=======
+function refreshWidgets() {
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
}
+function addTDTAnnoLayer() {
+<<<<<<< HEAD
function addYuanyuLayer() {
let Layer = map.getLayerById(100603);
@@ -623,19 +832,30 @@
mars3d.global_variables.layer100603_conifg.selectedstyle = new_style;
addYuanyuLayer();
}
+=======
+ Img_annoTileLayer = new mars3d.layer.TdtLayer({
+ name: "褰卞儚娉ㄨ",
+ layer: "img_z",
+ key: mars3d.Token.tiandituArr,
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
});
+ Img_annoTileLayer.show = false;
+ Img_annoTileLayer.pid = 50;
+ map.addLayer(Img_annoTileLayer);
- //鍗曞嚮浜嬩欢
- layer_100603_yuanqu.on(mars3d.EventType.click, function (event) {
- console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+ Vec_annoTileLayer = new mars3d.layer.TdtLayer({
+ name: "鐭㈤噺鍥炬敞璁�",
+ layer: "vec_z",
+ key: mars3d.Token.tiandituArr,
});
-
- map.addLayer(layer_100603_yuanqu);
-
+ Vec_annoTileLayer.show = false;
+ Vec_annoTileLayer.pid = 50;
+ map.addLayer(Vec_annoTileLayer);
}
-function addJinboLayer() {
+function addfunctionLayers() {
+<<<<<<< HEAD
let Layer = map.getLayerById(100604);
if (Layer) {
mars3d.global_variables.layer1002_conifg.show = Layer.options.show;
@@ -686,19 +906,25 @@
mars3d.global_variables.layer100604_conifg.selectedstyle = new_style;
addJinboLayer();
}
+=======
+ layer_1001_guokong = new mars3d.layer.DivLayer({
+ name: '鍥芥帶鐐�',
+ pid: 99, //鍥惧眰绠＄悊 涓娇鐢紝鐖惰妭鐐筰d
+ show: false
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
});
+ map.addLayer(layer_1001_guokong);
- //鍗曞嚮浜嬩欢
- layer_100604_jinbo.on(mars3d.EventType.click, function (event) {
- console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
- });
+ layer_1001_guokong.on(mars3d.EventType.click, function (event) {
+ console.log("鐩戝惉layer锛屽崟鍑讳簡鐭㈤噺瀵硅薄", event);
- map.addLayer(layer_100604_jinbo);
+ console.log(event.graphic?.attr)
-}
+ var item = event.graphic?.attr;
-function addBianjieLayer() {
+ //haoutil.msg('鍗曞嚮浜嗭細' + item['楂樻牎鍚嶇О'])
+<<<<<<< HEAD
let Layer = map.getLayerById(100605);
if (Layer) {
mars3d.global_variables.layer1002_conifg.show = Layer.options.show;
@@ -749,19 +975,44 @@
mars3d.global_variables.layer100605_conifg.selectedstyle = new_style;
addBianjieLayer();
}
+=======
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
});
- //鍗曞嚮浜嬩欢
- layer_100605_bianjie.on(mars3d.EventType.click, function (event) {
- console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+ layer_1001_guokong.bindPopup(function (event) {
+ let item = event.graphic?.attr;
+ var html =
+ "楂樻牎鍚嶇О锛�" +
+ item["楂樻牎鍚嶇О"] +
+ "<br />鎵�灞炲湴鍖猴細" +
+ item["鍦板尯"] +
+ "<br />涓荤閮ㄩ棬锛�" +
+ item["涓荤閮ㄩ棬"] +
+ "<br />鍔炲灞傛锛�" +
+ item["鍔炲灞傛"] +
+ "<br />鐜嬬墝涓撲笟锛�" +
+ item["鐜嬬墝涓撲笟"] +
+ "<br /><br /><p><a href='#' onclick='javascript:showDetail(1001,\"" + item["楂樻牎鍚嶇О"] + "\")' >璇︾粏淇℃伅</a></p>";
+ return html;
});
- map.addLayer(layer_100605_bianjie);
-}
+ // add 鍥芥帶鐐�
+ //鏄剧ず楂樻牎鐐�
+ $.getJSON("//data.mars3d.cn/file/apidemo/gaoxiao.json", (result) => {
+ var pointColorArr = ["#f33349", "#f79a2c", "#f2fa19", "#95e40c", "#1ffee6"];
+ for (var i = 0, len = result.length; i < len; i++) {
+ var item = result[i];
+ var jwd = item["缁忕含搴�"].split(",");
+ if (jwd.length !== 2) {
+ continue;
+ }
-function addQuanLayer() {
+ var jd = Number(jwd[0]);
+ var wd = Number(jwd[1]);
+ var clr = pointColorArr[i % pointColorArr.length];
+<<<<<<< HEAD
let Layer = map.getLayerById(100607);
if (Layer) {
mars3d.global_variables.layer1002_conifg.show = Layer.options.show;
@@ -813,18 +1064,24 @@
addQuanLayer();
}
});
+=======
+ var graphic = new mars3d.graphic.DivGraphic({
+ position: Cesium.Cartesian3.fromDegrees(jd, wd),
+ style: {
+ html: '<div class="mars3d-animation-point" style="color:' + clr + ';"><p></p></div>',
+ //html: '<div><p><img src="img/marker/mark1.png"></p></div>',
+ distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000), //鎸夎璺濊窛绂绘樉绀�
+ },
+ attr: item,
+ });
+ layer_1001_guokong.addGraphic(graphic);
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
- //鍗曞嚮浜嬩欢
- layer_100607_quan.on(mars3d.EventType.click, function (event) {
- console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
+ }
});
- map.addLayer(layer_100607_quan);
-
}
-
-
-function addXinzhenquLayer() {
+function addRoadLayer() {
let Layer = map.getLayerById(100610);
if (Layer) {
@@ -835,6 +1092,7 @@
};
//鏂瑰紡2锛氬湪鍒涘缓鍦扮悆鍚庤皟鐢╝ddLayer娣诲姞鍥惧眰(鐩存帴new瀵瑰簲type绫诲瀷鐨勫浘灞傜被)
+<<<<<<< HEAD
layer_100610_qu = new mars3d.layer.WmsLayer({
id:100610,
pid: 1006,
@@ -851,6 +1109,21 @@
},
// center: { "lat": 30.594533, "lng": 121.581681, "alt": 93405, "heading": 359, "pitch": -61 },
+=======
+ layer_1006_roadsection = new mars3d.layer.WmsLayer({
+ pid: 99,
+ name: "涓婃捣甯傞亾璺�",
+ type: "wms",
+ url: "http://58.246.27.194:7011/geoserver/konglu_58/wms",
+ layers: "konglu_58:vis_region_100601_hour",
+ crs: "EPSG:4326",
+ parameters: {
+ "transparent": "true",
+ "format": "image/png"
+ },
+ center: { "lat": 31.162801, "lng": 121.543277, "alt": 50000, "heading": 359.2, "pitch": -39.5 },
+ "noCenter": true,
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
getFeatureInfoParameters: {
feature_count: 10
},
@@ -866,6 +1139,7 @@
}),
},
popup: "all",
+<<<<<<< HEAD
show: mars3d.global_variables.layer100610_conifg.show,
selectedMapStyleOptions: mars3d.global_variables.layer100610_conifg.selectedstyle,
hasMapStyleOptions:mars3d.global_variables.layer100610_conifg.styleoptions,
@@ -940,23 +1214,23 @@
addJiedaoLayer();
}
+=======
+ show: false,
+ flyTo: false
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
});
console.log(layer_100611_jiedao.show);
//鍗曞嚮浜嬩欢
- layer_100611_jiedao.on(mars3d.EventType.click, function (event) {
+ layer_1006_roadsection.on(mars3d.EventType.click, function (event) {
console.log("鍗曞嚮浜嗙煝閲忔暟鎹紝鍏�" + event.features.length + "鏉�", event);
});
- map.addLayer(layer_100611_jiedao);
-
+ map.addLayer(layer_1006_roadsection);
}
-
-
-/////////
function addMaskShanghai() {
//geojson 鍚堣偉杈圭晫绾�
@@ -981,6 +1255,7 @@
}
+<<<<<<< HEAD
function addGrid5Layers() {
let Layer = map.getLayerById(5000);
@@ -1097,122 +1372,12 @@
}
+=======
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
function addFunctionalLayers() {
- // add mask
- //addMaskShanghai();
- addTDTAnnoLayer();
- // 娣诲姞涓氬姟鍥惧眰
- addguokongLayers();
- addWeizhanLayer();
- addJianceLayer();
- addRoadLayer();
- // addRegionLayer();
- addJichangLayer();
- addMatouLayer();
- addHuanxianLayer();
- addYuanyuLayer();
- addJinboLayer();
- addBianjieLayer();
- addQuanLayer();
- addXinzhenquLayer();
- addJiedaoLayer();
- addWindLayer();
- addGrid5Layers();
- addGrid1Layers();
-
-}
-
-function addWindLayer(dataTime) {
-
- //鏄剧ず楂樻牎鐐�
- //getWindParametersByTime(dataTime){
-
- $.getJSON("data/getWindParametersByTime.json", { datatime: '2021-09-08 12:00:00', qindex: 'pm25' }, (result) => {
- console.log(result);
-
- layer_wind = new mars3d.layer.CanvasWindLayer({
- id: 2001,
- pid: 99,
- name: "瀹炴椂椋庡満",
- color: "#ffffff", //棰滆壊
- frameRate: 20, //姣忕鍒锋柊娆℃暟
- speedRate: 60, //椋庡墠杩涢�熺巼
- particlesNumber: 1000,
- maxAge: 60,
- lineWidth: 1,
- reverseY: true
- });
- layer_wind.show = false;
- map.addLayer(layer_wind);
-
- layer_wind.data = convertWindData(result.data);
- });
-}
-
-function convertWindData(arr) {
-
- var arrU = [];
- var arrV = [];
-
- var xmin = arr[0].x;
- var xmax = arr[0].x;
- var ymin = arr[0].y;
- var ymax = arr[0].y;
-
- // 椋庡悜鏄互y杞存鏂瑰悜涓洪浂搴﹂『鏃堕拡杞紝0搴﹁〃绀哄寳椋庛��90搴﹁〃绀轰笢椋庛��
- // u琛ㄧず缁忓害鏂瑰悜涓婄殑椋庯紝u涓烘锛岃〃绀鸿タ椋庯紝浠庤タ杈瑰惞鏉ョ殑椋庛��
- // v琛ㄧず绾害鏂瑰悜涓婄殑椋庯紝v涓烘锛岃〃绀哄崡椋庯紝浠庡崡杈瑰惞鏉ョ殑椋庛��
- for (let i = 0, len = arr.length; i < len; i++) {
- const item = arr[i];
- if (xmin > item.x) {
- xmin = item.x;
- }
- if (xmax < item.x) {
- xmax = item.x;
- }
- if (ymin > item.y) {
- ymin = item.y;
- }
- if (ymax < item.y) {
- ymax = item.y;
- }
-
- var u = mars3d.WindUtil.getU(item.speed, item.dir);
- arrU.push(u);
-
- var v = mars3d.WindUtil.getV(item.speed, item.dir);
- arrV.push(v);
- }
-
- var rows = getKeyNumCount(arr, "y"); //璁＄畻 琛屾暟
- var cols = getKeyNumCount(arr, "x"); //璁＄畻 鍒楁暟
-
- return {
- xmin: xmin,
- xmax: xmax,
- ymax: ymax,
- ymin: ymin,
- rows: rows,
- cols: cols,
- udata: arrU, //妯悜椋庨��
- vdata: arrV, //绾靛悜椋庨��
- };
-}
-
-function getKeyNumCount(arr, key) {
- var obj = {};
- arr.forEach((item) => {
- obj[item[key]] = true;
- });
-
- var count = 0;
- for (let col in obj) {
- count++;
- }
- return count;
}
function showDetail(layerid, itemCode) {
@@ -1230,7 +1395,6 @@
mars3d.widget.activate({
uri: "widgetsTS/qyDetailsView/widget.js",
dataQy: itemCode,
- itemcode: itemCode
});
}
diff --git a/js/index.js b/js/index.js
index 0884f26..59efba6 100644
--- a/js/index.js
+++ b/js/index.js
@@ -67,13 +67,11 @@
//鍒涘缓涓夌淮鍦扮悆鍦烘櫙
map = new mars3d.Map("mars3dContainer", mapOptions);
-
-
- addFunctionalLayers();
-
//鏋勯�爓idget
initWidget(map);
+ initLayersByUserid();
+
//濡傛灉鏈墄yz浼犲弬锛岃繘琛屽畾浣�
if (haoutil.isutil.isNotNull(request.x) && haoutil.isutil.isNotNull(request.y)) {
map.setCameraView(request, { duration: 0, isWgs84: true });
diff --git a/widgets/manageLayers_style/view.js b/widgets/manageLayers_style/view.js
index e37a476..a274ed6 100644
--- a/widgets/manageLayers_style/view.js
+++ b/widgets/manageLayers_style/view.js
@@ -243,7 +243,7 @@
// add map style selection radio
- if (!layer.hasOpacity && !layer.options.hasMapStyleOptions) {
+ if (!layer.hasOpacity && !layer.options.style_options) {
return;
}
@@ -271,15 +271,15 @@
},
});
}
- if (layer.options.hasMapStyleOptions) {
+ if (layer.options.style_options) {
var view = $("#" + tNode.tId);
var radio_html = '<div id="' + tNode.tId + '_style" style="color: white;">';
- let item = layer.options.hasMapStyleOptions;
+ let item = layer.options.style_options;
for (var i = 0, len = item.length; i < len; i++) {
- radio_html += '<span class="button level1 switch center_docu" ></span><label><input type="radio" name="' + tNode.tId + '_style" value="'+item[i]+'" ' + (item[i] == layer.options.selectedMapStyleOptions ? "checked" : "") + '/>' + item[i].toUpperCase() + '</label></br>';
+ radio_html += '<span class="button level1 switch center_docu" ></span><label><input type="radio" name="' + tNode.tId + '_style" value="'+item[i]+'" ' + (i == 0 ? "checked" : "") + '/>' + item[i].toUpperCase() + '</label></br>';
}
radio_html += '</div>';
@@ -292,7 +292,16 @@
$('input[type=radio][name=' + tNode.tId + '_style]').change(function () {
var layer = layersObj[tNode.uuid];
+<<<<<<< HEAD
layer.options.reloadLayers(this.value);
+=======
+ if (layer.options.type =='wms'){
+ layer.options.parameters.styles = layer.options.style_prefix+this.value;
+ layer.reload();
+ }
+ //TODO
+
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
});
}
diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index 8589b3a..e9eb4ec 100644
--- a/widgetsTS/dataTime/widget.js
+++ b/widgetsTS/dataTime/widget.js
@@ -24,21 +24,12 @@
(day > 9 ? day : ("0" + day)) + " 00:00:00";
}
-function applyDateType(){
+function applyDateType() {
var dateType = $('input[type=radio][name=datatype]').val();
return dateType;
}
-function reloadTop10(){
- var leftAndRight = mars3d.widget.getClass("widgetsTS/widget_Overall/widget.js");
- if(leftAndRight){
- if(leftAndRight.viewWindowLeft){
- leftAndRight.viewWindowLeft.loadTop10();
- }
- }
-}
-
-function getAppDateTime(){
+function getAppDateTime() {
return $('#appDate').val();
}
@@ -65,9 +56,11 @@
this.defaultDateTime = getDefaultDateTime();
// 鍒濆鍖� 鍙傛暟
let request = haoutil.system.getRequest();
+
if (window.top) {
request = $.extend(request, haoutil.system.getRequest(window.top));
}
+<<<<<<< HEAD
console.log( mars3d.global_variables);
mars3d.global_variables = { geoserver_url_predix:'http://58.246.27.194:7011/',userid: request.userid || 2, queryDataType: 'hour' };
mars3d.global_variables.queryDataTStart = this.defaultDateTime;
@@ -88,10 +81,11 @@
聽聽mars3d.global_variables.layer1000_conifg={name:'缃戞牸鍥惧眰1000',styleoptions:['pm25','pm10','no','no2','nox','co'],selectedstyle:'pm25',show:false};
聽聽mars3d.global_variables.layer5000_conifg={name:'缃戞牸鍥惧眰5000',styleoptions:['pm25','pm10','no','no2','nox','co'],selectedstyle:'pm25',show:false};
console.log( mars3d.global_variables);
+=======
+ mars3d.global_variables.userid = request?.userid || 2;
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
}
-
-
//姣忎釜绐楀彛鍒涘缓瀹屾垚鍚庤皟鐢�
winCreateOK(opt, result) {
@@ -126,6 +120,7 @@
}).on("changeDate", function () {
mars3d.global_variables.queryDataTStart = $('#appDate').val() + " 00:00:00";
+<<<<<<< HEAD
console.log(mars3d.global_variables.queryDataTStart);
// 鍦� function.js 涓畾涔夌殑 function
@@ -149,6 +144,8 @@
reloadTop10();
+=======
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
reLoadLayers();
// refreshWidgets();
@@ -171,6 +168,7 @@
}).on("changeDate", function () {
mars3d.global_variables.queryDataTStart = $('#appDateHour').val();
+<<<<<<< HEAD
console.log(mars3d.global_variables.queryDataTStart);
// 鍦� function.js 涓畾涔夌殑 function
addguokongLayers();
@@ -195,15 +193,19 @@
// reLoadLayers();
// refreshWidgets();
+=======
+ reLoadLayers();
+ refreshWidgets();
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
});
$("#appDateHour").datetimepicker("setDate", new Date(this.defaultDateTime));
$('#appDateHour').datetimepicker('setEndDate', new Date(this.defaultDateTime));
}
-
+
//婵�娲绘彃浠�
activate() {
-
+
}
//閲婃斁鎻掍欢
--
Gitblit v1.9.1