diff --git a/.env.development b/.env.development index 3cc4689..a1d29ea 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 智能开关管理系统 +VUE_APP_TITLE = 智能开关-开发 # 开发环境配置 ENV = 'development' diff --git a/public/favicon.ico b/public/favicon.ico index e263760..1b1cddb 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index e263760..f0698f4 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 2455a1e..14040d5 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -5,7 +5,7 @@ const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dyn const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || '' const state = { title: '', - theme: storageSetting.theme || '#409EFF', + theme: storageSetting.theme || '#8883F0', sideTheme: storageSetting.sideTheme || sideTheme, showSettings: showSettings, topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav, diff --git a/src/utils/mixins.js b/src/utils/mixins.js index 15e501e..1bdae5f 100644 --- a/src/utils/mixins.js +++ b/src/utils/mixins.js @@ -25,3 +25,32 @@ export const $view = { } } } + + +/** + * 显隐列 + **/ +export const $showColumns = { + data() { + return { + columns: [] + } + }, + computed: { + showColumns() { + if (this.columns == null) { + return []; + } + return this.columns.filter(item => item.visible); + }, + isShow() { + return (key) => { + if (this.columns == null) { + return false; + } + let column = this.columns.find(item => item.key === key); + return column != null && column.visible; + } + } + }, +} diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue index eb8668a..cad7b41 100644 --- a/src/views/system/device/index.vue +++ b/src/views/system/device/index.vue @@ -312,9 +312,6 @@ export default { modelId: [ { required: true, message: "型号不能为空", trigger: "change" } ], - deviceName: [ - { required: true, message: "设备名称不能为空", trigger: "change" } - ], mac: [ { required: true, message: "设备MAC不能为空", trigger: "change" } ], diff --git a/src/views/system/smUser/index.vue b/src/views/system/smUser/index.vue index 7cd1a8e..9ffac52 100644 --- a/src/views/system/smUser/index.vue +++ b/src/views/system/smUser/index.vue @@ -89,66 +89,61 @@ v-hasPermi="['system:smUser:export']" >导出 - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +