测试问题修复
This commit is contained in:
parent
5132d3ec60
commit
09d56091fa
|
@ -2,7 +2,7 @@
|
||||||
* @Author: hisense.wuhongjian
|
* @Author: hisense.wuhongjian
|
||||||
* @Date: 2022-04-20 17:16:35
|
* @Date: 2022-04-20 17:16:35
|
||||||
* @LastEditors: hisense.wuhongjian
|
* @LastEditors: hisense.wuhongjian
|
||||||
* @LastEditTime: 2022-08-25 14:13:30
|
* @LastEditTime: 2022-10-26 17:57:52
|
||||||
* @Description: 告诉大家这是什么
|
* @Description: 告诉大家这是什么
|
||||||
*/
|
*/
|
||||||
import request from '@/utils/request'
|
import request from '@/utils/request'
|
||||||
|
@ -99,14 +99,37 @@ export function getHls(params) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 西海岸--获取摄像头列表的后台地址 (测试环境地址:10.134.135.92:9537)
|
// 西海岸--获取摄像头列表的后台地址 (测试环境地址:10.134.135.92:9537)
|
||||||
let _cameraUrl = _global && _global.config && _global.config.camreaInfo && _global.config.camreaInfo.cameraUrl || '10.134.135.92:9537';
|
let _cameraUrl =
|
||||||
|
(_global &&
|
||||||
|
_global.config &&
|
||||||
|
_global.config.camreaInfo &&
|
||||||
|
_global.config.camreaInfo.cameraUrl) ||
|
||||||
|
'10.134.135.92:9537'
|
||||||
//能力集市基础设施-左侧列表
|
//能力集市基础设施-左侧列表
|
||||||
export function getCameraInfoByAreaId(params) {
|
export function getCameraInfoByAreaId(params) {
|
||||||
return axios.get(`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
|
return axios.get(
|
||||||
|
`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
|
||||||
config2
|
config2
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
//能力集市基础设施-摄像头
|
//能力集市基础设施-摄像头
|
||||||
export function getCameraByCondition(params) {
|
export function getCameraByCondition(params) {
|
||||||
return axios.post(`http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`, params, config2)
|
return axios.post(
|
||||||
|
`http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`,
|
||||||
|
params,
|
||||||
|
config2
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function initiateMeet(data) {
|
||||||
|
// return request({
|
||||||
|
// url: '/enke/initiateMeet',
|
||||||
|
// method: 'post',
|
||||||
|
// data: data,
|
||||||
|
// })
|
||||||
|
return axios.post(
|
||||||
|
'http://10.134.135.92:8888/renren-admin/enke/initiateMeet',
|
||||||
|
data,
|
||||||
|
config2
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -776,7 +776,8 @@
|
||||||
defineExpose,
|
defineExpose,
|
||||||
computed,
|
computed,
|
||||||
} from 'vue'
|
} from 'vue'
|
||||||
import { getUser, initiateMeet, getEnkeUsers } from '@/api/home'
|
import { getUser, getEnkeUsers } from '@/api/home'
|
||||||
|
import { initiateMeet } from '@/api/file'
|
||||||
import {
|
import {
|
||||||
getCameraByParentId,
|
getCameraByParentId,
|
||||||
getStreamByChannelCode,
|
getStreamByChannelCode,
|
||||||
|
|
|
@ -66,7 +66,7 @@
|
||||||
></path>
|
></path>
|
||||||
</svg>
|
</svg>
|
||||||
<img class="icon-poylon" @click="areaMode()" src="~@/supermap/image/icon-poylon.png">
|
<img class="icon-poylon" @click="areaMode()" src="~@/supermap/image/icon-poylon.png">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<video-play
|
<video-play
|
||||||
v-if="openVideo"
|
v-if="openVideo"
|
||||||
|
@ -197,7 +197,7 @@
|
||||||
L.drawLocal.draw.handlers.polygon.tooltip.cont = '单击继续绘制形状'
|
L.drawLocal.draw.handlers.polygon.tooltip.cont = '单击继续绘制形状'
|
||||||
L.drawLocal.draw.handlers.polygon.tooltip.end =
|
L.drawLocal.draw.handlers.polygon.tooltip.end =
|
||||||
'单击继续绘制形状,双击结束绘制'
|
'单击继续绘制形状,双击结束绘制'
|
||||||
|
|
||||||
this.hiMap.mapObj.map.off('draw:created')
|
this.hiMap.mapObj.map.off('draw:created')
|
||||||
this.hiMap.mapObj.drawPolygon.enable()
|
this.hiMap.mapObj.drawPolygon.enable()
|
||||||
this.hiMap.mapObj.map.once('draw:created', (e) => {
|
this.hiMap.mapObj.map.once('draw:created', (e) => {
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue