From 6d30bbc342ad016d667d8564cd96f5e9cbb91a13 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 29 Oct 2020 16:05:19 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2asset=E7=9A=84=E5=8F=82=E6=95=B0=E4=B8=BAquery=20?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9aseet=E5=88=97=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/endpointTab.vue     | 30 +++++++++++--------
 .../src/components/page/project/project.vue   | 12 ++++++--
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
index ebc7756ea..b47360dd0 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
@@ -15,7 +15,7 @@
           export-file-name="endpoint"
           export-url="/endpoint/export"
           import-url="/endpoint/import"
-          :params="searchLabel"
+          :params="endpointSearchLabel"
           @afterImport="getTableData"
           class="margin-l-20"
         >
@@ -57,13 +57,16 @@
         :width="item.width"
         :key="`col-${index}`"
         :label="item.label"
-        min-width="110px"
+        :min-width="(item.minWidth?item.minWidth+'px':'110px')"
         :sortable="$tableSet.sortableShow(item.prop,'endpointTab')"
         :prop="$tableSet.propTitle(item.prop,'endpointTab')"
         :sort-orders="['ascending', 'descending']"
       >
         <template slot-scope="scope" :column="item">
-          <span v-if="item.prop == 'asset' && scope.row[item.prop]" class="link" @click="">{{scope.row[item.prop].host}}</span>
+          <span v-if="item.prop == 'asset' && scope.row[item.prop]" class="link" @click="">
+            {{scope.row[item.prop].sn}} :
+            ({{scope.row[item.prop].host}})
+          </span>
           <span v-else-if="item.prop == 'project' && scope.row[item.prop]">{{scope.row.project.name}}</span>
           <span v-else-if="item.prop == 'module' && scope.row[item.prop]">{{scope.row.module.name}}</span>
           <span v-else-if="item.prop == 'param'">
@@ -175,6 +178,7 @@
             label: this.$t("project.endpoint.asset"),
             prop: 'asset',
             show: true,
+            minWidth:'400',
           },{
             label: this.$t("project.endpoint.host"),
             prop: 'host',
@@ -183,6 +187,7 @@
             label: this.$t("project.endpoint.port"),
             prop: 'port',
             show: true,
+            width:'120'
           },{
             label: this.$t("overall.type"),
             prop: 'type',
@@ -199,6 +204,7 @@
             label: this.$t("alert.list.state"),
             prop: 'state',
             show: true,
+            width:'80'
           },{
             label: this.$t("project.endpoint.alerts"),
             prop: 'alerts',
@@ -231,12 +237,12 @@
           }, {
             id: 11,
             name: this.$t('asset.asset'),
-            type: 'asset',
-            label: 'asset',
+            type: 'query',
+            label: 'query',
             disabled: false
           }],
         },
-        searchLabel: { //搜索参数
+        endpointSearchLabel: { //搜索参数
         },
         tableData: [],
       }
@@ -309,18 +315,18 @@
       },
       search(searchObj) {
         let orderBy = '';
-        if(this.searchLabel.orderBy){
-          orderBy=this.searchLabel.orderBy
+        if(this.endpointSearchLabel.orderBy){
+          orderBy=this.endpointSearchLabel.orderBy
         }
-        this.searchLabel = {};
-        this.pageObj.pageNo = 1;
+        this.endpointSearchLabel = {};
+        // this.pageObj.pageNo = 1;
         for (let item in searchObj) {
           if (searchObj[item]) {
-            this.$set(this.searchLabel, item, searchObj[item]);
+            this.$set(this.endpointSearchLabel, item, searchObj[item]);
           }
         }
         if(orderBy){
-          this.$set(this.searchLabel, 'orderBy', orderBy);
+          this.$set(this.endpointSearchLabel, 'orderBy', orderBy);
         }
         this.getTableData();
       },
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 83cdf5d42..4a58270e6 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -80,7 +80,10 @@
             :sort-orders="['ascending', 'descending']"
           >
             <template slot-scope="scope" :column="item" >
-              <span v-if="item.prop == 'asset' && scope.row[item.prop]" class="link" @click="detailEndpoint(scope.row)">{{scope.row[item.prop].host}}</span>
+              <span v-if="item.prop == 'asset' && scope.row[item.prop]" class="link" @click="detailEndpoint(scope.row)">
+                {{scope.row[item.prop].sn}} :
+                ({{scope.row[item.prop].host}})
+              </span>
               <span v-else-if="item.prop == 'param'">
               <template v-if="scope.row.paramObj">
                 <span v-for="(p,i) in scope.row.paramObj">{{p.key}}={{p.value}}<span v-if="i < scope.row.paramObj.length-1">，</span></span>
@@ -234,6 +237,7 @@
             label: this.$t("project.endpoint.port"),
             prop: 'port',
             show: true,
+            width:100,
           },{
             label: this.$t("overall.type"),
             prop: 'type',
@@ -250,6 +254,7 @@
             label: this.$t("alert.list.state"),
             prop: 'state',
             show: true,
+            width:80,
           },{
             label: this.$t("project.endpoint.alerts"),
             prop: 'alerts',
@@ -294,8 +299,9 @@
           }, {
             id: 11,
             name: this.$t('asset.asset'),
-            type: 'asset',
-            label: 'asset',
+            // name: this.$t('asset.asset'),
+            type: 'query',
+            label: 'query',
             disabled: false
           }],
         },