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

front/src/api/file.js

@@ -117,7 +117,7 @@ export function getPlaceType() {
 //西海岸 根据标签树查询视频列表
 export function CameraConditionPlaceType(params) {
     return axios.post(
-        'http://10.134.135.92:9537/data_service/getCamera/CameraConditionPlaceType' +
+        'http://10.134.135.92:9537/data_service/getCamera/CameraConditionPlaceType' ,
         params,
         config2
     )

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;
-    padding: 0 20px;
+   // width: 1088px;
+    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/detailsPageInfrastructureTreeXha.vue

@@ -140,7 +140,6 @@ export default defineComponent({
     const bumenImg = require('@/assets/newHome/bumen.png')
     const biaoqianImg = require('@/assets/newHome/biaoqian.png')
     const router = useRouter()
-    const whoShow1 = ref(whoShow)
     const showKey = ref(0)
     const treeData = ref([])
     const selectId = ref('')
@@ -149,6 +148,24 @@ export default defineComponent({
     //切换tab
     const btnClick = (index) => {
       itemIndex.value = index
+    if(index===2){
+      if(chooseId.value !==''){
+        let placeTypeCode =[]
+      placeTypeCode.push(chooseId.value)
+      mybus.emit('CameraConditionPlaceType', placeTypeCode)
+    }else{
+      mybus.emit('clearLeftSelect')
+    }
+    }else{
+      if(selectId.value!==''){
+        mybus.emit('getCameraByParentId', selectId.value)
+      }else{
+      mybus.emit('clearLeftSelect')
+      }
+    }
+     
+  
+   
     }
     //选择标签内容
     const tabClick = (id) => {
@@ -156,6 +173,7 @@ export default defineComponent({
         chooseId.value = ''
         mybus.emit('clearLeftSelect')
       }else{
+  
         chooseId.value = id
       let placeTypeCode =[]
       placeTypeCode.push(id)
@@ -175,14 +193,10 @@ export default defineComponent({
       if (select == '基础设施') {
   
         let res = {}
-        if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
-          res = await getCameraAllOrgan({ parentId: 'S4NbecfYB1DBH8HNULGS34' })
-        } else {
-          // 西海岸
+   
           res = await getCameraInfoByAreaId({
             areaId: '70be8c5b664f4bcf869d82f2e8335051',
           })
-        }
         treeData.value = (res.data && res.data.data) || []
         let tabs={}
         tabs = await getPlaceType()
@@ -202,14 +216,9 @@ export default defineComponent({
       chooseId.value=''
     })
     const onSelect = async (item, val, child) => {
-     
-      // if(selectId.value===val.id){
-      //   selectId.value=''
-      //     mybus.emit('clearLeftSelect')
-      // }else{
+
         let res = {}
          mybus.emit('getCameraByParentId', val.id)
-
         res = await getCameraInfoByAreaId({ areaId: val.id })
       treeData.value.map((treeDataItem, index) => {
         if (item.id == treeDataItem.id) {
@@ -222,36 +231,33 @@ export default defineComponent({
         }
       })
       if (child) {
+        
           if(selectId.value===child.id){
         selectId.value=''
-          mybus.emit('clearLeftSelect')
+        
       }else{
         selectId.value = child.id
       }
       
       }
-     // }
+ 
      
     }
 
     watch(selectId, (newVal) => {
- 
-      if (newVal == '') {
-        mybus.emit('getCameraByParentId', '')
-        mybus.emit('getListByParentId', '')
+
+      if (newVal == '') { 
+          mybus.emit('clearLeftSelect')
+        // mybus.emit('getCameraByParentId', '')
+        // mybus.emit('getListByParentId', '')
       }
     })
 
     const showBottom = async (item) => {
       item.show = !item.show
       let res = {}
-      if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
-        res = await getCameraAllOrgan({ parentId: item.id })
-      } else {
         // 西海岸
         res = await getCameraInfoByAreaId({ areaId: item.id })
-      }
-
       treeData.value.map((treeDataItem, index) => {
         if (item.id == treeDataItem.id) {
           treeData.value[index].children = (res.data && res.data.data) || []
@@ -268,7 +274,7 @@ export default defineComponent({
         // 取消选中
         if (!val.show) {
           selectId.value = ''
-          mybus.emit('clearLeftSelect')
+         // mybus.emit('clearLeftSelect')
         }
       }
     }