ly.fan
/
xy-frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化报表

Browse Source
jc
fanluyan 9 months ago
parent 56db09b6f7
commit 1dc6818eca
8 changed files with 112 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
src/views/photographicDevice/components/parameterSetDialog.vue
Unescape Escape View File

@ -862,7 +862,7 @@
</el-form-item>
<el-form-item label="数据包" prop="packetVal">
<el-input-number
:min="1"
:min="0.1"
:max="32"
v-model="upgradationform.packetVal"
></el-input-number>

7
src/views/realTimeMonitor/components/parameterArea.vue
Unescape Escape View File

@ -477,12 +477,7 @@ export default {
//历史图片跳转
handlehistoryPic() {
console.log(this.areaData);
if (this.areaData.id == "13276") {
// "id": 13009,
// "towerid": 3980,
this.$set(this.areaData, "id", 13009);
this.$set(this.areaData, "towerid", 3980);
}
console.log(this.selectDyId, this.selectLineId, this.selectTowerId);
// console.log(this.zzCmdid, this.selectChannelValue);
if (typeof this.dateValue == "number") {

27
src/views/realTimeMonitor/components/setAppDialog.vue
Unescape Escape View File

@ -108,6 +108,10 @@
label="故障上报"
v-model="appForm.reportFault"
></el-checkbox>
<el-checkbox
label="输出调试信息"
v-model="appForm.outputDbgInfo"
></el-checkbox>
</el-form-item>
<el-form-item label="CMA服务器端口" class="cmaClass">
<el-input v-model="appForm.port"></el-input>
@ -187,6 +191,7 @@ export default {
productionDate: "", // 生产日期
workStatusTimes: 3,
reportFault: "", //故障上报
outputDbgInfo: "", //输出调试信息
},
protocolOptions: [
{
@ -309,7 +314,7 @@ export default {
},
{
name: "configs",
value: 18,
value: 19,
},
//装置通道数
{ name: "name1", value: "channels" },
@ -389,6 +394,9 @@ export default {
{ name: "name18", value: "reportFault" },
{ name: "value18", value: this.appForm.reportFault ? 1 : 0 },
{ name: "type18", value: 0 },
{ name: "name19", value: "outputDbgInfo" },
{ name: "value19", value: this.appForm.outputDbgInfo ? 1 : 0 },
{ name: "type19", value: 0 },
];
this.setTermFn(params);
} else {
@ -530,9 +538,13 @@ export default {
this.appForm.channels = resultContent.channels; //装置通道数,程序默认值为4
this.appForm.packetSize = resultContent.packetSize; //图像数据分包大小
this.appForm.timeForKeepingLogs =
resultContent.timeForKeepingLogs / 86400; //效范围：1*86400（含）-45*86400（含） 不设置的默认值为 15*86400
resultContent.timeForKeepingLogs !== undefined
? resultContent.timeForKeepingLogs / 86400
: ""; //效范围：1*86400（含）-45*86400（含） 不设置的默认值为 15*86400
this.appForm.timeForKeepingPhotos =
resultContent.timeForKeepingPhotos / 86400; //有效范围：1*86400（含）-45*86400（含） 不设置的默认值为 15*86400
resultContent.timeForKeepingPhotos !== undefined
? resultContent.timeForKeepingPhotos / 86400
: ""; //有效范围：1*86400（含）-45*86400（含） 不设置的默认值为 15*86400
this.appForm.imgQuality = resultContent.imgQuality; //图像质量
this.appForm.heartbeat = resultContent.heartbeat; //心跳周期
this.appForm.upgradePacketBase = resultContent.upgradePacketBase; //升级报文中，子包起始号 一般可设置的值是 0或者1
@ -547,7 +559,12 @@ export default {
this.appForm.bsManufacturer = resultContent.bsManufacturer; // 生产厂家
this.appForm.productionDate = resultContent.productionDate * 1000; // 生产日期
this.appForm.workStatusTimes = resultContent.workStatusTimes; // 生产日期
this.appForm.reportFault = resultContent.reportFault; // 故障上报
this.appForm.reportFault =
resultContent.reportFault == 1 ? true : false; // 故障上报
this.appForm.outputDbgInfo =
resultContent.outputDbgInfo == 1 ? true : false; // 输出调试信息
console.log(this.appForm.outputDbgInfo);
console.log(resultContent.outputDbgInfo);
} else {
this.appForm.channels = 4; //装置通道数,程序默认值为4
this.appForm.packetSize = 2048; //图像数据分包大小
@ -568,6 +585,7 @@ export default {
this.appForm.productionDate = ""; // 生产日期
this.appForm.productionDate = 3; // 工作状态报周期
this.appForm.reportFault = ""; // 故障上报
this.appForm.outputDbgInfo = ""; //输出调试信息
}
this.$message({
@ -622,6 +640,7 @@ export default {
this.appForm.productionDate = ""; // 生产日期
this.appForm.productionDate = 3; // 工作状态报周期
this.appForm.reportFault = ""; // 故障上报
this.appForm.outputDbgInfo = ""; //输出调试信息
window.clearInterval(this.searchTimer);
this.searchTimer = null;
this.searchNum = 0;

14
src/views/realTimeSearch/index.vue
Unescape Escape View File

@ -121,7 +121,7 @@
<div class="bigpic" v-if="item.path.indexOf('videos') == -1">
<el-image
lazy
:src="item.path + '!1366x768'"
:src="item.path + '!800x600'"
:preview-src-list="[item.path]"
>
<template slot="error">
@ -276,6 +276,7 @@ export default {
this.formdata.channelid = this.$route.query.channelId;
this.formdata.termid = this.$route.query.termId;
this.$set(this.formdata, "starttime", Number(this.$route.query.date));
this.getPicData();
}
},
methods: {
@ -288,7 +289,6 @@ export default {
.then((res) => {
this.dyOptions = this.dyOptions.concat(res.data.list);
console.log(this.dyOptions);
if (JSON.stringify(this.$route.query) === "{}") {
this.formdata.dyid = this.dyOptions[0].id;
} else {
@ -337,7 +337,12 @@ export default {
.then((res) => {
this.zzOptions = [{ id: -1, name: "全部" }];
this.zzOptions = this.zzOptions.concat(res.data.list);
// this.formdata.termid = this.zzOptions[0].id;
console.log("切换了杆塔");
// console.log(this.formdata.termid);
// console.log(this.zzOptions[0].id);
// this.formdata.termid = this.zzOptions[0].id;
// console.log(this.formdata.termid);
if (JSON.stringify(this.$route.query) === "{}") {
this.formdata.termid = this.zzOptions[0].id;
} else {
@ -361,7 +366,7 @@ export default {
this.formdata.channelid = Number(this.$route.query.channelId);
}
this.getPicData();
//this.getPicData();
})
.catch((err) => {});
},
@ -386,6 +391,7 @@ export default {
this.total = res.data.total;
this.tdTermid = res.data.list[0].termid;
this.getSearchtdAlone();
console.log(this.$route.query);
this.loading = false;
})
.catch((err) => {

5
src/views/reportData/photostatis/components/photoList.vue
Unescape Escape View File

@ -4,6 +4,7 @@
title="图片历史数据"
:visible.sync="isShow"
:close-on-click-modal="false"
@close="hide"
width="100%"
>
<div class="headInfo">
@ -97,6 +98,7 @@ export default {
total: 0, //总条数
};
},
created() {},
methods: {
// 保存确定操作
display(row, params) {
@ -106,10 +108,13 @@ export default {
this.radio = this.paramsData.channelid;
console.log(this.radio);
console.log(row, params);
//localStorage.setItem("picflag", this.isShow);
this.getPhotoList();
},
hide() {
this.isShow = false;
// console.log(this.isShow);
// localStorage.setItem("picflag", this.isShow);
},
getPhotoList() {
this.picloading = true;

45
src/views/reportData/photostatis/index.vue
Unescape Escape View File

@ -190,6 +190,18 @@
{{ scope.row.photoInfo.firstPhotoTime }}
</template>
</el-table-column>
<el-table-column
prop="lastPhotoTime"
label="照片最后拍摄时间"
min-width="130"
show-overflow-tooltip
sortable
:sort-method="sortlastPhotoTime"
>
<template slot-scope="scope">
{{ scope.row.photoInfo.lastPhotoTime }}
</template>
</el-table-column>
<el-table-column
prop="lastRecvTime"
label="照片最后接收时间"
@ -303,10 +315,29 @@ export default {
drawerSearch: false,
tableheight: "100%",
roleName: "",
picflag: false,
};
},
created() {
this.roleName = localStorage.getItem("userName");
// this.picflag = localStorage.getItem("picflag");
// const backButtonRouteGuard = this.$router.beforeEach((to, from, next) => {
// if (from.name == "reportData" && this.picflag == "true") {
// console.log(from.name == "reportData" && this.picflag);
// /* Blocking back button in menu route */
// console.log(from.name);
// next(false);
// // this.hide();
// this.$refs.photoDialogref.hide();
// } else {
// /* allowing all other routes*/
// next(true);
// }
// });
// this.$once("hook:destroyed", () => {
// backButtonRouteGuard();
// });
},
mounted() {
this.getSearchdy();
@ -344,6 +375,20 @@ export default {
if (dateA > dateB) return 1;
return 0;
},
sortlastPhotoTime(a, b) {
// 将字符串转换为日期对象，处理 null 值
const dateA = a.photoInfo.lastPhotoTime
? new Date(a.photoInfo.lastPhotoTime)
: new Date(0);
const dateB = b.photoInfo.lastPhotoTime
? new Date(b.photoInfo.lastPhotoTime)
: new Date(0);
// 比较日期
if (dateA < dateB) return -1;
if (dateA > dateB) return 1;
return 0;
},
sortfirstTime(a, b) {
// 将字符串转换为日期对象，处理 null 值
const dateA = a.photoInfo.firstPhotoTime

26
src/views/system/deviceUpgrade/index.vue
Unescape Escape View File

@ -67,6 +67,11 @@
>
</template>
</el-table-column>
<el-table-column prop="fileSize" label="文件大小" width="120">
<template slot-scope="scope">
{{ scope.row.fileSize | changeType }}
</template>
</el-table-column>
<el-table-column prop="path" label="文件路径">
<template slot-scope="scope">
<span
@ -160,7 +165,28 @@ export default {
};
},
computed: {},
filters: {
changeType(val) {
if (val === 0) return "0B";
var k = 1024;
var sizes = ["B", "KB", "MB", "GB", "TB"];
let i = 0;
while (val >= k) {
val /= k;
i++;
}
let formattedVal = parseFloat(val.toFixed(2))
.toString()
.replace(/(\.\d*?)(0+)$/, function (m, $1, $2) {
return $2.length > 0 ? $1 : val.toString();
});
return formattedVal + " " + sizes[i];
},
},
mounted() {
this.getUpgradeList();
},

2
vue.config.js
Unescape Escape View File

@ -23,7 +23,7 @@ module.exports = defineConfig({
//表示拦截以/api开头的请求路径
//target: "http://192.168.1.190:8080", //190 需要去掉/Api
//target: "http://61.169.135.146:9911/", //运维 覆冰
// target: "http://61.169.135.146:9911/", //运维 覆冰
target: "http://61.169.135.146:40080/", //dell
//target: "http://192.168.50.198:8093", //java本机
changOrigin: true, //是否开启跨域

Write Preview
Loading…
Cancel
Save