This commit is contained in:
liqi 2025-04-02 22:29:18 +08:00
parent 6b0612c890
commit 0d7e9d1bc2
10 changed files with 24 additions and 18 deletions

View File

@ -75,14 +75,6 @@
"layer": "img_z" "layer": "img_z"
} }
], ],
"show": false
},
{
"id": "yinxiangMap",
"name": "天地图影像",
"type": "xyz",
"url": "http:/www.tdss.website:280/tiles/img_c/{z}/{x}/{y}",
"crs": "EPSG:4490",
"show": true "show": true
} }
], ],

View File

@ -1,7 +1,7 @@
import request from "@/utils/request"; import request from "@/utils/request";
export function Homeview(data) { export function Homeview(data) {
let url = "/api/Home/index"; let url = "/api/Home/view";
return request({ return request({
url: url, url: url,
method: "get", method: "get",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
src/assets/img/wargin.mp3 Normal file

Binary file not shown.

View File

@ -49,7 +49,7 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
position: absolute; position: absolute;
bottom: 1%; bottom: 0%;
width: 360px; width: 360px;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
@ -60,7 +60,7 @@ export default {
line-height: 40px; line-height: 40px;
color: #fff; color: #fff;
background: url(../../../assets/img/left-nohover.png); background: url(../../../assets/img/left-nohover.png);
background-size: 130% 230% !important; background-size: 100% 100% !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-position: center !important; background-position: center !important;
position: relative; position: relative;
@ -77,7 +77,7 @@ export default {
line-height: 40px; line-height: 40px;
color: #fff; color: #fff;
background: url(../../../assets/img/right-hover.png); background: url(../../../assets/img/right-hover.png);
background-size: 130% 230% !important; background-size: 100% 100% !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-position: center !important; background-position: center !important;
position: relative; position: relative;

View File

@ -38,6 +38,13 @@
<div class="left-contract" @click="handleContractClick"> <div class="left-contract" @click="handleContractClick">
<img :src="isContracted ? rightContract : leftContract" alt="" /> <img :src="isContracted ? rightContract : leftContract" alt="" />
</div> </div>
<video
v-if="iswarning"
title="Advertisement"
src="@/assets/img/wargin.mp3"
autoplay="true"
muted="muted"
></video>
</div> </div>
</template> </template>
@ -73,19 +80,20 @@ export default {
}, },
{ {
id: "3", id: "3",
name: "今日处置", name: "今日反制",
value: 0 value: 0
}, },
{ {
id: "4", id: "4",
name: "累计处置", name: "累计反制",
value: 0 value: 0
} }
], ],
drones: [], drones: [],
isContracted: false, isContracted: false,
homeView: {}, homeView: {},
droneTimers: new Map() droneTimers: new Map(),
iswarning: false
}; };
}, },
watch: { watch: {
@ -111,7 +119,7 @@ export default {
} }
// 15 // 15
newItem.currTime = 15000; newItem.currTime = 11115;
// //
const timer = this.startTimer(newItem); const timer = this.startTimer(newItem);
this.droneTimers.set(newItem.BatchId, timer); this.droneTimers.set(newItem.BatchId, timer);
@ -132,7 +140,13 @@ export default {
if (this.drones) { if (this.drones) {
mapUavFiex(this.drones); mapUavFiex(this.drones);
} }
console.log(this.drones, "newVal"); let alarm = this.drones.find((d) => d.alarmLevel === 1);
if (alarm) {
this.iswarning = true;
} else {
console.log(222);
this.iswarning = false;
}
} }
}, },
deep: true deep: true

View File

@ -62,7 +62,7 @@ export default {
? localhostPath ? localhostPath
: process.env.VUE_APP_API_URL; : process.env.VUE_APP_API_URL;
connection = new signalR.HubConnectionBuilder() connection = new signalR.HubConnectionBuilder()
.withUrl(uploadUrl + "/notification", { .withUrl(uploadUrl + "/websocket", {
skipNegotiation: true, skipNegotiation: true,
transport: signalR.HttpTransportType.WebSockets transport: signalR.HttpTransportType.WebSockets
}) })