diff --git a/.env.development b/.env.development index 38acc90..efacd23 100644 --- a/.env.development +++ b/.env.development @@ -5,5 +5,5 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -VUE_APP_URL = "http://huirong.ybkjyl.com/api" -# VUE_APP_URL = "http://127.0.0.1:7103" +# VUE_APP_URL = "http://huirong.ybkjyl.com/api" +VUE_APP_URL = "http://127.0.0.1:7103" diff --git a/src/api/device/device.js b/src/api/device/device.js index dae2c82..a527ca9 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -38,8 +38,8 @@ export function getInfoById(data) { } // 获取摄像头列表 -export function getSxtList() { - return request({ url: '/device/getSxtList', method: 'GET' }) +export function getOtherList(data) { + return request({ url: '/device/getOtherList', method: 'GET',params:data }) } /******************************************************************************************************************************************** */ diff --git a/src/api/deviceImage/deviceImage.js b/src/api/deviceImage/deviceImage.js index 42cd9f4..46d6c7a 100644 --- a/src/api/deviceImage/deviceImage.js +++ b/src/api/deviceImage/deviceImage.js @@ -14,9 +14,27 @@ export function getDeviceImageById(data) { } -// 获取视频 -export function getShiPinByChannelNo(data) { - return request({ url: '/deviceImage/getShiPinByChannelNo', method: 'GET', params: data }) +// 获取正常视频链接 +export function getVedioPcLiveById(data) { + return request({ url: '/deviceImage/getVedioPcLiveById', method: 'GET', params: data }) } +// 获取回放视频链接 +export function getVedioPcRecById(data) { + return request({ url: '/deviceImage/getVedioPcRecById', method: 'GET', params: data }) +} + +// 质物检测获取正常视频链接 +export function getShiPinNormalByChannelNo(data) { + return request({ url: '/deviceImage/getShiPinNormalByChannelNo', method: 'GET', params: data }) +} + +// 手动调整定时 +export function updateCron(data) { + return request({ url: '/updateCron', method: 'GET', params: data }) +} + + + + diff --git a/src/views/monitor/videos/index.vue b/src/views/monitor/videos/index.vue index 55a46d4..d777c43 100644 --- a/src/views/monitor/videos/index.vue +++ b/src/views/monitor/videos/index.vue @@ -69,8 +69,8 @@
-

实时视频

-

回放视频

+

实时视频

+

回放视频

设备名称：{{ item.name }}

@@ -223,6 +223,13 @@ + + + + +
@@ -241,8 +248,8 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' -import { getSxtList } from '@/api/device/device' -import { getShiPinByChannelNo } from '@/api/deviceImage/deviceImage' +import { getOtherList } from '@/api/device/device' +import { getVedioPcRecById, getVedioPcLiveById } from '@/api/deviceImage/deviceImage' // import baojingchaxunAdd from './baojingchaxunAdd' // import baojingchaxunInfo from './baojingchaxunInfo' // import req from '@/api/baojingchaxun/baojingchaxun' @@ -321,12 +328,14 @@ export default { ], dialogImage: false, dialogImageJK: false, + dialogImageJKRec: false, // 视频开始 videoSrc: '../../../image/cangkushipin.mp4', playStatus: '', muteStatus: '', spUrl: '', + spRecUrl: '', active: -1, isMute: true, isPlay: false, @@ -411,6 +420,9 @@ export default { handleCloseJK() { this.dialogImageJK = false }, + handleCloseJKRec() { + this.dialogImageJKRec = false + }, handleVideo() { this.$refs.videoDiolag.dialogImage = true }, @@ -592,8 +604,7 @@ export default { } }, init() { - getSxtList().then((res) => { - console.log(res) + getOtherList({ type: 1 }).then((res) => { if (res.code == 200) { this.zc_list = res.data } @@ -737,12 +748,18 @@ export default { this.$store.dispatch('tagsView/delView', this.$route) this.$router.go(-1) }, - getShiPin(channelNo) { - getShiPinByChannelNo({ channelNo: channelNo }).then(res => { + getVedioPcLive(id) { + getVedioPcLiveById({ id: id }).then(res => { this.spUrl = res.data this.dialogImageJK = true }) }, + getVedioPcRec(id) { + getVedioPcRecById({ id: id }).then(res => { + this.spRecUrl = res.data + this.dialogImageJKRec = true + }) + }, toMore() { this.active = -1 this.dialogImage = true diff --git a/src/views/shebeitaizhang/shebeitaizhangAdd.vue b/src/views/shebeitaizhang/shebeitaizhangAdd.vue index 7876e12..6e20699 100644 --- a/src/views/shebeitaizhang/shebeitaizhangAdd.vue +++ b/src/views/shebeitaizhang/shebeitaizhangAdd.vue @@ -46,8 +46,9 @@ - - + @@ -71,17 +72,30 @@ clearable /> - + 上偏移 - + - + + + + + 仓库 + + + + + + + - + 左偏移 @@ -101,6 +115,23 @@ + + + 请选择所属Nvr + + + + + + + + + +
@@ -108,7 +139,7 @@ diff --git a/src/views/zhiwujiance/zhiwujianceInfo.vue b/src/views/zhiwujiance/zhiwujianceInfo.vue index 144915e..bcb7f14 100644 --- a/src/views/zhiwujiance/zhiwujianceInfo.vue +++ b/src/views/zhiwujiance/zhiwujianceInfo.vue @@ -114,9 +114,12 @@ export default { manufacturerFax: '2023-05-23', status: '1', cangku: '仓库1', - tuUrl: './image/tu1.jpg' + tuUrl: './image/tu1.jpg', + modifyTime: '', + imgAfter: '' }, rules: {}, + infoOne: {} } }, methods: { @@ -142,8 +145,8 @@ export default { getDeviceImageById({ id: row.id }).then(resp => { console.log('resp', resp) // this.infoForm = resp.data - this.infoForm.modifyTime = resp.data.modifyTime - this.infoForm.imgAfter = resp.data.imgAfter + this.infoOne.modifyTime = resp.data.modifyTime + this.infoOne.imgAfter = resp.data.imgAfter }).catch(e => { this.formobj = row }) diff --git a/src/views/zhiwujiance/zhiwujianceList.vue b/src/views/zhiwujiance/zhiwujianceList.vue index f30f5cb..8ddcd3d 100644 --- a/src/views/zhiwujiance/zhiwujianceList.vue +++ b/src/views/zhiwujiance/zhiwujianceList.vue @@ -31,8 +31,8 @@
质物监测信息列表
- +
-
- - +
@@ -112,7 +109,7 @@ import zhiwujianceAdd from './zhiwujianceAdd' import zhiwujianceInfo from './zhiwujianceInfo' import * as echarts from "echarts"; import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuanb' -import { getDeviceImagePage, getShiPinByChannelNo } from '@/api/deviceImage/deviceImage' +import { getDeviceImagePage, getShiPinNormalByChannelNo } from '@/api/deviceImage/deviceImage' // 1.1完好率饼图 const wanhao_Chart = { @@ -185,11 +182,19 @@ export default { }, data() { return { + imgUrl: 'D:/resources/download/1/202306080924311.png', wanhao_Chart: wanhao_Chart, // 1.1 weixiu_Chart: weixiu_Chart, sunhai_Chart: sunhai_Chart, btndisabled: false, btnList: [ + { + type: 'primary', + size: 'small', + icon: '', + btnKey: 'toAdd', + btnLabel: '设置定时' + }, { type: 'info', size: 'small', @@ -204,35 +209,9 @@ export default { sids: [], // 查询 ----------- tableKey: 0, - list: [ - { - cangku: '仓库1003F3', name: '康师傅矿泉水', tuUrl: './image/tu1.jpg', createTime: '2023-05-03', createTime2: '18:26:38', changjia: '康师傅', shuliang: '1000', zhongliang: '500', - nameb: '康师傅矿泉水2', tuUrlb: './image/tu2.jpg', createTimeb: '2023-05-03', createTime2: '18:26:38', changjiab: '康师傅', shuliangb: '1000', zhongliangb: '500' - }, - { - cangku: '仓库1003F3', name: '康师傅矿泉水', tuUrl: './image/tu1.jpg', createTime: '2023-05-03', createTime2: '18:26:38', changjia: '康师傅', shuliang: '1000', zhongliang: '500', - nameb: '康师傅矿泉水2', tuUrlb: './image/tu2.jpg', createTimeb: '2023-05-03', createTime2: '18:26:38', changjiab: '康师傅', shuliangb: '1000', zhongliangb: '500' - }, - { - cangku: '仓库1003F3', name: '康师傅矿泉水', tuUrl: './image/tu1.jpg', createTime: '2023-05-03', createTime2: '18:26:38', changjia: '康师傅', shuliang: '1000', zhongliang: '500', - nameb: '康师傅矿泉水2', tuUrlb: './image/tu2.jpg', createTimeb: '2023-05-03', createTime2: '18:26:38', changjiab: '康师傅', shuliangb: '1000', zhongliangb: '500' - }, - { - cangku: '仓库1003F3', name: '康师傅矿泉水', tuUrl: './image/tu1.jpg', createTime: '2023-05-03', createTime2: '18:26:38', changjia: '康师傅', shuliang: '1000', zhongliang: '500', - nameb: '康师傅矿泉水2', tuUrlb: './image/tu2.jpg', createTimeb: '2023-05-03', createTime2: '18:26:38', changjiab: '康师傅', shuliangb: '1000', zhongliangb: '500' - }, - ], - - Datalista: [ - { - cangku: '仓库1003F3', name: '康师傅矿泉水', tuUrl: './image/tu1.jpg', createTime: '2023-05-03', createTime2: '18:26:38', changjia: '康师傅', shuliang: '1000', zhongliang: '500', - nameb: '康师傅矿泉水2', tuUrlb: './image/tu2.jpg', createTimeb: '2023-05-03', createTime2: '18:26:38', changjiab: '康师傅', shuliangb: '1000', zhongliangb: '500' - }, - - ], + list: [], Datalistb: [ { name: '仓库1', cangku: '仓库1003F3', weizhi: '石家庄市长安区和平西路126号', huohao: 'F31006C102325', ren: '李舜华', dianhua: '13933263572' }, - ], listLoading: false, listQuery: { @@ -283,8 +262,8 @@ export default { this.init() }, methods: { - toShipin(row) { - getShiPinByChannelNo({ channelNo: row.channelNo }).then(res => { + getVedioPcLive(row) { + getShiPinNormalByChannelNo({ channelNo: row.channelNo }).then(res => { this.spUrl = res.data this.dialogImage = true }) @@ -360,20 +339,6 @@ export default { var pageindex = index + 1 + pagestart return pageindex }, - // 查询列表信息 - getList() { - // this.listLoading = true - // req.gysPagerList(this.listQuery).then((response) => { - // this.listLoading = false - // if (response.code === '200' && response.data && response.data.total > 0) { - // this.list = response.data.records - // this.listQuery.total = response.data.total - // } else { - // this.list = [] - // this.listQuery.total = 0 - // } - // }) - }, // 查询按钮 handleFilter() { this.listQuery.current = 1 @@ -384,7 +349,7 @@ export default { // 打开添加对话框 toAdd() { this.viewState = 2 - this.$refs['divadd'].showAdd(this.listQuery.createOrgSid) + this.$refs['divadd'].showAdd() }, // 打开添加设备对话框 handleDddShebei() { @@ -432,10 +397,6 @@ export default { return } }, - handleEdit(row) { - this.viewState = 2 - this.$refs['divadd'].showAdd(this.listQuery.createOrgSid) - }, // 打开查看 handleCheck(row) { this.viewState = 4