From c619448874e5aa04b72feaf35935143ece2fc9eb Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 22 Mar 2023 16:21:33 +0800 Subject: [PATCH] update --- src/main.js | 2 +- src/views/atomViews/ListViewWithHead.vue | 14 ++++++++++++-- src/views/modules/pms/carHistory/index.vue | 1 + src/views/modules/pms/currentCarLocation/config.js | 2 -- src/views/modules/pms/currentCarLocation/index.vue | 11 +++++++++-- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/main.js b/src/main.js index a16c25d..31e6160 100644 --- a/src/main.js +++ b/src/main.js @@ -25,7 +25,7 @@ import cloneDeep from 'lodash/cloneDeep' import myComponents from 'code-brick-zj' -import mocks from './mocks' +// import mocks from './mocks' Vue.config.productionTip = false diff --git a/src/views/atomViews/ListViewWithHead.vue b/src/views/atomViews/ListViewWithHead.vue index b1905cb..4fa714a 100644 --- a/src/views/atomViews/ListViewWithHead.vue +++ b/src/views/atomViews/ListViewWithHead.vue @@ -104,6 +104,8 @@ export default { triggerUpdate(val, oldVal) { if (val && val !== oldVal) { // get list + this.page = 1 + this.size = 20 this.getList(); } }, @@ -398,6 +400,14 @@ export default { } }); } + case "to-car-history": { + return this.$router.push({ + name: 'pms-carHistory', + query: { + code: data.code + } + }) + } } }, @@ -417,8 +427,8 @@ export default { if ("timerange" in params && !!params.timerange) { const [startTime, endTime] = params["timerange"]; delete params.timerange; - params.startTime = moment(startTime).format("YYYY-MM-DD HH:mm:ss"); - params.endTime = moment(endTime).format("YYYY-MM-DD HH:mm:ss"); + params.startTime = moment(startTime).format("YYYY-MM-DDTHH:mm:ss"); + params.endTime = moment(endTime).format("YYYY-MM-DDTHH:mm:ss"); } } diff --git a/src/views/modules/pms/carHistory/index.vue b/src/views/modules/pms/carHistory/index.vue index 1e38492..6261ca2 100644 --- a/src/views/modules/pms/carHistory/index.vue +++ b/src/views/modules/pms/carHistory/index.vue @@ -5,6 +5,7 @@ :dialog-configs="dialogConfigs" :listQueryExtra="[{ code }]" attach-list-query-data="code" + :trigger-update="triggerUpdateKey" /> diff --git a/src/views/modules/pms/currentCarLocation/config.js b/src/views/modules/pms/currentCarLocation/config.js index 0231a93..015ab4e 100644 --- a/src/views/modules/pms/currentCarLocation/config.js +++ b/src/views/modules/pms/currentCarLocation/config.js @@ -1,6 +1,4 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent"; -// import switchBtn from "@/components/noTemplateComponents/switchBtn"; -import QuillRichInput from "@/components/noTemplateComponents/richInput"; import request from "@/utils/request"; import { timeFilter } from '@/utils/filters' diff --git a/src/views/modules/pms/currentCarLocation/index.vue b/src/views/modules/pms/currentCarLocation/index.vue index c9f36d7..4e7c848 100644 --- a/src/views/modules/pms/currentCarLocation/index.vue +++ b/src/views/modules/pms/currentCarLocation/index.vue @@ -1,5 +1,12 @@