From 2b8b2dd545f56647b2348b03ac276268e27fad3d Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Mon, 4 Dec 2023 16:29:20 +0800
Subject: [PATCH 1/6] =?UTF-8?q?NEZ-3349=20feat=EF=BC=9Asoftware=20asset?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/bottomBox/bottomBox.vue |  10 +-
 ...softwareAsset.vue => softwareAssetTab.vue} | 110 +++++------
 .../src/components/common/mixin/dataList.js   |  42 ++--
 .../src/components/common/mixin/table.js      |   3 -
 .../table/settings/softwareAssetTable.vue     | 187 ++++++++++++------
 .../table/settings/softwareTypeTable.vue      |  10 +-
 .../page/asset/software/softwareAsset.vue     |  41 +++-
 7 files changed, 245 insertions(+), 158 deletions(-)
 rename nezha-fronted/src/components/common/bottomBox/tabs/{softwareAsset.vue => softwareAssetTab.vue} (68%)

diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index 3223db222..ea8156082 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -83,11 +83,11 @@
         <!-- notebook Tab -->
         <notebook-tab @getTableData="getTableData" v-if="from === fromRoute.notebook && targetTab === 'notebookTab'" :from="from" :obj="obj"  :tabs="tabs.notebook" @changeTab="changeTab" :targetTab.sync="targetTab"></notebook-tab>
         <!--softwareAsset列表的tab-->
-        <endpointTabNew v-if="from === fromRoute.softwareAsset && targetTab === 'endpoint'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="softwareAssetTbas" :targetTab="targetTab" @changeTab="changeTab"></endpointTabNew>
-        <licenseManagementTab v-if="from === fromRoute.softwareAsset && targetTab === 'licenseManagement'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="softwareAssetTbas" :targetTab="targetTab" @changeTab="changeTab"></licenseManagementTab>
+        <!-- <endpointTabNew v-if="from === fromRoute.softwareAsset && targetTab === 'endpoint'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="softwareAssetTbas" :targetTab="targetTab" @changeTab="changeTab"></endpointTabNew> -->
+        <!-- <licenseManagementTab v-if="from === fromRoute.softwareAsset && targetTab === 'licenseManagement'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="softwareAssetTbas" :targetTab="targetTab" @changeTab="changeTab"></licenseManagementTab> -->
 
         <!--softwareType 下滑-->
-        <softwareAsset v-if="(from === fromRoute.softwareType) && targetTab === 'softwareAsset'" :tabs="tabs.softwareType" ref="assetTab" :from="from" :obj="obj" @changeTab="changeTab" @exit="closeSubList" :targetTab.sync="targetTab"></softwareAsset>
+        <softwareAssetTab v-if="(from === fromRoute.softwareType) && targetTab === 'softwareAsset'" :tabs="tabs.softwareType" ref="assetTab" :from="from" :obj="obj" @changeTab="changeTab" @exit="closeSubList" :targetTab.sync="targetTab"></softwareAssetTab>
       </div>
     </div>
   </div>
@@ -126,7 +126,7 @@ import discoveryTab from '@/components/common/bottomBox/tabs/discoveryTab'
 import IpDetails from '@/components/common/bottomBox/tabs/IpDetails'
 import recordRuleEvalLog from '@/components/common/bottomBox/tabs/recordRuleEvalLog'
 import notebookTab from '@/components/common/bottomBox/tabs/notebookTab'
-import softwareAsset from '@/components/common/bottomBox/tabs/softwareAsset'
+import softwareAssetTab from '@/components/common/bottomBox/tabs/softwareAssetTab'
 import licenseManagementTab from '@/components/common/bottomBox/tabs/licenseManagementTab'
 
 export default {
@@ -163,7 +163,7 @@ export default {
     vsysBottomTab,
     rolesTab,
     notebookTab,
-    softwareAsset,
+    softwareAssetTab,
     licenseManagementTab
   },
   props: {
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/softwareAsset.vue b/nezha-fronted/src/components/common/bottomBox/tabs/softwareAssetTab.vue
similarity index 68%
rename from nezha-fronted/src/components/common/bottomBox/tabs/softwareAsset.vue
rename to nezha-fronted/src/components/common/bottomBox/tabs/softwareAssetTab.vue
index 33e5b32d2..8c214fec5 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/softwareAsset.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/softwareAssetTab.vue
@@ -1,57 +1,62 @@
 <template>
-  <nz-bottom-data-list
-    :showTitle='showTitle'
-    :obj='obj'
-    :targetTab.sync="targetTab"
-    :api="url"
-    style="height: 100%"
-    :custom-table-title.sync="tools.customTableTitle"
-    :layout="['searchInput', 'elementSet']"
-    :search-msg="searchMsg"
-    :tableId="tableId"
-    :tabs="tabs"
-    @search="search"
-    @changeTab="changeTab"
-  >
-    <template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
-    <template v-slot>
-      <softwareAssetTable
-        ref="dataTable"
-        :orderByFa="orderBy"
-        v-my-loading="tools.loading"
-        :loading="tools.loading"
-        :api="url"
-        :custom-table-title="tools.customTableTitle"
-        :height="mainTableHeight"
-        :table-data="tableData"
-        @del="del"
-        @edit="edit"
-        @copy="copy"
-        @orderBy="tableDataSort"
-        @reload="getTableData"
-        @selectionChange="selectionChange"
-        @showBottomBox="(targetTab, object) => { $refs.dataList.showBottomBox(targetTab, object) }"></softwareAssetTable>
-    </template>
-    <template v-slot:pagination>
-      <Pagination ref="Pagination" :pageObj="pageObj" :tableId="tableId" @pageNo='pageNo' @pageSize='pageSize'></Pagination>
-    </template>
-  </nz-bottom-data-list>
+  <div>
+    <nz-bottom-data-list
+      :showTitle='showTitle'
+      :obj='obj'
+      :targetTab.sync="targetTab"
+      :api="url"
+      style="height: 100%"
+      :custom-table-title.sync="tools.customTableTitle"
+      :layout="['searchInput', 'elementSet']"
+      :search-msg="searchMsg"
+      :tableId="tableId"
+      :tabs="tabs"
+      @search="search"
+      @changeTab="changeTab"
+    >
+      <template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
+      <template v-slot>
+        <softwareAssetTable
+          ref="dataTable"
+          :orderByFa="orderBy"
+          v-my-loading="tools.loading"
+          :loading="tools.loading"
+          :api="url"
+          :custom-table-title="tools.customTableTitle"
+          :height="subTableHeight"
+          :table-data="tableData"
+          @del="del"
+          @edit="edit"
+          @copy="copy"
+          @orderBy="tableDataSort"
+          @reload="getTableData"
+          @selectionChange="selectionChange"
+          @showBottomBox="(targetTab, object) => { $refs.dataList.showBottomBox(targetTab, object) }"></softwareAssetTable>
+      </template>
+      <template v-slot:pagination>
+        <Pagination ref="Pagination" :pageObj="pageObj" :tableId="tableId" @pageNo='pageNo' @pageSize='pageSize'></Pagination>
+      </template>
+    </nz-bottom-data-list>
+    <transition name="right-box">
+      <softwareAssetBox v-if="rightBox.show" :obj="object" @close="closeRightBox"></softwareAssetBox>
+    </transition>
+  </div>
 </template>
 
 <script>
 import dataListMixin from '@/components/common/mixin/dataList'
 import subDataListMixin from '@/components/common/mixin/subDataList'
 import nzBottomDataList from '@/components/common/bottomBox/nzBottomDataList'
-import { fromRoute } from '@/components/common/js/constants'
 import detailViewRightMixin from '@/components/common/mixin/detailViewRightMixin'
 import softwareAssetTable from '@/components/common/table/settings/softwareAssetTable'
-
+import softwareAssetBox from '@/components/common/rightBox/software/softwareAssetBox'
 export default {
   name: 'softwareAssetTab',
   mixins: [dataListMixin, subDataListMixin, detailViewRightMixin],
   components: {
     nzBottomDataList,
-    softwareAssetTable
+    softwareAssetTable,
+    softwareAssetBox
   },
   computed: {
     externalTerminal () {
@@ -89,14 +94,6 @@ export default {
       },
       objectSilence: {},
       silenceBoxShow: false,
-      searchLabel: { dcIds: this.obj.id },
-      brandData: [],
-      modelData: [],
-      stateData: [],
-      typeData: [],
-      dcData: [],
-      snmpCredentialData: [],
-      fieldGroupData: [],
       needAlertDaysData: true,
       trendKey: 'assetId',
       fromBottom: true
@@ -163,19 +160,10 @@ export default {
           this.tableData = response.data.list
           const globalSearchId = this.$store.getters.getGlobalSearchId
           let detailViewRightObj = ''
-          if (this.tableId === 'notebookTable' && this.detailType === 'view') { // 防止详情视图编辑后切换到别的数据
-            const obj = this.tableData.find(item => item.id === this.detailViewRightObj.id)
-            if (obj) {
-              detailViewRightObj = obj
-            } else {
-              detailViewRightObj = this.tableData[0]
-            }
+          if (globalSearchId) {
+            detailViewRightObj = this.tableData.find(item => item.id === globalSearchId)
           } else {
-            if (globalSearchId) {
-              detailViewRightObj = this.tableData.find(item => item.id === globalSearchId)
-            } else {
-              detailViewRightObj = this.tableData[0]
-            }
+            detailViewRightObj = this.tableData[0]
           }
           this.detailViewRightObj = this.$lodash.cloneDeep(detailViewRightObj)
           this.pageObj.total = response.data.total
@@ -193,7 +181,7 @@ export default {
           this.$message.error(response.error || response.msg)
         }
       })
-    },
+    }
   },
   watch: {
     obj: {
diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index d582e1583..11aced2fc 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -447,22 +447,24 @@ export default {
       if (!tableTitle || !this.tableId) {
         return
       }
-      const preferenceTableTitle = (tableHeaders && tableHeaders.length) ? tableHeaders : tableTitle
-      if (tableTitle) {
-        // 先根据本地缓存中的prop进行排序
-        tableTitle.sort(function (a, b) {
-          return preferenceTableTitle.findIndex(function (c) {
-            return c.prop === a.prop
-          }) - preferenceTableTitle.findIndex(function (c) {
-            return c.prop === b.prop
-          })
-        })
-        this.tools.customTableTitle = tableTitle.map((item, index) => { // 修复切换中英文的问题
-          item.show = preferenceTableTitle[index].show
-          return item
-        })
-      }
-      if (preferenceTableTitle && (preferenceTableTitle.length > tableTitle.length)) {
+      let preferenceTableTitle = (tableHeaders && tableHeaders.length) ? tableHeaders : tableTitle
+      preferenceTableTitle = preferenceTableTitle.filter(item => tableTitle.find(t => item.prop === t.prop || item.type === 'label'))
+
+      // 先根据本地缓存中的prop进行排序
+      tableTitle.sort((a, b) => {
+        const indexA = preferenceTableTitle.findIndex(item => item.prop === a.prop)
+        const indexB = preferenceTableTitle.findIndex(item => item.prop === b.prop)
+        if (indexA === -1) return 1
+        if (indexB === -1) return -1
+        return indexA - indexB
+      })
+
+      this.tools.customTableTitle = tableTitle.map((item, index) => { // 修复切换中英文的问题
+        item.show = preferenceTableTitle[index] ? preferenceTableTitle[index].show : true
+        return item
+      })
+
+      if (preferenceTableTitle.length > tableTitle.length) { // asset label
         const arr = preferenceTableTitle.splice(tableTitle.length, preferenceTableTitle.length)
         arr.forEach(item => {
           item.minWidth = item.label.length * 16 + 20
@@ -832,10 +834,10 @@ export default {
           },
           jsonKey: 'val'
         },
-        dc: {
+        dcIds: {
           target: this.searchLabel,
           isSearchInput: true,
-          propertyName: 'dc',
+          propertyName: 'dcIds',
           type: 'number',
           defaultJson: {
             name: 'Date center',
@@ -1135,10 +1137,10 @@ export default {
           },
           jsonKey: 'val'
         },
-        dc: {
+        dcIds: {
           target: this.searchLabel,
           isSearchInput: true,
-          propertyName: 'dc',
+          propertyName: 'dcIds',
           type: 'number',
           defaultJson: {
             name: 'Date center',
diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js
index e0ffaca4a..92cefbc39 100644
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -75,17 +75,14 @@ export default {
           break
         }
         case 'sync': {
-          // this.$emit('copy', row)
           this.$emit('sync', row)
           break
         }
         case 'fastSilence': {
-          // this.$emit('copy', row)
           this.$emit('addSilence', row, param)
           break
         }
         case 'topology': {
-          // this.$emit('copy', row)
           this.$emit('topology', row, param)
           break
         }
diff --git a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
index 71a7de2e1..242dda939 100644
--- a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
@@ -43,6 +43,14 @@
               </template>
             </copy>
           </template>
+          <template v-else-if="item.prop === 'category'">
+            <div>
+              {{scope.row.type ? scope.row.type.category : '-'}}
+            </div>
+          </template>
+          <template v-else-if="item.prop === 'type'">
+            {{scope.row.type ? scope.row.type.name : '-'}}
+          </template>
           <template v-else-if="item.prop === 'asset'">
             <div>
               <div class="document-copy-block" v-if="scope.row.asset">
@@ -59,27 +67,18 @@
               <span v-else>--</span>
             </div>
           </template>
-          <template v-else-if="item.prop === 'category'">
-            <div>
-              {{scope.row.type ? scope.row.type.category : '-'}}
+          <span v-else-if="item.prop === 'dateIssued' || item.prop === 'dateExpires'">{{ scope.row[item.prop] ? momentTz(scope.row[item.prop] ) : '-'}}</span>
+          <!-- status -->
+          <template v-else-if="item.prop === 'status'">
+            <div v-if="scope.row.status === 1">
+              <i class="nz-icon nz-icon-import-success1" style="color:#8dcb4b;"></i>
+              <span>{{$t('licenseMange.licensed')}}</span>
             </div>
-          </template>
-          <template v-else-if="item.prop === 'project'">
-            <div>
-              <div class="document-copy-block" v-if="scope.row.project">
-              <span class="document-copy-text"
-                    :title="scope.row[item.prop].name"
-                    @mouseenter="labelHover(scope.row, item.prop, true,true, $event)"
-                    @mouseleave="labelHover(scope.row, item.prop, false,true)">
-              {{scope.row[item.prop].name}}
-              </span>
-                <i v-if="scope.row[item.prop].name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(scope.row[item.prop].name)" :title="$t('overall.copyText')"></i>
-              </div>
-              <span v-else>--</span>
+            <div v-else-if="scope.row.status == 2">
+              <i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i>
+              <span>{{ $t('licenseMange.notLicensed') }}</span>
             </div>
-          </template>
-          <template v-else-if="item.prop === 'type'">
-            {{scope.row.type ? scope.row.type.name : '-'}}
+            <div v-else>-</div>
           </template>
           <span v-else-if="scope.row[item.prop]" :class="item.prop === 'remark'? 'el-table-remark':''">{{scope.row[item.prop]}}</span>
           <span v-else>-</span>
@@ -91,16 +90,21 @@
         fixed="right">
         <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
         <div slot-scope="scope" class="table-operation-items">
-          <!-- <button class="table-operation-item" v-has="'softwareAsset_edit'" @click="$emit('edit', scope.row)" :title="$t('overall.edit')"><i class="nz-icon nz-icon-edit"></i></button> -->
-          <button class="table-operation-item" @click="showBottomBox('endpoint', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button>
-          <el-dropdown size="medium" v-has="['softwareAsset_delete','main_edit','softwareAsset_edit']" trigger="click" @command="tableOperation">
+          <!-- <button class="table-operation-item" @click="showBottomBox('endpoint', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button> -->
+          <button class="table-operation-item" v-has="'softwareAsset_edit'" @click="tableOperation(['edit', scope.row])" :title="$t('overall.edit')"><i class="nz-icon nz-icon-edit"></i></button>
+          <el-dropdown size="medium" v-has="['softwareAsset_edit','softwareAsset_add','softwareAsset_delete']" trigger="click" @command="tableOperation">
             <div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')">
               <i class="nz-icon nz-icon-more3"></i>
             </div>
             <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
-              <el-dropdown-item v-has="'softwareAsset_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-              <el-dropdown-item v-has="'softwareAsset_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
-              <el-dropdown-item v-has="'softwareAsset_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:true, single:true,from:'model'}]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'softwareAsset_add'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'softwareAsset_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:true, single:true,from:'softwareAsset'}]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'softwareAsset_edit'" :command="['upload', scope.row]" @click.native="upload(scope.row)">
+                <i class="nz-icon nz-icon-upload"></i><span class="operation-dropdown-text">{{$t('softwareAsset.upload')}}</span>
+              </el-dropdown-item>
+              <el-dropdown-item v-has="'softwareAsset_edit'" :command="['download', scope.row]" @click.native="download(scope.row)">
+                <i class="nz-icon nz-icon-download1"></i><span class="operation-dropdown-text">{{$t('softwareAsset.download')}}</span>
+              </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -121,6 +125,15 @@
       :that="alertLabelObj"
       :type="alertLabelType"
     ></alertLabel>
+    <el-upload
+      action=""
+      :auto-upload="false"
+      accept=".v2c,.V2CP,.H2R,.R2H,.H2H,.ID "
+      :on-change="uploadChange"
+      style="display: none"
+      ref="upload"
+    >
+    </el-upload>
   </div>
 </template>
 
@@ -128,8 +141,9 @@
 import table from '@/components/common/mixin/table'
 import copy from '@/components/common/copy'
 import alertLabelMixin from '@/components/common/mixin/alertLabelMixin'
+import axios from 'axios'
 export default {
-  name: 'softwareTypeTable',
+  name: 'softwareTable',
   mixins: [table, alertLabelMixin],
   components: { copy },
   props: {
@@ -143,13 +157,13 @@ export default {
           label: 'ID',
           prop: 'id',
           show: true,
-          width: 120,
+          width: 80,
           sortable: 'custom'
         }, {
           label: this.$t('overall.name'),
           prop: 'name',
           show: true,
-          width: 350,
+          width: 200,
           sortable: 'custom'
         }, {
           label: this.$t('softwareType.category'),
@@ -157,62 +171,113 @@ export default {
           show: true,
           minWidth: 200,
           sortable: 'custom'
-        },
-        // {
-        //   label: this.$t('config.menus.icon'),
-        //   prop: 'icon',
-        //   show: true,
-        //   width: 120,
-        //   sortable: 'custom'
-        // },
-        {
+        }, {
           label: this.$t('overall.type'),
           prop: 'type',
           minWidth: 200,
           show: true
-        },
-        {
-          label: this.$t('project.project.projectName'),
-          prop: 'project',
-          minWidth: 200,
-          show: true
         }, {
           label: this.$t('asset.asset'),
           prop: 'asset',
           minWidth: 200,
           show: true
-        },
-
-        {
+        }, {
+          label: this.$t('licenseMange.dateIssue'),
+          prop: 'dateIssued',
+          minWidth: 200,
+          show: true
+        }, {
+          label: this.$t('licenseMange.dateExpire'),
+          prop: 'dateExpires',
+          minWidth: 200,
+          show: true
+        }, {
+          label: this.$t('licenseMange.licenseStatus'),
+          prop: 'status',
+          minWidth: 200,
+          show: true
+        }, {
+          label: this.$t('licenseMange.concurrency'),
+          prop: 'concurrency',
+          minWidth: 150,
+          show: true
+        }, {
+          label: this.$t('licenseMange.logins'),
+          prop: 'logins',
+          minWidth: 100,
+          show: true
+        }, {
           label: this.$t('overall.remark'),
           prop: 'remark',
           minWidth: 200,
           show: true
         }
-      ]
+      ],
+      uploadId: undefined
     }
   },
   methods: {
+    // 上传V2C
+    upload (row) {
+      this.uploadId = row.id
+      this.$refs.upload.$children[0].$refs.input.click()
+    },
+    async uploadChange (file) {
+      const form = new FormData()
+      form.append('file', file.raw)
+      form.append('saId', this.uploadId)
+      const res = await this.$post('/license/uploadV2C', form, { 'Content-Type': 'multipart/form-data' })
+      if (res.code === 200) {
+        this.$emit('reload')
+        this.$message.success(this.$t('tip.uploadSuccess'))
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 下载C2V
+    download (row) {
+      const params = {
+        saId: row.id
+      }
+      axios.get('/license/downloadC2V', { responseType: 'blob', params: params }).then(res => {
+        const filename = row.name + '.c2v'
+        if (window.navigator.msSaveOrOpenBlob) {
+          // 兼容ie11
+          const blobObject = new Blob([res.data])
+          window.navigator.msSaveOrOpenBlob(blobObject, filename)
+        } else {
+          const url = URL.createObjectURL(new Blob([res.data]))
+          const a = document.createElement('a')
+          document.body.appendChild(a) // 此处增加了将创建的添加到body当中
+          a.href = url
+          a.download = filename
+          a.target = '_blank'
+          a.click()
+          a.remove() // 将a标签移除
+        }
+      }, error => {
+        const $self = this
+        const reader = new FileReader()
+        reader.onload = function (event) {
+          const responseText = reader.result
+          const exception = JSON.parse(responseText)
+          if (exception.message) {
+            $self.$message.error(exception.message)
+          } else if (exception.msg) {
+            $self.$message.error(exception.msg)
+          } else {
+            console.error(error)
+          }
+        }
+        reader.readAsText(error.response.data)
+      })
+    },
     copyValue (item) {
       const str = item
-      // const domUrl = document.createElement('input')
-      // domUrl.value = JSON.stringify(str)
-      // domUrl.id = 'creatDom'
-      // document.body.appendChild(domUrl)
-      // domUrl.select() // 选择对象
-      // document.execCommand('Copy') // 执行浏览器复制命令
-      // const creatDom = document.getElementById('creatDom')
-      // creatDom.parentNode.removeChild(creatDom)
-      // this.$message.success(this.$t('overall.copySuccess'))
       this.$copyText(JSON.stringify(str)).then(() => {
         this.$message.success({ message: this.$t('overall.copySuccess') })
       })
     }
-  },
-  created () {
-  },
-  computed: {
-
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/common/table/settings/softwareTypeTable.vue b/nezha-fronted/src/components/common/table/settings/softwareTypeTable.vue
index 77c311ae5..299c493f9 100644
--- a/nezha-fronted/src/components/common/table/settings/softwareTypeTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/softwareTypeTable.vue
@@ -75,17 +75,15 @@
         fixed="right">
         <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
         <div slot-scope="scope" class="table-operation-items">
-          <!-- <button class="table-operation-item" v-has="'model_edit'" @click="$emit('edit', scope.row)" :title="$t('overall.edit')"><i class="nz-icon nz-icon-edit"></i></button> -->
           <button class="table-operation-item" @click="showBottomBox('softwareAsset', scope.row)" :title="$t('overall.view')"><i class="nz-icon nz-icon-view1"></i></button>
-          <el-dropdown size="medium" v-has="['model_delete','main_edit','model_edit']" trigger="click" @command="tableOperation">
+          <el-dropdown size="medium" v-has="['software_type_add','software_type_edit','software_type_delete']" trigger="click" @command="tableOperation">
             <div class="table-operation-item table-operation-item--more" :title="$t('overall.moreOperations')">
               <i class="nz-icon nz-icon-more3"></i>
             </div>
             <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
-              <el-dropdown-item v-has="'model_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
-              <el-dropdown-item v-has="'model_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
-              <el-dropdown-item v-has="'model_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:true, single:true,from:'model'}]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
-              <el-dropdown-item v-has="'main_edit'" :command="['sync', scope.row]"><i class="nz-icon nz-icon-sync"></i><span class="operation-dropdown-text">{{$t('overall.syncChart')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'software_type_add'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'software_type_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'software_type_delete'" :command="['delete-rel', scope.row, {forceDeleteShow:true, single:true,from:'softwareType'}]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
diff --git a/nezha-fronted/src/components/page/asset/software/softwareAsset.vue b/nezha-fronted/src/components/page/asset/software/softwareAsset.vue
index b3449e6c7..7a94433a6 100644
--- a/nezha-fronted/src/components/page/asset/software/softwareAsset.vue
+++ b/nezha-fronted/src/components/page/asset/software/softwareAsset.vue
@@ -97,6 +97,7 @@ export default {
   data () {
     return {
       url: '/asset/software',
+      tableId: 'softwareAssetTable',
       blankObject: { // 空白对象
         id: '',
         name: '',
@@ -106,7 +107,6 @@ export default {
         params: {},
         remark: ''
       },
-      tableId: 'softwareAssetTable',
       searchMsg: { // 给搜索框子组件传递的信息
         searchLabelList: [{
           name: 'ID',
@@ -123,7 +123,44 @@ export default {
     }
   },
   created () {
-
+    const searchKeys = {
+      // key: path 键
+      // value: vue set 参数
+      pageNo: { target: this.pageObj, propertyName: 'pageNo', type: 'number' },
+      pageSize: { target: this.pageObj, propertyName: 'pageSize', type: 'number' },
+      orderBy: { target: this.$data, propertyName: 'orderBy', type: 'string' },
+      ids: {
+        target: this.searchLabel,
+        isSearchInput: true,
+        propertyName: 'ids',
+        type: 'string',
+        defaultJson: {
+          disabled: false,
+          id: 'ids',
+          label: 'ids',
+          name: 'ID',
+          type: 'input',
+          val: ''
+        },
+        jsonKey: 'val'
+      },
+      name: {
+        target: this.searchLabel,
+        isSearchInput: true,
+        propertyName: 'name',
+        type: 'string',
+        defaultJson: {
+          disabled: false,
+          id: 'name',
+          label: 'name',
+          name: 'Name',
+          type: 'input',
+          val: ''
+        },
+        jsonKey: 'val'
+      }
+    }
+    this.initQueryFromPath(searchKeys)
   },
   computed: {
   },

From e1da04af1576f3f75971bc8d3adaf2bf012d1aa7 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Tue, 5 Dec 2023 09:45:54 +0800
Subject: [PATCH 2/6] =?UTF-8?q?NEZ-3350=20feat=EF=BC=9Asoftware=20asset=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rightBox/software/softwareAssetBox.vue    | 23 ++-----------------
 .../table/settings/softwareAssetTable.vue     |  2 +-
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue b/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
index 9d15af1f2..cb2bb38f7 100644
--- a/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
@@ -15,11 +15,12 @@
           </el-form-item>
           <!--type-->
           <el-form-item :label="$t('softwareType.text')" prop="typeId" class="select-warp">
-<!--            <el-input maxlength="128" show-word-limit v-model="editSoftwareAsset.type" size="small" type="text"></el-input>-->
+            <!-- <el-input maxlength="128" show-word-limit v-model="editSoftwareAsset.type" size="small" type="text"></el-input> -->
             <el-select v-model="editSoftwareAsset.typeId" size="small" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" @change="renderParams">
               <el-option v-for="item in softwareTypeArr" :key="item.id" :value="item.id" :label="item.name"></el-option>
             </el-select>
           </el-form-item>
+          <!-- asset -->
           <el-form-item :label='$t("asset.asset")' label-width="125px" prop="assetId" v-if="!disabled">
             <v-selectpage
               :data="assetList"
@@ -40,12 +41,6 @@
               :result-format="resultFormat"
             ></v-selectpage>
           </el-form-item>
-          <!--project-->
-          <el-form-item :label='$t("project.project.projectName")' class="select-warp" prop="projectId">
-            <el-select id="add-endpoint-project" v-model="editSoftwareAsset.projectId" class="right-box__select" clearable placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id">
-              <el-option v-for="item in projectList" :id="'project-'+item.id" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
           <!--remark-->
           <el-form-item :label="$t('overall.remark')" prop="remark">
             <el-input maxlength="256" show-word-limit v-model="editSoftwareAsset.remark" size="small" :rows="2" type="textarea"></el-input>
@@ -190,7 +185,6 @@ export default {
         name: '',
         typeId: '',
         assetId: '',
-        projectId: '',
         params: {},
         remark: ''
       },
@@ -209,7 +203,6 @@ export default {
           { required: true, message: this.$t('validate.required'), trigger: 'change' }
         ]
       },
-      projectList: [],
       softwareTypeArr: [],
       assetList: [],
       columns: [
@@ -253,9 +246,6 @@ export default {
         this.isEdit = true
         const editSoftwareAsset = JSON.parse(JSON.stringify(n))
         editSoftwareAsset.paramObj = []
-        if (editSoftwareAsset.projectId === -1) {
-          editSoftwareAsset.projectId = ''
-        }
         editSoftwareAsset.assetId = ''
         // if (editSoftwareAsset.params) {
         //   Object.keys(editSoftwareAsset.params).forEach(key => {
@@ -268,7 +258,6 @@ export default {
     }
   },
   created () {
-    this.getProjectList()
     this.getAsset()
     this.getSoftwareTypeList()
   },
@@ -342,14 +331,6 @@ export default {
         }
       })
     },
-    /* 获取project列表 */
-    getProjectList () {
-      this.$get('monitor/project', { pageSize: -1, pageNo: 1 }).then(response => {
-        if (response.code === 200) {
-          this.projectList = response.data.list
-        }
-      })
-    },
     /* 获取asset列表 */
     getAsset () {
       this.$get('asset/asset', { pageSize: -1 }).then(res => {
diff --git a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
index 242dda939..a6cb1b783 100644
--- a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
@@ -70,7 +70,7 @@
           <span v-else-if="item.prop === 'dateIssued' || item.prop === 'dateExpires'">{{ scope.row[item.prop] ? momentTz(scope.row[item.prop] ) : '-'}}</span>
           <!-- status -->
           <template v-else-if="item.prop === 'status'">
-            <div v-if="scope.row.status === 1">
+            <div v-if="scope.row.status == 1">
               <i class="nz-icon nz-icon-import-success1" style="color:#8dcb4b;"></i>
               <span>{{$t('licenseMange.licensed')}}</span>
             </div>

From dc814ce35306b3a6188215e04dfd8c1127b5d613 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Tue, 5 Dec 2023 16:39:02 +0800
Subject: [PATCH 3/6] =?UTF-8?q?NEZ-3351=20feat=EF=BC=9Aasset=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=20license=20statu?=
 =?UTF-8?q?s=20=E5=88=97=E5=92=8C=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/table/asset/assetTable.scss        | 16 ++++++
 .../src/components/common/searchInput.vue     |  4 +-
 .../src/components/common/searchSelectInfo.js |  9 +++
 .../common/table/asset/assetTable.vue         | 55 +++++++++++++++++--
 .../table/settings/softwareAssetTable.vue     | 11 ++--
 .../src/components/page/asset/asset.vue       | 22 ++++++++
 6 files changed, 106 insertions(+), 11 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss b/nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss
index 110bbb905..9d6c1c3f0 100644
--- a/nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss
+++ b/nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss
@@ -30,3 +30,19 @@
     }
   }
 }
+
+.licenseStatus{
+  padding: 20px 15px;
+  background: $--background-color-empty;
+  border-radius: 3px;
+  transform: translate(-40px,20px);
+  .licenseStatus-title{
+    color: $--color-text-regular;
+  }
+  .licenseStatus-date{
+    color: $--color-text-primary;
+    i{
+      color: $--color-primary;
+    }
+  }
+}
\ No newline at end of file
diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index 15f4fae10..0b6094e5a 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -989,6 +989,8 @@ export default {
               objectInfo.priority = val.valnum
             } else if (val.label === 'dashboardVarType') {
               objectInfo.varType = val.valnum
+            } else if (val.label === 'licenseStatus') {
+              objectInfo.licenseStatus = val.valnum
             } else if (typeof (val.valnum) === 'undefined' || val.valnum == '') {
               this.selectInfoList[val.label].forEach(item => {
                 if (item.label === val.val) {
@@ -1069,7 +1071,7 @@ export default {
           localStorage.setItem('nz-history-' + this.where, JSON.stringify(this.historyList))
         } else {
           this.historyList = JSON.parse(localStorage.getItem('nz-history-' + this.where))
-          const findIndex = this.historyList.findIndex(item=> JSON.stringify(item) ==  JSON.stringify(this.select_list))
+          const findIndex = this.historyList.findIndex(item => JSON.stringify(item) == JSON.stringify(this.select_list))
           if (findIndex !== -1) {
             this.historyList.splice(findIndex, 1)
           }
diff --git a/nezha-fronted/src/components/common/searchSelectInfo.js b/nezha-fronted/src/components/common/searchSelectInfo.js
index 83bb37126..8db0e17e4 100644
--- a/nezha-fronted/src/components/common/searchSelectInfo.js
+++ b/nezha-fronted/src/components/common/searchSelectInfo.js
@@ -399,6 +399,15 @@ export default {
             value: 3,
             label: i18n.t('issue.low')
           }
+        ],
+        licenseStatus: [
+          {
+            value: 1,
+            label: i18n.t('licenseMange.licensed')
+          }, {
+            value: 0,
+            label: i18n.t('licenseMange.notLicensed')
+          }
         ]
       }
     }
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index 29e531c0e..e7253ab04 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -140,14 +140,52 @@
           </template>
           <template v-else-if="item.prop === 'brand'">{{scope.row.brand ? scope.row.brand.name : '-'}}</template>
           <template v-else-if="item.prop === 'purchaseDate'">{{scope.row.purchaseDate ? scope.row.purchaseDate : '-'}}</template>
+          <!-- license -->
+          <template v-else-if="item.prop === 'license'">
+            <el-popover
+              placement="right-start"
+              trigger="hover"
+              :open-delay="300"
+              popper-class="licenseStatus nz-tooltip-bac"
+              :disabled="!(scope.row.license&&scope.row.license.status==1)"
+            >
+              <div>
+                <!-- dateIssued -->
+                <div class="licenseStatus-title" style="margin-bottom:5px;">{{$t('licenseMange.dateIssue')}}</div>
+                <div class="licenseStatus-date">
+                  <i class="nz-icon nz-icon-date margin-r-5"/>
+                  <span>{{ scope.row.license&&scope.row.license.dateIssued ? momentTz(scope.row.license.dateIssued ) : '-'}}</span>
+                </div>
+                <!-- dateExpires -->
+                <div class="licenseStatus-title" style="margin-top:10px;margin-bottom:5px;">{{$t('licenseMange.dateExpire')}}</div>
+                <div class="licenseStatus-date">
+                  <i class="nz-icon nz-icon-date margin-r-5"/>
+                  <span v-if="scope.row.license && scope.row.license.dateExpires == -1">{{$t('license.permanent')}}</span>
+                  <span v-else>{{ scope.row.license && scope.row.license.dateExpires ? momentTz(scope.row.license.dateExpires ) : '-'}}</span>
+                </div>
+              </div>
+              <!-- status -->
+              <div slot="reference">
+                <div v-if="scope.row.license&&scope.row.license.status == 1">
+                  <i class="nz-icon nz-icon-import-success1" style="color:#8dcb4b;"></i>
+                  <span>{{$t('licenseMange.licensed')}}</span>
+                </div>
+                <div v-if="scope.row.license&&scope.row.license.status == 0">
+                  <i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i>
+                  <span>{{$t('licenseMange.notLicensed')}}</span>
+                </div>
+                <div v-else>-</div>
+              </div>
+            </el-popover>
+          </template>
           <span v-else-if="item.prop === 'id'" :id="'globalSearch' + scope.row.id">{{scope.row[item.prop]}}</span>
           <template v-else>
-          <span v-if="scope.row.fields&&scope.row.fields.find(field => field.name === item.prop)">
-            {{scope.row.fields.find(field => field.name === item.prop).value.join(',')}}
-          </span>
-            <span v-else>
-             {{scope.row[item.prop]}}
-          </span>
+            <span v-if="scope.row.fields&&scope.row.fields.find(field => field.name === item.prop)">
+              {{scope.row.fields.find(field => field.name === item.prop).value.join(',')}}
+            </span>
+              <span v-else>
+              {{scope.row[item.prop]}}
+            </span>
           </template>
         </template>
       </el-table-column>
@@ -324,6 +362,11 @@ export default {
           prop: 'purchaseDate',
           show: false,
           minWidth: 120
+        }, {
+          label: this.$t('licenseMange.licenseStatus'),
+          prop: 'license',
+          minWidth: 150,
+          show: true
         }
       ]
     }
diff --git a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
index a6cb1b783..68c339d38 100644
--- a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
@@ -67,16 +67,19 @@
               <span v-else>--</span>
             </div>
           </template>
-          <span v-else-if="item.prop === 'dateIssued' || item.prop === 'dateExpires'">{{ scope.row[item.prop] ? momentTz(scope.row[item.prop] ) : '-'}}</span>
+          <span v-else-if="item.prop === 'dateIssued' || item.prop === 'dateExpires'">
+            <span v-if="scope.row[item.prop] == -1">{{$t('license.permanent')}}</span>
+            <span v-else>{{ scope.row[item.prop] ? momentTz(scope.row[item.prop] ) : '-'}}</span>
+          </span>
           <!-- status -->
           <template v-else-if="item.prop === 'status'">
             <div v-if="scope.row.status == 1">
               <i class="nz-icon nz-icon-import-success1" style="color:#8dcb4b;"></i>
               <span>{{$t('licenseMange.licensed')}}</span>
             </div>
-            <div v-else-if="scope.row.status == 2">
+            <div v-else-if="scope.row.status == 0">
               <i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i>
-              <span>{{ $t('licenseMange.notLicensed') }}</span>
+              <span>{{$t('licenseMange.notLicensed')}}</span>
             </div>
             <div v-else>-</div>
           </template>
@@ -194,7 +197,7 @@ export default {
         }, {
           label: this.$t('licenseMange.licenseStatus'),
           prop: 'status',
-          minWidth: 200,
+          minWidth: 150,
           show: true
         }, {
           label: this.$t('licenseMange.concurrency'),
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 80dda68c8..b8d59862d 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -336,6 +336,12 @@ export default {
           type: 'input',
           label: 'comment',
           disabled: false
+        }, {
+          name: this.$t('licenseMange.licenseStatus'),
+          type: 'select',
+          label: 'licenseStatus',
+          readonly: true,
+          disabled: false
         }]
       },
 
@@ -997,6 +1003,22 @@ export default {
         },
         jsonKey: 'val'
       },
+      licenseStatus: {
+        target: this.searchLabel,
+        isSearchInput: true,
+        propertyName: 'licenseStatus',
+        type: 'string',
+        defaultJson: {
+          disabled: false,
+          label: 'licenseStatus',
+          name: 'licenseStatus',
+          readonly: true,
+          type: 'select',
+          val: '',
+          listStr: 'licenseStatus'
+        },
+        jsonKey: 'valnum'
+      },
       dcIds: { target: this.searchCheckBox, propertyName: 'dcIds', type: 'string', target2: this.selectValue, type2: 'array' },
       typeIds: { target: this.searchCheckBox, propertyName: 'typeIds', type: 'string', target2: this.selectValue, type2: 'array' },
       ping: { target: this.searchCheckBox, propertyName: 'ping', type: 'string', target2: this.selectValue, type2: 'array' },

From c1a86bca291fc31674a0223e136c5032c20314ad Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Thu, 7 Dec 2023 11:11:33 +0800
Subject: [PATCH 4/6] =?UTF-8?q?NEZ-3354=20fix=EF=BC=9AAsset=20attributes?=
 =?UTF-8?q?=20=E5=85=83=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/assetMetaBox.vue          |  8 +-
 .../rightBox/software/softwareAssetBox.vue    | 93 ++++++++++++-------
 .../rightBox/software/softwareTypeBox.vue     | 82 ++++++++++------
 .../common/table/asset/assetMetaTable.vue     |  4 +-
 4 files changed, 119 insertions(+), 68 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
index 332658666..d5c415ab5 100644
--- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
@@ -12,12 +12,12 @@
       <!-- begin--表单-->
       <div class="right-box__container">
         <div class="container__form">
-          <el-form label-width="120px"  :model="editAssetMeta" label-position = "top" ref="editAssetMetaForm" :rules="rules">
+          <el-form label-width="120px" :model="editAssetMeta" label-position = "top" ref="editAssetMetaForm" :rules="rules">
             <el-form-item :label='$t("overall.name")' prop="name">
               <el-input placeholder="" maxlength="64" show-word-limit v-model="editAssetMeta.name" size="small" id="editAssetMeta-box-input-name"></el-input>
             </el-form-item>
             <el-form-item :label='$t("overall.key")' prop="metaKey">
-              <el-input placeholder="" maxlength="128" show-word-limit v-model="editAssetMeta.metaKey" size="small" id="editAssetMeta-box-input-key"></el-input>
+              <el-input :disabled="!!(editAssetMeta.id)" placeholder="" maxlength="128" show-word-limit v-model="editAssetMeta.metaKey" size="small" id="editAssetMeta-box-input-key"></el-input>
             </el-form-item>
             <el-form-item :label='$t("dashboard.dashboard.chartForm.group")' prop="groupId">
               <el-select v-model="editAssetMeta.groupId" size="small" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" :popper-append-to-body="false">
@@ -336,9 +336,7 @@ export default {
           t.disabled = false
         })
       } else if (value == 1) {
-        if (this.editAssetMeta.type !== 'RADIO' &&
-            this.editAssetMeta.type !== 'CHECKBOX' &&
-            this.editAssetMeta.type !== 'SELECT') {
+        if (this.editAssetMeta.type !== 'RADIO' && this.editAssetMeta.type !== 'CHECKBOX' && this.editAssetMeta.type !== 'SELECT') {
           flag = false
           this.editAssetMeta.type = 'RADIO'
         }
diff --git a/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue b/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
index cb2bb38f7..9aad50f30 100644
--- a/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue
@@ -52,7 +52,7 @@
 <!--          <el-form-item v-for="(value, key) in editSoftwareAsset.params" :label="key" :key="key">-->
 <!--            <el-input maxlength="128" show-word-limit v-model="editSoftwareAsset.params[key]" size="small" type="text" @input="$forceUpdate()"></el-input>-->
 <!--          </el-form-item>-->
-          <el-form-item prop="paramObj">
+          <el-form-item prop="paramObj" v-my-loading="loading">
             <div v-for="(label, i) in editSoftwareAsset.paramObj" :key="i" class="form__dotted-item form__dotted-item-required">
               <el-form-item :prop="'paramObj.' + i + '.value.0'" :rules="[ { required: JSON.parse(label.param).required === '1', message: $t('validate.required'), trigger: 'blur' }]">
                 <template v-slot:label>
@@ -155,7 +155,7 @@ import editRigthBox from '../../mixin/editRigthBox'
 import { sysObjectIdInput } from '@/components/common/js/validate'
 import iconList from '@/components/common/js/iconList'
 import { asset as assetConstants } from '@/components/common/js/constants'
-
+import axios from 'axios'
 export default {
   name: 'softwareAssetBox',
   components: {
@@ -235,7 +235,8 @@ export default {
             return row.dc ? row.dc.name : ''
           }
         }
-      ]
+      ],
+      loading: false
     }
   },
   watch: {
@@ -245,13 +246,7 @@ export default {
       handler (n) {
         this.isEdit = true
         const editSoftwareAsset = JSON.parse(JSON.stringify(n))
-        editSoftwareAsset.paramObj = []
         editSoftwareAsset.assetId = ''
-        // if (editSoftwareAsset.params) {
-        //   Object.keys(editSoftwareAsset.params).forEach(key => {
-        //     editSoftwareAsset.paramObj.push(editSoftwareAsset.params[key])
-        //   })
-        // }
         this.editSoftwareAsset = editSoftwareAsset
         this.oldData = this.$lodash.cloneDeep(this.editSoftwareAsset)
       }
@@ -293,15 +288,14 @@ export default {
           const params = {
             ...this.editSoftwareAsset
           }
-          params.params = {}
+          params.params = {
+            connectorAttributeKeys: []
+          }
           params.paramObj.forEach(item => {
-            if (item.type === 'CHECKBOX') {
-              params.params[item.metaKey] = item.value
-            } else if (item.type === 'DATETIME' && JSON.parse(item.param).interval) {
-              params.params[item.metaKey] = item.value
-            } else {
-              params.params[item.metaKey] = item.value[0]
-            }
+            params.params.connectorAttributeKeys.push({
+              key: item.metaKey,
+              value: item.value
+            })
           })
           params.icon = this.imageUrl
           if (this.editSoftwareAsset.id) {
@@ -356,21 +350,58 @@ export default {
         return assetData
       }
     },
-    renderParams () {
-      this.editSoftwareAsset.paramObj = []
+    async renderParams () {
+      // 获取当前type的attributes key
+      this.loading = true
       const findItem = this.softwareTypeArr.find(item => item.id == this.editSoftwareAsset.typeId)
-      if (findItem.params) {
-        Object.keys(findItem.params).forEach(key => {
-          if (findItem.params[key].type === 'CHECKBOX') {
-            findItem.params[key].value = this.editSoftwareAsset.params[key] ? this.editSoftwareAsset.params[key] : findItem.params[key].value
-          } else if (findItem.params[key].type === 'DATETIME' && JSON.parse(findItem.params[key].param).interval) {
-            findItem.params[key].value = this.editSoftwareAsset.params[key] ? this.editSoftwareAsset.params[key] : findItem.params[key].value
-          } else {
-            findItem.params[key].value = this.editSoftwareAsset.params[key] ? [this.editSoftwareAsset.params[key]] : findItem.params[key].value
-          }
-          this.editSoftwareAsset.paramObj.push(findItem.params[key])
-        })
-        this.oldData = this.$lodash.cloneDeep(this.editSoftwareAsset)
+      const connectorAttributeKeys = this.$lodash.get(findItem, 'params.connectorAttributeKeys', [])
+      const requests = connectorAttributeKeys.map(key => {
+        return this.$get('asset/field/meta', { key: key })
+      })
+      const paramObj = []
+      const res = await axios.all(requests)
+      res.forEach(response => {
+        const data = this.$lodash.get(response, 'data.list.0')
+        if (data) {
+          paramObj.push({ ...data, value: this.blankLabelValue(data), action: 0 })
+        }
+      })
+      // 设置填写过的值
+      const keyValue = this.$lodash.get(this.editSoftwareAsset, 'params.connectorAttributeKeys', [])
+      paramObj.forEach(item => {
+        const findValue = keyValue.find(subItem => subItem.key == item.metaKey)?.value
+        findValue && (item.value = findValue)
+      })
+      this.$set(this.editSoftwareAsset, 'paramObj', paramObj)
+      this.oldData = this.$lodash.cloneDeep(this.editSoftwareAsset)
+      this.loading = false
+    },
+    blankLabelValue (label) {
+      const defaultValue = JSON.parse(label.param).default || ''
+      if (label.type.toUpperCase() === this.assetConstants.labelTypeData.CHECKBOX) {
+        const arr = []
+        if (label.param && JSON.parse(label.param).items) {
+          JSON.parse(label.param).items.forEach(item => {
+            if (item.check) {
+              arr.push(item.name)
+            }
+          })
+        }
+        return arr
+      } else if (label.type.toUpperCase() === this.assetConstants.labelTypeData.MULTITEXT || label.type.toUpperCase() === assetConstants.labelTypeData.TEXT || label.type.toUpperCase() === assetConstants.labelTypeData.TEXTAREA) {
+        return [defaultValue]
+      } else if (label.type.toUpperCase() === this.assetConstants.labelTypeData.RADIO || label.type.toUpperCase() === assetConstants.labelTypeData.SELECT) {
+        const arr = ['']
+        if (label.param && JSON.parse(label.param).items) {
+          JSON.parse(label.param).items.forEach(item => {
+            if (item.check) {
+              arr[0] = item.name
+            }
+          })
+        }
+        return arr
+      } else {
+        return [defaultValue]
       }
     }
   }
diff --git a/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue b/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue
index 0c6739645..6651ec151 100644
--- a/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue
@@ -44,7 +44,8 @@
           <div class="form__sub-title" >
             <span>{{$t('softwareType.params')}}</span>
           </div>
-          <el-form-item prop="paramObj">
+          <!-- 此处属性只展示不可修改 -->
+          <el-form-item prop="paramObj" v-my-loading="loading">
             <div v-for="(label, i) in editSoftwareType.paramObj" :key="i" class="form__dotted-item form__dotted-item-required">
               <el-form-item :prop="'paramObj.' + i + '.value.0'" :rules="[]">
                 <template v-slot:label>
@@ -56,56 +57,59 @@
                   </div>
                 </template>
                 <template v-if="label.action !== 1">
+                  <!-- TEXT -->
                   <template v-if="label.type.toUpperCase() === assetConstants.labelTypeData.TEXT">
-                    <el-input v-model="label.value[0]" size="small"/>
+                    <el-input disabled v-model="label.value[0]" size="small"/>
                   </template>
+                  <!-- PASSWORD -->
                   <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.PASSWORD">
-                    <el-input v-model="label.value[0]" type="password" size="small"/>
-                  </template>
-                  <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.MULTITEXT">
-                    <div v-for="(value, i) in label.value" :key="i" class="label__multi-text">
-                      <el-input v-model="label.value[i]" size="small"/>
-                      <span @click="addMultiTextRow(label)" style="margin: 0 5px" :title="$t('tip.add')"><i class="nz-icon nz-icon-plus"></i></span>
-                      <span @click="removeMultiTextRow(label, i)" :title="$t('overall.delete')"><i class="nz-icon nz-icon-minus"></i></span>
-                    </div>
+                    <el-input disabled v-model="label.value[0]" type="password" size="small"/>
                   </template>
+                  <!-- TEXTAREA -->
                   <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.TEXTAREA">
-                    <el-input v-model="label.value[0]" :maxlength="4096" show-word-limit size="small" :rows="2" type="textarea"/>
+                    <el-input disabled v-model="label.value[0]" :maxlength="4096" show-word-limit size="small" :rows="2" type="textarea"/>
                   </template>
+                  <!-- RADIO -->
                   <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.RADIO">
-                    <el-radio-group v-model="label.value[0]">
+                    <el-radio-group disabled v-model="label.value[0]">
                       <el-radio v-for="item in JSON.parse(label.param).items" :key="item.name" :label="item.name">{{item.name}}</el-radio>
                     </el-radio-group>
                   </template>
+                  <!-- CHECKBOX -->
                   <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.CHECKBOX">
-                    <el-checkbox-group v-model="label.value">
+                    <el-checkbox-group disabled v-model="label.value">
                       <el-checkbox v-for="item in JSON.parse(label.param).items" :key="item.name" :label="item.name" :value="item.name"></el-checkbox>
                     </el-checkbox-group>
                   </template>
+                  <!-- SELECT -->
                   <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.SELECT">
-                    <el-select v-model="label.value[0]" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" size="small">
+                    <el-select disabled v-model="label.value[0]" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" size="small">
                       <el-option v-for="item in JSON.parse(label.param).items" :key="item.name" :label="item.name" :value="item.name"></el-option>
                     </el-select>
                   </template>
+                  <!-- INTEGER -->
                   <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.INTEGER">
-                    <el-input v-model="label.value[0]" oninput="value=value.replace(/[^\d]/g,'')" size="small"></el-input>
+                    <el-input disabled v-model="label.value[0]" oninput="value=value.replace(/[^\d]/g,'')" size="small"></el-input>
                   </template>
+                  <!-- DOUBLE -->
                   <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.DOUBLE">
-                    <el-input-number v-model="label.value[0]" :controls="false" size="small" :precision="JSON.parse(label.param).decimals" style="width: 100%;text-align: left" :max="10000000000000000000" :min="-10000000000000000000"></el-input-number>
+                    <el-input-number disabled v-model="label.value[0]" :controls="false" size="small" :precision="JSON.parse(label.param).decimals" style="width: 100%;text-align: left" :max="10000000000000000000" :min="-10000000000000000000"></el-input-number>
                   </template>
+                  <!-- DATETIME -->
                   <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.DATETIME">
                     <template v-if="JSON.parse(label.param).subType === assetConstants.labelSubTypeData.time">
                       <div v-if="JSON.parse(label.param).interval" style="display: flex; justify-content: space-between">
-                        <el-time-select v-model="label.value[0]" size="small"></el-time-select>
-                        <el-time-select v-model="label.value[1]" size="small"></el-time-select>
+                        <el-time-select disabled v-model="label.value[0]" size="small"></el-time-select>
+                        <el-time-select disabled v-model="label.value[1]" size="small"></el-time-select>
                       </div>
                       <template v-else>
-                        <el-time-select v-model="label.value[0]" size="small" style="width: 100%"></el-time-select>
+                        <el-time-select disabled v-model="label.value[0]" size="small" style="width: 100%"></el-time-select>
                       </template>
                     </template>
                     <template v-else>
                       <template v-if="JSON.parse(label.param).interval">
                         <my-date-picker
+                          disabled
                           id="asset-box-input-purchase-date"
                           v-model="label.value"
                           :type="JSON.parse(label.param).subType === assetConstants.labelSubTypeData.date ? 'daterange' : 'datetimerange'"
@@ -118,6 +122,7 @@
                       </template>
                       <template v-else>
                         <my-date-picker
+                          disabled
                           id="asset-box-input-parchase-date"
                           v-model="label.value[0]"
                           :type="JSON.parse(label.param).subType"
@@ -130,8 +135,9 @@
                       </template>
                     </template>
                   </template>
+                  <!-- EMAIL -->
                   <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.EMAIL">
-                    <el-input v-model="label.value[0]" size="small"/>
+                    <el-input disabled v-model="label.value[0]" size="small"/>
                   </template>
                 </template>
               </el-form-item>
@@ -171,7 +177,7 @@ import editRigthBox from '../../mixin/editRigthBox'
 import { sysObjectIdInput } from '@/components/common/js/validate'
 import iconList from '@/components/common/js/iconList'
 import { asset as assetConstants } from '@/components/common/js/constants'
-
+import axios from 'axios'
 export default {
   name: 'softwareTypeBox',
   components: {
@@ -252,7 +258,8 @@ export default {
             })
           }
         }
-      }
+      },
+      loading: false
     }
   },
   watch: {
@@ -263,13 +270,8 @@ export default {
         this.isEdit = true
         const editSoftwareType = JSON.parse(JSON.stringify(n))
         this.imageUrl = editSoftwareType.icon
-        editSoftwareType.paramObj = []
-        if (editSoftwareType.params) {
-          Object.keys(editSoftwareType.params).forEach(key => {
-            editSoftwareType.paramObj.push(editSoftwareType.params[key])
-          })
-        }
         this.editSoftwareType = editSoftwareType
+        this.renderParams()
       }
     }
   },
@@ -279,6 +281,24 @@ export default {
     this.getFieldGroupData()
   },
   methods: {
+    // 根据key 请求Asset attributes
+    async renderParams () {
+      this.loading = true
+      const connectorAttributeKeys = this.$lodash.get(this.editSoftwareType, 'params.connectorAttributeKeys', [])
+      const requests = connectorAttributeKeys.map(key => {
+        return this.$get('asset/field/meta', { key: key })
+      })
+      const paramObj = []
+      const res = await axios.all(requests)
+      res.forEach(response => {
+        const data = this.$lodash.get(response, 'data.list.0')
+        if (data) {
+          paramObj.push({ ...data, value: this.blankLabelValue(data), action: 0 })
+        }
+      })
+      this.$set(this.editSoftwareType, 'paramObj', paramObj)
+      this.loading = false
+    },
     clickOutside () {
       this.esc(false)
     },
@@ -313,9 +333,11 @@ export default {
             ...this.editSoftwareType
           }
           params.icon = this.imageUrl
-          params.params = {}
+          params.params = {
+            connectorAttributeKeys: []
+          }
           params.paramObj.forEach(item => {
-            params.params[item.metaKey] = item
+            params.params.connectorAttributeKeys.push(item.metaKey)
           })
           if (this.editSoftwareType.id) {
             this.$put(this.url, params).then(res => {
diff --git a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
index 69fca305b..06735ce45 100644
--- a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
@@ -66,7 +66,7 @@
         </div>
         <div v-else-if=" item.prop === 'type' ">
           <div v-if="scope.row[item.prop].toUpperCase() == 'TEXT'"><i class="nz-icon nz-icon-text"></i>&nbsp;&nbsp;{{typeData[0].name}}</div>
-          <div v-else-if="scope.row[item.prop].toUpperCase() == 'MULTITEXT'"><i class="nz-icon nz-icon-multitext"></i>&nbsp;&nbsp;{{typeData[1].name}}</div>
+          <!-- <div v-else-if="scope.row[item.prop].toUpperCase() == 'MULTITEXT'"><i class="nz-icon nz-icon-multitext"></i>&nbsp;&nbsp;{{typeData[1].name}}</div> -->
           <div v-else-if="scope.row[item.prop].toUpperCase() == 'TEXTAREA'"><i class="nz-icon nz-icon-textarea"></i>&nbsp;&nbsp;{{typeData[1].name}}</div>
           <div v-else-if="scope.row[item.prop].toUpperCase() == 'RADIO'"><i class="nz-icon nz-icon-radio"></i>&nbsp;&nbsp;{{typeData[2].name}}</div>
           <div v-else-if="scope.row[item.prop].toUpperCase() == 'CHECKBOX'"><i class="nz-icon nz-icon-checkbox"></i>&nbsp;&nbsp;{{typeData[3].name}}</div>
@@ -245,7 +245,7 @@ export default {
           value: 'EMAIL',
           name: this.$t('config.assetLabel.email')
         }
-      ],
+      ]
     }
   },
   methods: {

From edf489fd504c33208e80d5a21992bb88f64b948b Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Thu, 7 Dec 2023 13:59:25 +0800
Subject: [PATCH 5/6] =?UTF-8?q?NEZ-3355=20fix=EF=BC=9A=E5=BD=93=20status?=
 =?UTF-8?q?=20=3D=202=20=E6=97=B6=E5=B1=95=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/table/asset/assetTable.scss           |  2 +-
 .../components/common/table/asset/assetTable.vue | 16 ++++++++++------
 .../common/table/settings/softwareAssetTable.vue | 14 +++++++++-----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss b/nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss
index 9d6c1c3f0..a9c279c72 100644
--- a/nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss
+++ b/nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss
@@ -35,7 +35,7 @@
   padding: 20px 15px;
   background: $--background-color-empty;
   border-radius: 3px;
-  transform: translate(-40px,20px);
+  transform: translate(0,20px);
   .licenseStatus-title{
     color: $--color-text-regular;
   }
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index e7253ab04..c91cefd3d 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -143,7 +143,7 @@
           <!-- license -->
           <template v-else-if="item.prop === 'license'">
             <el-popover
-              placement="right-start"
+              placement="left-start"
               trigger="hover"
               :open-delay="300"
               popper-class="licenseStatus nz-tooltip-bac"
@@ -166,13 +166,17 @@
               </div>
               <!-- status -->
               <div slot="reference">
-                <div v-if="scope.row.license&&scope.row.license.status == 1">
+                <div v-if="scope.row.license && scope.row.license.status == 0">
+                  <i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i>
+                  <span>{{$t('licenseMange.notLicensed')}}</span>
+                </div>
+                <div v-else-if="scope.row.license && scope.row.license.status == 1">
                   <i class="nz-icon nz-icon-import-success1" style="color:#8dcb4b;"></i>
                   <span>{{$t('licenseMange.licensed')}}</span>
                 </div>
-                <div v-if="scope.row.license&&scope.row.license.status == 0">
-                  <i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i>
-                  <span>{{$t('licenseMange.notLicensed')}}</span>
+                <div v-else-if="scope.row.license && scope.row.license.status == 2">
+                  <i class="nz-icon nz-icon-stop" style="color:#ec7f66;"></i>
+                  <span>{{$t('overall.error')}}（{{$t('config.terminallog.statusItem.unknownError')}}）</span>
                 </div>
                 <div v-else>-</div>
               </div>
@@ -365,7 +369,7 @@ export default {
         }, {
           label: this.$t('licenseMange.licenseStatus'),
           prop: 'license',
-          minWidth: 150,
+          minWidth: 200,
           show: true
         }
       ]
diff --git a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
index 68c339d38..1ec7424f2 100644
--- a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
@@ -73,13 +73,17 @@
           </span>
           <!-- status -->
           <template v-else-if="item.prop === 'status'">
-            <div v-if="scope.row.status == 1">
+            <div v-if="scope.row.status == 0">
+              <i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i>
+              <span>{{$t('licenseMange.notLicensed')}}</span>
+            </div>
+            <div v-else-if="scope.row.status == 1">
               <i class="nz-icon nz-icon-import-success1" style="color:#8dcb4b;"></i>
               <span>{{$t('licenseMange.licensed')}}</span>
             </div>
-            <div v-else-if="scope.row.status == 0">
-              <i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i>
-              <span>{{$t('licenseMange.notLicensed')}}</span>
+            <div v-else-if="scope.row.status == 2">
+              <i class="nz-icon nz-icon-stop" style="color:#ec7f66;"></i>
+              <span>{{$t('overall.error')}}（{{$t('config.terminallog.statusItem.unknownError')}}）</span>
             </div>
             <div v-else>-</div>
           </template>
@@ -197,7 +201,7 @@ export default {
         }, {
           label: this.$t('licenseMange.licenseStatus'),
           prop: 'status',
-          minWidth: 150,
+          minWidth: 200,
           show: true
         }, {
           label: this.$t('licenseMange.concurrency'),

From 0c15ded89659d3daffe4075968fbc1b3c606c382 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 8 Dec 2023 16:05:15 +0800
Subject: [PATCH 6/6] =?UTF-8?q?NEZ-3360=20=20fix=EF=BC=9AChartTimeSeries?=
 =?UTF-8?q?=20NaN=E4=B8=8D=E6=98=BE=E7=A4=BA=20=E4=BB=A5=E5=8F=8A=E5=A0=86?=
 =?UTF-8?q?=E5=8F=A0=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/chart/chart/uplot/chartTimeSeriesMixin.js  | 8 +++++++-
 nezha-fronted/src/components/chart/chart/uplot/stack.js   | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js
index 14f294891..bdc8858f7 100644
--- a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js
+++ b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js
@@ -73,6 +73,9 @@ export default {
             if (typeof (itemValue) === 'string') {
               itemValue = Number(itemValue)
             }
+            // if (typeof (itemValue) !== 'undefined' && isNaN(itemValue)) {
+            //   itemValue = null
+            // }
             if (itemValue === null && nullValueMode !== 'null') {
               if (nullValueMode === 'zero') {
                 itemValue = 0
@@ -341,7 +344,10 @@ export default {
               paramsDot = 6
             }
             const val = typeof (item.value[1]) == 'undefined' ? 0 : formatScientificNotation(item.value[1], paramsDot)
-            const showVal = typeof (item.value[1]) == 'undefined' ? '' : chartDataFormat.getUnit(unit).compute(val, null, -1, decimals)
+            let showVal = typeof (item.value[1]) == 'undefined' ? '' : chartDataFormat.getUnit(unit).compute(val, null, -1, decimals)
+            if ((item.value[1] + '') === 'NaN') {
+              showVal = 'NaN'
+            }
             sum += isNaN(self.numberWithEConvent(val)) ? 0 : parseFloat(self.numberWithEConvent(val))
             let previousDom = ''
             if (previousItem) {
diff --git a/nezha-fronted/src/components/chart/chart/uplot/stack.js b/nezha-fronted/src/components/chart/chart/uplot/stack.js
index fb952bb01..626ed5edc 100644
--- a/nezha-fronted/src/components/chart/chart/uplot/stack.js
+++ b/nezha-fronted/src/components/chart/chart/uplot/stack.js
@@ -12,6 +12,9 @@ function stack (data, omit) {
       if (typeof (v) === 'undefined') {
         return accum[i]
       }
+      if (isNaN(v)) {
+        return accum[i]
+      }
       return (accum[i] += +v)
     }))
   }