-
![]()
-
+
+
+
+
+
![]()
-
-
- {{ item.lineName }} /
- {{
- item.displayName !== null && item.displayName !== ""
- ? item.displayName
- : item.cmdid
- }}
- /
- {{
- item.alias !== null && item.alias !== ""
- ? item.alias
- : item.channnelName
- }}
- / 告警原因：({{ item.enname }})
+ [已读]
+ [未读]
+
+ {{ item.lineName }} /
+ {{
+ item.displayName !== null && item.displayName !== ""
+ ? item.displayName
+ : item.cmdid
+ }}
+ /
+ {{
+ item.alias !== null && item.alias !== ""
+ ? item.alias
+ : item.channnelName
+ }}
+
- 告警时间：{{
+ {{
$moment(item.alarmTime).format("YYYY-MM-DD HH:mm:ss")
- }}
- 主动拍照
- 历史图片
+ }}
+ ({{ item.enname }})
+
@@ -372,8 +382,10 @@ export default {
dyOptions: [{ id: -1, name: "全部" }], //电压数据
xlOptions: [{ id: -1, name: "全部" }], //线路数据
gtOptions: [{ id: -1, name: "全部" }], //杆塔数据
+ tdOptions: [{ id: -1, name: "全部", alias: null }], //通道数据
gjOptions: [{ id: -1, label: -1, name: "全部" }], //告警数据
formdata: {
+ channel: 1,
dyId: -1,
lineId: -1,
towerId: -1,
@@ -548,9 +560,14 @@ export default {
.then((res) => {
this.gjOptions = [{ id: -1, label: -1, name: "全部" }];
this.gjOptions = this.gjOptions.concat(res.data.list);
+ this.tdOptions = [{ id: -1, name: "全部", alias: null }];
+ this.tdOptions = this.tdOptions.concat(res.data.channellist);
+ console.log(this.tdOptions);
console.log(this.gjOptions);
this.formdata.label = this.gjOptions[0].label;
+ this.formdata.channel = this.tdOptions[1].id;
console.log(this.formdata.label);
+ console.log(this.formdata.channel);
})
.catch((err) => {});
},
@@ -822,9 +839,9 @@ export default {
console.log(this.requestId);
this.btnpicloading = true;
this.statusTimer = window.setInterval(() => {
- this.getTakePicStatus(this.requestId);
+ this.getTakePicStatus(res.data);
this.statusNum++;
- }, 2000);
+ }, 3000);
})
.catch((err) => {
console.log(err); //代码错误、请求失败捕获
@@ -843,12 +860,18 @@ export default {
getTakePicStatus(data) {
console.log(data);
getTakePicStatusJoggle({
- requestid: data,
+ requestid: data.requestId,
+ termId: this.selectRow.termId,
+ photoTime: new Date(data.taketime).getTime(),
})
.then((res) => {
console.log(res);
//res.data 0 状态未知 1 成功 2失败
- if (res.data == 0 && this.statusNum >= 5) {
+ if (
+ res.data.cmaStatus == 0 &&
+ res.data.picStatus == false &&
+ this.statusNum >= 5
+ ) {
this.statusNum = 0;
clearInterval(this.statusTimer);
this.statusTimer = null;
@@ -860,16 +883,16 @@ export default {
message: "下发指令超时，请重试！",
type: "warning",
});
- } else if (res.data == 1) {
- this.statusNum = 0;
- clearInterval(this.statusTimer);
- this.statusTimer = null;
+ } else if (res.data.cmaStatus == 1 || res.data.picStatus == true) {
this.$message({
duration: 1500,
showClose: true,
message: "下发指令成功！",
type: "success",
});
+ this.statusNum = 0;
+ clearInterval(this.statusTimer);
+ this.statusTimer = null;
this.timer = window.setInterval(() => {
this.newPicApi();
this.i++;
@@ -895,6 +918,7 @@ export default {
getTakePicPhotoStatusJoggle({
photoTime: new Date(this.picTime).getTime(),
termId: this.selectRow.termId,
+ requestid: this.requestId,
}).then((res) => {
console.log(res.data);
if (res.data == true && this.i < 10) {
@@ -957,11 +981,26 @@ export default {
console.log(val);
this.bigPhotoPic = val.path;
this.showBigpic = true;
-
this.$nextTick(() => {
console.log("huatu");
this.drawlineList(val, index);
});
+ //未读变已读
+ if (val.isread == 0) {
+ setTimeout(function () {
+ readAlarm({
+ id: val.id,
+ })
+ .then((res) => {
+ console.log(res);
+ val.isread = 1;
+ console.log(val.isread);
+ })
+ .catch((err) => {
+ console.log(err);
+ });
+ }, 300);
+ }
}
},
dateFormat(row, column) {
@@ -1096,7 +1135,7 @@ export default {
background-color: rgba(18, 128, 113, 0.2);
}
.readbox {
- color: #e49e61;
+ color: #169e8c;
}
}
.pageNation {
@@ -1166,34 +1205,36 @@ export default {
margin: auto;
}
.piclist {
- display: flex;
- // justify-content: space-around;
- flex-wrap: wrap;
+ // display: flex;
+ // // justify-content: space-around;
+ // flex-wrap: wrap;
overflow: auto;
border: 1px solid #eee;
height: calc(100% - 2px);
}
.imgList {
- width: calc((100% - 104px) / 3);
+ width: calc((100% - 40px) / 4);
position: relative;
display: inline-block;
- margin: 8px;
+ margin: 2px;
position: relative;
- padding: 4px;
border-radius: 3px;
background: #fff;
- height: fit-content;
- //height: auto;
+ height: 30%;
border: 2px solid transparent;
- .el-card__body {
- padding: 0px;
- }
.bigpic {
width: 100%;
height: 100%;
background-size: 100% 100%;
+ position: relative;
.picshow {
position: relative;
+ height: 100%;
+ img {
+ cursor: pointer;
+ width: 100%;
+ height: 100%;
+ }
.myCanvas {
position: absolute;
width: 100%;
@@ -1204,48 +1245,65 @@ export default {
pointer-events: none;
}
}
- }
- img {
- cursor: pointer;
- width: 100%;
- height: 250px;
- object-fit: fill;
- }
-
- .caption {
- padding: 9px;
- color: #333;
- .alarmInfo {
- color: #e49e61;
- }
- .infoTop {
- font-size: 14px;
- color: #000;
- font-weight: normal;
- margin-top: 2px;
- padding-left: 5px;
- padding-right: 5px;
- }
- .infoBottom {
- color: #000;
- font-size: 12px;
- font-weight: normal;
- margin-top: 6px;
- padding-left: 5px;
- padding-right: 5px;
- .el-button--small {
- margin-left: 24px;
- padding: 4px;
- width: 78px;
+ .caption {
+ padding: 6px;
+ color: #fff;
+ position: absolute;
+ left: 0;
+ bottom: 0px;
+ background: rgba(0, 0, 0, 0.5);
+ width: calc(100% - 12px);
+ .alarmInfo {
+ color: #fff;
}
- .el-button + .el-button {
- margin-left: 10px;
+ .infoTop {
+ font-size: 14px;
+ color: #fff;
+ font-weight: normal;
+ margin-top: 2px;
+ padding-left: 5px;
+ padding-right: 5px;
+ .readbox {
+ color: #169e8c;
+ }
+ }
+ .infoBottom {
+ color: #fff;
+ font-size: 12px;
+ font-weight: normal;
+ margin-top: 6px;
+ padding-left: 5px;
+ padding-right: 5px;
+ display: flex;
+ justify-content: space-between;
+ .el-button--small {
+ margin-left: 24px;
+ padding: 4px;
+ width: 78px;
+ }
+ .el-button + .el-button {
+ margin-left: 10px;
+ }
+ }
+ }
+ .toolsBtn {
+ position: absolute;
+ right: 4px;
+ top: 4px;
+ z-index: 2;
+ .el-button {
+ width: auto;
+ background: rgba(0, 0, 0, 0.5);
+ border: 1px solid transparent;
+ color: #fff;
+ font-size: 20px;
+ padding: 2px;
}
}
}
}
.bgColor {
- border: 2px solid #e49e61;
+ border: 2px solid #169e8c;
}
}
}
diff --git a/src/views/stritl/index.vue b/src/views/stritl/index.vue
index 7e0cbcc..84751c7 100644
--- a/src/views/stritl/index.vue
+++ b/src/views/stritl/index.vue
@@ -298,6 +298,7 @@ export default {
// title: {
// text: "装置在线统计",
// },
+ color: ["#169e8c", "#bbb"],
tooltip: {
trigger: "item",
},
+