Compare commits
No commits in common. "cde4f5d82e44d1af5d0291287e3e4340d6c78dc1" and "dce08fa047cf1917018da084ddd652ed6092e43d" have entirely different histories.
cde4f5d82e
...
dce08fa047
|
|
@ -7,45 +7,45 @@
|
|||
*/
|
||||
var _global = {}
|
||||
var CONFIGITEM = {
|
||||
// version: 'qingdao', // 青岛
|
||||
// version: 'xihaian', // 西海岸
|
||||
version: 'dev', // 测试
|
||||
// version: 'frp', // 内网穿透
|
||||
// version: 'xihaian', // 开发
|
||||
vNum: 'v0.8.7.2',
|
||||
configData: {
|
||||
// 青岛市大数据局
|
||||
qingdao: {
|
||||
previewUrl: 'http://15.72.183.90:7008/',
|
||||
apiURL: 'http://15.72.183.90:8000/ucs-admin',
|
||||
websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket'
|
||||
},
|
||||
// 西海岸大数据局
|
||||
xihaian: {
|
||||
previewUrl: 'http://10.134.135.9:9796/',
|
||||
// apiURL: 'http://10.134.135.9:8888/ucs-admin',
|
||||
// apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发
|
||||
apiURL: 'http://192.168.124.236:8888/ucs-admin',
|
||||
// apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄
|
||||
websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket'
|
||||
},
|
||||
// 测试
|
||||
test: {
|
||||
previewUrl: 'http://192.168.124.243:9796/',
|
||||
apiURL: 'http://192.168.124.243:8888/ucs-admin',
|
||||
websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
|
||||
},
|
||||
// 内网穿透
|
||||
frp: {
|
||||
previewUrl: 'http://124.222.94.39:9796/',
|
||||
apiURL: 'http://124.222.94.39:8888/ucs-admin',
|
||||
websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket'
|
||||
},
|
||||
dev: {
|
||||
previewUrl: 'http://localhost:8080/',
|
||||
apiURL: 'http://192.168.124.233:8888/ucs-admin',
|
||||
websocketURL: 'ws://192.168.124.233:8888/ucs-admin/websocket'
|
||||
}
|
||||
// version: 'qingdao', // 青岛
|
||||
// version: 'xihaian', // 西海岸
|
||||
version: 'dev', // 测试
|
||||
// version: 'frp', // 内网穿透
|
||||
// version: 'xihaian', // 开发
|
||||
vNum: 'v0.8.7.2',
|
||||
configData: {
|
||||
// 青岛市大数据局
|
||||
qingdao: {
|
||||
previewUrl: 'http://15.72.183.90:7008/',
|
||||
apiURL: 'http://15.72.183.90:8000/ucs-admin',
|
||||
websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket'
|
||||
},
|
||||
// 西海岸大数据局
|
||||
xihaian: {
|
||||
previewUrl: 'http://10.134.135.9:9796/',
|
||||
// apiURL: 'http://10.134.135.9:8888/ucs-admin',
|
||||
// apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发
|
||||
apiURL: 'http://192.168.124.236:8888/ucs-admin',
|
||||
// apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄
|
||||
websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket'
|
||||
},
|
||||
// 测试
|
||||
test: {
|
||||
previewUrl: 'http://192.168.124.243:9796/',
|
||||
apiURL: 'http://192.168.124.243:8888/ucs-admin',
|
||||
websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
|
||||
},
|
||||
// 内网穿透
|
||||
frp: {
|
||||
previewUrl: 'http://124.222.94.39:9796/',
|
||||
apiURL: 'http://124.222.94.39:8888/ucs-admin',
|
||||
websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket'
|
||||
},
|
||||
dev: {
|
||||
previewUrl: 'http://localhost:8080/',
|
||||
apiURL: 'http://192.168.124.243:8888/ucs-admin',
|
||||
websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
|
||||
}
|
||||
}
|
||||
}
|
||||
_global.config = CONFIGITEM.configData[CONFIGITEM.version]
|
||||
_global.config = CONFIGITEM.configData[CONFIGITEM.version]
|
||||
|
|
|
|||
|
|
@ -7,117 +7,122 @@
|
|||
*/
|
||||
var _global = {}
|
||||
var CONFIGITEM = {
|
||||
// version: 'qingdao', //青岛
|
||||
version: 'xihaian', // 西海岸
|
||||
//version: 'dev', // 开发
|
||||
// version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
|
||||
// version: 'qingdao', // 测试
|
||||
//version: 'frp', // 内网穿透
|
||||
vNum: 'v0.8.15.2',
|
||||
configData: {
|
||||
// 青岛市大数据局
|
||||
qingdao: {
|
||||
loginInfo: {
|
||||
// 视频平台登陆信息
|
||||
loginIp: '10.132.191.3',
|
||||
loginPort: '8320',
|
||||
userName: 'ynszdz',
|
||||
userPwd: 'Admin@123',
|
||||
},
|
||||
backUrl: 'http://15.72.183.90:8001',
|
||||
previewUrl: 'http://15.72.183.90:7008/',
|
||||
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
|
||||
apiURL: 'http://15.72.183.90:8000/ucs-admin',
|
||||
websocketURL: '15.72.183.90:8000/ucs-admin',
|
||||
// websocketURL: '192.168.124.233:8888/ucs-admin',
|
||||
POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
// 研发展厅
|
||||
zhanTingDev: {
|
||||
loginInfo: {
|
||||
// 视频平台登陆信息
|
||||
loginIp: '10.132.191.3',
|
||||
loginPort: '8320',
|
||||
userName: 'ynszdz',
|
||||
userPwd: 'Admin@123',
|
||||
},
|
||||
backUrl: 'http://15.72.183.90:8001',
|
||||
previewUrl: 'http://15.72.183.90:7008/',
|
||||
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
|
||||
//apiURL: 'http://15.72.183.90:8000/ucs-admin',
|
||||
// websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超
|
||||
websocketURL: '10.18.1.99:8889/ucs-admin',
|
||||
// websocketURL: '10.16.5.35:8888/ucs-admin',
|
||||
POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
// 西海岸大数据局
|
||||
xihaian: {
|
||||
loginInfo: {
|
||||
// 视频平台登陆信息
|
||||
loginIp: '',
|
||||
loginPort: '',
|
||||
userName: '',
|
||||
userPwd: '',
|
||||
},
|
||||
// 获取摄像头的后端接口地址
|
||||
camreaInfo: {
|
||||
// cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
|
||||
// cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境
|
||||
cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
|
||||
},
|
||||
backUrl: 'http://10.134.135.9:9797',
|
||||
previewUrl: 'http://10.134.135.9:9796/',
|
||||
apiURL: 'http://10.134.135.92:8888/renren-admin',
|
||||
// websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
|
||||
websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
|
||||
//websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄
|
||||
// websocketURL: '10.18.1.99:8889/ucs-admin', // 研发
|
||||
POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
// 开发
|
||||
dev: {
|
||||
loginInfo: {
|
||||
// 视频平台登陆信息
|
||||
loginIp: '',
|
||||
loginPort: '',
|
||||
userName: '',
|
||||
userPwd: '',
|
||||
},
|
||||
backUrl: 'http://localhost:8001',
|
||||
previewUrl: 'http://192.168.124.243:9796/',
|
||||
apiURL: 'http://192.168.124.243:8888/ucs-admin',
|
||||
websocketURL: '192.168.124.243:8888/ucs-admin',
|
||||
// websocketURL: '10.18.1.99:8889/ucs-admin',
|
||||
POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
// 测试
|
||||
test: {
|
||||
loginInfo: {
|
||||
// 视频平台登陆信息
|
||||
loginIp: '',
|
||||
loginPort: '',
|
||||
userName: '',
|
||||
userPwd: '',
|
||||
},
|
||||
backUrl: 'http://192.168.124.243:9797',
|
||||
previewUrl: 'http://192.168.124.243:9796/',
|
||||
websocketURL: '192.168.124.243:8888/ucs-admin',
|
||||
POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
// 内网穿透
|
||||
frp: {
|
||||
loginInfo: {
|
||||
// 视频平台登陆信息
|
||||
loginIp: '',
|
||||
loginPort: '',
|
||||
userName: '',
|
||||
userPwd: '',
|
||||
},
|
||||
backUrl: 'http://124.222.94.39:9797',
|
||||
previewUrl: 'http://124.222.94.39:9796/',
|
||||
websocketURL: '124.222.94.39:8888/ucs-admin',
|
||||
POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
// version: 'qingdao', //青岛
|
||||
// version: 'xihaian', // 西海岸
|
||||
version: 'dev', // 开发
|
||||
// version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
|
||||
// version: 'qingdao', // 测试
|
||||
//version: 'frp', // 内网穿透
|
||||
vNum: 'v0.8.15.2',
|
||||
configData: {
|
||||
// 青岛市大数据局
|
||||
qingdao: {
|
||||
loginInfo: {
|
||||
// 视频平台登陆信息
|
||||
loginIp: '10.132.191.3',
|
||||
loginPort: '8320',
|
||||
userName: 'ynszdz',
|
||||
userPwd: 'Admin@123',
|
||||
},
|
||||
backUrl: 'http://15.72.183.90:8001',
|
||||
previewUrl: 'http://15.72.183.90:7008/',
|
||||
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
|
||||
apiURL: 'http://15.72.183.90:8000/ucs-admin',
|
||||
websocketURL: '15.72.183.90:8000/ucs-admin',
|
||||
// websocketURL: '192.168.124.233:8888/ucs-admin',
|
||||
POI_URL:
|
||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
// 研发展厅
|
||||
zhanTingDev: {
|
||||
loginInfo: {
|
||||
// 视频平台登陆信息
|
||||
loginIp: '10.132.191.3',
|
||||
loginPort: '8320',
|
||||
userName: 'ynszdz',
|
||||
userPwd: 'Admin@123',
|
||||
},
|
||||
backUrl: 'http://15.72.183.90:8001',
|
||||
previewUrl: 'http://15.72.183.90:7008/',
|
||||
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
|
||||
//apiURL: 'http://15.72.183.90:8000/ucs-admin',
|
||||
// websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超
|
||||
websocketURL: '10.18.1.99:8889/ucs-admin',
|
||||
// websocketURL: '10.16.5.35:8888/ucs-admin',
|
||||
POI_URL:
|
||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
// 西海岸大数据局
|
||||
xihaian: {
|
||||
loginInfo: {
|
||||
// 视频平台登陆信息
|
||||
loginIp: '',
|
||||
loginPort: '',
|
||||
userName: '',
|
||||
userPwd: '',
|
||||
},
|
||||
// 获取摄像头的后端接口地址
|
||||
camreaInfo: {
|
||||
// cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
|
||||
// cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境
|
||||
cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
|
||||
},
|
||||
backUrl: 'http://10.134.135.9:9797',
|
||||
previewUrl: 'http://10.134.135.9:9796/',
|
||||
// websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
|
||||
// websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
|
||||
websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄
|
||||
// websocketURL: '10.18.1.99:8889/ucs-admin', // 研发
|
||||
POI_URL:
|
||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
// 开发
|
||||
dev: {
|
||||
loginInfo: {
|
||||
// 视频平台登陆信息
|
||||
loginIp: '',
|
||||
loginPort: '',
|
||||
userName: '',
|
||||
userPwd: '',
|
||||
},
|
||||
backUrl: 'http://localhost:8001',
|
||||
previewUrl: 'http://192.168.124.243:9796/',
|
||||
apiURL: 'http://192.168.124.243:8888/ucs-admin',
|
||||
websocketURL: '192.168.124.243:8888/ucs-admin',
|
||||
// websocketURL: '10.18.1.99:8889/ucs-admin',
|
||||
POI_URL:
|
||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
// 测试
|
||||
test: {
|
||||
loginInfo: {
|
||||
// 视频平台登陆信息
|
||||
loginIp: '',
|
||||
loginPort: '',
|
||||
userName: '',
|
||||
userPwd: '',
|
||||
},
|
||||
backUrl: 'http://192.168.124.243:9797',
|
||||
previewUrl: 'http://192.168.124.243:9796/',
|
||||
websocketURL: '192.168.124.243:8888/ucs-admin',
|
||||
POI_URL:
|
||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
// 内网穿透
|
||||
frp: {
|
||||
loginInfo: {
|
||||
// 视频平台登陆信息
|
||||
loginIp: '',
|
||||
loginPort: '',
|
||||
userName: '',
|
||||
userPwd: '',
|
||||
},
|
||||
backUrl: 'http://124.222.94.39:9797',
|
||||
previewUrl: 'http://124.222.94.39:9796/',
|
||||
websocketURL: '124.222.94.39:8888/ucs-admin',
|
||||
POI_URL:
|
||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
},
|
||||
}
|
||||
_global.config = CONFIGITEM.configData[CONFIGITEM.version]
|
||||
_global.config = CONFIGITEM.configData[CONFIGITEM.version]
|
||||
|
|
|
|||
|
|
@ -10,141 +10,141 @@ import axios from 'axios'
|
|||
import store from '@/store'
|
||||
|
||||
const config = {
|
||||
headers: {
|
||||
token: store.getters['user/accessToken'],
|
||||
'Content-Type': 'multipart/form-data',
|
||||
},
|
||||
headers: {
|
||||
token: store.getters['user/accessToken'],
|
||||
'Content-Type': 'multipart/form-data',
|
||||
},
|
||||
}
|
||||
const config2 = {
|
||||
headers: {
|
||||
'Content-Type': 'application/json; charset-utf-8',
|
||||
},
|
||||
headers: {
|
||||
'Content-Type': 'application/json; charset-utf-8',
|
||||
},
|
||||
}
|
||||
export function getDevelopmentFile(params) {
|
||||
return request({
|
||||
url: '/developmentGuide/getDevelopmentFile',
|
||||
method: 'get',
|
||||
params,
|
||||
})
|
||||
return request({
|
||||
url: '/developmentGuide/getDevelopmentFile',
|
||||
method: 'get',
|
||||
params,
|
||||
})
|
||||
}
|
||||
export function updateDevelopmentFile(params) {
|
||||
return axios.post(
|
||||
window.SITE_CONFIG.apiURL + '/developmentGuide/uploadDevelopmentFile',
|
||||
params,
|
||||
config
|
||||
)
|
||||
return axios.post(
|
||||
window.SITE_CONFIG.apiURL + '/developmentGuide/uploadDevelopmentFile',
|
||||
params,
|
||||
config
|
||||
)
|
||||
}
|
||||
export function test() {
|
||||
return axios.post(
|
||||
'http://15.72.158.81/zyjk/ZywMessage.asmx/ZywMessagePort',
|
||||
config2
|
||||
)
|
||||
return axios.post(
|
||||
'http://15.72.158.81/zyjk/ZywMessage.asmx/ZywMessagePort',
|
||||
config2
|
||||
)
|
||||
}
|
||||
export function correct(params) {
|
||||
return axios.post('http://15.72.183.90:7008/correct', params, config2)
|
||||
return axios.post('http://15.72.183.90:7008/correct', params, config2)
|
||||
}
|
||||
export function paddleocr(params) {
|
||||
return axios.post('http://15.72.183.90:7008/paddleocr', params, config2)
|
||||
return axios.post('http://15.72.183.90:7008/paddleocr', params, config2)
|
||||
}
|
||||
// 算法总接口
|
||||
export function algo(params) {
|
||||
return axios.post('http://15.72.184.10:8888/api/algo', params, config2)
|
||||
return axios.post('http://15.72.184.10:8888/api/algo', params, config2)
|
||||
}
|
||||
|
||||
// 能力云图-数据资源
|
||||
export function count() {
|
||||
return axios.post(
|
||||
'http://10.134.135.24:30058/share-portal/platform/index/abilityMarket/count',
|
||||
config2
|
||||
)
|
||||
return axios.post(
|
||||
'http://10.134.135.24:30058/share-portal/platform/index/abilityMarket/count',
|
||||
config2
|
||||
)
|
||||
}
|
||||
export function getVideoList(params) {
|
||||
return axios.get(
|
||||
'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' +
|
||||
params.name +
|
||||
'&pageNo=' +
|
||||
params.pageNo +
|
||||
'&pageSize=' +
|
||||
params.pageSize,
|
||||
config2
|
||||
)
|
||||
return axios.get(
|
||||
'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' +
|
||||
params.name +
|
||||
'&pageNo=' +
|
||||
params.pageNo +
|
||||
'&pageSize=' +
|
||||
params.pageSize,
|
||||
config2
|
||||
)
|
||||
}
|
||||
// 能力云图-数据资源-总数据数
|
||||
export function getRecord(params) {
|
||||
return axios.get(
|
||||
'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' +
|
||||
params.serviceName +
|
||||
'&orderField=' +
|
||||
params.orderField +
|
||||
'&orderType=' +
|
||||
params.orderType +
|
||||
'&pageNum=' +
|
||||
params.pageNum +
|
||||
'&pageSize=' +
|
||||
params.pageSize +
|
||||
'&serviceType=' +
|
||||
params.serviceType,
|
||||
config2
|
||||
)
|
||||
return axios.get(
|
||||
'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' +
|
||||
params.serviceName +
|
||||
'&orderField=' +
|
||||
params.orderField +
|
||||
'&orderType=' +
|
||||
params.orderType +
|
||||
'&pageNum=' +
|
||||
params.pageNum +
|
||||
'&pageSize=' +
|
||||
params.pageSize +
|
||||
'&serviceType=' +
|
||||
params.serviceType,
|
||||
config2
|
||||
)
|
||||
}
|
||||
|
||||
export function getHls(params) {
|
||||
return axios.get(
|
||||
'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' +
|
||||
params.cameraId +
|
||||
'&protocol=' +
|
||||
params.protocol,
|
||||
config2
|
||||
)
|
||||
return axios.get(
|
||||
'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' +
|
||||
params.cameraId +
|
||||
'&protocol=' +
|
||||
params.protocol,
|
||||
config2
|
||||
)
|
||||
}
|
||||
// 西海岸 POI搜索
|
||||
export function getListForPOI(params) {
|
||||
return axios.get(
|
||||
'http://10.134.135.3:21009/service/lbs/coder/geocoding2?appKey=675d95594136456bb7b1434dda31953f&city=青岛&keywords=' +
|
||||
params.keywords,
|
||||
config2
|
||||
)
|
||||
return axios.get(
|
||||
'http://10.134.135.3:21009/service/lbs/coder/geocoding2?appKey=675d95594136456bb7b1434dda31953f&city=青岛&keywords=' +
|
||||
params.keywords,
|
||||
config2
|
||||
)
|
||||
}
|
||||
|
||||
//西海岸 获取左侧标签树
|
||||
export function getPlaceType() {
|
||||
return axios.get(
|
||||
'http://10.134.135.92:9537/data_service/placeTypes/getPlaceType',
|
||||
config2
|
||||
)
|
||||
return axios.get(
|
||||
'http://10.134.135.92:9537/data_service/placeTypes/getPlaceType',
|
||||
config2
|
||||
)
|
||||
}
|
||||
// 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537)
|
||||
let _cameraUrl =
|
||||
(_global &&
|
||||
_global.config &&
|
||||
_global.config.camreaInfo &&
|
||||
_global.config.camreaInfo.cameraUrl) ||
|
||||
'10.134.135.92:9537'
|
||||
//能力集市基础设施-左侧列表
|
||||
(_global &&
|
||||
_global.config &&
|
||||
_global.config.camreaInfo &&
|
||||
_global.config.camreaInfo.cameraUrl) ||
|
||||
'10.134.135.92:9537'
|
||||
//能力集市基础设施-左侧列表
|
||||
export function getCameraInfoByAreaId(params) {
|
||||
return axios.get(
|
||||
`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
|
||||
config2
|
||||
)
|
||||
return axios.get(
|
||||
`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
|
||||
config2
|
||||
)
|
||||
}
|
||||
//能力集市基础设施-摄像头
|
||||
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
|
||||
)
|
||||
}
|
||||
// return request({
|
||||
// url: '/enke/initiateMeet',
|
||||
// method: 'post',
|
||||
// data: data,
|
||||
// })
|
||||
return axios.post(
|
||||
'http://10.134.135.92:8888/renren-admin/enke/initiateMeet',
|
||||
data,
|
||||
config2
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,8 +42,6 @@ function updateProgressBar(processed, total, elapsed, layersArray) {
|
|||
function createMarkerClusterLayer(layerClassName) {
|
||||
let array = [];
|
||||
let markerClusterLayer = null
|
||||
//let currentZoom = this.map._zoom
|
||||
//console.log('zzzzzz', currentZoom);
|
||||
if (layerClassName) {
|
||||
// 如果存在类名，表示需要自定义图标
|
||||
markerClusterLayer = L.markerClusterGroup({
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@
|
|||
>
|
||||
<button class="buzhou">提交</button>
|
||||
</a-popconfirm>
|
||||
<button class="buzhou" v-else-if="showView === '部署与使用'" @click="submit()">
|
||||
<button class="buzhou" v-else-if="服务商联系电话 === '部署与使用'" @click="submit()">
|
||||
提交
|
||||
</button>
|
||||
<button class="quxiao" @click="close()">取消</button>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
海康H5Player
|
||||
-->
|
||||
<template>
|
||||
<div id='player' style="width:800px;height:600px;z-index:9999"></div>
|
||||
<div id='player' style="width:950px;height:600px"></div>
|
||||
</template>
|
||||
<script>
|
||||
const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
:key="item.key"
|
||||
@click="jumpPage(item,'headerClick')"
|
||||
class="nav"
|
||||
:class="[{'select':item.key == select},{'select-inner':(item.key == 'DetailsPageconetent' && item.innerKey && props.targetFlag)}]"
|
||||
:class="[{'select':item.key == select},{'select-inner':(item.key == 'DetailsPageconetent' && item.innerKey == 'algorithmCompare'&& props.targetFlag)}]"
|
||||
>
|
||||
{{ item.name }}
|
||||
</div>
|
||||
|
|
@ -171,7 +171,6 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
console.log('3333333------------>', props)
|
||||
// 返回首页
|
||||
const goToHome = () => {
|
||||
// 西海岸
|
||||
|
|
@ -291,7 +290,7 @@
|
|||
break
|
||||
case '能力集市':
|
||||
router.push({
|
||||
path: targetRouter.value.path,
|
||||
path: '/algorithmCompare',
|
||||
query: {
|
||||
id: targetRouter.value.id,
|
||||
},
|
||||
|
|
@ -302,11 +301,41 @@
|
|||
path: '/capabilityCloud',
|
||||
})
|
||||
break
|
||||
// case '技术文档':
|
||||
// router.push({
|
||||
// path: '/developmentGuide',
|
||||
// })
|
||||
// break
|
||||
case '新手指南':
|
||||
router.push({
|
||||
path: '/instructionManual',
|
||||
})
|
||||
break
|
||||
case '需求中心':
|
||||
router.push({
|
||||
path: '/demandCenter',
|
||||
})
|
||||
break
|
||||
case '区市站点':
|
||||
router.push({
|
||||
path: '/mapTest',
|
||||
})
|
||||
break
|
||||
case '后台管理':
|
||||
Cookies.remove('JSESSIONID')
|
||||
window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
|
||||
// window.reload('http://15.2.21.238:9797')
|
||||
break
|
||||
case '赋能案例':
|
||||
router.push({
|
||||
path: '/assignCase',
|
||||
})
|
||||
break
|
||||
case '典型赋能案例':
|
||||
router.push({
|
||||
path: '/assignCase',
|
||||
})
|
||||
break
|
||||
case '融合服务':
|
||||
router.push({
|
||||
path: '/integrationServices',
|
||||
|
|
@ -402,9 +431,8 @@
|
|||
})
|
||||
|
||||
mybus.on('changeMenuStyle', (data) => {
|
||||
debugger
|
||||
targetRouter.value = data;
|
||||
if(data.path=='/algorithmCompare'){
|
||||
targetRouter.value = data;
|
||||
jumpPage({
|
||||
"name": "能力集市",
|
||||
"key": "DetailsPageconetent",
|
||||
|
|
@ -412,12 +440,6 @@
|
|||
},'innerClick');
|
||||
} else if(data.path =='/DetailsPageconetent'){
|
||||
jumpPage({ name: '能力集市', key: 'DetailsPageconetent' },'headerClick')
|
||||
} else if(data.path =='/details'){
|
||||
jumpPage({
|
||||
"name": "能力集市",
|
||||
"key": "DetailsPageconetent",
|
||||
"innerKey":"details"
|
||||
},'innerClick');
|
||||
}
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -609,18 +609,12 @@
|
|||
}
|
||||
} else {
|
||||
context.emit('saveSearchCodition')
|
||||
// router.push({
|
||||
// path: '/details',
|
||||
// query: {
|
||||
// id: item.id,
|
||||
// },
|
||||
// });
|
||||
//修改顶部菜单的样式
|
||||
let pathData = {
|
||||
path: '/details',
|
||||
id: item.id,
|
||||
};
|
||||
mybus.emit('changeMenuStyle',pathData);
|
||||
router.push({
|
||||
path: '/details',
|
||||
query: {
|
||||
id: item.id,
|
||||
},
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,5 @@
|
|||
<template>
|
||||
<div>
|
||||
<div class="nav-box">
|
||||
<a-breadcrumb>
|
||||
<a-breadcrumb-item @click="goToDetailsPageconetent" class="bread-crumb-span">能力集市</a-breadcrumb-item>
|
||||
<a-breadcrumb-item>{{detailName}}</a-breadcrumb-item>
|
||||
</a-breadcrumb>
|
||||
</div>
|
||||
<div class="detail-back" @click="previousPage" :style="{ color: textColor }">
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -30,40 +24,20 @@ const previousPage = () => {
|
|||
|
||||
}
|
||||
|
||||
const detailName = ref("应用资源")
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
.detail-back {
|
||||
position: absolute;
|
||||
top: 0.6rem;
|
||||
top: 0.85rem;
|
||||
left: 100px;
|
||||
font-size: 0.18rem;
|
||||
color: #fff;
|
||||
cursor: pointer;
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
//background-image: url('~@/assets/detailsAll/back.png');
|
||||
background-image: url('~@/assets/detailsAll/back.png');
|
||||
background-size: 100% 100%;
|
||||
}
|
||||
.nav-box {
|
||||
position: absolute;
|
||||
top: 0.6rem;
|
||||
//left: 100px;
|
||||
font-size: 0.18rem;
|
||||
color: #fff;
|
||||
height: 30px;
|
||||
line-height:30px;
|
||||
width: 100%;
|
||||
font-size: 14px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
background: rgba(244, 245, 248, 0.8);
|
||||
padding-left: 145px;
|
||||
padding-top: 5px;
|
||||
.bread-crumb-span{
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -8,12 +8,11 @@
|
|||
<template>
|
||||
<div>
|
||||
<div id="apply-container">
|
||||
<home-header :showView="showView" :target-flag = "targetFlag"></home-header>
|
||||
<home-header :showView="showView"></home-header>
|
||||
<detail-back></detail-back>
|
||||
<div class="detail-content">
|
||||
<details-view v-if="showView === 'details-view'"></details-view>
|
||||
<details-view v-if="showView === 'details-view'"></details-view>
|
||||
<algorithm-details
|
||||
v-if="showView === 'algorithm-details'"
|
||||
v-else-if="showView === 'algorithm-details'"
|
||||
></algorithm-details>
|
||||
<application-details
|
||||
v-else-if="showView === 'application-details'"
|
||||
|
|
@ -25,7 +24,6 @@
|
|||
v-else-if="showView === 'business-details'"
|
||||
></business-details>
|
||||
<layer-service v-else-if="showView === 'layer-service'"></layer-service>
|
||||
</div>
|
||||
<home-footer></home-footer>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -97,7 +95,6 @@
|
|||
const id = router.currentRoute.value.query.id
|
||||
const obj = JSON.parse(window.sessionStorage.getItem('preview'))
|
||||
let showView = ref('')
|
||||
const targetFlag= ref(true)
|
||||
const init = () => {
|
||||
if (id) {
|
||||
selectOne(id).then((res) => {
|
||||
|
|
@ -174,7 +171,6 @@
|
|||
formState,
|
||||
options,
|
||||
showView,
|
||||
targetFlag,
|
||||
init,
|
||||
router,
|
||||
id,
|
||||
|
|
@ -195,7 +191,4 @@
|
|||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.detail-content{
|
||||
margin-top:90px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,34 +1,8 @@
|
|||
<template>
|
||||
<div class="wrapper">
|
||||
<div class="nav">
|
||||
<div :class="{ active: itemIndex == 1 }" @click="btnClick(1)">
|
||||
<span
|
||||
class="photo"
|
||||
:style="{
|
||||
backgroundImage: `url(${bumenImg}) `,
|
||||
backgroundSize: 'cover',
|
||||
}"
|
||||
></span>
|
||||
<span>部门</span>
|
||||
</div>
|
||||
<div :class="{ active: itemIndex == 2 }" @click="btnClick(2)">
|
||||
<span
|
||||
class="photo"
|
||||
:style="{
|
||||
backgroundImage: `url(${biaoqianImg}) `,
|
||||
backgroundSize: 'cover',
|
||||
}"
|
||||
></span>
|
||||
<span>标签</span>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="itemIndex == 1" class="wrapper-title-left-tree" :key="showKey">
|
||||
<div class="wrapper-title-left-tree" :key="showKey">
|
||||
<div v-for="item in treeData" :key="item.id" class="primaryNode">
|
||||
<div
|
||||
class="top"
|
||||
@click="showBottom(item)"
|
||||
:class="item.show ? 'topSelect' : ''"
|
||||
>
|
||||
<div class="top" @click="showBottom(item)" :class="item.show ? 'topSelect' : ''">
|
||||
{{ item.name }}
|
||||
({{ item.channelCount }})
|
||||
<DownOutlined v-show="!item.show" />
|
||||
|
|
@ -36,28 +10,13 @@
|
|||
</div>
|
||||
<div class="bottom" v-show="item.show">
|
||||
<div v-for="val in item.children" :key="val.id" class="item">
|
||||
<div
|
||||
class="up"
|
||||
:class="selectId == val.id ? 'select' : ''"
|
||||
@click="showDown(item, val), onSelect(item, val)"
|
||||
>
|
||||
<div class="up" :class="selectId == val.id ? 'select' : ''"
|
||||
@click="showDown(item, val), onSelect(item, val)">
|
||||
<div>
|
||||
<svg
|
||||
t="1654068878091"
|
||||
class="icon"
|
||||
viewBox="0 0 1024 1024"
|
||||
version="1.1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
p-id="2156"
|
||||
width="0.25rem"
|
||||
height="0.25rem"
|
||||
v-show="selectId == val.id"
|
||||
>
|
||||
<path
|
||||
d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z"
|
||||
p-id="2157"
|
||||
fill="#0058e1"
|
||||
></path>
|
||||
<svg t="1654068878091" class="icon" viewBox="0 0 1024 1024" version="1.1"
|
||||
xmlns="http://www.w3.org/2000/svg" p-id="2156" width="0.25rem" height="0.25rem"
|
||||
v-show="selectId == val.id">
|
||||
<path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z" p-id="2157" fill="#0058e1"></path>
|
||||
</svg>
|
||||
<span class="name">{{ val.name }}({{ val.channelCount }})</span>
|
||||
</div>
|
||||
|
|
@ -68,30 +27,13 @@
|
|||
</span>
|
||||
</div>
|
||||
<div class="down" v-show="val.show">
|
||||
<div
|
||||
v-for="child in val.children"
|
||||
:key="child.id"
|
||||
class="child"
|
||||
:class="selectId == child.id ? 'select2' : ''"
|
||||
@click="onSelect(item, child, child)"
|
||||
>
|
||||
<div v-for="child in val.children" :key="child.id" class="child"
|
||||
:class="selectId == child.id ? 'select2' : ''" @click="onSelect(item, child, child)">
|
||||
<div>
|
||||
<svg
|
||||
t="1654068878091"
|
||||
class="icon"
|
||||
viewBox="0 0 1024 1024"
|
||||
version="1.1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
p-id="2156"
|
||||
width="0.25rem"
|
||||
height="0.25rem"
|
||||
v-show="selectId == child.id"
|
||||
>
|
||||
<path
|
||||
d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z"
|
||||
p-id="2157"
|
||||
fill="#0058e1"
|
||||
></path>
|
||||
<svg t="1654068878091" class="icon" viewBox="0 0 1024 1024" version="1.1"
|
||||
xmlns="http://www.w3.org/2000/svg" p-id="2156" width="0.25rem" height="0.25rem"
|
||||
v-show="selectId == child.id">
|
||||
<path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z" p-id="2157" fill="#0058e1"></path>
|
||||
</svg>
|
||||
<span class="name">
|
||||
{{ child.name }}
|
||||
|
|
@ -104,20 +46,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="itemIndex == 2" class="wrapper-title-left-tree">
|
||||
<div v-for="(item, index) in biaoqianList">
|
||||
<div class="titleName">{{ item.placeTypeName }}</div>
|
||||
<div class="glgkmk" v-for="(child, index) in item.children">
|
||||
<div
|
||||
class="glgknum"
|
||||
:class="{ active: child.placeTypeCode == chooseId }"
|
||||
@click="tabClick(child.placeTypeCode)"
|
||||
>
|
||||
{{ child.placeTypeName }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
|
|
@ -131,35 +59,29 @@ import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
|
|||
|
||||
export default defineComponent({
|
||||
setup() {
|
||||
const biaoqianList = ref([])
|
||||
const bumenImg = require('@/assets/newHome/bumen.png')
|
||||
const biaoqianImg = require('@/assets/newHome/biaoqian.png')
|
||||
const router = useRouter()
|
||||
const whoShow1 = ref(whoShow)
|
||||
const showKey = ref(0)
|
||||
const treeData = ref([])
|
||||
const selectId = ref('')
|
||||
let itemIndex = ref(1)
|
||||
let chooseId = ref('')
|
||||
//切换tab
|
||||
const btnClick = (index) => {
|
||||
itemIndex.value = index
|
||||
}
|
||||
//选择标签内容
|
||||
const tabClick = (id) => {
|
||||
chooseId.value = id
|
||||
}
|
||||
|
||||
// 初始化
|
||||
const init = async () => {
|
||||
treeData.value = []
|
||||
let select =
|
||||
router.currentRoute.value.query.select ||
|
||||
DETAIL_PAGE_CONTENT_DEFAULT_TAB
|
||||
console.log(
|
||||
'router.currentRoute.value.query.select',
|
||||
router.currentRoute.value.query.select
|
||||
)
|
||||
let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
|
||||
if (select === '123') {
|
||||
select = ''
|
||||
}
|
||||
console.log(
|
||||
'获取url中的select=====================>',
|
||||
router.currentRoute.value.query.select
|
||||
)
|
||||
if (select == '基础设施') {
|
||||
let res = {}
|
||||
let res = {};
|
||||
if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
|
||||
res = await getCameraAllOrgan({ parentId: 'S4NbecfYB1DBH8HNULGS34' })
|
||||
} else {
|
||||
|
|
@ -168,27 +90,9 @@ export default defineComponent({
|
|||
areaId: '70be8c5b664f4bcf869d82f2e8335051',
|
||||
})
|
||||
}
|
||||
treeData.value = (res.data && res.data.data) || []
|
||||
//获取标签列表=========
|
||||
biaoqianList.value = [
|
||||
{
|
||||
placeTypeName: '政府机构',
|
||||
children: [
|
||||
{ placeTypeName: '行政中心', placeTypeCode: '1' },
|
||||
{ placeTypeName: '行政中心', placeTypeCode: '12' },
|
||||
{ placeTypeName: '行政中心', placeTypeCode: '14' },
|
||||
],
|
||||
},
|
||||
{
|
||||
placeTypeName: '政府机构1',
|
||||
children: [
|
||||
{ placeTypeName: '行政中心', placeTypeCode: '2' },
|
||||
{ placeTypeName: '行政中心', placeTypeCode: '3' },
|
||||
],
|
||||
},
|
||||
]
|
||||
treeData.value = res.data && res.data.data || []
|
||||
// 只有一个，默认展开到二级菜单
|
||||
if (res.data && res.data.data.length == 1) {
|
||||
if(res.data && res.data.data.length == 1) {
|
||||
showBottom(treeData.value[0])
|
||||
}
|
||||
}
|
||||
|
|
@ -198,6 +102,11 @@ export default defineComponent({
|
|||
})
|
||||
|
||||
const onSelect = async (item, val, child) => {
|
||||
console.log('item--------onSelect---->', item);
|
||||
console.log('val------onSelect------>', val);
|
||||
console.log('child-----onSelect------->', child);
|
||||
mybus.emit('getCameraByParentId', val.id)
|
||||
mybus.emit('getListByParentId', val.id)
|
||||
let res = {}
|
||||
if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
|
||||
res = await getCameraAllOrgan({ parentId: val.id })
|
||||
|
|
@ -228,8 +137,8 @@ export default defineComponent({
|
|||
})
|
||||
|
||||
const showBottom = async (item) => {
|
||||
item.show = !item.show
|
||||
let res = {}
|
||||
item.show = !item.show;
|
||||
let res = {};
|
||||
if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
|
||||
res = await getCameraAllOrgan({ parentId: item.id })
|
||||
} else {
|
||||
|
|
@ -239,17 +148,17 @@ export default defineComponent({
|
|||
|
||||
treeData.value.map((treeDataItem, index) => {
|
||||
if (item.id == treeDataItem.id) {
|
||||
treeData.value[index].children = (res.data && res.data.data) || []
|
||||
treeData.value[index].children = res.data && res.data.data || []
|
||||
console.log('treeData.value.[index]', treeData.value[index])
|
||||
}
|
||||
})
|
||||
}
|
||||
const showDown = (item, val) => {
|
||||
selectId.value = val.id
|
||||
console.log('item---showDown--------->', item)
|
||||
console.log('val----showDown-------->', val)
|
||||
console.log('item---showDown--------->', item);
|
||||
console.log('val----showDown-------->', val);
|
||||
if (item.children) {
|
||||
val.show = !val.show
|
||||
val.show = !val.show;
|
||||
// 取消选中
|
||||
if (!val.show) {
|
||||
selectId.value = ''
|
||||
|
|
@ -257,19 +166,12 @@ export default defineComponent({
|
|||
}
|
||||
}
|
||||
return {
|
||||
btnClick,
|
||||
tabClick,
|
||||
treeData,
|
||||
showKey,
|
||||
onSelect,
|
||||
showBottom,
|
||||
showDown,
|
||||
selectId,
|
||||
itemIndex,
|
||||
bumenImg,
|
||||
biaoqianImg,
|
||||
biaoqianList,
|
||||
chooseId,
|
||||
}
|
||||
},
|
||||
beforeUnmount() {
|
||||
|
|
@ -283,67 +185,6 @@ export default defineComponent({
|
|||
})
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
.titleName {
|
||||
font-size: 18px;
|
||||
color: #1e1a1a;
|
||||
margin-bottom: 10px;
|
||||
padding-left: 10px;
|
||||
border-left: 6px solid #1296db;
|
||||
}
|
||||
.glgkmk {
|
||||
cursor: pointer;
|
||||
text-align: center;
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 30%;
|
||||
margin-bottom: 10px;
|
||||
.active {
|
||||
color: #0058e1;
|
||||
}
|
||||
.glgknum {
|
||||
// color: #000000;
|
||||
}
|
||||
}
|
||||
|
||||
.glgkmk :hover {
|
||||
color: #0058e1;
|
||||
}
|
||||
.nav {
|
||||
margin-bottom: 13px;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
align-items: center;
|
||||
font-size: 18px;
|
||||
font-family: 'Alibaba PuHuiTi';
|
||||
color: #000000;
|
||||
line-height: 0.32rem;
|
||||
margin-bottom: 0.1rem;
|
||||
|
||||
.photo {
|
||||
display: inline-block;
|
||||
height: 0.3rem;
|
||||
width: 0.3rem;
|
||||
margin-right: 0.1rem;
|
||||
}
|
||||
|
||||
div {
|
||||
padding: 0 0.1rem;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
div:hover {
|
||||
color: #1296db;
|
||||
}
|
||||
|
||||
.active {
|
||||
font-weight: 600;
|
||||
color: #1296db;
|
||||
border-bottom: 0.02rem solid #1296db;
|
||||
}
|
||||
}
|
||||
|
||||
.primaryNode {
|
||||
.top {
|
||||
width: 100%;
|
||||
|
|
@ -391,7 +232,7 @@ export default defineComponent({
|
|||
border-top: 0.01rem solid #ccc;
|
||||
padding: 0 0.1rem;
|
||||
|
||||
& > div {
|
||||
&>div {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
|
@ -448,7 +289,7 @@ export default defineComponent({
|
|||
align-items: center;
|
||||
padding: 0 0.1rem;
|
||||
|
||||
& > div {
|
||||
&>div {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,15 +20,13 @@
|
|||
:key="url"
|
||||
:src="url"
|
||||
>
|
||||
<div class="video-content">
|
||||
<h5-player></h5-player>
|
||||
</div>
|
||||
<!-- <div style="color:#000000">
|
||||
<div class="video-content" style=" z-index: 1">
|
||||
<h5-player :video-url="videoUrl"></h5-player>
|
||||
</div>
|
||||
<!-- <div class="video-content" style=" z-index: 1">
|
||||
<h5-player :video-url = "videoUrl"></h5-player>
|
||||
</div> -->
|
||||
<div class="footer-button">
|
||||
<div style="color:#000000">
|
||||
<h5-player :video-url = "videoUrl"></h5-player>
|
||||
</div>
|
||||
<div>
|
||||
<a-button type="primary" @click="applyNow(url)">立即申请</a-button>
|
||||
<a-button type="primary" style="margin-left:20px" @click="addIntoCart(url)">加入申购车</a-button>
|
||||
</div>
|
||||
|
|
@ -166,18 +164,6 @@
|
|||
width: 960px;
|
||||
//height: 700px;
|
||||
margin-left: 8px;
|
||||
.video-content{
|
||||
width: 950px;
|
||||
height:600px;
|
||||
text-align: left;
|
||||
padding: 5px;
|
||||
}
|
||||
.footer-button{
|
||||
width: 950px;
|
||||
//height:50px;
|
||||
text-align: center;
|
||||
padding-top:20px;
|
||||
}
|
||||
}
|
||||
.ant-carousel :deep(.slick-slide) {
|
||||
text-align: center;
|
||||
|
|
@ -213,7 +199,18 @@
|
|||
.ant-carousel :deep(.slick-dots) {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.video-content{
|
||||
width: 950px;
|
||||
height:600px;
|
||||
text-align: left;
|
||||
padding: 5px;
|
||||
}
|
||||
.footer-button{
|
||||
width: 950px;
|
||||
height:50px;
|
||||
text-align: center;
|
||||
padding-top:20px;
|
||||
}
|
||||
}
|
||||
// .current-video {
|
||||
// width: 320px;
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ import { ElMessage } from 'element-plus'
|
|||
},
|
||||
components: {
|
||||
TiledMap,
|
||||
VideoPlay
|
||||
VideoPlay,
|
||||
},
|
||||
created() {},
|
||||
watch: {
|
||||
|
|
@ -199,7 +199,7 @@ import { ElMessage } from 'element-plus'
|
|||
//this.addResourceTomap('videoMap', this.pointAllData);
|
||||
})
|
||||
|
||||
//所有摄像头数据上图
|
||||
//摄像头数据上图
|
||||
mybus.off('cameraDataOnMap')
|
||||
mybus.on('cameraDataOnMap', (data) => {
|
||||
this.addResourceTomap('videoMap', data)
|
||||
|
|
@ -721,14 +721,6 @@ import { ElMessage } from 'element-plus'
|
|||
z-index: 988;
|
||||
cursor: pointer;
|
||||
}
|
||||
.input-with-select{
|
||||
width: 2.4rem;
|
||||
svg{
|
||||
position: relative;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
}
|
||||
}
|
||||
.icon-poylon {
|
||||
width: 0.46rem;
|
||||
bottom: 0.6rem;
|
||||
|
|
|
|||
Loading…
Reference in New Issue