Merge branch 'dev' into build

# Conflicts: # components/AiOkrTree/AiOkrTree.vue # project/dv/apps/AppGridDV.vue
2022-08-23 11:04:07 +08:00
parent e445063afc de190a9076
commit 7bbdaee6d3
11 changed files with 252 additions and 1776 deletions
--- a/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
+++ b/project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue
@@ -617,6 +617,14 @@
          .dept-name{
            display: inline-block;
            width: 200px;
+            height: 22px;
+            overflow:hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis; 
+            vertical-align: bottom;
+          }
+          .el-icon-arrow-down{
+            vertical-align: middle;
          }
        }
        .active{