@@ -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) => {
diff --git a/src/views/reportData/photostatis/components/photoList.vue b/src/views/reportData/photostatis/components/photoList.vue
index 0f4e98e..654fd52 100644
--- a/src/views/reportData/photostatis/components/photoList.vue
+++ b/src/views/reportData/photostatis/components/photoList.vue
@@ -4,6 +4,7 @@
title="图片历史数据"
:visible.sync="isShow"
:close-on-click-modal="false"
+ @close="hide"
width="100%"
>
@@ -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;
diff --git a/src/views/reportData/photostatis/index.vue b/src/views/reportData/photostatis/index.vue
index 4ba61f5..64c8912 100644
--- a/src/views/reportData/photostatis/index.vue
+++ b/src/views/reportData/photostatis/index.vue
@@ -190,6 +190,18 @@
{{ scope.row.photoInfo.firstPhotoTime }}
+
+
+ {{ scope.row.photoInfo.lastPhotoTime }}
+
+
{
+ // 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
diff --git a/src/views/system/deviceUpgrade/index.vue b/src/views/system/deviceUpgrade/index.vue
index 55bd3ee..9dae55d 100644
--- a/src/views/system/deviceUpgrade/index.vue
+++ b/src/views/system/deviceUpgrade/index.vue
@@ -67,6 +67,11 @@
>
+
+
+ {{ scope.row.fileSize | changeType }}
+
+
= 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();
},
diff --git a/vue.config.js b/vue.config.js
index eeadbb2..86367af 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -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, //是否开启跨域