From 0ceb77bf6bbaf98c7c72835e69771997da604d2e Mon Sep 17 00:00:00 2001 From: "zyc@123456" <784479659@qq.com> Date: Tue, 30 May 2023 18:12:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E5=8E=BB=E6=8E=89=E5=85=A5=E4=BE=B5=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=EF=BC=8C=E8=A7=86=E9=A2=91=E4=B8=AD=E5=BF=83=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=85=A5=E4=BE=B5=E6=8A=A5=E8=AD=A6=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/index.vue | 15 +- src/views/monitor/videos/index.vue | 221 +++++++++++++++-------------- 2 files changed, 126 insertions(+), 110 deletions(-) diff --git a/src/views/index.vue b/src/views/index.vue index f7e83de..c686138 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -82,7 +82,7 @@
-
+
@@ -391,7 +391,7 @@ //margin: 20px 20 0 0 !important; background-color: #fff; box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px; - padding: 10px; + padding: 20px 10px 21px 10px; } // .tops .topbox:last-of-type { // margin: 0; @@ -408,7 +408,8 @@ flex-wrap: nowrap; justify-content: flex-start;align-items: center; margin: 0; - padding: 20px ; + padding: 35px 20px 38px 20px; + // padding: 20px ; } .topbox .mids .lefts{width: 100px;} .topbox .mids .lefts .iconbox { @@ -496,7 +497,7 @@ } .con { - padding: 20px 0; + padding: 10px 0 0 0; display: flex; flex-direction: row; flex-wrap: nowrap; @@ -531,8 +532,8 @@ } .news .content { - padding: 10px 0; - height:160px; + padding: 10px 0; height:120px; + // height:160px; overflow: hidden; } diff --git a/src/views/monitor/videos/index.vue b/src/views/monitor/videos/index.vue index 9b5554f..9b0ffa5 100644 --- a/src/views/monitor/videos/index.vue +++ b/src/views/monitor/videos/index.vue @@ -32,7 +32,7 @@
-
+

布防

撤防

报警确认

旁路

-
+
-->
@@ -114,115 +113,118 @@
-
- + - - -
-

正常

- 216 -
- - -
-

离线

- 23 -
- - -
-

报警

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

正常

- 216 +
+ + +
+ + + +
+

正常

+ 216 +
+ + +
+

离线

+ 23
- - -
-
- - - -
-

正常

- 216 -
- - -
-

离线

- 23 -
- - -
-

报警

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

正常

- 216 + + +
+

报警

+ 38 +
+ + +
+
+ + + +
+

正常

+ 216 +
+ + +
+

离线

+ 23
- - -
-

离线

- 23 -
- - -
-

报警

- 38 + + +
+

报警

+ 38 +
+ + +
+
+ + + +
+

正常

+ 216 +
+ + +
+

离线

+ 23
- - -
+ + +
+

报警

+ 38 +
+ + +
+
+
@@ -382,9 +384,9 @@ export default { seenshipinDianziweilan: false, // showRuqinbaojing: true, - showShipinjiankong: false, - showMenjinguanli: false, - showDianziweilan: false, + showShipinjiankong: true, + showMenjinguanli: true, + showDianziweilan: true, //鼠标移入 seen_shubiaoShipinjiankong: false, //上边的按钮入侵报警正常 @@ -864,7 +866,8 @@ export default { .mores /deep/ .el-checkbox-button.is-checked .el-checkbox-button__inner { background-color: #e9f7fa;border: 1px solid #469efd;color: #000; } -.moress{position: absolute;top: 100px;left: 20px;z-index: 9000; +.moress{ + /* position: absolute;top: 100px;left: 20px;z-index: 9000; */ padding: 0 0px; display: flex; flex-direction: column; @@ -966,4 +969,16 @@ export default { // width: calc((100% - 1px) / 4 );box-sizing: border-box;font-size:18px;} // .tabhead .bar:last-of-type{border-right: 0px solid #eeeeee;width: calc((100% - 0px) / 4 );} // .tabhead .barb {background-color: #fff;color: #0b5394;} */ +.leftbars{ position: absolute; + top: 30px; + left: 20px; + z-index: 900; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: flex-start;align-items: center;} + .leftbars .bartops{width: 120px;} + .leftbars .bartops .libar{margin: 0 0 20px 0;padding: 10px; + background-color: #ffffff;box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px;} + .leftbars .moress{flex: 1;}