From d12e030d8a7690d79c5786bc2a786b6c21a24433 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 18 Jun 2021 16:31:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap
---
widgets/searchL/Widget.js | 59 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index b3793d0..356343d 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -98,6 +98,7 @@
$(".searchColce").click(function () {
$('.searchLMain').hide();
that.addOneEntitys.removeAll();
+ topic.publish('getLegendsData', '');
})
$("#local_data").keyup(function (e) {
@@ -232,7 +233,7 @@
clickHand: function clickHand(data) {
var pickedObjects = this.map.scene.drillPick(data.position) || 0;
// console.log(pickedObjects);
- if (pickedObjects.length != 0) {
+ if (pickedObjects.length != 0 && pickedObjects.id != undefined) {
var data = pickedObjects[0].primitive.id.onceData[1];
if (pickedObjects[0].primitive.id.onceData[0] == 1) {//全景
@@ -315,27 +316,28 @@
},
//定位实体位置
shiti: function (data, i) {
+ // console.log(data)
var imgs = i == 1 ? 'images/addL/全景.png' : i == 2 ? 'images/addL/监控.png' : i == 3 ? 'images/addL/监测.png' : '';
this.addOneEntitys.add({
id: data.id, // 实体ID
name: data.name, // 实体名称
position: Cesium.Cartesian3.fromDegrees(Number(data.lon), Number(data.lat)), // x,y 实体经纬度
- // label: {
- // show: true,
- // text: item.siteName, // text 与实体相关的文字
- // font: "700 14px '黑体'",
- // fillColor: Cesium.Color.DEEPSKYBLUE,
- // // backgroundColor: Cesium.Color.DEEPSKYBLUE,
- // style: Cesium.LabelStyle.FILL_AND_OUTLINE,
- // outlineWidth: 2,
- // outlineColor: Cesium.Color.fromBytes(255, 255, 255), // 文字轮廓的颜色
- // verticalOrigin: Cesium.VerticalOrigin.CENTER,//垂直位置
- // horizontalOrigin: Cesium.HorizontalOrigin.LEFT,//水平位置
- // pixelOffset: new Cesium.Cartesian2(10, -10), // 文字位置
- // heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
- // distanceDisplayCondition: new Cesium.DistanceDisplayCondition(1, entityConfig.showheight),
- // disableDepthTestDistance: Number.POSITIVE_INFINITY
- // },
+ label: {
+ show: true,
+ text: data.name, // text 与实体相关的文字
+ font: "700 20px '黑体'",
+ fillColor: Cesium.Color.fromCssColorString("rgba(57,165,253)"),
+ // backgroundColor: Cesium.Color.DEEPSKYBLUE,
+ style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+ outlineWidth: 2,
+ outlineColor: Cesium.Color.fromBytes(255, 255, 255), // 文字轮廓的颜色
+ verticalOrigin: Cesium.VerticalOrigin.CENTER,//垂直位置
+ horizontalOrigin: Cesium.HorizontalOrigin.CENTER,//水平位置
+ pixelOffset: new Cesium.Cartesian2(0, -40), // 文字位置
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+ // distanceDisplayCondition: new Cesium.DistanceDisplayCondition(1, entityConfig.showheight),
+ disableDepthTestDistance: Number.POSITIVE_INFINITY
+ },
billboard: {
show: true,
// image: 'images/addL/监测.png',
@@ -391,6 +393,10 @@
});
+ table.on('row(test)', function (obj) {
+ that.goOnPosition([obj.data.lon, obj.data.lat], 1, obj.data);
+ });
+
table.on('tool(test)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
var data = obj.data //获得当前行数据
, layEvent = obj.event; //获得 lay-event 对应的值
@@ -400,9 +406,6 @@
} else if (layEvent === 'edit') {
that.goOnPosition([obj.data.lon, obj.data.lat], 1, obj.data);
}
- });
- table.on('row(test)', function (obj) {
- that.goOnPosition([obj.data.lon, obj.data.lat], 1, obj.data);
});
}
if (data1 != 1) {
@@ -479,6 +482,7 @@
that.goOnPosition([obj.data.lon, obj.data.lat], 2, obj.data);
}
});
+
table.on('row(test1)', function (obj) {
that.goOnPosition([obj.data.lon, obj.data.lat], 2, obj.data);
});
@@ -588,12 +592,23 @@
</tr>
<tr>
<th>图片：</th>
- <td class="left" colspan="3">
- <img src="${obj.data.attList[0].uaOriginPath}" alt="">
+ <td class="left" colspan="3" id="popupsimg">
+ <img layer-src="${obj.data.attList[0].uaOriginPath}" src="${obj.data.attList[0].uaOriginPath}" alt="">
</td>
</tr>`;
str += '</table>';
XQDom.append(str);
+ // 相册层
+ layui.use(['form', 'layer'], function () {
+
+ //----------模块----------
+ var form = layui.form;
+ var layer = layui.layer;
+ layer.photos({
+ photos: '#popupsimg'
+ , anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
+ });
+ });
},
getshuiwen: function (stcd) {
var that = this;
--
Gitblit v1.9.3