Merge remote-tracking branch 'origin/dev-css-refact' into dev

# Conflicts:
#	src/Login.vue
#	src/assets/css/components/components/rightBox/report/reportBox.scss
#	src/assets/css/components/views/charts2/entityDetailSubscriberMap.scss
#	src/assets/css/components/views/charts2/networkOverviewApps.scss
#	src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss
#	src/assets/css/components/views/entityExplorer/entityList/row.scss
#	src/components/rightBox/report/ReportBox.vue
#	src/components/table/setting/knowledgeBaseTableForCard.vue
#	src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
#	src/views/entityExplorer/entityList/Row.vue

src/views/setting/Index.vue

@@ -4,7 +4,7 @@
     <div class="explorer-top-tools explorer-detection-top-tools">
       <div class="explorer-top-tools-title">{{$t('overall.knowledgeBase')}}</div>
     </div>
-    <div style="width: 100%;padding-bottom: 26px;">
+    <div class="administration__tabs">
       <chart-tabs :data="tabsData" router></chart-tabs>
     </div>
     <!-- 内容区 -->
@@ -35,7 +35,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>

src/views/setting/KnowledgeBase.vue

@@ -4,14 +4,14 @@
       <div class="top-title">
         {{$t('overall.knowledgeBase')}}
       </div>
-      <div class="builtIn-to-user-defined" >
-        <button :title="$t('knowledgeBase.userDefinedLibrary')" class="top-tool-btn--user_defined_library"
-                v-if="hasPermission('userDefinedLibrary')"
-                @click="changeToUserDefinedList">
-          <i class="cn-icon-add-knowledge-base cn-icon" ></i>
-          <span>{{$t('knowledgeBase.userDefinedLibrary')}}</span>
-        </button>
-      </div>
+<!--      <div class="builtIn-to-user-defined" >-->
+<!--        <button :title="$t('knowledgeBase.userDefinedLibrary')" class="top-tool-btn&#45;&#45;user_defined_library"-->
+<!--                v-if="hasPermission('userDefinedLibrary')"-->
+<!--                @click="changeToUserDefinedList">-->
+<!--          <i class="cn-icon-add-knowledge-base cn-icon" ></i>-->
+<!--          <span>{{$t('knowledgeBase.userDefinedLibrary')}}</span>-->
+<!--        </button>-->
+<!--      </div>-->
     </div>
 
     <!-- 内置库列表 -->

src/views/setting/KnowledgeBaseUserDefinedList.vue

@@ -33,7 +33,7 @@
             </button>
             <div class="top-tool-search margin-l-10" >
               <el-input v-model="keyWord"  size="small" @keyup.enter="onSearch"></el-input>
-              <button class="top-tool-btn top-tool-btn--search" style="border-radius: 0 2px 2px 0 !important;" @click="onSearch">
+              <button class="top-tool-btn top-tool-btn--search" @click="onSearch">
                 <el-icon><Search /></el-icon>
                 <!--<i class="el-icon-search"></i>-->
               </button>