admin/Mars3D-screen_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx：冲突

Browse Source
This commit is contained in:
X_Rian 2024-09-16 12:03:19 +08:00
commit ed52e73e17
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/goverment/largeScreen/components/equipmentAdd.vue
View File

@ -100,10 +100,10 @@
<span v-else>{{ row.name }}</span> <span v-else>{{ row.name }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="url" align="center" label="资源地址"> <el-table-column prop="code" align="center" label="设备编码">
<template #default="{ row }"> <template #default="{ row }">
<el-input v-model="row.url" v-if="row.isEdit" /> <el-input v-model="row.code" v-if="row.isEdit" />
<span v-else>{{ row.url }}</span> <span v-else>{{ row.code }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作"> <el-table-column align="center" label="操作">
@ -248,6 +248,7 @@ const saveEdit = async (row: any) => {
let requestData = { let requestData = {
name: row.name, name: row.name,
url: row.url, url: row.url,
code: row.code,
monitorId: row.monitorId, monitorId: row.monitorId,
category: props.equipTypeDictLabel category: props.equipTypeDictLabel
}; };
@ -313,7 +314,7 @@ const newPoint = () => {
id: "point-tip", id: "point-tip",
type: "point", type: "point",
style: { style: {
visibleDepth: false // 是否被遮挡 // visibleDepth: false // 是否被遮挡
} }
}); });
}; };
@ -451,7 +452,7 @@ onMounted(async () => {
console.log(map, "66666"); console.log(map, "66666");
console.log(QueryPopup, "777888"); console.log(QueryPopup, "777888");
map.scene.globe.depthTestAgainstTerrain = false; // 不加无法投射到地形上 map.scene.globe.depthTestAgainstTerrain = false; // 不加无法投射到地形上
map.onlyPickModelPosition = true; // 是否仅在模型上标绘 // map.onlyPickModelPosition = true; // 是否仅在模型上标绘
graphicLayer = new mars3d.layer.GraphicLayer(); graphicLayer = new mars3d.layer.GraphicLayer();
map.addLayer(graphicLayer); map.addLayer(graphicLayer);
graphicLayer.on(mars3d.EventType.drawCreated, function (e) { graphicLayer.on(mars3d.EventType.drawCreated, function (e) {

23
src/views/goverment/largeScreen/index.vue
View File

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