diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index ce06f28..466b15b 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2022-03-03 09:16:10 * @LastEditors: gtz - * @LastEditTime: 2022-03-07 19:47:15 + * @LastEditTime: 2022-03-08 14:34:24 * @Description: file content * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue --> @@ -28,29 +28,32 @@ - + - + -
+
{{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
+ - + - + -
+
{{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
@@ -58,12 +61,15 @@ -
+
{{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
+ @@ -99,6 +105,7 @@ export default { overflow-x: scroll; padding: 0 16px; padding-top: 24px; + font-size: 14px; .dashboard-main { width: 100%; min-width: 1380px; @@ -152,6 +159,10 @@ export default { .dashboard-layout { margin: 20px 0; .dashboard-layout-shelf-box { + .dashboard-layout-footer { + text-align: center; + margin-top: 12px; + } .dashboard-layout-shelf { padding: 0 8px; .dashboard-layout-row { @@ -160,15 +171,18 @@ export default { width: 100%; text-align: center; height: 32px; - line-height: 32px; box-shadow: 0px 3px 6px 0px rgba(166, 174, 190, 0.8); border-radius: 2px 4px 4px 2px; margin-bottom: 8px; + display: flex; + align-items: center; + justify-content: center; .dashboard-layout-item-cricle{ display: inline-block; width: 12px; height: 12px; border-radius: 6px; + margin-right: 6px; } } } diff --git a/src/views/dashboard/testdata.js b/src/views/dashboard/testdata.js index 1465a5f..20de52c 100644 --- a/src/views/dashboard/testdata.js +++ b/src/views/dashboard/testdata.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2022-03-03 15:47:47 * @LastEditors: gtz - * @LastEditTime: 2022-03-07 19:08:57 + * @LastEditTime: 2022-03-07 20:41:47 * @Description: file content * @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js */ @@ -2927,12 +2927,12 @@ export default { } ], portAttributeList: [ - { id: 1, name: 'Working Port', color: '#D8E5FF' }, + { id: 1, name: 'Working Port', color: '#E1EBFF' }, { id: 2, name: 'Buffer Port', color: '#FFF8E8' }, { id: 3, name: 'Exception Port', color: '#F6F6F6' } ], portAttributeObj: { - 1: '#D8E5FF', + 1: '#E1EBFF', 2: '#FFF8E8', 3: '#F6F6F6' }, diff --git a/vue.config.js b/vue.config.js index ee7ccf1..f778620 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,9 +46,9 @@ module.exports = { // 这里写入需要代理的api和对应的目标地址 proxy: { '/api': { - target: 'http://localhost:8080', + // target: 'http://localhost:8080', // target: 'http://192.168.0.148:8080', - // target: 'http://a.wms.picaiba.com/api', + target: 'http://a.wms.picaiba.com/api', // target: 'http://192.168.0.127:8080', // target: 'http://192.168.0.165:8080', // target: 'http://192.168.43.105:8080',