jc
fanluyan 1 year ago
parent ba6492eb52
commit cea121f20a

@ -78,21 +78,21 @@ export default {
index: "/realTimeSearch", index: "/realTimeSearch",
title: "历史图片", title: "历史图片",
}, },
{ // {
icon: "iconfont icon-fubing", // icon: "iconfont icon-fubing",
index: "/weatherIce", // index: "/weatherIce",
title: "气象覆冰", // title: "",
subs: [ // subs: [
{ // {
index: "/weather", // index: "/weather",
title: "气象监测", // title: "",
}, // },
{ // {
index: "/icing", // index: "/icing",
title: "覆冰监测", // title: "",
}, // },
], // ],
}, // },
{ {
icon: "el-icon-files", icon: "el-icon-files",
index: "/property", index: "/property",

@ -53,6 +53,13 @@
@focus="handleFocus" @focus="handleFocus"
> >
</el-date-picker> </el-date-picker>
<el-button
type="primary"
@click="setnowTime"
style="margin-left: 12px"
:loading="nowTimesetLoading"
>校时</el-button
>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
@ -997,6 +1004,7 @@ export default {
isShow: false, isShow: false,
activeName: "1", activeName: "1",
timeLoading: false, timeLoading: false,
nowTimesetLoading: false,
timesetLoading: false, timesetLoading: false,
devicenewtime: "", devicenewtime: "",
devicetime: "", devicetime: "",
@ -1250,9 +1258,56 @@ export default {
}, },
{ {
name: "time", name: "time",
value: this.devicenewtime / 1000, value: Math.round(this.devicenewtime / 1000),
},
];
this.setTermFn(params);
} else {
console.log("error submit!!");
this.$message({
duration: 1500,
showClose: true,
message: "请填写新装置时间",
type: "error",
});
return false;
}
} else {
this.$message({
duration: 1500,
showClose: true,
message: "装置下线,发送指令失败",
type: "error",
});
}
},
//
setnowTime() {
if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
const deviceNowTime = new Date().getTime();
console.log(deviceNowTime);
this.devicenewtime = deviceNowTime;
if (
deviceNowTime !== "" &&
deviceNowTime !== undefined &&
deviceNowTime !== null
) {
this.nowTimesetLoading = true;
let params = [
{
name: "act",
value: "time",
},
{
name: "flag",
value: 1,
},
{
name: "time",
value: Math.round(deviceNowTime / 1000),
}, },
]; ];
console.log(params);
this.setTermFn(params); this.setTermFn(params);
} else { } else {
console.log("error submit!!"); console.log("error submit!!");
@ -2018,6 +2073,7 @@ export default {
this.i = 0; this.i = 0;
this.timeLoading = false; this.timeLoading = false;
this.timesetLoading = false; this.timesetLoading = false;
this.nowTimesetLoading = false;
this.sampLoading = false; this.sampLoading = false;
this.sampSetLoading = false; this.sampSetLoading = false;
this.upperLoading = false; this.upperLoading = false;
@ -2093,6 +2149,7 @@ export default {
}); });
this.timeLoading = false; this.timeLoading = false;
this.timesetLoading = false; this.timesetLoading = false;
this.nowTimesetLoading = false;
this.sampLoading = false; this.sampLoading = false;
this.sampSetLoading = false; this.sampSetLoading = false;
this.upperLoading = false; this.upperLoading = false;
@ -2230,6 +2287,8 @@ export default {
this.tabsActive = "first"; this.tabsActive = "first";
this.samplingForm = {}; this.samplingForm = {};
this.deviceTimeForm = {}; this.deviceTimeForm = {};
this.devicenewtime = "";
this.devicetime = "";
this.upperComputer = {}; this.upperComputer = {};
this.inetComputer = {}; this.inetComputer = {};
this.idParameter = {}; this.idParameter = {};

@ -22,12 +22,12 @@ module.exports = defineConfig({
"/api": { "/api": {
//表示拦截以/api开头的请求路径 //表示拦截以/api开头的请求路径
//target: "http://180.166.218.222:40080", //dell //target: "http://180.166.218.222:40080", //dell
target: "http://192.168.1.190:8080", //liu 本机ip 需要去掉/Api // target: "http://192.168.1.190:8080", //liu 本机ip 需要去掉/Api
//target: "http://192.168.50.7:8093", //liu 本机ip 需要去掉/Api //target: "http://192.168.50.7:8093", //liu 本机ip 需要去掉/Api
//target: "http://192.168.111.211:80", //东视 target: "http://192.168.111.211:80", //东视
changOrigin: true, //是否开启跨域 changOrigin: true, //是否开启跨域
pathRewrite: { pathRewrite: {
"^/api": "", //重写api把api变成空字符因为我们真正请求的路径是没有api的 "^/api": "/api", //重写api把api变成空字符因为我们真正请求的路径是没有api的
}, },
}, },
}, },

Loading…
Cancel
Save