This commit is contained in:
2023-10-10 16:06:53 +08:00
parent 51f101ea4e
commit 78796203f6
38 changed files with 487 additions and 438 deletions

View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-21 14:26:23
* @LastEditors: zwq
* @LastEditTime: 2023-10-07 16:45:47
* @LastEditTime: 2023-10-10 16:05:52
* @Description:
-->
<template>
@@ -12,9 +12,9 @@
ref="searchBarForm"
@headBtnClick="buttonClick" />
<div class="tips">
<el-tag effect="dark"></el-tag>
<el-tag type="success" effect="dark"></el-tag>
<el-tag type="warning" effect="dark"></el-tag>
<el-tag effect="dark" color="#7362F3" style="border:none"></el-tag>
<el-tag effect="dark" color="#16DC09" style="border:none"></el-tag>
<el-tag effect="dark" color="#FFA08F" style="border:none"></el-tag>
</div>
<div class="mainbody">
<div v-for="a in listQuery.total" :key="a">
@@ -25,11 +25,11 @@
class="dashboard-layout-item"
v-for="a in wareData.one"
:key="a.id+a.warehouseStorehouseCode"
:style="{background: bgColor[a.warehouseStorehouseState], float: 'left'}">
<!-- <div
style="background: #FFF8E8; float: left">
<div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ a.warehouseStorehouseCode }}
:style="{background: bgColor[a.warehouseStorehouseState]}" />
{{ a.warehouseStorehouseName }}
</div>
</el-row>
<el-row>
@@ -37,11 +37,11 @@
class="dashboard-layout-item"
v-for="b in wareData.two"
:key="b.id+b.warehouseStorehouseCode"
:style="{background: bgColor[b.warehouseStorehouseState], float: 'left'}">
<!-- <div
style="background: #FFF8E8; float: left">
<div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ b.warehouseStorehouseCode }}
:style="{background: bgColor[b.warehouseStorehouseState]}" />
{{ b.warehouseStorehouseName }}
</div>
</el-row>
</el-col>
@@ -54,11 +54,11 @@
class="dashboard-layout-item"
v-for="c in wareData.there"
:key="c.id+c.warehouseStorehouseCode"
:style="{background: bgColor[c.warehouseStorehouseState], float: 'left'}">
<!-- <div
style="background: #FFF8E8; float: left">
<div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ c.warehouseStorehouseCode }}
:style="{background: bgColor[c.warehouseStorehouseState]}" />
{{ c.warehouseStorehouseName }}
</div>
</el-row>
<el-row>
@@ -66,11 +66,11 @@
class="dashboard-layout-item"
v-for="d in wareData.four"
:key="d.id+d.warehouseStorehouseCode"
:style="{background: bgColor[d.warehouseStorehouseState], float: 'left'}">
<!-- <div
style="background: #FFF8E8; float: left">
<div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ d.warehouseStorehouseCode }}
:style="{background: bgColor[d.warehouseStorehouseState]}" />
{{ d.warehouseStorehouseName }}
</div>
</el-row>
</el-col>
@@ -82,7 +82,7 @@
<script>
import basicPage from '../mixins/basic-page';
import { getWarehouseStorehouseList } from '@/api/asrs/warehouseStorehouse';
import { getWarehouseStorehouseList,exportWarehouseStorehouseExcel } from '@/api/asrs/warehouseStorehouse';
export default {
mixins: [basicPage],
@@ -90,6 +90,7 @@ export default {
return {
urlOptions: {
getDataListURL: getWarehouseStorehouseList,
exportURL: exportWarehouseStorehouseExcel,
},
listQuery: {
wareLayer: 1,
@@ -101,7 +102,7 @@ export default {
there: [],
four: [],
},
bgColor:['#37d97f','#ffbd02','#0b58ff'],
bgColor:['#16DC09','#FFA08F','#7362F3'],
formConfig: [
{
type: 'select',
@@ -123,6 +124,13 @@ export default {
name: 'search',
color: 'primary',
},
{
type: 'button',
btnName: '下载',
name: 'export',
plain: true,
color: 'primary',
},
],
};
},
@@ -161,6 +169,9 @@ export default {
this.listQuery.wareLayer = val.value;
this.getDataList();
break;
case 'export':
this.handleExport(this.aId);
break;
default:
console.log(val);
}
@@ -176,13 +187,12 @@ export default {
flex-direction: column;
}
.dashboard-layout-item {
color: white;
width: 3.3%;
width: 80px;
text-align: center;
height: 40px;
height: 32px;
box-shadow: 0px 3px 6px 0px rgba(166, 174, 190, 0.8);
border-radius: 2px 4px 4px 2px;
margin-bottom: 4px;
margin-bottom: 8px;
display: flex;
align-items: center;
justify-content: center;
@@ -194,11 +204,12 @@ export default {
margin-right: 6px;
}
&:hover {
background-color: rgba(85, 136, 253, 0.8) !important;
color: #ffffff;
cursor: pointer;
transform: scaleY(1.3) translateZ(0);
transform: scale(1.3) translateZ(0);
}
&:nth-child(2n) {
margin-right: 24px;
}
}
.el-divider--horizontal {
margin: 10px 0;
@@ -209,6 +220,6 @@ export default {
.tips {
position: absolute;
top: 22px;
left: 370px;
right: 120px;
}
</style>

View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-21 14:26:23
* @LastEditors: zwq
* @LastEditTime: 2023-10-07 16:45:37
* @LastEditTime: 2023-10-10 15:41:01
* @Description:
-->
<template>
@@ -12,9 +12,9 @@
ref="searchBarForm"
@headBtnClick="buttonClick" />
<div class="tips">
<el-tag effect="dark"></el-tag>
<el-tag type="success" effect="dark"></el-tag>
<el-tag type="warning" effect="dark"></el-tag>
<el-tag type="info" color="#D8E5FF"></el-tag>
<el-tag type="info" color="#FFF8E8"></el-tag>
<el-tag type="info" color="#F6F6F6"></el-tag>
</div>
<div class="mainbody">
<div v-for="a in listQuery.total" :key="a">
@@ -29,7 +29,7 @@
<!-- <div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ a.warehouseStorehouseCode }}
{{ a.warehouseStorehouseName }}
</div>
</el-row>
<el-row>
@@ -41,7 +41,7 @@
<!-- <div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ b.warehouseStorehouseCode }}
{{ b.warehouseStorehouseName }}
</div>
</el-row>
</el-col>
@@ -58,7 +58,7 @@
<!-- <div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ c.warehouseStorehouseCode }}
{{ c.warehouseStorehouseName }}
</div>
</el-row>
<el-row>
@@ -70,7 +70,7 @@
<!-- <div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ d.warehouseStorehouseCode }}
{{ d.warehouseStorehouseName }}
</div>
</el-row>
</el-col>
@@ -82,7 +82,7 @@
<script>
import basicPage from '../mixins/basic-page';
import { getWarehouseStorehouseList } from '@/api/asrs/warehouseStorehouse';
import { getWarehouseStorehouseList,exportWarehouseStorehouseExcel } from '@/api/asrs/warehouseStorehouse';
export default {
mixins: [basicPage],
@@ -90,6 +90,7 @@ export default {
return {
urlOptions: {
getDataListURL: getWarehouseStorehouseList,
exportURL: exportWarehouseStorehouseExcel,
},
listQuery: {
wareLayer: 1,
@@ -101,7 +102,7 @@ export default {
there: [],
four: [],
},
bgColor:['#37d97f','#ffbd02','#0b58ff'],
bgColor:['#FFF8E8','#F6F6F6','#D8E5FF'],
formConfig: [
{
type: 'select',
@@ -123,6 +124,13 @@ export default {
name: 'search',
color: 'primary',
},
{
type: 'button',
btnName: '下载',
name: 'export',
plain: true,
color: 'primary',
},
],
};
},
@@ -162,6 +170,9 @@ export default {
this.listQuery.wareLayer = val.value;
this.getDataList();
break;
case 'export':
this.handleExport(this.bId);
break;
default:
console.log(val);
}
@@ -177,7 +188,6 @@ export default {
flex-direction: column;
}
.dashboard-layout-item {
color: white;
width: 3.3%;
text-align: center;
height: 40px;
@@ -195,10 +205,8 @@ export default {
margin-right: 6px;
}
&:hover {
background-color: rgba(85, 136, 253, 0.8) !important;
color: #ffffff;
cursor: pointer;
transform: scaleY(1.3) translateZ(0);
transform: scale(1.3) translateZ(0);
}
}
.el-divider--horizontal {
@@ -210,6 +218,6 @@ export default {
.tips {
position: absolute;
top: 22px;
left: 370px;
right: 120px;
}
</style>