diff --git a/src/views/dashboard/components/HomeMap.vue b/src/views/dashboard/components/HomeMap.vue index 7c02495..3e0ea7f 100644 --- a/src/views/dashboard/components/HomeMap.vue +++ b/src/views/dashboard/components/HomeMap.vue @@ -344,9 +344,12 @@ ) return ( params.name + - '
仓库数量: ' + - valueStr + + '
仓库数量:1 ' + '个' + // params.name + + // '
仓库数量: ' + + // valueStr + + // '个' ) } else { return ( diff --git a/src/views/monitor/videos/index.vue b/src/views/monitor/videos/index.vue index b21cf02..1388d44 100644 --- a/src/views/monitor/videos/index.vue +++ b/src/views/monitor/videos/index.vue @@ -22,8 +22,6 @@ --> - -
@@ -61,31 +59,91 @@
--> -
-
- +
-
- -
-

实时视频

-

回放视频

-
- -
-

设备名称:1号楼1F西侧走廊像机1

-

设备编号:HK023123

-

设备IP:192.168.1.2

+ +
+
+
+ +
+

实时视频

+

回放视频

+
+ +
+

设备名称:1号楼1F西侧走廊像头1

+

设备编号:HK023123

+
+
+
+
+ + + + +
+
+
+ + + + +
+
+
+ + + + +
+ + + + +
-
-
+
+
+
+
+
-
@@ -94,136 +152,67 @@
-
-
+
+
+
+
+
+
-
- -
- -
-

布防

-

撤防

-

报警确认

-

旁路

+
+
+
+
+ +
+

布防

+

撤防

+

报警确认

+

旁路

+
+
- +
视频监控
+
门禁管理
+
电子围栏
-
--> -
-
-
视频监控
-
门禁管理
-
电子围栏
-
-
- - +
+ + +
+

正常

+ 216
-
- -
-

报警

- 38 -
-
-
-
--> -
- - - -
-

正常

- 216 -
-
- -
+ + +

离线

23
-
- -
-

报警

- 38 -
-
- -
-
- - - -
-

正常

- 216 -
-
- -
-

离线

- 23 + + +
+

报警

+ 38
-
- -
-

报警

- 38 -
-
- -
-
- - - -
-

正常

- 216 -
-
- -
-

离线

- 23 -
-
- -
-

报警

- 38 -
-
-
-
- +
+
+
@@ -380,6 +369,9 @@ export default { // 视频结束 seenshipinRuqinbaojing: false, seenshipinShipinjiankong: false, + seenshipinShipinjiankong2: false, + seenshipinShipinjiankong3: false, + seenshipinShipinjiankong4: false, seenshipinMenjinguanli: false, seenshipinDianziweilan: false, // @@ -389,6 +381,9 @@ export default { showDianziweilan: true, //鼠标移入 seen_shubiaoShipinjiankong: false, + seen_shubiaoShipinjiankong2: false, + seen_shubiaoShipinjiankong3: false, + seen_shubiaoShipinjiankong4: false, //上边的按钮入侵报警正常 showRuqinbaojing_zhengchang: true, //上边的按钮入侵报警离线 @@ -442,6 +437,15 @@ export default { openshipinShipinjiankong() { this.seenshipinShipinjiankong = !this.seenshipinShipinjiankong }, + openshipinShipinjiankong2() { + this.seenshipinShipinjiankong2 = !this.seenshipinShipinjiankong2 + }, + openshipinShipinjiankong3() { + this.seenshipinShipinjiankong3 = !this.seenshipinShipinjiankong3 + }, + openshipinShipinjiankong4() { + this.seenshipinShipinjiankong4 = !this.seenshipinShipinjiankong4 + }, openshipinMenjinguanli() { this.seenshipinMenjinguanli = !this.seenshipinMenjinguanli }, @@ -518,6 +522,25 @@ export default { openDianziweilan_baojing() { this.showDianziweilan_baojing = !this.showDianziweilan_baojing }, + ////// + //上边的按钮正常 + open_zhengchang() { + this.showShipinjiankong_zhengchang = !this.showShipinjiankong_zhengchang + this.showMenjinguanli_zhengchang = !this.showMenjinguanli_zhengchang + this.showDianziweilan_zhengchang = !this.showDianziweilan_zhengchang + }, + //上边的按钮离线 + open_lixian() { + this.showShipinjiankong_lixian = !this.showShipinjiankong_lixian + this.showMenjinguanli_lixian = !this.showMenjinguanli_lixian + this.showDianziweilan_lixian = !this.showDianziweilan_lixian + }, + //上边的按钮报警 + open_baojing() { + this.showShipinjiankong_baojing = !this.showShipinjiankong_baojing + this.showMenjinguanli_baojing = !this.showMenjinguanli_baojing + this.showDianziweilan_baojing = !this.showDianziweilan_baojing + }, //鼠标移入 enter() { this.seen_shubiaoShipinjiankong = true @@ -525,7 +548,27 @@ export default { leave() { this.seen_shubiaoShipinjiankong = false }, - + //鼠标移入2 + enter2() { + this.seen_shubiaoShipinjiankong2 = true + }, + leave2() { + this.seen_shubiaoShipinjiankong2 = false + }, + //鼠标移入3 + enter3() { + this.seen_shubiaoShipinjiankong3 = true + }, + leave3() { + this.seen_shubiaoShipinjiankong3 = false + }, + //鼠标移入2 + enter4() { + this.seen_shubiaoShipinjiankong4 = true + }, + leave4() { + this.seen_shubiaoShipinjiankong4 = false + }, resetState() { this.viewState = 1 }, @@ -735,16 +778,17 @@ export default { diff --git a/src/views/zhiwujiance/zhiwujianceInfo.vue b/src/views/zhiwujiance/zhiwujianceInfo.vue index ca0b4b4..2b0360c 100644 --- a/src/views/zhiwujiance/zhiwujianceInfo.vue +++ b/src/views/zhiwujiance/zhiwujianceInfo.vue @@ -13,6 +13,61 @@
质物监测详情信息
+ + 仓库名称 + + + + {{ infoForm.name }} + + + + 仓库位置 + + + + {{ infoForm.weizhi }} + + + + + + 货架号 + + + + {{ infoForm.huohao }} + + + + 联系人 + + + + {{ infoForm.ren }} + + + + + + 联系电话 + + + + {{ infoForm.tel }} + + + + 拍照时间 + + + + {{ infoForm.time }} + + + + + + 拍照图片 diff --git a/src/views/zhiwujiance/zhiwujianceList.vue b/src/views/zhiwujiance/zhiwujianceList.vue index 188d633..0a0f642 100644 --- a/src/views/zhiwujiance/zhiwujianceList.vue +++ b/src/views/zhiwujiance/zhiwujianceList.vue @@ -55,8 +55,19 @@ @selection-change="handleSelectionChange"> + + + +