diff --git a/src/views/goverment/largeScreen/components/equipmentAdd.vue b/src/views/goverment/largeScreen/components/equipmentAdd.vue
index 54ac5eb..4338196 100644
--- a/src/views/goverment/largeScreen/components/equipmentAdd.vue
+++ b/src/views/goverment/largeScreen/components/equipmentAdd.vue
@@ -100,10 +100,10 @@
{{ row.name }}
-
+
-
- {{ row.url }}
+
+ {{ row.code }}
@@ -248,6 +248,7 @@ const saveEdit = async (row: any) => {
let requestData = {
name: row.name,
url: row.url,
+ code: row.code,
monitorId: row.monitorId,
category: props.equipTypeDictLabel
};
@@ -313,7 +314,7 @@ const newPoint = () => {
id: "point-tip",
type: "point",
style: {
- visibleDepth: false // 是否被遮挡
+ // visibleDepth: false // 是否被遮挡
}
});
};
@@ -451,7 +452,7 @@ onMounted(async () => {
console.log(map, "66666");
console.log(QueryPopup, "777888");
map.scene.globe.depthTestAgainstTerrain = false; // 不加无法投射到地形上
- map.onlyPickModelPosition = true; // 是否仅在模型上标绘
+ // map.onlyPickModelPosition = true; // 是否仅在模型上标绘
graphicLayer = new mars3d.layer.GraphicLayer();
map.addLayer(graphicLayer);
graphicLayer.on(mars3d.EventType.drawCreated, function (e) {
diff --git a/src/views/goverment/largeScreen/index.vue b/src/views/goverment/largeScreen/index.vue
index 40ecce8..4c04177 100644
--- a/src/views/goverment/largeScreen/index.vue
+++ b/src/views/goverment/largeScreen/index.vue
@@ -582,12 +582,11 @@ const getEquipmentList = async (id: any) => {
// const dom = initVue3Popup(resPointStyle?.codeValue, { data: { name: item.name } });
// return dom;
// },
- html: `
-

-
-
-
- `,
+ html: `
+

+
+
+ `,
offsetX: +resPointStyle?.offsetX,
offsetY: +resPointStyle?.offsetY,
distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 100000)
@@ -595,11 +594,13 @@ const getEquipmentList = async (id: any) => {
});
graphicLayer.addGraphic(graphicImg);
let urlData: any = "";
- if (item.url) {
+ console.log(22222, item.url)
+ if (item.code) {
urlData = await equipmentUrlGet({ monitorId: item.monitorId });
graphicImg.bindPopup(
(event: any) => {
const attr = event.graphic.attr || {};
+ console.log(11111111111, urlData)
if (!attr) {
return;
}
@@ -2387,7 +2388,7 @@ onUnmounted(() => {
:deep() {
.mars3d-camera-content {
width: 100px;
- height: 30px;
+ height: 30px;
display: flex;
align-items: center;
justify-content: center;
@@ -2395,8 +2396,8 @@ onUnmounted(() => {
.mars3d-camera-img {
width: 30px;
height: 30px;
- // animation: cameraMove 1s linear infinite alternate;
- // -webkit-animation: cameraMove 1s linear infinite alternate;
+ animation: cameraMove 1s linear infinite alternate;
+ -webkit-animation: cameraMove 1s linear infinite alternate;
}
.mars3d-camera-text {
color: white;
@@ -2512,4 +2513,4 @@ onUnmounted(() => {
color: #fff;
}
}
-
\ No newline at end of file
+