From f198ad5f5a336b87b7b4a3302c458c17cb30d3fe Mon Sep 17 00:00:00 2001 From: guoyue Date: Wed, 12 Oct 2022 16:00:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8:=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=91=84=E5=83=8F=E5=A4=B4=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?api=E6=9B=B4=E6=94=B9=E4=B8=BA=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/public/static/config/basicConfig.js | 5 +++++ front/src/api/file.js | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index ea1f9e0d..b07d4451 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..9e4133e2 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.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) } From 6d3d16bbdfcf9d17cc104c6a16a5294e3238d2bd Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Wed, 12 Oct 2022 16:00:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/personalCenter/components/AbilityApplication.vue | 6 +++--- .../src/views/personalCenter/components/PutOnTheShelf .vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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/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('撤回申请失败！') } }) } From adcb0cdbf0fe9d4cc3878c85953804eb1fc6657a Mon Sep 17 00:00:00 2001 From: guoyue Date: Wed, 12 Oct 2022 16:11:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8:=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=91=84=E5=83=8F=E5=A4=B4=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?api=E6=9B=B4=E6=94=B9=E4=B8=BA=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/file.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/api/file.js b/front/src/api/file.js index 9e4133e2..19b43c8d 100644 --- a/front/src/api/file.js +++ b/front/src/api/file.js @@ -99,7 +99,7 @@ export function getHls(params) { } // 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537) -let _cameraUrl = _global && _global.config && _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) { return axios.get(`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`, From 85fa71f4b9e1d4bfeb07904d8d5ced534d1e9e93 Mon Sep 17 00:00:00 2001 From: guoyue Date: Wed, 12 Oct 2022 17:10:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E7=94=B3=E8=B4=AD=E8=BD=A6=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/personalCenter/components/PurchaseVehicle.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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({ From 56696c6266e606af2419fa92edca59b12650e43d Mon Sep 17 00:00:00 2001 From: guoyue Date: Wed, 12 Oct 2022 17:41:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E6=B7=BB=E5=8A=A0=E5=88=B0?= =?UTF-8?q?=E7=94=B3=E8=B4=AD=E8=BD=A6=EF=BC=8Capi=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/home.js | 10 +++++++++- front/src/views/home/infrastructurePage.vue | 7 +++++-- 2 files changed, 14 insertions(+), 3 deletions(-) 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" > +