Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev

src/assets/css/components/views/entityExplorer/entity-detail.scss

@@ -25,7 +25,7 @@
       background-color: #F3F7FA;
 
       i {
-        font-size: 22px;
+        font-size: 26px;
         color: #4E84B4;
       }
     }

src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss

@@ -9,7 +9,7 @@
     right: 50px;
     top: 0;
     width: 550px;
-    height: 350px;
+    height: 320px;
 
     &.overview-map--ip {
       height: 210px;

src/assets/css/components/views/entityExplorer/entityList/row.scss

@@ -51,7 +51,7 @@
       background-color: #F3F7FA;
 
       i {
-        font-size: 22px;
+        font-size: 26px;
         color: #4E84B4;
       }
     }

src/store/modules/panel.js

@@ -14,7 +14,8 @@ const panel = {
     chartLastPosition: {
       x: 0,
       y: 0
-    }
+    },
+    chartList:[]
   },
   mutations: {
     setShowRightBox (state, flag) {
@@ -55,6 +56,12 @@ const panel = {
     },
     setChartListId (state, id) {
       state.chartListId = id
+    },
+    setChartList (state, chart) {
+      state.chartList.push(chart)
+    },
+    cleanChartList (state) {
+      state.chartList = []
     }
   },
   getters: {
@@ -93,6 +100,9 @@ const panel = {
     },
     getChartListId (state, id) {
       return state.chartListId
+    },
+    getChartList (state) {
+      return state.chartList
     }
   },
   actions: {

src/views/charts/PanelChart.vue

@@ -379,6 +379,7 @@ export default {
   mounted () {
     this.showLoading(true)
     this.getChartData()
+    this.$store.commit('cleanChartList')
   },
   setup (props) {
     const dateRangeValue = 60

src/views/charts/charts/ChartDomainRecursiveResolve.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="overflow-y: auto; height: 100%; color: #555;">{{linuxLineSymbolConvert}}</div>
+  <div style="overflow-y: auto; height: 100%; color: #555; white-space: pre;">{{linuxLineSymbolConvert}}</div>
 </template>
 
 <script>

src/views/charts/charts/chart-echart-mixin.js

@@ -79,9 +79,19 @@ export default {
       this.$emit('showLoading', true)
       try {
         this.myChart.setOption(this.chartOption)
+        this.$store.commit('setChartList', this.$_.cloneDeep(this.myChart))
         if (chartNum && chartNum == 2) {
           this.myChart2.setOption(this.chartOption)
+          this.$store.commit('setChartList', this.$_.cloneDeep(this.myChart2))
         }
+        let _this = this
+        window.addEventListener("resize", function(){
+          _this.$store.getters.getChartList.forEach(chart =>{
+            if(chart){
+              chart.resize()
+            }
+          })
+        });
       } finally {
         setTimeout(() => {
           this.$emit('showLoading', false)

src/views/entityExplorer/entityList/detailOverview/Domain.vue

@@ -22,10 +22,10 @@
         <div class="row__label row__label--width130">{{$t('entities.org')}}</div>
         <div class="row__content">{{entityData.domainWhoisOrg || '-'}}</div>
       </div>
-      <div class="overview__row">
-        <div class="row__label row__label--width130">{{$t('overall.remark')}}</div>
+<!--      <div class="overview__row">
+        <div class="row__label row__label&#45;&#45;width130">{{$t('overall.remark')}}</div>
         <div class="row__content">{{entityData.domainDescription || '-'}}</div>
-      </div>
+      </div>-->
     </div>
   </div>
   <div class="overview-item">