From 2aab9a8982522cb0955d01c78fbd21a86ffb93c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E6=99=8F=E5=BD=AD?= <995457985@qq.com> Date: Tue, 25 Apr 2023 14:37:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20ai=E9=A2=84=E8=AD=A6=E5=92=8C=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/LeftMenu/LeftMenu.vue | 2 +- src/components/LeftMenu/leftMenu.scss | 2 +- src/styles/common.scss | 7 + .../AIwarning/accessSituation/index.scss | 52 ++++--- .../AIwarning/accessSituation/index.vue | 19 ++- .../AIwarning/accessSituation/index.scss | 54 +++---- .../AIwarning/accessSituation/index.vue | 16 +- .../AIwarning/alarmRecord/index.scss | 3 + .../goverment/AIwarning/alarmRecord/index.vue | 2 +- src/views/home/index.scss | 54 ++++++- src/views/home/index.scss.3742606228 | 138 ------------------ src/views/home/index.vue | 8 +- 12 files changed, 142 insertions(+), 215 deletions(-) delete mode 100644 src/views/home/index.scss.3742606228 diff --git a/src/components/LeftMenu/LeftMenu.vue b/src/components/LeftMenu/LeftMenu.vue index df85200..a5e7409 100644 --- a/src/components/LeftMenu/LeftMenu.vue +++ b/src/components/LeftMenu/LeftMenu.vue @@ -10,7 +10,7 @@
- + 搜索
diff --git a/src/components/LeftMenu/leftMenu.scss b/src/components/LeftMenu/leftMenu.scss index 0ad2ea6..215f740 100644 --- a/src/components/LeftMenu/leftMenu.scss +++ b/src/components/LeftMenu/leftMenu.scss @@ -50,7 +50,7 @@ background-color: #ffffff; } .search-btn { - margin-left: 5px; + margin-left: 12px; } .footer { display: flex; diff --git a/src/styles/common.scss b/src/styles/common.scss index 15a00ab..fa6318c 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -168,3 +168,10 @@ .m-10 { margin: 0 20px; } +// 分页器 +.pagination { + display: flex; + align-items: center; + justify-content: center; + width: 100%; +} diff --git a/src/views/enterprise/AIwarning/accessSituation/index.scss b/src/views/enterprise/AIwarning/accessSituation/index.scss index 66bdd7f..85c2e20 100644 --- a/src/views/enterprise/AIwarning/accessSituation/index.scss +++ b/src/views/enterprise/AIwarning/accessSituation/index.scss @@ -44,35 +44,47 @@ } .imgPage { box-sizing: border-box; - display: flex; flex: 1; - flex-wrap: wrap; - justify-content: flex-start; + width: 100%; padding: 20px; margin-top: 20px; overflow-y: scroll; background-color: #ffffff; border-radius: 8px; - .img_item { - width: 31.3%; - - // height: 26%; - // padding: 10px; - margin: 10px; - cursor: pointer; - border: 1px solid #dedddd; - border-radius: 4px; - opacity: 1; - .page_text { - padding: 8px 16px; - .img_bottom { - display: flex; - justify-content: space-between; - font-size: 12px; - color: #333333; + display: flex; + flex-direction: column; + .imgTable { + width: 100%; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + flex: 1; + .img_item { + width: 31.3%; + height: 244px; + margin: 10px; + cursor: pointer; + border: 1px solid #dedddd; + border-radius: 4px; + opacity: 1; + .page_text { + padding: 8px 16px; + .img_bottom { + display: flex; + justify-content: space-between; + font-size: 12px; + color: #333333; + } } } } + + .pagination { + display: flex; + align-items: center; + justify-content: center; + margin-top: 20px; + } } } } diff --git a/src/views/enterprise/AIwarning/accessSituation/index.vue b/src/views/enterprise/AIwarning/accessSituation/index.vue index 17cd41b..c09bb32 100644 --- a/src/views/enterprise/AIwarning/accessSituation/index.vue +++ b/src/views/enterprise/AIwarning/accessSituation/index.vue @@ -62,23 +62,26 @@
-
- -
-
{{ item.typeName }}
-
-
位置:{{ item.deviceName }}
-
报警事件:{{ item.createTime }}
+
+
+ +
+
{{ item.typeName }}
+
+
位置:{{ item.deviceName }}
+
报警事件:{{ item.createTime }}
+
+
diff --git a/src/views/goverment/AIwarning/accessSituation/index.scss b/src/views/goverment/AIwarning/accessSituation/index.scss index a51c874..0918526 100644 --- a/src/views/goverment/AIwarning/accessSituation/index.scss +++ b/src/views/goverment/AIwarning/accessSituation/index.scss @@ -11,16 +11,10 @@ // margin-left: 20px; padding: 0 0 0 20px; - // padding: 0 13% 0 20px; - // background-color: aqua; .form_div { height: 56px; background-color: #ffffff; border-radius: 8px; - - // display: flex; - // // justify-content: center; - // align-items: center; } .form { padding: 16px 0 0 36px; @@ -30,40 +24,46 @@ } .imgPage { box-sizing: border-box; - display: flex; flex: 1; - flex-wrap: wrap; - justify-content: flex-start; + width: 100%; padding: 20px; margin-top: 20px; overflow-y: scroll; background-color: #ffffff; border-radius: 8px; - .img_item { - width: 31.3%; - - // height: 26%; - // padding: 10px; - margin: 10px; - cursor: pointer; - border: 1px solid #dedddd; - border-radius: 4px; - opacity: 1; - .page_text { - padding: 8px 16px; - .img_bottom { - display: flex; - justify-content: space-between; - font-size: 12px; - color: #333333; + display: flex; + flex-direction: column; + .imgTable { + width: 100%; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + flex: 1; + .img_item { + width: 31.3%; + height: 244px; + margin: 10px; + cursor: pointer; + border: 1px solid #dedddd; + border-radius: 4px; + opacity: 1; + .page_text { + padding: 8px 16px; + .img_bottom { + display: flex; + justify-content: space-between; + font-size: 12px; + color: #333333; + } } } } + .pagination { display: flex; align-items: center; justify-content: center; - width: 100%; + margin-top: 20px; } } } diff --git a/src/views/goverment/AIwarning/accessSituation/index.vue b/src/views/goverment/AIwarning/accessSituation/index.vue index e8bb6b3..02a45dd 100644 --- a/src/views/goverment/AIwarning/accessSituation/index.vue +++ b/src/views/goverment/AIwarning/accessSituation/index.vue @@ -64,13 +64,15 @@
-
- -
-
{{ item.typeName }}
-
-
位置:{{ item.deviceName }}
-
报警事件:{{ item.createTime }}
+
+
+ +
+
{{ item.typeName }}
+
+
位置:{{ item.deviceName }}
+
报警事件:{{ item.createTime }}
+
diff --git a/src/views/goverment/AIwarning/alarmRecord/index.scss b/src/views/goverment/AIwarning/alarmRecord/index.scss index a51923c..5668222 100644 --- a/src/views/goverment/AIwarning/alarmRecord/index.scss +++ b/src/views/goverment/AIwarning/alarmRecord/index.scss @@ -53,6 +53,9 @@ } } } +.diaForm { + padding: 0 20% 0 0; +} .img_title { margin: 0 0 4px; font-family: "siyuan_Medium"; diff --git a/src/views/goverment/AIwarning/alarmRecord/index.vue b/src/views/goverment/AIwarning/alarmRecord/index.vue index a92d9dc..6055afc 100644 --- a/src/views/goverment/AIwarning/alarmRecord/index.vue +++ b/src/views/goverment/AIwarning/alarmRecord/index.vue @@ -64,7 +64,7 @@
抓拍隐患
- + diff --git a/src/views/home/index.scss b/src/views/home/index.scss index 3179fdd..4083b77 100644 --- a/src/views/home/index.scss +++ b/src/views/home/index.scss @@ -80,32 +80,70 @@ // color: #fff; display: flex; background-color: #008bff; - .header-item { + border-radius: 8px; + + .header-important { + position: relative; display: flex; - flex: none; - flex-direction: column; align-items: center; justify-content: center; - width: 330px; + width: 20%; height: 170px; overflow-x: auto; cursor: pointer; - img { - // background-color: #fff; - width: 60px; - height: 56px; + // border-right: 1px solid pink; + + .header-item { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + } + + span { + margin: 5px 0; + font-size: 20px; + color: #fff; + } + + &::after { + content: ""; + position: absolute; + width: 2px; + height: 66px; + top: 50px; + bottom: 40px; + right: 0; + background-color: rgba(255, 255, 255, 0.54); + } + + &:last-child::after { + display: none; } } + // .header-important ::after { + // content: ""; + // width: 2px; + // height: 50px; + // background-color: pink; + // } } .safe { // display: flex; flex-flow: row wrap; width: 100%; margin: 20px 0; + .labelName { + color: #999; + .el-icon { + margin-right: 10px; + } + } .safe-contain { display: flex; flex-wrap: wrap; color: #666666; + min-height: 169px; .safe-item { width: 204px; height: 169px; diff --git a/src/views/home/index.scss.3742606228 b/src/views/home/index.scss.3742606228 deleted file mode 100644 index 1f6e5f5..0000000 --- a/src/views/home/index.scss.3742606228 +++ /dev/null @@ -1,138 +0,0 @@ -.el-container { - width: 100%; - height: 100%; - .el-header { - box-sizing: border-box; - display: flex; - align-items: center; - justify-content: space-between; - height: 72px; - padding: 0 15px 0 0; - background: linear-gradient(to right, #0e63d9 0%, #00378f 100%); - border-bottom: 1px solid #f1f1f1; - .header-lf { - display: flex; - align-items: center; - overflow: hidden; - white-space: nowrap; - .logo { - flex-shrink: 0; - - // width: 210px; - margin-left: 16px; - cursor: pointer; - span { - height: 36px; - font-size: 24px; - line-height: 36px; - - // font-weight: bold; - color: #dadada; - white-space: nowrap; - } - img { - width: 28px; - object-fit: contain; - margin-right: 6px; - } - } - } - :deep(.tool-bar-lf) { - color: #ffffff; - .el-breadcrumb__inner.is-link { - color: #e5eaf3; - &:hover { - color: var(--el-color-primary); - } - } - .el-breadcrumb__item:last-child .el-breadcrumb__inner, - .el-breadcrumb__item:last-child .el-breadcrumb__inner:hover { - color: #cfd3dc; - } - } - :deep(.tool-bar-ri) { - .toolBar-icon, - .username { - color: #e5eaf3; - } - } - } - .el-aside { - width: 200px; - overflow: inherit; - background-color: #ffffff; - border-right: 1px solid var(--el-border-color); - transition: all 0.3s ease; - .menu { - display: flex; - flex-direction: column; - height: 100%; - transition: all 0.3s ease; - .el-menu { - overflow-x: hidden; - border-right: none; - } - } - } - .contain-section { - padding: 30px 135px; - .contain-header { - // color: #fff; - display: flex; - background-color: #008bff; - .header-item { - display: flex; - flex: none; - flex-direction: column; - align-items: center; - justify-content: center; - width: 330px; - height: 170px; - overflow-x: auto; - cursor: pointer; - img { - // background-color: #fff; - width: 60px; - height: 56px; - } - } - } - .safe { - - // display: flex; - flex-flow: row wrap; - width: 100%; - margin: 20px 0; - .safe-contain { - display: flex; - flex-wrap: wrap; - color: #666666; - .safe-item { - width: 204px; - height: 169px; - margin: 17px 30px; - - // display: flex; - cursor: pointer; - - // overflow-x: auto; - background: #ffffff; - border: 1px solid #ebebeb; - border-radius: 4px; - opacity: 1; - div { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - height: 100%; - img { - width: 60px; - height: 56px; - } - } - } - } - } - } -} diff --git a/src/views/home/index.vue b/src/views/home/index.vue index efbc100..41e03f1 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -15,15 +15,15 @@
-
-
+
+
logo -

{{ item.moduleName }}

+ {{ item.moduleName }}
-
+
{{ i }}