@@ -66,15 +66,16 @@ export default {
page: 1, // 当前页数
towertitle: "", //杆塔名称
lineLoading: false, //杆塔loading
- swiperLoading: false,
+ swiperLoading: true,
terminalPhoto: [], //获取装置当前图片数据
photoNum: 5,
dateValue: "", //当前时间
- protocolInfo: "",
+ protocolInfo: 0,
nopicPath: require("@/assets/img/nopic.jpg"),
typeRadio: -1, //类型选择
allTreeFlag: true,
roleName: "",
+ carouselKey: 0, // 初始key
};
},
watch: {
@@ -149,7 +150,7 @@ export default {
console.log("杆塔");
this.LineFlag = false;
this.towerFlag = true;
- this.terminalPhoto = [];
+ //this.terminalPhoto = [];
this.protocolInfo = this.treeSelectData.protocol;
console.log("asddddddddddddddddddddd", this.treeSelectData);
this.towertitle = this.treeSelectData.name;
@@ -163,7 +164,7 @@ export default {
console.log(channelId, date, termId);
this.swiperLoading = true;
console.log("zhanshi asdadadadadadsddadadadadad", this.terminalPhoto);
- this.terminalPhoto = [];
+ //this.terminalPhoto = [];
getTerminalPhotoListJoggle({
channelid: channelId,
time: date,
@@ -176,12 +177,13 @@ export default {
{
path: this.nopicPath,
termId: termId,
- mediatype: 0,
+ mediaType: 0,
},
];
} else {
this.terminalPhoto = res.data.list;
}
+ this.carouselKey++; // 更新key以强制重新渲染
// let newDataList = [];
// let current = 0;
// if (this.terminalPhoto && this.terminalPhoto.length > 0) {
@@ -284,6 +286,9 @@ export default {
}
}
}
+ .el-loading-mask {
+ background-color: rgba(0, 0, 0, 0.3);
+ }
}
.parameterArea {
width: 220px;
diff --git a/src/views/system/deviceUpgrade/index.vue b/src/views/system/deviceUpgrade/index.vue
index 9dae55d..4e6d16d 100644
--- a/src/views/system/deviceUpgrade/index.vue
+++ b/src/views/system/deviceUpgrade/index.vue
@@ -343,6 +343,7 @@ export default {
message: res.msg,
type: "error",
});
+ this.progressLoading = false;
this.reportData.title = "";
this.$refs.upload.clearFiles();
}
+
+