diff --git a/.eslintrc.js b/.eslintrc.js index 0c290b7..591320c 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -192,6 +192,15 @@ module.exports = { 'object-curly-spacing': [2, 'always', { objectsInObjects: false }], - 'array-bracket-spacing': [2, 'never'] + 'array-bracket-spacing': [2, 'never'], + "vue/html-self-closing": ["error", { + "html": { + "void": "always", + "normal": "never", + "component": "always" + }, + "svg": "always", + "math": "always" + }], } } diff --git a/src/assets/images/home/theme_Img_03.png b/src/assets/images/home/theme_Img_03.png new file mode 100644 index 0000000..2ab6e2d Binary files /dev/null and b/src/assets/images/home/theme_Img_03.png differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 86ff946..70951e2 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -5,6 +5,7 @@ @import 'sidebar'; @import 'btn'; @import 'eladmin'; +@import 'iconfont.css'; body { height: 100%; @@ -197,25 +198,22 @@ aside { padding: 0 18px; background: #fff; border-radius: 4px; + overflow: hidden; .home_item_title { display: flex; padding: 18px 0; border-bottom: 1px solid #eee; - h4 { margin-left: 6px; font-size: 16px; color: #333333; } - .iconfont { font-size: 16px; color: #3a8aeb; } } } - - .auth_code { position: relative; .login-code { diff --git a/src/main.js b/src/main.js index 16738d9..f4c6290 100644 --- a/src/main.js +++ b/src/main.js @@ -17,7 +17,6 @@ import checkPer from '@/utils/permission' import permission from './components/Permission' import './assets/styles/element-variables.scss' // global css -import './assets/styles/iconfont.css' import './assets/styles/index.scss' // 代码高亮 diff --git a/src/settings.js b/src/settings.js index 0a595c6..81efc0a 100644 --- a/src/settings.js +++ b/src/settings.js @@ -38,7 +38,7 @@ module.exports = { /** * 是否显示设置的底部信息 */ - showFooter: true, + showFooter: false, /** * 底部文字,支持html语法 */ diff --git a/src/views/dashboard/AgencyData.vue b/src/views/dashboard/AgencyData.vue index f81f8b7..859e500 100644 --- a/src/views/dashboard/AgencyData.vue +++ b/src/views/dashboard/AgencyData.vue @@ -4,6 +4,33 @@

机构数据

+
+
+

+ 当前版本:普通版 +

+

+ 有效时间:2023-12-31 +

+

+ 联系人:周杰伦 +

+

+ 联系方式:15100701025 +

+
+
+ 升级 +

+ 屏幕数量: + 1/10 +

+

+ 管理人员: + 2/10 +

+
+
@@ -23,6 +50,37 @@ export default { \ No newline at end of file + diff --git a/src/views/dashboard/DeviceData.vue b/src/views/dashboard/DeviceData.vue index 3aa1115..d550cb7 100644 --- a/src/views/dashboard/DeviceData.vue +++ b/src/views/dashboard/DeviceData.vue @@ -8,7 +8,7 @@
设备总数量
- 1 + 2
@@ -54,6 +54,7 @@ export default { padding: 18px 22px 0 22px; .info_item { position: relative; + font-size: 14px; width: 136px; height: 141px; padding: 19px 18px 24px 18px; @@ -74,13 +75,14 @@ export default { .info_total { position: absolute; right: 18px; - bottom: 24px; + bottom: 12px; display: flex; // align-items: flex-end; span { display: block; &:last-child { - margin-top: 32px; + font-size: 12px; + margin-top: 38px; } } .info_num { diff --git a/src/views/dashboard/PublishProcess.vue b/src/views/dashboard/PublishProcess.vue index 9982df0..2ac253f 100644 --- a/src/views/dashboard/PublishProcess.vue +++ b/src/views/dashboard/PublishProcess.vue @@ -37,7 +37,7 @@ export default { diff --git a/src/views/home.vue b/src/views/home.vue index aa7cf68..fad2976 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -12,6 +12,7 @@ + @@ -20,12 +21,14 @@ import PublishProcess from './dashboard/PublishProcess' import DeviceData from './dashboard/DeviceData' import AgencyData from './dashboard/AgencyData' +import ThemeGallery from './dashboard/ThemeGallery' export default { name: 'Dashboard', components: { PublishProcess, DeviceData, - AgencyData + AgencyData, + ThemeGallery }, data() { return { @@ -41,5 +44,6 @@ export default { padding: 24px; background-color: #f5f5f5; position: relative; + min-height: calc(100vh - 64px); }