diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js index bd59ed3..6d1640a 100644 --- a/src/api/http/http-api.js +++ b/src/api/http/http-api.js @@ -9,6 +9,11 @@ export default { url: "/realTime", name: "获取实时监控列表" }, + getHistoryList: { + method: "POST", + url: "/order/list", + name: "获取历史监控列表" + }, realTimeLychee: { method: "GET", url: "/realTime/lychee", @@ -86,10 +91,15 @@ export default { url: "/camera/io/toPtz", name: "转至球机IO配置点" }, - queryList: { - url: '/order/list', - name: '查询', + warnList: { + url: '/warn/list', + name: 'plc未连接数量', method: 'POST' + }, + disPlcList: { + url: '/plc/disPlc', + name: 'plc未连接列表', + method: 'GET' } } diff --git a/src/layouts/AsideMenu.vue b/src/layouts/AsideMenu.vue index f2473b3..4429520 100644 --- a/src/layouts/AsideMenu.vue +++ b/src/layouts/AsideMenu.vue @@ -62,7 +62,7 @@ export default { parents = this.$router.options.routes[0].children.filter(ele => { if ( this.userInfo.permissionList.some(item => { - return item.rights === ele.name && ele.name.indexOf("center") < 0 && item.rights === ele.name && ele.name.indexOf("ioTable") < 0 && item.rights === ele.name && ele.name.indexOf("realTimeMonitoringModel") < 0; + return item.rights === ele.name && ele.name.indexOf("center") < 0 && item.rights === ele.name && ele.name.indexOf("ioTable") < 0 && item.rights === ele.name && ele.name.indexOf("realTimeMonitoringModel") < 0 && item.rights === ele.name && ele.name.indexOf("plcStatus") < 0; }) ) { return ele; @@ -83,7 +83,7 @@ export default { recursionRoute(parents); }else { parents = this.$router.options.routes[0].children.filter(item => { - return !item.name.startsWith("center") && !item.name.startsWith("ioTable") && !item.name.startsWith("realTimeMonitoringModel"); + return !item.name.startsWith("center") && !item.name.startsWith("ioTable") && !item.name.startsWith("realTimeMonitoringModel") && !item.name.startsWith("plcStatus"); }); } this.routes = parents; diff --git a/src/layouts/PageContent.vue b/src/layouts/PageContent.vue index 6e847dc..e233128 100644 --- a/src/layouts/PageContent.vue +++ b/src/layouts/PageContent.vue @@ -98,8 +98,8 @@ export default { .table{ background: #ffffff; margin: 8px 20px; - height: calc(100vh - 190px); - padding:20px; + min-height: calc(100vh - 190px); + padding: 20px; } } diff --git a/src/layouts/PageHeader.vue b/src/layouts/PageHeader.vue index 7a81f19..214fa6d 100644 --- a/src/layouts/PageHeader.vue +++ b/src/layouts/PageHeader.vue @@ -11,7 +11,7 @@
- + @@ -93,6 +93,9 @@ export default { }).catch(err => { console.log(err) }) + }, + openPlc() { + this.$router.push({name: 'plcStatus'}) } } }; diff --git a/src/router/index.js b/src/router/index.js index c500b71..a6232bc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -155,6 +155,14 @@ const routes = [{ name: '个人中心' }, component: () => import('@/views/center') + }, + { + path: 'plcStatus', + name: 'plcStatus', + meta: { + name: 'PLC状态' + }, + component: () => import('@/views/plcStatus') } ] }, diff --git a/src/views/alarmVideos/index.vue b/src/views/alarmVideos/index.vue index d96591a..2441e99 100644 --- a/src/views/alarmVideos/index.vue +++ b/src/views/alarmVideos/index.vue @@ -5,8 +5,9 @@ - - + + @@ -24,11 +25,33 @@ :pagination="pagination" @change="handleGetHistoryList" > + + + 查看视频 + + + + + + + + 查看视频 + + + + + +
+ diff --git a/src/views/cameraManage/ioModel.vue b/src/views/cameraManage/ioModel.vue index 9294f59..8f30293 100644 --- a/src/views/cameraManage/ioModel.vue +++ b/src/views/cameraManage/ioModel.vue @@ -15,7 +15,12 @@ :form="form" :wrapper-col="formItemAcrossLayout.wrapperCol" > - + + + + @@ -54,9 +59,10 @@ export default { // console.log('触发了watch，重新赋值') this.$nextTick(()=>{ //this.$nextTick解决不能在表单渲染之前赋值的报错问题 this.form.setFieldsValue({ //setFieldsValue 表示对form表单重新设置值 - name:newVal.name, - ip:newVal.ip, - rtsp:newVal.rtsp + name: newVal.name, + code: newVal.code, + ip: newVal.ip, + rtsp: newVal.rtsp }) }) }else{ diff --git a/src/views/cameraManage/ioTable.vue b/src/views/cameraManage/ioTable.vue index b2378ad..69ea322 100644 --- a/src/views/cameraManage/ioTable.vue +++ b/src/views/cameraManage/ioTable.vue @@ -67,7 +67,11 @@ const columns = [ } }, { - title: 'IO指令', + title: '指令编码', + dataIndex: 'code', + }, + { + title: '指令名称', dataIndex: 'name', }, { diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue index 483a916..44f18d8 100644 --- a/src/views/checkManage/index.vue +++ b/src/views/checkManage/index.vue @@ -1,77 +1,78 @@ + diff --git a/src/views/realTimeMonitoring/index.vue b/src/views/realTimeMonitoring/index.vue index 3d915b2..9e2ea16 100644 --- a/src/views/realTimeMonitoring/index.vue +++ b/src/views/realTimeMonitoring/index.vue @@ -67,7 +67,7 @@ export default { }, beforeRouteLeave(to,form,next) { - if (this.vlcz) { + if (this.vlcz.playlist) { this.vlcz.playlist.stop(); next(true) } else { diff --git a/src/views/realTimeMonitoring/model.vue b/src/views/realTimeMonitoring/model.vue index 29a2f98..ffc4282 100644 --- a/src/views/realTimeMonitoring/model.vue +++ b/src/views/realTimeMonitoring/model.vue @@ -76,6 +76,8 @@ export default { }, mounted() { this.mdata = this.$route.query.modelData + this.id = this.$route.query.modelData.id + console.log(this.id) this.getHdVideos(this.$route.query.modelData.rtsp) }, beforeRouteLeave(to, form, next) { @@ -88,7 +90,7 @@ export default { }, methods: { handleCancel() { - this.$router.go(-1); + this.$router.push({name: 'realTimeMonitoring'}); }, getHdVideos(rtsp) { this.$nextTick(() => { diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue index 5422fa3..12336a6 100644 --- a/src/views/roadwayManage/model.vue +++ b/src/views/roadwayManage/model.vue @@ -22,7 +22,19 @@ + + +
+ + + + +
@@ -226,18 +238,20 @@ export default { // console.log('触发了watch，重新赋值') this.$nextTick(()=>{ //this.$nextTick解决不能在表单渲染之前赋值的报错问题 this.form.setFieldsValue({ //setFieldsValue 表示对form表单重新设置值 - name:newVal.name, - plcId:newVal.plcId, - leftType:newVal.leftType === null ? '' : newVal.leftType === 0 ? '单伸' : '双伸', - leftRow:newVal.leftRow, - leftColumn:newVal.leftColumn, - leftShelveId:newVal.leftShelveId, - leftInsideShelveId:newVal.leftInsideShelveId, - leftOutsideShelveId:newVal.leftOutsideShelveId, - rightType:newVal.rightType === null ? '' : newVal.rightType === 0 ? '单伸' : '双伸', - rightRow:newVal.rightRow, - rightColumn:newVal.rightColumn, - rightShelveId:newVal.rightShelveId, + name: newVal.name, + plcId: newVal.plcId, + plcIp: newVal.plcIp, + plcPort: newVal.plcPort, + leftType: newVal.leftType === null ? '' : newVal.leftType === 0 ? '单伸' : '双伸', + leftRow: newVal.leftRow, + leftColumn: newVal.leftColumn, + leftShelveId: newVal.leftShelveId, + leftInsideShelveId: newVal.leftInsideShelveId, + leftOutsideShelveId: newVal.leftOutsideShelveId, + rightType: newVal.rightType === null ? '' : newVal.rightType === 0 ? '单伸' : '双伸', + rightRow: newVal.rightRow, + rightColumn: newVal.rightColumn, + rightShelveId: newVal.rightShelveId, rightInsideShelveId:newVal.rightInsideShelveId, rightOutsideShelveId:newVal.rightOutsideShelveId, camera1Id:newVal.camera1Name,