西海岸顶部导航提示正在建设中

front/public/static/config/basicConfig.js

@@ -62,8 +62,9 @@ var CONFIGITEM = {
       },
       backUrl: 'http://10.134.135.9:9797',
       previewUrl: 'http://10.134.135.9:9796/',
-      websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境
+      // websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境
-      websocketURL: '10.134.135.92:8888/renren-admin', // 测试环境
+      // websocketURL: '10.134.135.92:8888/renren-admin', // 测试环境
+      websocketURL: '192.168.124.254:8888/renren-admin', // 李志成-远雄
       // websocketURL: '10.18.1.99:8889/renren-admin', // 研发
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',

front/src/api/home.js

@@ -74,7 +74,8 @@ export function getHls(params) {
 // 加入申购车
 export function sgcInsert(data) {
   return request({
-    url: '/resourcecar/insert',
+    // url: '/resourcecar/insert',
+    url: '/resourcecar/batchInsert', // 西海岸-加入购物车相当于收藏功能
     method: 'post',
     data,
   })

front/src/views/home/components/header.vue

@@ -23,8 +23,8 @@
     >
       {{ item.name }}
     </div>
-    <a-badge :count="sgcNum">
+    <!-- 购物车 -->
-      <!-- 购物车 -->
+    <!-- <a-badge :count="sgcNum">
       <svg
         t="1650455446850"
         class="icon"
@@ -42,8 +42,7 @@
           p-id="2070"
         ></path>
       </svg>
-      <!-- <a-avatar shape="square" size="large" /> -->
+    </a-badge> -->
-    </a-badge>
     <a-badge :count="mynoticeNum" style="margin-left: 0.2rem">
       <!-- 消息提醒 -->
       <svg
@@ -182,7 +181,8 @@
   }
   // 跳转页面
   const jumpPage = (item) => {
-    if(item.name !== '能力集市') {
+    let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
+    if(_arr.includes(item.name)) {
       return message.warn('正在建设中！')
     }
     // console.log(item)

front/src/views/home/infrastructurePage.vue

@@ -452,15 +452,6 @@
           >
             批量预览
           </a-button>
-          <!-- 批量预览 -->
-          <!-- <a-button
-            type="primary"
-            @click="batchPicturePreview"
-            class="buttonAdd"
-            v-else
-          >
-            批量预览
-          </a-button> -->
           <!-- 添加至申购车 -->
           <a-button
             v-if="isXiHaiAn"
@@ -1916,13 +1907,20 @@
   //加入申购车
   const addShoppingCart = () => {
     if (selectedList.value.length > 0) {
-      sgcInsert({
+      let _arr = []
-        delFlag: '0',
+      selectedList.value.map(v => {
-        resourceId: '8888888880000000001',
+        _arr.push({
-        note1: selectedList.value,
+          delFlag: '0',
-        // userId: userId.value,
+          resourceId: v.idtCameraChannel,
-      }).then((res) => {
+          note1: [v],
-        console.log(res)
+        })
+      })
+      console.log('_arr------------>', _arr);
+      sgcInsert(_arr).then((res) => {
+        console.log('res------申购车------>', res);
+        if(res.data.code !== 0) {
+          return message.error(res.data.msg)
+        }
         message.success('添加申购车成功！')
         mybus.emit('getSgcNum')
       })
@@ -1958,7 +1956,7 @@
   ])
   // 西海岸--状态展示
   if(isXiHaiAn) {
-    columns.value = columns.value.splice(2, 0, {
+    columns.value.splice(2, 0, {
       title: '状态',
       dataIndex: 'status',
       width: '10%',

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

@@ -498,6 +498,7 @@
       pageSize: pageSize.value,
       name: name.value,
     }).then((res) => {
+      console.log('res-----selectResourceCarGroupByDept------->', res);
       let statistics = 0
       res.data.data.list.map((val) => {
         val.initLoading = true
@@ -524,30 +525,13 @@
       }
       // console.log('整体页面加载次数===============>', load.value)
       // 判断是否有已打开项，如果有重新载入之后自动打开
-      debugger
       list.value = res.data.data.list
       if (index || index === 0) {
-        debugger
         list.value[index].show = true
-        // console.log('1111', list.value[index])
         showNew(list.value[index])
-        // showBottom()
       }
-      // list.value = res.data.data.list
-      console.log(
-        '重新请求值',
-        index,
-        // res.data.data.list[index].show,
-        list.value
-      )
 
       total.value = res.data.data.deptCount
-      console.log(
-        '重新请求值2',
-        index,
-        // res.data.data.list[index].show,
-        list.value
-      )
       showKey.value++
       if (type == 'init' || type == 'changePage') {
         getListByDeptId(list.value[0])
@@ -557,7 +541,7 @@
   // 通过deptid查询列表
   const getListByDeptId = (item) => {
     console.log(item, 'item')
-    if (item.children.length == 0) {
+    if (item.children && item.children.length == 0) {
       selectResourceListByDept({
         pageNum: item.pageNum,
         pageSize: item.pageSize,

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

@@ -40,42 +40,42 @@
           imgActive: require('@/assets/personalCenter/demandactive.png'),
           key: 'PurchaseVehicle',
         },
-        {
+        // {
-          title: '我的发布',
+        //   title: '我的发布',
-          img: require('@/assets/personalCenter/push.png'),
+        //   img: require('@/assets/personalCenter/push.png'),
-          imgActive: require('@/assets/personalCenter/pushactive.png'),
+        //   imgActive: require('@/assets/personalCenter/pushactive.png'),
-          key: 'push',
+        //   key: 'push',
-        },
+        // },
-        {
+        // {
-          title: '我的申请',
+        //   title: '我的申请',
-          img: require('@/assets/personalCenter/apply.png'),
+        //   img: require('@/assets/personalCenter/apply.png'),
-          imgActive: require('@/assets/personalCenter/applyactive.png'),
+        //   imgActive: require('@/assets/personalCenter/applyactive.png'),
-          key: 'apply',
+        //   key: 'apply',
-        },
+        // },
-        {
+        // {
-          title: '我的收藏',
+        //   title: '我的收藏',
-          img: require('@/assets/personalCenter/collect.png'),
+        //   img: require('@/assets/personalCenter/collect.png'),
-          imgActive: require('@/assets/personalCenter/collectactive.png'),
+        //   imgActive: require('@/assets/personalCenter/collectactive.png'),
-          key: 'collect',
+        //   key: 'collect',
-        },
+        // },
-        {
+        // {
-          title: '我的浏览',
+        //   title: '我的浏览',
-          img: require('@/assets/personalCenter/recent.png'),
+        //   img: require('@/assets/personalCenter/recent.png'),
-          imgActive: require('@/assets/personalCenter/recentactive.png'),
+        //   imgActive: require('@/assets/personalCenter/recentactive.png'),
-          key: 'recent',
+        //   key: 'recent',
-        },
+        // },
-        {
+        // {
-          title: '我的需求',
+        //   title: '我的需求',
-          img: require('@/assets/personalCenter/demand.png'),
+        //   img: require('@/assets/personalCenter/demand.png'),
-          imgActive: require('@/assets/personalCenter/demandactive.png'),
+        //   imgActive: require('@/assets/personalCenter/demandactive.png'),
-          key: 'demand',
+        //   key: 'demand',
-        },
+        // },
-        {
+        // {
-          title: '我的评论',
+        //   title: '我的评论',
-          img: require('@/assets/personalCenter/remark.png'),
+        //   img: require('@/assets/personalCenter/remark.png'),
-          imgActive: require('@/assets/personalCenter/remarkactive.png'),
+        //   imgActive: require('@/assets/personalCenter/remarkactive.png'),
-          key: 'remark',
+        //   key: 'remark',
-        },
+        // },
       ]
       const selectedKeys = ref(['PurchaseVehicle'])
       const type = JSON.parse(window.sessionStorage.getItem('type'))