Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

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', // 正式环境

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)
 }

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,

front/src/views/home/infrastructurePage.vue

@@ -669,6 +669,7 @@
         :title="wrjName + '详情'"
         @ok="wrjVisible = false"
       >
+        <template #footer></template>
         <div v-for="(db, key) in wrjData" :key="key">
           <template v-if="typeof db == 'object'">
             <div
@@ -721,6 +722,7 @@
   import { getCameraByCondition } from '@/api/file'
   import {
     sgcInsert,
+    xhaAddCart,
     getRoomSearch,
     getDate,
     setSubmit,
@@ -1396,7 +1398,6 @@
         }
         selectType.value = '视频资源'
         console.log('444------------>', 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)
         }

front/src/views/personalCenter/components/AbilityApplication.vue

@@ -65,7 +65,7 @@
             <a-popconfirm v-if="!item.ended" title="是否终止此流程?" ok-text="是" cancel-text="否"
               @confirm="endThis(item.instanceId)" @cancel="cancel">
               <a-button type="primary" danger style="margin-left: 10px">
-                流程终止
+                撤回申请
               </a-button>
             </a-popconfirm>
           </div>
@@ -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('撤回申请失败！')
     }
   })
 }

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({

front/src/views/personalCenter/components/PutOnTheShelf .vue

@@ -19,7 +19,7 @@
         @confirm="endThis"
         @cancel="cancel"
       >
-        <a-button type="primary" danger>流程终止</a-button>
+        <a-button type="primary" danger>撤回申请</a-button>
       </a-popconfirm>
       <div v-else></div>
     </div>
@@ -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('撤回申请失败！')
       }
     })
   }