From 65e579fdba68b40e9583765371918aee2b47c83b Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 09 十一月 2021 15:47:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/vue-smart-ai
---
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue | 12 ++----------
src/pages/shuohuangMonitorAnalyze/components/lkgManage.vue | 24 ++++++++++++++----------
2 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/lkgManage.vue b/src/pages/shuohuangMonitorAnalyze/components/lkgManage.vue
index e43bbdf..d684bb0 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/lkgManage.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/lkgManage.vue
@@ -9,12 +9,15 @@
:loading="uploading"
>涓婁紶 LKJ 鏁版嵁鏂囦欢</el-button
> -->
+ <el-tooltip class="item" effect="dark" content="涓婁紶 LKJ 鏁版嵁鏂囦欢" placement="bottom">
<span
class="icon iconfont"
@click="uploadDirectoryTrigger"
style="font-size: 34px; color: #92abd1"
></span
>
+ </el-tooltip>
+
<input
ref="directoryInput"
@change="importDirectory"
@@ -142,8 +145,9 @@
<style lang="scss">
.lkg-manage {
background: #fff;
- padding: 25px 33px;box-shadow: 0px 3px 6px rgba(160, 174, 230, 0.56);
-border-radius: 10px;
+ padding: 25px 33px;
+ box-shadow: 0px 3px 6px rgba(160, 174, 230, 0.56);
+ border-radius: 10px;
.import-btn {
text-align: left;
margin-bottom: 10px;
@@ -181,18 +185,18 @@
}
.icon-wrap {
background: #9dabc1;
- width: 24px; height: 24px;
+ width: 24px;
+ height: 24px;
border-radius: 50%;
text-align: center;
.del-icon {
- color: #fff;
- font-size: 21px;
- cursor: pointer;
+ color: #fff;
+ font-size: 21px;
+ cursor: pointer;
+ }
}
+ .icon-wrap:hover {
+ background: #d94141;
}
- .icon-wrap:hover{
- background: #D94141;
- }
-
}
</style>
\ No newline at end of file
diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index 73a4df5..ead0f1a 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
@@ -995,7 +995,6 @@
.config {
display: flex;
flex-wrap: no-wrap;
- cursor: pointer;
border-bottom: 1px solid #d7dce8;
.title {
padding: 10px 20px;
@@ -1071,7 +1070,7 @@
.more {
margin-top: 7px;
padding: 0px 6px;
-
+ cursor: pointer;
margin-right: 10px;
width: 46px;
height: 25px;
@@ -1085,6 +1084,7 @@
.multCheck {
margin-top: 7px;
width: 44px;
+ cursor: pointer;
height: 23px;
line-height: 23px;
padding: 0px 12px;
@@ -1096,14 +1096,6 @@
span {
color: #ee4e6e;
}
- // &:hover {
- // color: #7695ec;
- // border-color: #7695ec;
- // }
- // &.checked {
- // color: #409eff;
- // border-color: #409eff;
- // }
}
}
.el-menu.el-menu--horizontal {
--
Gitblit v1.8.0