|
@@ -19,7 +19,7 @@
|
|
|
</el-date-picker>
|
|
|
<el-button type="primary" size="mini" @click="totime(time, 1)">查询</el-button>
|
|
|
</el-col>
|
|
|
- <div id="card_one" style="width: 70vw; height: 30vw; margin: 40px 0 0 0"></div>
|
|
|
+ <div id="card_thr" style="width: 70vw; height: 30vw; margin: 40px 0 0 0"></div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
@@ -50,8 +50,8 @@ export default {
|
|
|
async created() {},
|
|
|
methods: {
|
|
|
...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
|
|
|
- async search({ skip = 0, limit = 10 } = {}) {
|
|
|
- let res = await this.query({ skip, limit, status: '1' });
|
|
|
+ async search({ skip = 0, limit = 10, ...info } = {}) {
|
|
|
+ let res = await this.query({ skip, limit, status: '1', type: info.time, start: info.start, end: info.end });
|
|
|
if (this.$checkRes(res)) {
|
|
|
let list = res.data.sMarkOrder;
|
|
|
let xAxisList = [];
|