Commit 58a766d5 authored by 蔡伟's avatar 蔡伟

Merge branch 'feat/layout-style' into 'dev'

feat(*): 跳转闭环传递时间段

See merge request !30
parents 9cb754f2 f5909de2
...@@ -632,7 +632,6 @@ import moment from 'moment'; ...@@ -632,7 +632,6 @@ import moment from 'moment';
import { getToken } from '@/utils/auth.js'; import { getToken } from '@/utils/auth.js';
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { storeToRefs } from 'pinia' import { storeToRefs } from 'pinia'
import { useUsersStore } from "@/pinia/user.js"; import { useUsersStore } from "@/pinia/user.js";
import { useRoute, useRouter } from "vue-router"; import { useRoute, useRouter } from "vue-router";
const router = useRouter(); const router = useRouter();
...@@ -646,7 +645,16 @@ const formInline = ref({ ...@@ -646,7 +645,16 @@ const formInline = ref({
warnType: '', warnType: '',
productionLineId: '', productionLineId: '',
deviceType: '', deviceType: '',
createTime: ['',''] createTime: route.query.startTime
? [
moment(new Date(route.query.startTime).getTime()).format(
"YYYY-MM-DD HH:mm:ss"
),
moment(new Date(route.query.endTime).getTime()).format(
"YYYY-MM-DD HH:mm:ss"
),
]
: ['','']
}); });
const workTicketNo = ref(''); const workTicketNo = ref('');
......
...@@ -379,6 +379,10 @@ const handleDusterLeakNumClick = () => { ...@@ -379,6 +379,10 @@ const handleDusterLeakNumClick = () => {
const handleCloseLoopNumClick = () => { const handleCloseLoopNumClick = () => {
router.push({ router.push({
path: "/my-loop/myAgency", path: "/my-loop/myAgency",
query: {
startTime: moment().subtract(24, 'hours').format("YYYY-MM-DD HH:mm:ss"),
endTime: moment().format("YYYY-MM-DD HH:mm:ss"),
},
}); });
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment