diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js
index b67b249c..6d37819d 100644
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@@ -61,6 +61,11 @@ var CONFIGITEM = {
userName: '',
userPwd: '',
},
+ // 获取摄像头的后端接口地址
+ camreaInfo: {
+ // cameraUrl: '10.134.135.92:9537', // 测试环境
+ cameraUrl: '10.134.135.9:9537', // 生产环境
+ },
backUrl: 'http://10.134.135.9:9797',
previewUrl: 'http://10.134.135.9:9796/',
// websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境
diff --git a/front/src/api/file.js b/front/src/api/file.js
index ccb2466b..19b43c8d 100644
--- a/front/src/api/file.js
+++ b/front/src/api/file.js
@@ -97,13 +97,16 @@ export function getHls(params) {
config2
)
}
+
+// 西海岸--获取摄像头列表的后台地址 (测试环境地址: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) {
- return axios.get(`http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
+ return axios.get(`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
config2
)
}
//能力集市基础设施-摄像头
export function getCameraByCondition(params) {
- return axios.post('http://10.134.135.92:9537/data_service/getCamera/getCameraByCondition', params, config2)
+ return axios.post(`http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`, params, config2)
}
diff --git a/front/src/api/home.js b/front/src/api/home.js
index db989ea8..7daee6ff 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -74,7 +74,15 @@ export function getHls(params) {
// 加入申购车
export function sgcInsert(data) {
return request({
- // url: '/resourcecar/insert',
+ url: '/resourcecar/insert',
+ method: 'post',
+ data,
+ })
+}
+
+// 西海岸--加入申购车
+export function xhaAddCart(data) {
+ return request({
url: '/resourcecar/batchInsert', // 西海岸-加入购物车相当于收藏功能
method: 'post',
data,
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 5fa40442..ba77c2e5 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -669,6 +669,7 @@
:title="wrjName + '详情'"
@ok="wrjVisible = false"
>
+
', 444);
-
} else if (name == '政务云资源') {
room.value = true
tableHeight.value = 600
@@ -1578,6 +1579,8 @@
clickList.value[1].content = []
}
clickList.value[indexFather].content[0] = name
+ console.log('clickList.value[indexFather].content[0]------------>', clickList.value[indexFather].content[0]);
+
if (tabList.value[1]) {
tabList.value[1].title = ''
tabList.value[1].content = []
@@ -1888,7 +1891,7 @@
note1: [v],
})
})
- sgcInsert(_arr).then((res) => {
+ xhaAddCart(_arr).then((res) => {
if(res.data.code !== 0) {
return message.error(res.data.msg)
}
diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue
index 1b91b1d9..fd66c448 100644
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@@ -65,7 +65,7 @@
- 流程终止
+ 撤回申请
@@ -271,10 +271,10 @@ console.log(props.refObj, '=====================================')
const endThis = (instanceId) => {
endProcess({ instanceId: instanceId }).then((res) => {
if (res.data.code == 0) {
- message.success('流程终止成功!')
+ message.success('撤回申请成功!')
mybus.emit('closeModal', { type: '能力申请', index: 0 })
} else {
- message.warning('流程终止失败!')
+ message.warning('撤回申请失败!')
}
})
}
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 66a7bc81..46e032f6 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -643,7 +643,7 @@ const delList = () => {
}
//ceshiFunction
const ceshiFunction = () => {
- debugger
+ // debugger
if (checkedListAbility.value.length == 0) {
message.warning('请先选择需要操作的数据!')
}
@@ -660,7 +660,7 @@ const handleDelete = (item, index) => {
if (checkedListAbility.value.length == 0) {
return message.warning('请先选择需要操作的数据!')
} else {
- delArr = checkedListAbility.value
+ delArr = checkedListAbility.value.map(v=>v.id)
}
}
sgcDel({
diff --git a/front/src/views/personalCenter/components/PutOnTheShelf .vue b/front/src/views/personalCenter/components/PutOnTheShelf .vue
index aba774fb..cc37393a 100644
--- a/front/src/views/personalCenter/components/PutOnTheShelf .vue
+++ b/front/src/views/personalCenter/components/PutOnTheShelf .vue
@@ -19,7 +19,7 @@
@confirm="endThis"
@cancel="cancel"
>
- 流程终止
+ 撤回申请
@@ -54,10 +54,10 @@
const endThis = () => {
endProcess({ instanceId: props.refObj.processInstanceId }).then((res) => {
if (res.data.code == 0) {
- message.success('流程终止成功!')
+ message.success('撤回申请成功!')
mybus.emit('closeModal', { type: '能力上架', index: 2 })
} else {
- message.warning('流程终止失败!')
+ message.warning('撤回申请失败!')
}
})
}