mt-ck-00a/mt-ck-wms-ui
8
0
Fork 0
Código Incidencias Pull Requests Lanzamientos Wiki Actividad

update dashboard

Explorar el Código
Este commit está contenido en:
gtz217 2022-03-08 14:34:48 +08:00
padre cf888de5d8
commit b6d0d32b6f
Se han modificado 2 ficheros con 15 adiciones y 5 borrados
Mostrar estadísticas Descargar archivo de parche Descargar archivo de diferencias Expandir todos los archivos Contraer todos los archivos

16
src/views/dashboard/index.vue
Ver fichero

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-03-03 09:16:10
* @LastEditors: gtz
* @LastEditTime: 2022-03-07 20:14:55
* @LastEditTime: 2022-03-08 14:34:24
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
-->
@ -31,7 +31,7 @@
<el-row v-if="current * 80 < shelfList[0].rowList[0].portList.length" class="dashboard-layout" :gutter="12">
<el-col v-for="item in 4" :key="'shelfbox' + item" class="dashboard-layout-shelf-box" :span="6">
<el-row>
<el-col v-for="i in shelfList" :key="item + 'shelf' + i.id" :span="12" class="dashboard-layout-shelf">
<el-col v-for="(i, index) in shelfList" :key="item + 'shelf' + i.id" :span="12" class="dashboard-layout-shelf">
<el-row>
<el-col v-for="z in i.rowList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
<div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}">
@ -40,6 +40,9 @@
</div>
</el-col>
</el-row>
<div class="dashboard-layout-footer">
{{ '第' + (index + 1) + '排(' + ((current - 1) * 4 + item) + ')' }}
</div>
</el-col>
</el-row>
</el-col>
@ -47,7 +50,7 @@
<el-row v-else class="dashboard-layout" :gutter="12">
<el-col v-for="item in Math.ceil((shelfList[0].rowList[0].portList.length - (current - 1) * 80) / 20)" :key="'shelfbox' + item" class="dashboard-layout-shelf-box" :span="6">
<el-row>
<el-col v-for="i in shelfList" :key="item + 'shelf' + i.id" :span="12" class="dashboard-layout-shelf">
<el-col v-for="(i, index) in shelfList" :key="item + 'shelf' + i.id" :span="12" class="dashboard-layout-shelf">
<el-row v-if="item < Math.ceil((shelfList[0].rowList[0].portList.length - (current - 1) * 80) / 20)">
<el-col v-for="z in i.rowList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
<div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}">
@ -64,6 +67,9 @@
</div>
</el-col>
</el-row>
<div class="dashboard-layout-footer">
{{ '第' + (index + 1) + '排(' + ((current - 1) * 4 + item) + ')' }}
</div>
</el-col>
</el-row>
</el-col>
@ -153,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 {

4
vue.config.js
Ver fichero

@ -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',