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

2021-04-27 21:00:11 +08:00
parent d364d8f76f 17ddaa3f64
commit 2fda104eeb
72 changed files with 8388 additions and 2334 deletions
--- a/nezha-fronted/src/components/common/table/settings/modelTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/modelTable.vue
@@ -95,11 +95,11 @@ export default {
          label: this.$t('config.model.remark'),
          prop: 'remark',
          show: true
-        },{
+        }, {
          label: this.$t('config.model.assetNum'),
          prop: 'assetNum',
          show: true,
-          width:200
+          width: 200
        }
      ]
    }