Commit cfdfb273 authored by liqiuyu's avatar liqiuyu

Merge branch 'dev' of https://app.bmetech.com/liuzhaohui/dctomproject into dev

parents 930886d6 5c08188d
This diff is collapsed.
This diff is collapsed.
...@@ -1194,7 +1194,10 @@ const disposeWorkSheetDetail = (obj)=> { ...@@ -1194,7 +1194,10 @@ const disposeWorkSheetDetail = (obj)=> {
// 其他页面跳转当前页面,携带参数初始化 // 其他页面跳转当前页面,携带参数初始化
const getInitParams = () => { const getInitParams = () => {
if (route.query) { if (route.query) {
const { suspendStartTime, suspendEndTime } = route.query; const { deviceName, suspendStartTime, suspendEndTime } = route.query;
if (deviceName) {
formInline.value.keyword = deviceName;
}
if (suspendStartTime) { if (suspendStartTime) {
formInline.value.createTime[0] = suspendStartTime; formInline.value.createTime[0] = suspendStartTime;
} }
......
...@@ -131,7 +131,7 @@ const form = reactive({ ...@@ -131,7 +131,7 @@ const form = reactive({
dusterNo: "", dusterNo: "",
dateValue: [ dateValue: [
moment(new Date(new Date().getTime() - 24 * 60 * 60 * 1000 * 10)).format("YYYY-MM-DD") + ' 00:00:00', moment(new Date(new Date().getTime() - 24 * 60 * 60 * 1000 * 10)).format("YYYY-MM-DD") + ' 00:00:00',
moment(new Date()).format("YYYY-MM-DD") + ' 00:00:00', moment(new Date()).format("YYYY-MM-DD") + ' 23:59:59',
], ],
}); });
const startVal = ref(null); const startVal = ref(null);
......
...@@ -320,7 +320,7 @@ const onExportFile = () => { ...@@ -320,7 +320,7 @@ const onExportFile = () => {
const onDownloadTemplate = () => { const onDownloadTemplate = () => {
// window.open('http://visimg.bmetech.com/stone/img/1748314002767/设备数据.xlsx') // window.open('http://visimg.bmetech.com/stone/img/1748314002767/设备数据.xlsx')
axios axios
.get("http://visimg.bmetech.com/stone/img/1748314002767/设备数据.xlsx", { .get("https://visimg.bmetech.com/stone/img/1748314002767/设备数据.xlsx", {
responseType: "blob", responseType: "blob",
}) })
.then((res) => { .then((res) => {
......
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