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

front/src/utils/request.js

@@ -23,10 +23,8 @@ let loadingInstance
  * @param {*} msg
  */
 const handleCode = (code, msg, res) => {
-  // debugger
   switch (code) {
     case 401:
-      debugger
       store.dispatch('user/resetAll').catch(() => {})
       break
     case 403:
@@ -66,7 +64,6 @@ const instance = axios.create({
  */
 instance.interceptors.request.use(
   (config) => {
-    // debugger
     const token = getAccessToken()
     if (token) config.headers[tokenName] = token
     if (
@@ -157,7 +154,6 @@ instance.interceptors.response.use(
     // }
   },
   (error) => {
-    // debugger
     console.log('接口error', error)
     if (loadingInstance) loadingInstance.close()
 

front/src/views/home/AbilityToApplyFor.vue

@@ -267,7 +267,7 @@
 
 <style scoped lang="less">
   .ability-to-apply-for {
-    height: 2.9rem;
+    // height: 2.9rem;
     overflow: hidden;
 
     .title {
@@ -281,7 +281,7 @@
     }
 
     .ability-to-apply-for-content {
-      padding-right: 0.5rem;
+      // padding-right: 0.5rem;
       position: relative;
 
       .dep-name {

front/src/views/home/DetailsPageconetent.vue

@@ -2321,7 +2321,8 @@
           }
 
           .leixingsumfather {
-            width: 8.1rem;
+            margin-left: -13px;
+            width: 9.4rem;
             display: inline-block;
             height: 0.3014rem;
             overflow: hidden;

front/src/views/home/apply.vue

@@ -312,7 +312,6 @@
       const apiURL = window.SITE_CONFIG.apiURL
 
       if (!applyAll) {
-        debugger
         list.value.map((item) => {
           item.arr.map((val) => {
             let obj = item.children

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

@@ -857,8 +857,8 @@
 </script>
 <style scoped lang="less">
   #search-result-list-container {
-    width: 1088px;
+   // width: 1088px;
-    padding: 0 20px;
+    padding: 0 18px;
     background: #f3f5f9;
 
     .detail-content {
@@ -871,7 +871,7 @@
     }
 
     .shai-xuan {
-      width: 1047px;
+      // width: 1047px;
       height: 36px;
       // margin: 11px 0 20px;
       // background: #e5f2ff;
@@ -904,7 +904,7 @@
 
       .condition {
         position: absolute;
-        right: 20px;
+        right: 0px;
         top: 10px;
 
         ul li {
@@ -941,7 +941,7 @@
     }
 
     .result-list {
-      width: 1048px;
+      // width: 1048px;
       display: flex;
       flex-direction: column;
       flex-wrap: wrap;
@@ -1010,7 +1010,7 @@
           display: flex;
           justify-content: space-between;
           align-items: center;
-          margin: 0 10px 0 0;
+          // margin: 0 10px 0 0;
 
           .header-right {
             // display: flex;
@@ -1023,7 +1023,7 @@
             }
 
             div {
-              margin-right: 24px;
+              // margin-right: 24px;
             }
 
             .label-content {
@@ -1043,7 +1043,7 @@
 
           .header-right:last-child {
             div {
-              margin-right: 16px;
+           //   margin-right: 10px;
             }
           }
 
@@ -1107,7 +1107,7 @@
             flex: 1;
             display: flex;
             justify-content: flex-end;
-            margin: 0 10px;
+            // margin: 0 10px;
             align-items: center;
 
             .shopping {
@@ -1194,7 +1194,8 @@
             align-items: center;
 
             & > div {
-              margin: 0 10px;
+              margin-right: 16px;
+              // margin: 0 10px;
             }
           }
 
@@ -1224,7 +1225,7 @@
 
   .description {
     max-width: 990px;
-    height: 52px;
+   // height: 52px;
     font-size: 14px;
     line-height: 18px;
     display: -webkit-box;

front/src/views/home/infrastructureApplication.vue

@@ -2,7 +2,7 @@
  * @Author: Light
  * @Date: 2022-11-18 11:53:43
  * @LastEditors: Light
- * @LastEditTime: 2022-11-22 10:54:46
+ * @LastEditTime: 2022-11-21 17:51:38
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -258,8 +258,7 @@
       }
     })
     dataList.requested.map((val) => {
-      console.log('111', val, addFlag)
+      if (addFlag && val.channelId == obj.channelId) {
-      if (addFlag && val.cameraInfo.channelId == obj.channelId) {
         addFlag = false
       }
     })

front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue

@@ -25,12 +25,12 @@
             </a-carousel>
           <div class="operation-content" style="position:ab">
               <div class="video-content">
-              <h5-player :video-url="videoUrl"></h5-player>
+              <h5-player :video-url="videoUrl"></h5-player> 
               </div>
               <div class="text-label">
                 <span>{{defaultIndex+1}}</span>/<span>{{cameraDataList.length}}</span>
               </div>
-              <div class="footer-button">
+              <div class="footer-button"> 
                 <a-button type="primary" @click="applyNow(cameraDataList[defaultIndex])">立即申请</a-button>
                 <a-button type="primary" style="margin-left:20px" @click="addIntoCart(cameraDataList[defaultIndex])">加入申购车</a-button>
                 </div>
@@ -46,15 +46,11 @@
     LeftCircleOutlined,
     RightCircleOutlined,
   } from '@ant-design/icons-vue'
-  // import { useRouter } from 'vue-router'
+  import { useRouter } from 'vue-router'
   import H5Player from '@/views/home/components/H5Player.vue'
   import mybus from '@/myplugins/mybus'
-  import { message } from 'ant-design-vue'
   import { getStreamByChannelCode } from '@/api/videoSurveillance'
   import {getCameraLiveStream} from '@/api/file'
-  import {willApplyCameraSelect,
-    getApplyCameraListXha,
-  } from '@/api/home'
   export default {
     name: '',
     components: {
@@ -82,10 +78,10 @@
     data() {
       return {
         openVideo: false,
-        videoStream: '',
+        videoStream: '',  
          videoUrl:'', //视频预览url
          defaultIndex:0,//默认显示列表中的对一个
-        //  router:useRouter()
+         router:useRouter()
       }
     },
     methods: {
@@ -98,59 +94,13 @@
       },
       //立即申请
       applyNow(item){
-        getApplyCameraListXha().then(res => {
+        console.log('applyNowapplyNow',item);
-          let flag = true
+       //跳转至申请页面
-          if (res.data.code == 0) {
+          this.router.push({
-            res.data.data.map((val) => {
+          path: '/apply',
-              val.cameraInfo = JSON.parse(val.cameraInfo)
+          query: {
-              console.log('applyNowapplyNow',val.cameraInfo);
+         
-              if(flag && val.cameraInfo.channelId == item.channelId){
+          },
-                flag = false
-              }
-            })
-            if(flag){
-              willApplyCameraSelect().then(res => {
-                if (res.data.code == 0) {
-                  res.data.data.map(val => {
-                    if(item.channelId == val.channelId){
-                      item.id = val.id
-                    }
-                  })
-                }
-                let obj = {
-                  arr: [
-                    {
-                      checked: true,
-                      delFlag: 0,
-                      id: '1593084734789996545',
-                      idtCameraChannel: '790582098133127168',
-                      loading: false,
-                      note1: '',
-                      resourceId: '1522550195055828996',
-                      resourceName: '摄像头列表',
-                      type: '基础设施',
-                    },
-                  ],
-                  deptName: '西海岸新区工业和信息化局',
-                  deptId: '732560225344761856',
-                }
-                item.type = '基础设施'
-                item.delFlag = 0
-                item.resourceId = item.channelId
-                item.resourceName = item.channelName
-                obj.arr[0].note1 = JSON.stringify([item])
-                if (obj.arr.length > 0) {
-                  localStorage.setItem('applyList', JSON.stringify([obj]))
-                  console.log('applyNowapplyNowobj',obj);
-                  this.$router.push({
-                    path: '/apply',
-                  })
-                }
-              })
-            }else{
-              message.warning('该摄像头已申请！')
-            }
-          }
         })
       },
       //加入申购车
@@ -186,7 +136,7 @@
            console.log('uyutyuyopopopop',this.cameraDataList[this.defaultIndex]);
             this.getVideoUrl(this.cameraDataList[this.defaultIndex]);
         }
-
+       
       },
       //查看下一个
       handleNext(){
@@ -196,10 +146,10 @@
             this.getVideoUrl(this.cameraDataList[0]);
           }else{
             this.defaultIndex = this.defaultIndex + 1;
-               console.log('opopopop',this.cameraDataList[this.defaultIndex]);
+               console.log('opopopop',this.cameraDataList[this.defaultIndex]); 
                   this.getVideoUrl(this.cameraDataList[this.defaultIndex]);
           }
-
+       
       }
     },
   }
@@ -279,14 +229,14 @@
       }
         .video-content{
      width: 750px;
-     height:600px;
+     height:600px; 
-     text-align: left;
+     text-align: left; 
      padding: 5px;
     }
     .footer-button{
        width: 750px;
-       //height:50px;
+       //height:50px; 
-       text-align: center;
+       text-align: center; 
        padding-top:5px;
     }
     }
@@ -339,7 +289,7 @@
   .ant-carousel :deep(.slick-dots) {
    display: none !important;
   }
-
+   
   }
   // .current-video {
   //   width: 320px;

front/src/views/home/videoSurveillance/index.vue

@@ -523,7 +523,7 @@ import { ElMessage } from 'element-plus'
         if(queryString){
           getCameraByCondition({
             pageNum: 1,
-            pageSize: 30000,
+            pageSize: 10,
             regionId: "70be8c5b664f4bcf869d82f2e8335051",
             type: "0",
             name:queryString,