From c3c3fe919937db7e55cb23e2b57000d573be8c14 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Tue, 22 Nov 2022 11:22:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?UI=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/utils/request.js                    |  4 ----
 front/src/views/home/AbilityToApplyFor.vue    |  4 ++--
 front/src/views/home/DetailsPageconetent.vue  |  3 ++-
 front/src/views/home/apply.vue                |  1 -
 .../home/components/searchResultList.vue      | 23 ++++++++++---------
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/front/src/utils/request.js b/front/src/utils/request.js
index dfcce28a..282c6e97 100644
--- a/front/src/utils/request.js
+++ b/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()
 
diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index dd1f572c..6a838ab7 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/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 {
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 2f3cdf55..777c3408 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/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;
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 33df1c19..53075a89 100644
--- a/front/src/views/home/apply.vue
+++ b/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
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index e418cc8a..83624849 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/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;

From 57b89687d18fc806f4560dd1780418fd3541cc1c Mon Sep 17 00:00:00 2001
From: chenchenzai <xiaoshangqing@hisense.com>
Date: Tue, 22 Nov 2022 11:24:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4=E4=B8=8A=E5=9B=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/supermap/map-showResource.js           | 3 ++-
 front/src/views/home/components/H5Player.vue     | 1 +
 front/src/views/home/videoSurveillance/index.vue | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/front/src/supermap/map-showResource.js b/front/src/supermap/map-showResource.js
index 8990447e..3aab1872 100644
--- a/front/src/supermap/map-showResource.js
+++ b/front/src/supermap/map-showResource.js
@@ -83,11 +83,12 @@ function createMarkerClusterLayer(layerClassName, mapObj) {
             maxClusterRadius: 80,
         })
         markerClusterLayer.on('clusterclick', function(a) {
-            //console.log('cluster ' + a.layer.getAllChildMarkers().length);
+            //console.log('cluster ' + a.layer.getAllChildMarkers());
             if (a.layer.getAllChildMarkers().length < 50) {
                 let clusterList = [];
                 for (var i = 0; i < a.layer.getAllChildMarkers().length; i++) {
                     //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].resourceData);
+                    //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].fData);
                     clusterList.push(a.layer.getAllChildMarkers()[i].resourceData);
                 }
                 //console.log('clusterList ' + a.layer.getAllChildMarkers(array, true));
diff --git a/front/src/views/home/components/H5Player.vue b/front/src/views/home/components/H5Player.vue
index ccb06eb6..8542c31c 100644
--- a/front/src/views/home/components/H5Player.vue
+++ b/front/src/views/home/components/H5Player.vue
@@ -67,6 +67,7 @@ import { message } from 'ant-design-vue'
                 handler(newVal, oldVal) {
                     console.log('oldVal:', oldVal)
                     console.log('newVal:', newVal)
+                   //this.realplay(newVal,0);   
                 },
                 // 立即处理 进入页面就触发
                 immediate: true
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 44ee5f19..fdc94a94 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -551,7 +551,7 @@ import { ElMessage } from 'element-plus'
         let params = {
         regionId: "70be8c5b664f4bcf869d82f2e8335051",
         pageNum: "1",
-        pageSize: 30000,
+        pageSize: 40000,
         type: 0,
         borderPolygonList: []
         }