From d1ef83de14da1ee52efb3aec4b2177c2835a39f3 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Tue, 25 Jul 2023 08:55:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=A4=84=E7=90=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/fonts/iconfont.css | 22 +- src/assets/fonts/iconfont.ttf | Bin 5064 -> 6580 bytes src/views/alarmHandling/index copy.vue | 1269 ++++++++++++++++++++++++ src/views/alarmHandling/index.vue | 260 +++-- src/views/stritl/index.vue | 1 + 5 files changed, 1450 insertions(+), 102 deletions(-) create mode 100644 src/views/alarmHandling/index copy.vue diff --git a/src/assets/fonts/iconfont.css b/src/assets/fonts/iconfont.css index fc2555f..2e77ad2 100644 --- a/src/assets/fonts/iconfont.css +++ b/src/assets/fonts/iconfont.css @@ -1,6 +1,6 @@ @font-face { font-family: "iconfont"; /* Project id */ - src: url('iconfont.ttf?t=1690177575312') format('truetype'); + src: url('iconfont.ttf?t=1690188947515') format('truetype'); } .iconfont { @@ -11,6 +11,18 @@ -moz-osx-font-smoothing: grayscale; } +.icon-paizhao:before { + content: "\e6ba"; +} + +.icon-paizhao-xianxing:before { + content: "\e8d1"; +} + +.icon-tuiguanglishitupianjinqun:before { + content: "\e613"; +} + .icon-gongsi:before { content: "\e62e"; } @@ -35,7 +47,15 @@ content: "\ef1c"; } +.icon-shexiangtou-zaixian:before { + content: "\ef1d"; +} + .icon-shudianxianlu_2722010801:before { content: "\efed"; } +.icon-tupian_normal:before { + content: "\e681"; +} + diff --git a/src/assets/fonts/iconfont.ttf b/src/assets/fonts/iconfont.ttf index 0dcedeb086e854a22642d4b1626cb1866ae02eeb..21ab3183b3075a000f0a018089164dbe976c9fc9 100644 GIT binary patch delta 2026 zcmZ`)Yitx%6h7zP*_mzGN2jx|zVrp}~aOq9Deeg=St0bu0u@%-e%k4grB#ff$l_CB?{|9!O!Kzap0Jv+85 z|3vayG)BG)MAjH7lm&i-zfz`ee%AxYPf@ZCE0a zf|l^pP3_-taaKYuvbcc>Ej=R6I~T=|P@DT2hmJANG3K80FzwO#nhoF#@S1cVjg1sA z4-z~}Q4we&jk}^%x-07{hbr?|k6t}>?b7wpTOGG@459O0Vp*6apfpRXPtn%F3><&dMWe@oQyj9~szLduyiiS$JLxcmBbq*0CR1P^* z^PeY~NK|$8s6&(wuAXv;GQ+h?4vBrbKI#yy25z;N1*6~w8ao^k+j8rsLt?SD=XLlE zXPL<+*#%zWwzOON#=XjYMI@p+pJ#uNXBgJNCK!Pdt;NvIj5UBgp@5u92sxb)vX;=h zu~*Fup<`QGMqLi7fe@K3(wj@M9vDSZ`|xfcr6-D{A_R)h>OKrav1bS~-Dt2o{a&@% z)9+DL)&5h6s0g|GecX!2d*dB6@wB(-dJF3kyf*J3TRCpoZ=4j?lU`L#BnOkp!8L*z z>22xswt`?8{8^2t^d5AE>WP>Y$CCt0bG^mh6w&nvo{Z>fi%O98rkE9DXK2zKQEv!1 z!w{GQnXNUr!q(b_shwzEKF`imhuWYEdTHCjX*HpybC^(!d-p}TyI}5Yg0mrP$HSMa z@YTaVF2ec`TTQc-gW#Wjk=d5XY#S3SWAqzF|3iYY*%3RA3nME>%vL*I7M{4!YL3)B z$=yC*cO`$(Uh47UC4QSPul2YK9)yiB4A4pKG7@5$;Z9elD;2DF5fikmpgJV_TysDl zBfomzvqOw}UGJ`f<+}?>)w`+7fe`Q4Bh|wZ;{qxevTxdVzBM9jDxz19uocFD9%wVj z9E`IwEZLW+9wt@PigS|Llp|N?sSPnJ*DLz(4SMO-+S)GTi0GDmWy5RVJ@e|L2Udw0 zE9wJ=y-A7(@p?pWtIou&7=hsRL|>9SvKP^RrGe_)!jpG1QY|mf0B$kVsb|$5M)H zq)arGW3KH?LW!~M(#s9fN<_ASbCzOPsxh}Fzu=M-_L}UM)z2I7&V+k2D@*dyB~p7U z>s%%^uCJbA?A^l>s>qqWnsWoCkVG9)Lr0Q}9rbHDfQ}?4v*H<*#CvNRO zmzgJevprV&{+>|S6&gaSJ!{1<$p7~wX9F^Q0J_;AW~`o22W?r1muG!}9pOH0^hjuh z_7To_gUwC$Zf{WYbMOU%%d4v|Q(2sI^ft5wsPth)o;{Ks&RWC!hONHgY-cWM=GNrQ zWUf#1Z;?HUON%w9y(*s8{JU4HQfTy`roF*{v^?yo5~$|Km%OSyQTUSnV0tT!lGfh1 za#)s!&vB@s)|maFIkYxsnz^+@=6+wmrFi5mzCd$RTBSR4`tzpe*aj~$t5wAt%;?JP|^IiBAu?(E-r?V{8G delta 575 zcmdmDd_sMKV!dP(Mge zC^xa9fYF4h4Ja=GlFv)bO_dQ?Y_oxZK>( +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + {{ + tableShow ? "图片列表" : "表格列表" + }} + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
+ +
+ + + + +
+ +
+
+ 主动拍照 + 历史图片 +
+
+
+
+
+ +
+
+ + +
+ +
+

+ {{ item.lineName }} / + {{ + item.displayName !== null && item.displayName !== "" + ? item.displayName + : item.cmdid + }} + / + {{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channnelName + }} + / 告警原因：({{ item.enname }}) +

+

+ 告警时间：{{ + $moment(item.alarmTime).format("YYYY-MM-DD HH:mm:ss") + }} + 主动拍照 + 历史图片 +

+
+
+ +
+
+ +
+
+ + +
+
+
+ +
+
+ + +
+
+ +
+
+ +
+ + + + diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue index 4a8fd15..4769640 100644 --- a/src/views/alarmHandling/index.vue +++ b/src/views/alarmHandling/index.vue @@ -37,6 +37,16 @@ > + + + + + -
-
+
+ + + +
-
-

- {{ 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", },