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

# Conflicts:
#	nezha-fronted/package-lock.json

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

@@ -0,0 +1,195 @@
+<template>
+  <div>
+    <div class="top-tools top-tools--sub">
+      <div class="top-tool-left">
+        <div class="sub-list-title">Name：<slot name="title"></slot></div>
+        <div class="sub-list-tabs">
+          <div v-for="tab in tabs" :key="tab.prop" :class="{'sub-list-tab--active': tab.active || tab.prop=== targetTab}" class="sub-list-tab" @click="changeTab(tab.prop)">{{tab.name}}</div>
+        </div>
+      </div>
+      <div class="top-tool-right" v-if="!customTool">
+        <div v-if="layout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20">
+          <search-input :searchMsg="searchMsg" position="endpoint-bottom" @search="search"></search-input>
+        </div>
+        <slot name="top-tool-right"></slot>
+        <button v-if="layout.indexOf('elementSet') > -1" id="account-column-setting" class="top-tool-btn margin-r-20"
+                type="button" @click="tools.showCustomTableTitle = true">
+          <i class="nz-icon-gear nz-icon"></i>
+        </button>
+      </div>
+      <div  class="top-tool-right" v-else>
+        <slot name="top-tool-right"></slot>
+      </div>
+    </div>
+    <!-- 自定义table列 -->
+    <transition name="el-zoom-in-top" v-if="targetTab!=='endpointQuery'">
+      <element-set
+        v-if="tools.showCustomTableTitle"
+        ref="customTableTitle"
+        :custom-table-title="customTableTitle"
+        :original-table-title="tableTitle"
+        :tableId="tableId"
+        @close="tools.showCustomTableTitle = false"
+        @update="updateCustomTableTitle"
+      ></element-set>
+    </transition>
+    <div class="sub-container">
+      <div class="nz-table2">
+        <slot></slot>
+      </div>
+      <div class="pagination-bottom">
+        <slot name="pagination"></slot>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'nzBottomDataList',
+  props: {
+    from: {
+      type: String,
+      default: ''
+    },
+    tableTitle: {
+      type: Array
+    },
+    customTableTitle: {
+      type: Array
+    },
+    layout: {
+      type: Array,
+      default () { return [] }
+    },
+    searchMsg: {
+      type: Object
+    },
+    tableId: {
+      type: String,
+      default: ''
+    },
+    tabs: {
+      type: Array
+    },
+    targetTab: String,
+    customTool: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      tools: {
+        toTopBtnTop: this.$tableHeight.toTopBtnTop, // to-top按钮的top属性
+        tableHover: false, // 控制滚动条和top按钮同时出现
+        showCustomTableTitle: false // 自定义列弹框是否显示
+      }
+    }
+  },
+  methods: {
+    updateCustomTableTitle (custom) {
+      this.$emit('update:customTableTitle', custom)
+    },
+    search (searchObj) {
+      this.$emit('search', searchObj)
+    },
+    // 切换tab
+    changeTab (tab) {
+      this.$emit('changeTab', tab)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import '@/assets/css/common/tableCommon.scss';
+/* begin--二级顶部工具栏*/
+.sub-top-tools {
+  display: flex;
+  height: 32px;
+  align-items: center;
+  justify-content: space-between;
+  border-top: 1px solid #DCDFE6;
+  border-bottom: 1px solid #E4E7ED;
+  margin: 0 -6px;
+  padding-right: 80px;
+  background-color: $content-right-background-color;
+  margin-bottom: 10px;
+}
+.sub-top-tools>div {
+  margin-top: 2px;
+}
+.sub-top-tools .top-tool-search {
+  width: 260px;
+  margin: -1px 0 0 0;
+  .select_input input {
+    background-color: white;
+  }
+}
+.sub-container {
+  padding: 10px;
+  height: 100%;
+  background-color: #f6f6f6;
+  &>div {
+    background-color: white;
+  }
+}
+.sub-top-tools .top-tool-btn-txt .nz-icon{
+  display: inline-block;
+  font-size: 12px;
+  margin-right: 6px;
+}
+.sub-top-tool-right {
+  display: flex;
+  align-content: center;
+}
+.has-sub-popper {
+  color: $danger-color;
+}
+.sub-box {
+  height: 50%;
+  position: relative;
+}
+.sub-list {
+  height: calc(100% - 9px);
+  position: absolute;
+  width: 100%;
+  z-index: 1;
+  top: 9px;
+
+  .sub-list__tabs {
+    height: 100%;
+    background-color: white;
+
+    &>div {
+      height: 100%;
+      background-color: #f6f6f6;
+
+      .nz-table2 {
+        height: calc(100% - 92px);
+        padding: 20px 20px 0;
+      }
+    }
+  }
+}
+.main-and-sub-transition {
+  transition: .4s height;
+}
+
+.resize-modal {
+  width: calc(100% - 240px);
+  opacity: 0.6;
+  background-color: #f5f9ff;
+  border: 1px solid #a7d0f7;
+  box-sizing: border-box;
+  position: fixed;
+  cursor: ns-resize;
+  display: none;
+  z-index: 20;
+  vertical-align: bottom;
+  bottom: 0;
+}
+
+/* end--二级顶部工具栏*/
+</style>

nezha-fronted/src/components/common/language/cn.js

@@ -767,8 +767,10 @@ const cn = {
     },
     model: {
       model: '资产型号',
-      vendor: '厂商',
+      name: '资产型号',
-      assets: '资产',
+      barnd: '品牌',
+      ChartTemplate: '图表模板',
+      assetNum: '资产编号',
       editModel: '编辑型号',
       createModel: '创建型号',
       remark: '备注',

nezha-fronted/src/components/common/language/en.js

@@ -717,8 +717,10 @@ const en = {
     },
     model: {
       model: 'Asset model',
-      vendor: 'Vendor',
+      brand: 'Brand', 
-      assets: 'Assets',
+      name: 'Asset model',
+      ChartTemplate: 'ChartTemplate',
+      assetNum: 'AssetNum',
       editModel: 'Edit model',
       createModel: 'Create model',
       remark: 'Remark',

nezha-fronted/src/components/common/rightBox/administration/modelBox.vue

@@ -0,0 +1,204 @@
+<template>
+  <div v-clickoutside="{obj: editModel, func: esc}" class="right-box right-box-asset">
+    <div class="right-box__header">
+      <div class="header__title">{{editModel.id ? $t('config.model.editModel') : $t('config.model.createModel')}}</div>
+      <div class="header__operation">
+        <span v-cancel="{obj: editModel, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
+      </div>
+    </div>
+    <div class="right-box__container">
+      <div class="container__form">
+        <el-form ref="modelForm" :model="editModel" :rules="rules" class="right-box-form right-box-form-left" label-position="top" label-width="120px">
+          <!--name-->
+          <el-form-item :label="$t('config.model.name')" prop="model">
+            <el-input v-model="editModel.remark" size="small" type="text"></el-input>
+          </el-form-item>
+          <!--brand-->
+          <el-form-item :label='$t("config.model.brand")' prop="brandId">
+            <el-select value-key="id" allow-create popper-class="config-dropdown" :filterable="true" v-model="editModel.brandId" placeholder="" size="small" id="module-box-input-project">
+            <el-option :id="'module-project-'+item.id" v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+          </el-form-item>
+          <!--remark-->
+          <el-form-item :label="$t('config.model.remark')" prop="remark">
+            <el-input v-model="editModel.remark" size="small" type="text"></el-input>
+          </el-form-item>
+          <!-- ChartTemplate -->
+          <el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate">
+            <v-selectpage 
+            :data="chartlList" 
+            :tb-columns="ChartSearchShowFields" 
+            :max-select-limit="3" 
+            :multiple="true"
+            title="ChartSearch"
+            placeholder="Please select item"
+            key-field="id"
+            v-model="editModel.chartIds" 
+            show-field="name" 
+            class="form-control"
+            @values="(data) => {editModel.chartIds = data.map(d => d.id).join(',')}"
+          ></v-selectpage>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div class="right-box__footer">
+      <button id="asset-edit-cancel" v-cancel="{obj: editModel, func: esc}" class="footer__btn footer__btn--light">
+        <span>{{$t('overall.cancel')}}</span>
+      </button>
+      <button id="asset-edit-save" :class="{'footer__btn--disabled': prevent_opt.save}" :disabled="prevent_opt.save" class="footer__btn" @click="save">
+        <span>{{$t('overall.save')}}</span>
+      </button>
+    </div>
+  </div>
+</template>
+
+<script>
+// import { host, port } from '@/components/common/js/validate'
+import selectWalk from '../../popBox/selectWalk'
+export default {
+  name: 'modelBox',
+  components: {
+    'select-walk': selectWalk,
+  },
+  props: {
+    obj: {
+      type: Object
+    }
+  },
+  computed: {
+    isCurrentUser () {
+      return function (username) {
+        return localStorage.getItem('nz-username') == username
+      }
+    }
+  },
+  data () {
+    return {
+      editModel: {}, 
+      brandList: [], // brand 列表数据
+      editModule: {}, 
+      chartlList: [], // chart 列表数据
+      ChartSearchShowFields: [ // ChartSearch 下拉搜索表头
+        {title: 'id',data: 'id'},
+        {title: 'name',data: 'name'},
+        {title: 'desc',data: 'type'},
+        {title: 'Description',data: 'Description'}
+      ],
+      url: 'asset/model',
+      brandUrl: 'asset/brand',
+      rightBox: { model: { show: false } },
+      roles: [],
+      rules: {
+          model: [
+            { required: true, message: '必填', trigger: 'blur' }
+          ],
+          brandId: [
+            { required: true, message: this.$t('validate.required'), trigger: 'change' }
+          ]
+      }
+    }
+  },
+  watch: {
+    obj: {
+      deep: true,
+      immediate: true,
+      handler (n) {
+        this.editModel = JSON.parse(JSON.stringify(n))
+      }
+    }
+  },
+  created () {
+    this.getBrandList()
+    this.ChartTemplateList()
+  },
+  methods: {
+    clickOutside () {
+      this.esc(false)
+    },
+    /* 关闭弹框 */
+    esc (refresh) {
+      this.prevent_opt.save = false
+      this.$emit('close', refresh)
+    },
+    saveModel () {
+      this.$refs.modelForm.validate((valid) => {
+        if (valid) {
+          if (this.editModel.id) {
+            console.log(this.editModel);
+            this.$put(this.url, this.editModel).then(res => {
+              this.prevent_opt.save = false
+              if (res.code === 200) {
+                this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
+                this.esc(true)
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+          } else {
+            this.$post(this.url, this.editModel).then(res => {
+              this.prevent_opt.save = false
+              if (res.code === 200) {
+                this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
+                this.esc(true)
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+          }
+        } else {
+          this.prevent_opt.save = false
+          return false
+        }
+      })
+    },
+    save () {
+      if (typeof this.editModel.brandId === 'string') { // 判断是否是新增的
+        this.$post(this.brandUrl, {name: this.editModel.brandId}).then(res => {
+          if (res.code === 200) { // 新增成功
+            this.getBrandList().then(res2 => { // 新增成功后，重新调用getBrandList，刷新brandList
+              const newBrand = this.brandList.find(b => b.name === this.editModel.brandId) // 取出刚新增的brand对象
+              if (newBrand) {
+                this.editModel.brandId = newBrand.id
+                this.saveModel()
+              }
+            })
+          }
+        })
+      } else {
+        this.saveModel()
+      }
+      
+    },
+    selectWalk (walk) {
+      console.log(walk);
+      if (this.editModule.walk.indexOf(walk) != -1) {
+        this.editModule.walk.splice(this.editModule.walk.indexOf(walk), 1)
+      } else {
+        this.editModule.walk.push(walk)
+      }
+    },
+    /* 获取brandList列表 */
+    getBrandList () {
+      return new Promise((resolve, reject) => {
+        this.$get('asset/brand', { pageSize: -1, pageNo: 1 }).then(response => {
+          if (response.code === 200) {
+            this.brandList = response.data.list
+            resolve()
+          }
+        })
+      })
+    },
+    /* 获取chart列表数据 */
+    ChartTemplateList () {
+      this.$get('visual/panel/chart',{pageSize : -1 , varType : 1, panelId: 0}).then(res => {
+        console.log(res);
+        this.chartlList = res.data.list
+      })
+    }
+  }
+}
+</script>
+<style lang="scss">
+  @import '@/assets/css/common/rightBoxCommon.scss';
+</style>

nezha-fronted/src/components/common/table/settings/modelTable.vue

@@ -0,0 +1,141 @@
+<template>
+  <el-table
+    id="modelTable"
+    ref="dataTable"
+    :data="tableData"
+    :height="height"
+    border
+    @header-dragend="dragend"
+    @sort-change="tableDataSort"
+    @selection-change="selectionChange"
+  >
+    <el-table-column
+      :resizable="false"
+      align="center"
+      type="selection"
+      width="55">
+    </el-table-column>
+    <el-table-column
+      v-for="(item, index) in customTableTitle"
+      v-if="item.show"
+      :key="`col-${index}`"
+      :fixed="item.fixed"
+      :label="item.label"
+      :min-width="`${item.minWidth}`"
+      :prop="item.prop"
+      :resizable="true"
+      :sort-orders="['ascending', 'descending']"
+      :width="`${item.width}`"
+    >
+      <template slot="header">
+        <span>{{item.label}}</span>
+        <div class="col-resize-area"></div>
+      </template>
+      <template slot-scope="scope" :column="item">
+        <template v-if="item.prop === 'roles'">
+          <template v-if="scope.row[item.prop]">
+            {{scope.row[item.prop].map(t=>t.name).join(',')}}
+          </template>
+          <template v-else>
+            <span>-</span>
+          </template>
+        </template>
+         <template v-else-if="item.prop === 'brand'">
+             {{scope.row.brand.name}}
+         </template>
+        <template v-else-if="item.prop === 'status'">
+          <el-switch
+            v-model="scope.row.status"
+            :active-color="theme.themeColor"
+            :disabled="isCurrentUser(scope.row.username) || !hasButton('user_edit') || (scope.row.username === 'admin' && scope.row.id === 1)"
+            active-value="1"
+            inactive-value="0"
+            @change="val => {statusChange(scope.row)}">
+          </el-switch>
+        </template>
+        <span v-else-if="item.prop === 'createTime'">{{utcTimeToTimezoneStr(scope.row[item.prop])}}</span>
+        <span v-else>{{scope.row[item.prop]}}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      :resizable="false"
+      :width="operationWidth"
+      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" @click="showBottomBox('operationLogTab', scope.row)"><i class="nz-icon nz-icon-view1"></i></button>
+        <el-dropdown size="medium" trigger="hover" @command="tableOperation">
+          <div class="table-operation-item table-operation-item--more">
+            <span>…</span><i class="nz-icon nz-icon-arrow-down"></i>
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item :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 :command="['delete', scope.row]" :disabled="scope.row.id === 1"><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>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+import table from '@/components/common/mixin/table'
+export default {
+  name: 'modelTable',
+  mixins: [table],
+  data () {
+    return {
+      tableTitle: [ // 原始table列
+        {
+          label: 'ID',
+          prop: 'id',
+          show: true,
+          width: 80
+        }, {
+          label: this.$t('config.model.name'),
+          prop: 'name',
+          show: true,
+          width: 160
+        }, {
+          label: this.$t('config.model.brand'),
+          prop: 'brand',
+          show: true,
+          width: 160
+        }, {
+          label: this.$t('config.model.remark'),
+          prop: 'remark',
+          show: true
+        },{
+          label: this.$t('config.model.assetNum'),
+          prop: 'assetNum',
+          show: true,
+          width:200
+        }
+      ]
+    }
+  },
+  methods: {
+    statusChange (user) {
+      if (user.roles) {
+        user.roleIds = user.roles.map(t => t.id)
+      }
+      this.$put(this.url, user).then(response => {
+        if (response.code === 200) {
+          this.rightBox.show = false
+          this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
+        } else {
+          this.$message.error(response.msg)
+        }
+        this.$emit('reload')
+      })
+    }
+  },
+  computed: {
+    isCurrentUser () {
+      return function (username) {
+        return localStorage.getItem('nz-username') === username
+      }
+    }
+  }
+}
+</script>

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

@@ -1,216 +1,86 @@
 <template>
-  <div style="height: 100%">
+  <div>
     <nz-data-list
       ref="dataList"
-      :components="['searchInput', 'elementSet']"
+      :api="url"
       :custom-table-title.sync="tools.customTableTitle"
       :from="fromRoute.model"
+      :layout="['searchInput', 'elementSet']"
       :search-msg="searchMsg"
-      :table-id="tableId"
+      @search="search"
-      :table-title="tableTitle">
+    >
       <template v-slot:top-tool-right>
-        <button id="model-add" v-has="'model_toAdd'" :title="$t('overall.createModel')" class="top-tool-btn margin-l-20" @click="add">
+        <button id="account-add" v-has="'user_add'" :title="$t('overall.createUser')" class="top-tool-btn margin-r-10"
+                type="button" @click="add">
           <i class="nz-icon-create-square nz-icon"></i>
         </button>
-        <delete-button id="model-list-batch-delete" v-has="'model_delete'" :delete-objs="batchDeleteObjs" api="model" @after="getTableData" @before="delFlag=true"></delete-button>
+        <delete-button id="account-list-batch-delete" v-has="'user_delete'" :api="url" :delete-objs="batchDeleteObjs" @after="getTableData" @before="delFlag=true"></delete-button>
       </template>
-      <template v-slot:default="slotProps">
+      <template v-slot="slotProps">
-        <el-table
+        <model-table
-          id="model-list-table"
           ref="dataTable"
-          v-loading="tools.loading"
+          v-loading="slotProps.loading"
-          :data="tableData"
+          :api="url"
+          :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"
-          border
+          :table-data="tableData"
-          @header-dragend="dragend"
+          @del="del"
-          @sort-change="tableDataSort"
+          @edit="edit"
-          @selection-change="(selection)=>{batchDeleteObjs=selection}"
+          @orderBy="tableDataSort"
-        >
+          @reload="getTableData"
-          <el-table-column
+          @selectionChange="selectionChange"
-            :resizable="false"
+          @showBottomBox="(targetTab, object) => { $refs.dataList.showBottomBox(targetTab, object) }"></model-table>
-            align="center"
-            type="selection"
-            width="55">
-          </el-table-column>
-          <el-table-column
-            v-for="(item, index) in tools.customTableTitle"
-            v-if="item.show"
-            :key="`col-${index}`"
-            :fixed="item.fixed"
-            :label="item.label"
-            :prop="item.prop"
-            :resizable="true"
-            :sort-orders="['ascending', 'descending']"
-            :width="`${item.width}`"
-            class="data-column"
-          >
-            <template slot="header">
-              <span>
-                <span>{{item.label}}</span>
-                <div class="col-resize-area"></div>
-              </span>
-            </template>
-            <template slot-scope="scope" :column="item">
-              <template v-if="item.prop === 'vendor'" >{{scope.row[item.prop].value}}</template>
-              <template v-else-if="item.prop === 'type'" >{{scope.row[item.prop].value}}</template>
-              <template v-else-if="item.prop === 'assetStat' && scope.row.assetStat" >
-                <el-popover
-                  :content="$t('overall.result.total') + '：' + scope.row.assetStat.total + '，' + $t('asset.inStock') + '：' + scope.row.assetStat.inStock + '，' + $t('asset.notInStock') + '：' + scope.row.assetStat.outStock + '，' + $t('asset.suspended') + '：' + scope.row.assetStat.suspended"
-                  placement="top"
-                  trigger="hover">
-                  <div slot="reference" class="dc-asset-states">
-                    <span class="dc-asset-state dc-asset-state-total">{{scope.row.assetStat.total}}</span>
-                    <span class="dc-asset-state dc-asset-state-in">{{scope.row.assetStat.inStock}}</span>
-                    <span class="dc-asset-state dc-asset-state-out">{{scope.row.assetStat.outStock}}</span>
-                    <span class="dc-asset-state dc-asset-state-suspended">{{scope.row.assetStat.suspended}}</span>
-                  </div>
-                </el-popover>
-              </template>
-              <template v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
-              <template v-else>-</template>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :resizable="false"
-            :width="operationWidth"
-            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" @click="$refs.dataList.showBottomBox('operationLog', scope.row)"><i class="nz-icon nz-icon-view1"></i></button>
-              <el-dropdown size="medium" trigger="hover" @command="tableOperation">
-                <div class="table-operation-item table-operation-item--more">
-                  <span>…</span><i class="nz-icon nz-icon-arrow-down"></i>
-                </div>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="['edit', scope.row]" :disabled="isBuildIn(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 :command="['delete', scope.row, `sys/role?ids=${scope.row.id}`]" :disabled="isBuildIn(scope.row)"><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>
-          </el-table-column>
-        </el-table>
-        <!-- 回到table顶部的按钮 -->
-        <button v-show="tools.showTopBtn && slotProps.mainResizeShow" id="role-list-totop" :class="{'to-top-is-hover': tools.tableHover}" :style="{top: tools.toTopBtnTop}" class="to-top" @click="toTop(scrollbarWrap)"><i class="nz-icon nz-icon-top"></i></button>
       </template>
-      <!-- 分页组件 -->
       <template v-slot:pagination>
-        <Pagination ref="Pagination" :pageObj="pageObj" :tableId="tableId" @pageNo='pageNo' @pageSize='pageSize'></Pagination>
+        <Pagination ref="Pagination" :page-obj="pageObj" :table-id="tableId" @pageNo='pageNo' @pageSize='pageSize'></Pagination>
       </template>
     </nz-data-list>
     <transition name="right-box">
-      <model-box v-if="rightBox.show" ref="modelBox" :model="object" @close="closeRightBox" @reload="getTableData"></model-box>
+      <model-box v-if="rightBox.show" :obj="object" @close="closeRightBox"></model-box>
     </transition>
   </div>
 </template>
 <script>
-import modelBox from '@/components/common/rightBox/modelBox'
 import deleteButton from '@/components/common/deleteButton'
+import modelBox from '@/components/common/rightBox/administration/modelBox'
 import nzDataList from '@/components/common/table/nzDataList'
-import tableMixin from '@/components/common/mixin/table'
+import dataListMixin from '@/components/common/mixin/dataList'
+import modelTable from '@/components/common/table/settings/modelTable'
+
 export default {
   name: 'model',
   components: {
-    deleteButton,
+    nzDataList,
     modelBox,
-    nzDataList
+    deleteButton,
+    modelTable
   },
-  mixins: [tableMixin],
+  mixins: [dataListMixin],
   data () {
     return {
-      tableId: 'modelTable', // 需要分页的table的id，用于记录每页数量
+      url: 'asset/model',
-
+      blankObject: { // 空白对象
-      blankObject: {
         id: '',
         name: '',
-        vendor: { id: '', value: '', code: '', type: '' },
+        chartIds: '',
-        type: { id: '', value: '', code: '', type: '' },
+        remark: ''
-        assetStat: { total: '', inStock: '', outStock: '' },
-        remark: '',
-        vendorCode: '',
-        typeCode: '',
-        uSize: 1
       },
-      tableTitle: [
+      tableId: 'modelTable',
-        {
-          label: 'ID',
-          prop: 'id',
-          show: true,
-          width: 80
-        }, {
-          label: this.$t('overall.name'),
-          prop: 'name',
-          show: true
-        }, {
-          label: this.$t('overall.type'),
-          prop: 'type',
-          show: true
-        }, {
-          label: this.$t('config.model.vendor'),
-          prop: 'vendor',
-          show: true
-        }, {
-          label: this.$t('config.model.assets'),
-          prop: 'assetStat',
-          show: true
-        }
-      ],
       searchMsg: { // 给搜索框子组件传递的信息
         zheze_none: true,
         searchLabelList: [{
-          id: 1,
+          id: 10,
-          name: 'ID',
+          name: this.$t('config.model.model'),
           type: 'input',
-          label: 'id',
+          label: 'name',
-          disabled: false
-        }, {
-          id: 5,
-          name: this.$t('config.promServer.dataCenter'),
-          type: 'dc',
-          label: 'dc',
           disabled: false
         }]
       }
     }
   },
   methods: {
-    assetStatClassName (param) {
+  },
-      if (param.column.label == this.$t('config.model.assets')) {
+  computed: {
-        return 'asset-state'
-      }
-      return ''
-    },
-    panel (obj) {
-      if (!this.hasButton('model_chart_view')) {
-        return
-      }
-      this.bottomBox.showSubList = true
-      this.bottomBox.model = obj
-      this.bottomBox.targetTab = 'panel'
-    },
-    getTableData () {
-      if (!this.hasButton('model_view')) {
-        this.$message.error(this.$t('tip.noAccess'))
-        return
-      }
-      this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
-      this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
-      this.$set(this.searchLabel, 'stat', 1)
-      this.tools.loading = true
-      this.$get('model', this.searchLabel).then(response => {
-        this.tools.loading = false
-        if (response.code === 200) {
-          this.tableData = response.data.list
-          this.pageObj.total = response.data.total
-          if (!this.scrollbarWrap) {
-            this.$nextTick(() => {
-              this.scrollbarWrap = this.$refs.dataTable.bodyWrapper
-              this.toTopBtnHandler(this.scrollbarWrap)
-            })
-          }
-        }
-      })
-    }
   }
 }
 </script>
-`

nezha-fronted/src/main.js

@@ -32,6 +32,9 @@ import pickTime from '@/components/common/pickTime'
 import bus from '@/libs/bus'
 import theme from '@/assets/css/theme.scss'
 
+import vSelectPage from 'v-selectpage';
+Vue.use(vSelectPage);
+
 Vue.component('Pagination', Pagination)
 Vue.component('searchInput', searchInput)
 Vue.component('element-set', elementSet)