From b301e4c8e1ad96518b35e391176614ac04be7bf7 Mon Sep 17 00:00:00 2001 From: jinna Date: Wed, 19 Jul 2023 17:53:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=A6=E5=86=99=E5=AE=9A=E6=97=B6=E5=B8=83/?= =?UTF-8?q?=E6=92=A4=E9=98=B2=E9=A1=B5=E9=9D=A2=E3=80=81=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E8=81=94=E5=8A=A8=E5=BC=B9=E7=AA=97=E3=80=81=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/cdn/iconfont/avue/iconfont.css | 4 + src/assets/image/add.png | Bin 0 -> 992 bytes src/assets/image/cancel_iten.png | Bin 0 -> 639 bytes src/page/index/logo.vue | 3 +- src/page/index/top/index.vue | 2 +- src/page/index/top/top-menu.vue | 4 +- src/styles/media.scss | 3 +- src/styles/sidebar.scss | 3 +- .../wirelessintrusion/deployment/list.vue | 484 ++++++++++++------ src/views/wirelessintrusion/warn/record.vue | 216 +++++--- 10 files changed, 492 insertions(+), 227 deletions(-) create mode 100644 src/assets/image/add.png create mode 100644 src/assets/image/cancel_iten.png diff --git a/public/cdn/iconfont/avue/iconfont.css b/public/cdn/iconfont/avue/iconfont.css index d957b8a..696b568 100644 --- a/public/cdn/iconfont/avue/iconfont.css +++ b/public/cdn/iconfont/avue/iconfont.css @@ -24,11 +24,13 @@ } .icon-rizhi1:before { + color: #fff; content: "\e6af"; } .icon-suoping:before { content: "\e6e9"; + color: #fff; } .icon-zhuti:before { @@ -109,6 +111,7 @@ .icon-quanping:before { content: "\e615"; + color: #fff; } .icon-bofangqi-suoping:before { @@ -117,6 +120,7 @@ .icon-navicon:before { content: "\e84e"; + color: #fff; } .icon-yuan:before { diff --git a/src/assets/image/add.png b/src/assets/image/add.png new file mode 100644 index 0000000000000000000000000000000000000000..d10ec2de32834f25cc95aa21d3182fa8f27dd332 GIT binary patch literal 992 zcmV<610Vc}P)Px&nn^@KR7gwhR!wLWXBd8--I>V>wnXuef`>;-Z4cLQFNe&hoFrWu1If%7Ta5u9%Z~4Y7 zOgH;00TDX4`M&pipXdF5iD&fj8R6pj0ydM`Q9?dZ-V*Rj*GbQG>bZ_A9v!uJ`G)=# zfwx6)UxAU>4d7?4d&g&H><8@~^^!3x@EwBP zfD}crNMZ%#>cc<1OLKE}v6jdtV5MkZQClF{7ZUzm1angKE;X_yk+8cN(}zL4N8q*U zTM=1w9qVvQVDoflKcoCj#jWglA%x8u67VnxE&uv^phDF6dfkpu2I>sDB1lf{YT zR9}RVUm&paPI|IYtjyHeVE|<}cjj^0=csQ0qNd%osSom*@WhL)eKd7^gEH;yNFR9-V!9~|ee;g=CWgY{JwdzJs z?xmQ|S=%;%zXLJki?^rX*!P-dbQFp76s6cvb!TkiqbI z*^91Sm^rhe&dgMH8Ia!PuJVp*r>n}=ZJA~&vp}$4#M|pS_G&##%~bPpQe+K7{s3e? zpR|6oUvCrRSBzhIT6!O!S`82>IV;L6_Cd97{y3?P1-xl!DkR99Equ&PQ<#m)_ zy^ym5*M+}k7N1PnaRb_I2=6V$yjN=793*9{mrSt%f@w!OjIxQ%l2A z%*)m*n??lMa`mPfPEPd$9D8yu)2=gqy_JQv_fG}fDM-iVv=so2bo>jQ_tP%VC3S)T O0000Px%IY~r8R7gwhmQ9F_VHC%Ie;;Akh)}F7$c}|lq!c9~8(FjP5jK(-pUG!7He_jG z!3G-&v9++6Au>u$u~9w>Q@;ImrZdx>+r4w&_s+d$GiP(_z0dpno^#Isf1X#2QfQR8 zjDi1K<(n?G?K!|gpj*=CvL`MLwmlU%3+w_W03U#LlAe@-mjc_~09*v-1CeDHunc$) zERgiQD7-G%_GDm2Zqxys1~x&z6CMFOCH2~V2TTK&N_yEeI7@jM*bEpL5BvcF9+~Zv zbZr1&yBC-VESL1GDX{H;JOEY!KY@?HB;YG>3pgbyo()E;z*~Upz++&oq%Vy!s0Q1X zq^Q)eF{H<~PXNb(PD!EMhEWLy{sQ;19XGOqx3gXACB^^!Q4J2*LEx~YGYzRBf{Gre z7M=sYQX_kS)xbkZ@jDnT1&6rOayOF@K7Sf;N#XbQfn#UeA;hrW@5o$IlzT|DBjZls zB=8NG0(=UWNP5w>jDcCeodm1^wgTIM9$>Mgs6b6|9RSV)ha{bALR{hZtHAz&*=;-a z>yWf}xQy2TcXMFGY2&2hfIdlYYaOH|10;oU3D}X|>r2ap|3aO+tH)x?zzN@${h13) z%uMIy?7jdTlk_9kj(k?v>uHQZ;0SOu5Ar&*zh9B@5=rsAP?WuoR {{userInfo.userName}} - + diff --git a/src/page/index/top/top-menu.vue b/src/page/index/top/top-menu.vue index 3add0bf..26a519c 100644 --- a/src/page/index/top/top-menu.vue +++ b/src/page/index/top/top-menu.vue @@ -5,8 +5,8 @@ text-color="#333"> - + diff --git a/src/views/wirelessintrusion/warn/record.vue b/src/views/wirelessintrusion/warn/record.vue index 436c616..dffe924 100644 --- a/src/views/wirelessintrusion/warn/record.vue +++ b/src/views/wirelessintrusion/warn/record.vue @@ -48,27 +48,61 @@ --> - @@ -82,6 +116,7 @@ form: {}, query: {}, loading: true, + dialogVisible:false, page: { pageSize: 10, currentPage: 1, @@ -96,16 +131,13 @@ searchShow: true, searchMenuSpan: 6, border: true, - index: true, + // index: true, menuWidth: 320, - viewBtn: true, + viewBtn: false, addBtn: false, editBtn: false, delBtn: false, selection: true, - selectable: (row, index) => { - return index !== 0; - }, dialogClickModal: false, column: [ { @@ -116,41 +148,66 @@ search: true, }, { - label: "报警类型", - type: "select", - dicUrl: "/api/blade-system/dict/dictionary?code=notice", - props: { - label: "dictValue", - value: "dictKey" - }, - dataType: "number", - slot: true, - prop: "category", - search: true, + label: "设备编号", + prop: "deviceNo", + span: 24, + row: true, + }, + { + label: "设备大类", + prop: "deviceType", + span: 24, + row: true, + }, + { + label: "品牌编号", + prop: "brandNo", + span: 24, + row: true, }, + // { + // label: "报警类型", + // type: "select", + // dicUrl: "/api/blade-system/dict/dictionary?code=notice", + // props: { + // label: "dictValue", + // value: "dictKey" + // }, + // dataType: "number", + // slot: true, + // prop: "category", + // search: true, + // }, { label: "所属区域", prop: "floor", - slot: true, + // slot: true, }, { label: "安装位置", prop: "address", - slot: true, + // slot: true, }, { label: "报警信息", - prop: "address", + prop: "alarmInfo", slot: true, + overHidden:true }, { label: "报警时间", - prop: "releaseTime", + prop: "alarmTime", + type: "date", + }, + { + label: "消报时间", + prop: "cancelTime", type: "date", }, ] }, - data: [] + data: [], + videoData:[] }; }, computed: { @@ -272,31 +329,74 @@ this.onLoad(this.page, this.query); }, onLoad(page, params = {}) { - const {releaseTimeRange} = this.query; - let values = { - ...params, - ...this.query - }; - if (releaseTimeRange) { - values = { - ...values, - releaseTime_datege: releaseTimeRange[0], - releaseTime_datelt: releaseTimeRange[1], - }; - values.releaseTimeRange = null; - } - this.loading = true; - getList(page.currentPage, page.pageSize, values).then(res => { - const data = res.data.data; - this.page.total = data.total; - this.data = data.records; - this.loading = false; - this.selectionClear(); - }); - } + // const {releaseTimeRange} = this.query; + // let values = { + // ...params, + // ...this.query + // }; + // if (releaseTimeRange) { + // values = { + // ...values, + // releaseTime_datege: releaseTimeRange[0], + // releaseTime_datelt: releaseTimeRange[1], + // }; + // values.releaseTimeRange = null; + // } + // this.loading = true; + // getList(page.currentPage, page.pageSize, values).then(res => { + // const data = res.data.data; + // this.page.total = data.total; + // this.data = data.records; + // this.loading = false; + // this.selectionClear(); + // }); + this.data = [ + {title:'空调',deviceNo:'A101',deviceType:'空调设备',brandNo:'格力AT51',floor:'一号楼一层北',address:'1011室',alarmInfo:'无法制冷',alarmTime:'2023-07-14 09:55:23',cancelTime:'2023-07-15 15:23:10'}, + {title:'空调',deviceNo:'A101',deviceType:'空调设备',brandNo:'格力AT51',floor:'一号楼一层北',address:'1011室',alarmInfo:'无法制冷,无法制冷无法制冷',alarmTime:'2023-07-14 09:55:23',cancelTime:''}, + ]; + this.loading = false; + this.page.total = this.data.length + }, + // 视频联动按钮 + linkVideo(){ + this.dialogVisible = true; + this.videoData = [ + {id:'001',url:'cdcdcdcd',name:'视频一'}, + {id:'002',url:'cdcdcdcd',name:'视频一'}, + {id:'003',url:'cdcdcdcd',name:'视频一'}, + {id:'004',url:'cdcdcdcd',name:'视频一'}, + {id:'005',url:'cdcdcdcd',name:'视频一'}, + {id:'006',url:'cdcdcdcd',name:'视频一'}, + {id:'007',url:'cdcdcdcd',name:'视频一'}, + {id:'008',url:'cdcdcdcd',name:'视频一'}, + ] + }, } }; - +