feat：asset搜素部分添加

nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue

@@ -30,7 +30,7 @@
         ></cabinet-table>
       </template>
       <template v-slot:top-tool-right>
-        <button id="asset-create-asset" v-has="'dc_add'" class="top-tool-btn margin-r-10" @click.stop="add">
+        <button id="asset-create-asset" v-has="'dc_add'" class="top-tool-btn margin-r-10 margin-l-10" @click.stop="add">
           <i class="nz-icon nz-icon-create-square"></i>
         </button>
         <top-tool-more-options

nezha-fronted/src/components/common/detailView/detailView.scss

@@ -11,6 +11,7 @@
     border: 1px solid #E7EAED;
     /deep/ .data-detail {
       flex: 1;
+      height: calc(100% - 100px);
     }
     .nz-detail-view-pagination {
       height: 30px;

nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue

@@ -1,19 +1,22 @@
 <template>
-  <ul class="detail-row-box">
+  <div class="detail-left-box">
-    <li v-for="(item,index) in tableData" :key="index" class="detail-row" @click="detailViewRightShow(item)" :class="item.id === detailViewRightObj.id ? 'selected' : ''">
+    <div style="height:40px">123</div>
-      <div class="detail-row-info">
+    <ul class="detail-row-box">
-        <div class="asset-manageIp">
+      <li v-for="(item,index) in tableData" :key="index" class="detail-row" @click="detailViewRightShow(item)" :class="item.id === detailViewRightObj.id ? 'selected' : ''">
-          <el-popover :content="$t('asset.assetStatPre')+(item.pingInfo.lastUpdate?utcTimeToTimezoneStr(item.pingInfo.lastUpdate):$t('asset.assetStatDown'))" v-if="item.pingInfo" placement="right" trigger="hover">
+        <div class="detail-row-info">
+          <div class="asset-manageIp">
+            <el-popover :content="$t('asset.assetStatPre')+(item.pingInfo.lastUpdate?utcTimeToTimezoneStr(item.pingInfo.lastUpdate):$t('asset.assetStatDown'))" v-if="item.pingInfo" placement="right" trigger="hover">
           <span slot="reference">
             <span :class="{'active-icon green-bg':item.pingInfo.status == 1,'active-icon red-bg':item.pingInfo.status == 0}"></span>
           </span>
-        </el-popover>
+            </el-popover>
-          {{item.manageIp}}
+            {{item.manageIp}}
+          </div>
+          <div class="asset-name">{{item.name}}</div>
         </div>
-        <div class="asset-name">{{item.name}}</div>
+      </li>
-      </div>
+    </ul>
-    </li>
+  </div>
-  </ul>
 </template>
 
 <script>
@@ -26,6 +29,85 @@ export default {
   props: {
     detailViewRightObj: {}
   },
+  data () {
+    return {
+      tableTitle: [
+        {
+          label: 'ID',
+          prop: 'id',
+          show: true,
+          width: 110,
+          sortable: 'custom'
+        }, {
+          label: this.$t('overall.name'),
+          prop: 'name',
+          show: true,
+          minWidth: 150,
+          sortable: 'custom'
+        }, {
+          label: this.$t('asset.manageIp'),
+          prop: 'manageIp',
+          show: true,
+          minWidth: 140,
+          sortable: 'custom'
+        }, {
+          label: this.$t('overall.type'),
+          prop: 'type',
+          show: true,
+          minWidth: 140,
+          sortable: 'custom'
+        }, {
+          label: this.$t('asset.state'),
+          prop: 'state',
+          show: true,
+          minWidth: 110,
+          sortable: 'custom'
+        }, {
+          label: this.$t('overall.dc'),
+          prop: 'dc',
+          show: true,
+          minWidth: 140,
+          sortable: 'custom'
+        }, {
+          label: this.$t('asset.cabinet'),
+          prop: 'cabinet',
+          show: true,
+          minWidth: 110,
+          sortable: 'custom'
+        }, {
+          label: this.$t('asset.alertNum'),
+          prop: 'alertNum',
+          show: true,
+          minWidth: 140,
+          sortable: 'custom'
+        }, {
+          label: this.$t('asset.endpointNum2'),
+          prop: 'endpointNum',
+          show: true,
+          minWidth: 160,
+          sortable: 'custom'
+        }, {
+          label: this.$t('asset.brand'),
+          prop: 'brand',
+          show: true,
+          minWidth: 120,
+          sortable: 'custom'
+        }, {
+          label: this.$t('asset.model'),
+          prop: 'model',
+          show: true,
+          minWidth: 110,
+          sortable: 'custom'
+        }, {
+          label: 'Talon',
+          prop: 'clientState',
+          show: true,
+          sortable: 'custom',
+          minWidth: 150
+        }
+      ]
+    }
+  },
   methods: {
     detailViewRightShow (item) {
       this.$emit('detailViewRightShow', item)
@@ -36,7 +118,7 @@ export default {
 
 <style scoped lang="scss">
   .detail-row-box{
-    /*height: 100%;*/
+    height: calc(100% - 40px);
     overflow: hidden;
     overflow-y: auto;
   }

nezha-fronted/src/components/common/detailView/nzDetailView.vue

@@ -8,6 +8,9 @@
         <div  class="top-tools">
           <div class="top-tool-left" style="min-width: 300px">
             <slot name="top-tool-left"></slot>
+            <div v-if="showLayout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20" :class="{'project-search alert-table asset-table endpoint-table': searchRight}">
+              <search-input ref="searchInput" :from="from" :inTransform="bottomBox.inTransform" :searchMsg="searchMsg" @search="search"></search-input>
+            </div>
           </div>
           <div :class="{'top-tool-main-right-to-left': bottomBox.showSubList}" class="top-tool-right">
             <slot name="top-tool-right"></slot>

nezha-fronted/src/components/common/detailView/view/detailViewRight.vue

@@ -94,10 +94,18 @@ export default {
     }, // resize时，用v-show="subResizeShow"控制页面内容是否显示
     obj: Object, // 关联的实体对象
     from: String, // 来自哪个页面
-    tabList: Array, // 动态页签列表
+    tabList: Array // 动态页签列表
-    targetTab: String // 展示哪个页签
+    // targetTab: String // 展示哪个页签
   },
   watch: {
+    from: {
+      immediate: true,
+      handler (n) {
+        if (n === fromRoute.asset) {
+          this.targetTab = 'panelTab'
+        }
+      }
+    },
     obj: {
       immediate: true,
       handler (n) {
@@ -124,6 +132,7 @@ export default {
   data () {
     return {
       fromRoute: fromRoute,
+      targetTab: '',
       tabs: {
         terminalLog: {
           monitor: [
@@ -339,4 +348,7 @@ export default {
   .sub-box /deep/ .pagination-bottom {
     bottom: -3px;
   }
+  .sub-box /deep/ .sub-list-tab{
+    cursor: pointer;
+  }
 </style>

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

@@ -77,16 +77,36 @@
       </template>
     </nz-data-list>
     <nzDetailView
-      v-loading="detailViewLoading"
+      v-loading="detailViewLoading || tools.loading"
       v-show="detailType !== 'list'"
       :api="url"
       :layout="dataListLayout"
       :from="fromRoute.asset"
+      :search-msg="searchMsg"
       :detailType="detailType"
       :detailViewRightObj="detailViewRightObj"
       @search="searchDetail"
       @changeDetailType="changeDetailType"
     >
+      <template v-slot:top-tool-left>
+        <div style="display: inline-block">
+          <span>Data center :</span>
+          <span>
+            <el-dropdown
+              type="primary"
+              @command="changeDetailType">
+              <button class="top-tool-btn table-column-setting"
+                      type="button">
+
+                <i class="nz-icon nz-icon-arrow-down" />
+              </button>
+              <el-dropdown-menu slot="dropdown" >
+                <el-dropdown-item :command="[item.id,dc]" v-for="(item,index) in dcData" :key="index"><el-checkbox ></el-checkbox>{{item.name}}</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </span>
+        </div>
+      </template>
       <template v-slot:top-tool-right>
         <button id="asset-create-asset" v-has="'asset_add'" :title="$t('overall.createAsset')" class="top-tool-btn" @click.stop="add">
           <i class="nz-icon nz-icon-create-square"></i>