fix:修复asset列表页删除tag等过滤条件后查询异常的bug

nezha-fronted/src/components/page/asset/asset.vue

@@ -174,7 +174,7 @@
                   @listResize="listResize" ></bottom-box>
     </transition>
     <transition name="right-box">
-      <asset-box v-if="rightBox.show" :asset="asset" @refresh="flushData" ref="assetBox" @close="closeRightBox"></asset-box>
+      <asset-box v-if="rightBox.show" :asset="asset" @refresh="getTableData" ref="assetBox" @close="closeRightBox"></asset-box>
     </transition>
   </div>
 </template>
@@ -538,11 +538,6 @@
           return "--";
         }
       },
-      flushData() {
-        Promise.all([this.getLeftMenuList()]).then(response => {
-          this.getTableData();
-        });
-      },
       closeAllPop() {
         this.$refs.idcConfigBox.forEach((item) => {
           item.show(false);
@@ -624,31 +619,18 @@
         this.$set(this.searchLabel, "orderBy", orderBy);
         this.getTableData();
       },
-      // 获取左侧菜单数据
-      getLeftMenuList(){
-        return new Promise(resolve => {
-          this.$get('asset/filter').then(response => {
-            if (response.code === 200) {
-              //dc
-              this.dcData = response.data.dc;
-              // AssetType
-              this.assetTypeData = response.data.assetType;
-              // vendor
-              this.vendorData = response.data.vendor;
-              // ping
-              this.pingData = response.data.ping.map(item => {
-                item.label = item.name;
-                item.value = item.status;
-                return item;
-              });
-            }
-            resolve();
-          });
-        });
-      },
       initEvent() {
         bus.$on("asset-filter-change", (column, content) => {
-          this.pageObj[column] = content;
+          if(column == 'multiParam'){
+            let $self=this;
+            if(content instanceof Array && content.length>0){
+              content.forEach(item=>{
+                $self.pageObj[item.key] = item.value;
+              })
+            }
+          }else{
+            this.pageObj[column] = content;
+          }
           this.getTableData();
         });
       },

nezha-fronted/src/components/page/config/util.vue

@@ -0,0 +1,60 @@
+
+<script>
+  import en from "../../common/language/en";
+  import cn from "../../common/language/cn";
+  export default {
+    name: "language",
+    data(){
+      return {
+        result:null,
+        languageList:[],
+      }
+    },
+    methods:{
+      compareFile:function(obj,compareObj){
+        if(!obj){
+          obj=en;
+        }
+        if(!compareObj){
+          compareObj=cn;
+        }
+        let keys=Object.keys(obj);
+        for (let key of keys){
+          if(typeof obj[key] == 'object'){
+            if(!compareObj[key]){
+              this.$set(compareObj,key,{});
+            }
+            this.compareFile(obj[key],compareObj[key]);
+          }else{
+            if(!compareObj[key]){
+              this.$set(compareObj,key,obj[key]);
+            }
+          }
+        }
+        this.result=cn;
+      },
+      listLanguage:function(obj,compareObj){
+        if(!obj){
+          obj=en;
+        }
+        if(!compareObj){
+          compareObj=cn;
+        }
+        let keys=Object.keys(obj);
+        for (let key of keys){
+          if(typeof obj[key] == 'object'){
+            if(!compareObj[key]){
+              this.$set(compareObj,key,{});
+            }
+            this.listLanguage(obj[key],compareObj[key]);
+          }else{
+            if(!compareObj[key]){
+              this.$set(compareObj,key,obj[key]);
+            }
+            this.languageList.push({en:obj[key],cn:compareObj[key]})
+          }
+        }
+      },
+    }
+  }
+</script>

nezha-fronted/src/components/page/dashboard/panel.vue

@@ -50,10 +50,20 @@
           </div>
 
           <pick-time :refresh-data-func="dateChange" v-model="searchTime" :use-chart-unit="false"></pick-time>
-          <button @click="addChart" :title="$t('overall.createChart')"
-                  class="nz-btn nz-btn-size-normal nz-btn-style-light ">
-            <i class="nz-icon-create-square nz-icon"></i>
-          </button>
+          <export-excel
+            export-file-name="chart"
+            export-url="/panel/export"
+            import-url="/panel/import"
+            :params="filter"
+            @afterImport="Refresh"
+          >
+            <template slot="optionZone">
+              <button @click="addChart" :title="$t('overall.createChart')"
+                      class="nz-btn nz-btn-size-normal nz-btn-style-light ">
+                <i class="nz-icon-create-square nz-icon"></i>
+              </button>
+            </template>
+          </export-excel>
         </div>
       </template>
     </div>
@@ -83,6 +93,7 @@
   import timePicker from '../../common/timePicker'
   import draggable from 'vuedraggable'
   import pickTime from "../../common/pickTime";
+  import exportXLSX from "../../common/exportXLSX";
   export default {
     name: "panel",
     data() {
@@ -162,6 +173,7 @@
       'time-picker':timePicker,
       draggable,
       'pick-time':pickTime,
+      'export-excel':exportXLSX,
     },
     methods: {
       //刷新