Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1

nezha-fronted/src/components/charts/chart-list.vue

@@ -308,6 +308,7 @@ export default {
       extraMarginBottom: 0, // dom额外的margin
       panelId: '',
       timer: null,
+      finshGetData: false,
       dataTotalList: [], // 懒加载：总记录数
       dataTotalListBak: [], // 用于查询：懒加载，总记录备份
       isPage: false, // 是否分页懒加载
@@ -596,6 +597,10 @@ export default {
 
     // 获取panel详情数据,获取panel下所有chart列表
     getData (params) {
+      if (this.finshGetData) {
+        return
+      }
+      this.finshGetData = true
       const param = {
         panelId: params.panelId,
         query: params.query,
@@ -676,6 +681,9 @@ export default {
       if (!params.panelId) { return } // 没有panelId不调用接口
       this.$get('visual/panel/chart?panelId=' + params.panelId + '&groupId=0' + '&pageSize=-1').then(response => {
         if (response.code === 200) {
+          setTimeout(() => {
+            this.finshGetData = false
+          }, 1000)
           response.data.list.forEach((item, index) => {
             item.isLoaded = false
           })

nezha-fronted/src/components/common/rightBox/asset/assetBox.vue

@@ -33,7 +33,12 @@
           </el-form-item>
           <el-form-item :label="$t('asset.state')" prop="stateId">
             <el-select v-model="editAsset.stateId" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" size="small" value-key="id">
-              <el-option v-for="state in options.stateOptions" :key="state.id" :label="state.name" :value="state.id"></el-option>
+              <el-option v-for="state in options.stateOptions" :key="state.id" :label="state.name" :value="state.id">
+                <div style="display: flex;justify-content: space-between;padding: 5px;">
+                  <div>{{state.name}}</div>
+                  <div style="width: 450px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;color: #999999" :title="state.remark">{{state.remark}}</div>
+                </div>
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('asset.manageIp')" prop="manageIp">
@@ -424,7 +429,7 @@ export default {
         this.isEdit = true
         this.editAsset = JSON.parse(JSON.stringify(n))
         this.editAsset.brandAndModel = [this.editAsset.brand.id, this.editAsset.model.id]
-        this.editAsset.stateId = n.state ? n.state.id : ''
+        this.editAsset.stateId = n.state ? n.state.id : 2
         this.editAsset.typeId = n.type ? n.type.id : ''
         this.$nextTick(() => {
           if (n.id) {

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

@@ -219,7 +219,7 @@ export default {
         pid: '',
         sn: '',
         manageIp: '',
-        stateId: '',
+        stateId: 2,
         purchaseDate: null,
         dcId: '',
         cabinetId: '',