修改bug

src/assets/scss/dataBoard/overview/index.scss

@@ -294,7 +294,7 @@
 
 }
 .m-wtqd{
-	padding: 0 16px;
+	padding: 20px 16px 0;
 }
 
 @keyframes move {

src/views/dataBoard/cpts/Tabs.vue

@@ -48,8 +48,8 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  height: 40px;
-  padding: 8px 16px 8px 29px;
+  height: 30px;
+  padding: 7px 0px 5px 34px;
   background: url(@/assets/images/shuju/overview/title-small-bg.png) no-repeat;
   background-size: 100% 100%;
 

src/views/dataBoard/cpts/sjkb-map/index.vue

@@ -948,7 +948,7 @@ export default {
             console.log(type, 'type')
             return type
           })
-          .size(36);
+          .size(32);
       scene.addLayer(numPointMarker1);
       numPointMarker2 = new PointLayer({
         name: 'numPointMarker2',
@@ -963,7 +963,7 @@ export default {
           })
           .shape('num', 'text')
           .color('#fff')
-          .size(18)
+          .size(14)
           .style({
             textOffset: [0, 7],
             fontWeight: "bold"
@@ -1140,6 +1140,7 @@ export default {
     border-radius: 5px;
     background: rgba(3, 31, 73, 0.72);
     background: url("@/assets/images/overview/dia_con.png");
+    border: none;
 
     &:before {
       position: absolute;

src/views/dataBoard/overview/components/DemandSwiperList.vue

@@ -89,7 +89,7 @@ export default {
 
   .swiper-container {
     width: 100%;
-    height: 120px;
+    height: 126px;
   }
 
   .item {

src/views/dataBoard/overview/components/MapDialog/DifficultyCharts.vue

@@ -81,7 +81,7 @@ export default {
             return res;
           },
         },
-        dataZoom: [
+      /*  dataZoom: [
           {
             "type": "slider",
             "start": 0,
@@ -92,7 +92,7 @@ export default {
             "showDataShadow": false,
             "borderColor": "transparent"
           }
-        ],
+        ],*/
         grid: {
           top: '18%',
           left: '2%',

src/views/dataBoard/overview/components/MapResourceInfoMore.vue

@@ -55,7 +55,7 @@
                 <div class="items">
                   <div class="label">联系电话：</div>
                   <div class="value">{{ detail.contactMobile }}</div>
-                  <CallPhone icon="el-icon-phone"/>
+<!--                  <CallPhone icon="el-icon-phone"/>-->
                 </div>
               </el-col>
               <el-col :span="12">
@@ -94,7 +94,7 @@
                 <div class="items">
                   <div class="label">联系电话：</div>
                   <div class="value">{{ detail.principalPhone }}</div>
-                  <CallPhone icon="el-icon-phone"/>
+<!--                  <CallPhone icon="el-icon-phone"/>-->
                 </div>
               </el-col>
               <el-col :span="12">
@@ -116,7 +116,7 @@
                 <div class="items">
                   <div class="label">联系电话：</div>
                   <div class="value">{{ detail.mobile }}</div>
-                  <CallPhone icon="el-icon-phone"/>
+<!--                  <CallPhone icon="el-icon-phone"/>-->
                 </div>
               </el-col>
               <el-col :span="12">

src/views/dataBoard/overview/components/RequirementList.vue

@@ -3,10 +3,10 @@
     <div class="tab" style="margin-top: 0;">
       <Tabs :list="tab" :value="tabval" @changeVal="(val) => tabval = val"/>
     </div>
-    <DemandSwiperList v-if="tabval === 1" :list="userDemandList" @showDetail="showDetail">
+    <DemandSwiperList v-if="tabval === 1" :list="userDemandList">
       <template slot-scope="{data}">
-        <span>{{ data.demandUserName }}</span>
-        <span>{{ data.content }}</span>
+        <span @click="goToPortrait(data)">{{ data.demandUserName }}</span>
+        <span @click="showDetail(data)">{{ data.content }}</span>
       </template>
 
     </DemandSwiperList>
@@ -79,6 +79,14 @@ export default {
     console.log(this.currentLevelData,'this.currentLevelData32')
   },
   methods: {
+    goToPortrait({demandUserId}) {
+      this.$router.push({
+        path: "/dataBoard/overview/resident",
+        query: {
+          user_id: demandUserId,
+        },
+      });
+    },
     showDetail({demandRecId}) {
       this.$refs.ServiceDetails.open(demandRecId);
     },

src/views/dataBoard/overview/components/jdjs.vue

@@ -16,7 +16,7 @@
         element-loading-text="加载中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0,0,0,0.5)"
-        style="height: 135px;margin-top: 10px"
+        style="height: 135px;margin-top: 12px"
       />
     </div>
     <title-small text="不满意风险人员">
@@ -405,6 +405,9 @@ export default {
   margin-top: 20px;
 }
 .f-darkGray{
-  margin-top: 5px;
+  margin-top: 10px;
+}
+.event-statistics {
+  margin-bottom: 27px;
 }
 </style>

src/views/dataBoard/overview/components/wtqd.vue

@@ -1,108 +1,92 @@
 <template>
   <div class="m-wtqd">
     <title-small text="难点堵点"/>
-    <div v-if="nddd.length>0" class="t-list f-hflex">
+    <div v-if="nddd.length>0" class="t-list f-hflex h135">
       <swiper ref="orderSwiper" :options="swiperOptions">
         <swiper-slide
-            v-for="(items, index) in nddd"
+            v-for="(item, index) in nddd"
             :key="index"
             class="swiper-slide"
         >
-          <div
-              v-for="(item, index) in items"
-              :key="index"
-              :class="['item', 'f-flex']"
-              @click="handleView(item)"
-          >
+          <div class="item f-flex" @click="handleView(item)">
             <span>{{ item.createdTime.substr(5, 5) }}</span>
             <span>{{ item.eventContent }}</span>
           </div>
         </swiper-slide>
       </swiper>
     </div>
-    <div v-else v-loading="listLoading" class="no-data h150"
+    <div v-else v-loading="listLoading" class="no-data h135"
          element-loading-background="rgba(0, 21, 64, 0"
          element-loading-spinner="el-icon-loading" element-loading-text="加载中">
       <NoData size="40"/>
     </div>
 
     <title-small text="矛盾纠纷"/>
-    <div v-if="mdjf.length>0" class="t-list f-hflex">
+    <div v-if="mdjf.length>0" class="t-list f-hflex h135">
       <swiper ref="orderSwiper" :options="swiperOptions">
         <swiper-slide
-            v-for="(items, index) in mdjf"
+            v-for="(item, index) in mdjf"
             :key="index"
             class="swiper-slide"
         >
-          <div
-              v-for="(item, index) in items"
-              :class="['item', 'f-flex']"
-              @click="handleView(item)"
-          >
+          <div class="item f-flex bto-border" @click="handleView(item)">
             <span>{{ item.createdTime.substr(5, 5) }}</span>
             <span>{{ item.eventContent }}</span>
           </div>
         </swiper-slide>
       </swiper>
     </div>
-    <div v-else v-loading="listLoading" class="no-data h150" element-loading-background="rgba(0, 21, 64, 0"
+    <div v-else v-loading="listLoading" class="no-data h135" element-loading-background="rgba(0, 21, 64, 0"
          element-loading-spinner="el-icon-loading"
          element-loading-text="加载中">
       <NoData size="40"/>
 
     </div>
+
     <title-small text="自身问题"/>
-    <div v-if="zswt.length>0" class="t-list f-hflex">
+    <div v-if="zswt.length>0" class="t-list f-hflex h135">
       <swiper ref="orderSwiper" :options="swiperOptions" class="swiper-containers">
         <swiper-slide
-            v-for="(items, index) in zswt"
+            v-for="(item, index) in zswt"
             :key="index"
             class="swiper-slide"
         >
-          <div
-              v-for="(item, index) in items"
-              :key="index"
-              :class="['item', 'f-flex']"
-              @click="handleView(item)"
-          >
+          <div class="item f-flex" @click="handleView(item)">
             <span>{{ item.createdTime.substr(5, 5) }}</span>
             <span>{{ item.eventContent }}</span>
           </div>
         </swiper-slide>
       </swiper>
     </div>
-    <div v-else v-loading="listLoading" class="no-data h150" element-loading-background="rgba(0, 21, 64, 0"
+    <div v-else v-loading="listLoading" class="no-data h135" element-loading-background="rgba(0, 21, 64, 0"
          element-loading-spinner="el-icon-loading"
          element-loading-text="加载中">
       <NoData size="40"/>
 
     </div>
+
     <title-small text="超出服务范围"/>
-    <div v-if="ccfwfw.length>0" class="t-list f-hflex">
+    <div v-if="ccfwfw.length>0" class="t-list f-hflex h135">
       <swiper ref="orderSwiper" :options="swiperOptions" class="swiper-containers">
         <swiper-slide
-            v-for="(items, index) in ccfwfw"
+            v-for="(item, index) in ccfwfw"
             :key="index"
             class="swiper-slide"
         >
-          <div
-              v-for="(item, index) in items"
-              :key="index"
-              :class="['item', 'f-flex']"
-              @click="handleView(item)"
-          >
+          <div class="item f-flex bto-border" @click="handleView(item)">
             <span>{{ item.createdTime.substr(5, 5) }}</span>
             <span>{{ item.eventContent }}</span>
           </div>
         </swiper-slide>
       </swiper>
     </div>
-    <div v-else v-loading="listLoading" class="no-data h150" element-loading-background="rgba(0, 21, 64, 0"
+    <div v-else v-loading="listLoading" class="no-data h135" element-loading-background="rgba(0, 21, 64, 0"
          element-loading-spinner="el-icon-loading"
          element-loading-text="加载中">
       <NoData size="40"/>
 
     </div>
+
     <title-small text="不满意问题数"/>
     <div class="f-flex white f-mean">
       <div
@@ -187,16 +171,15 @@ export default {
       startTime: "",
 
       tableData: [],
-      createdTime: '2022-05-20 10:50:58',
-      //   就是现在是每4条滚动一次我想要它一直滚动
       swiperOptions: {
         direction: "vertical", // 滑动方向，可以是 'horizontal' 或 'vertical'
+        slidesPerView: 3,
         autoplay: {
-          delay: 6000, // 自动切换的间隔时间，单位是毫秒
+          delay: 1000, // 自动切换的间隔时间，单位是毫秒
           disableOnInteraction: true, // 用户操作后是否禁止自动切换
         },
         loop: false, // 是否启用循环模式
-        speed: 1000, // 滑动速度，单位是毫秒
+        speed: 2000, // 滑动速度，单位是毫秒
       },
 
       nddd: [],
@@ -286,10 +269,14 @@ export default {
       this.listLoading = true
       const apiResults = await this.fetchData();
       this.listLoading = false
-      this.nddd = this.groupList(apiResults[0].list, 4);
+/*      this.nddd = this.groupList(apiResults[0].list, 4);
       this.mdjf = this.groupList(apiResults[1].list, 4);
       this.zswt = this.groupList(apiResults[2].list, 3);
-      this.ccfwfw = this.groupList(apiResults[3].list, 3);
+      this.ccfwfw = this.groupList(apiResults[3].list, 3);*/
+      this.nddd = apiResults[0].list
+      this.mdjf = apiResults[1].list
+      this.zswt = apiResults[2].list
+      this.ccfwfw = apiResults[3].list
     },
     groupList(array, subGroupLength) {
       let index = 0;
@@ -323,12 +310,12 @@ export default {
 
 <style lang="scss" scoped src="@/assets/scss/dataBoard/overview/index.scss"/>
 <style lang="scss" scoped>
-.h150 {
-  height: 150px;
+.h135 {
+  height: 135px;
 }
 
-.h200 {
-  height: 200px;
+.h175 {
+  height: 175px;
 }
 
 .f-hflex {
@@ -358,15 +345,17 @@ export default {
   position: relative;
   flex: 1;
   width: 100%;
+  margin-top: 10px;
+  margin-bottom: 16px;
 
   .swiper-container {
     width: 100%;
-    height: 150px;
+    height: 100%;
   }
 
   .swiper-containers {
     width: 100%;
-    height: 150px;
+    height: 100%;
   }
 
   .item {
@@ -403,15 +392,16 @@ export default {
   padding: 0 4px;
 
   .bto-border {
-    height: 1px;
+    //height: 1px;
     border-bottom: 1px solid;
     border-image: linear-gradient(to right, #1c3e69 0%, #4eafd5 50%, #1c3e69 100%);
     border-image-slice: 1;
+    background: none;
   }
 }
 
 .white {
-  padding: 18px 0;
+  padding: 8px 0 17px;
   //height: 100px;
 }
 </style>

src/views/dataBoard/overview/index.vue

@@ -504,7 +504,7 @@ export default {
                 item3.type = 'resources'
                 item3.num = item3.resources;
                 item3.offsets = [-50, 50];
-                item3.latitude = centerLngLat.lat + 0.0018
+                item3.latitude = centerLngLat.lat + 0.002
                 item3.longitude = centerLngLat.lng
               }
               if (item3.hasOwnProperty("problems")) {
@@ -512,20 +512,24 @@ export default {
                 item3.num = item3.problems;
                 item3.offsets = [50, -50];
                 item3.latitude = centerLngLat.lat
-                item3.longitude = centerLngLat.lng + .0018
+                item3.longitude = centerLngLat.lng + .002
               }
               if (item3.hasOwnProperty("events")) {
                 item3.type = 'events'
                 item3.num = item3.events;
                 item3.offsets = [-50, -50];
-                item3.latitude = centerLngLat.lat + .0018
-                item3.longitude = centerLngLat.lng + .0018
+                item3.latitude = centerLngLat.lat + .002
+                item3.longitude = centerLngLat.lng + .002
               }
+              // item3.latitude = 59.62496862480762
+              // item3.longitude = 126.11233377322651
+
             })
           }
         })
         console.log(countData, 'countData')
         this.$refs.map.setNumpoint(countData)
+
         // console.log(countData,'countData')
 
       })

src/views/dataBoard/satisfactionEval/components/Title/titleSmall.vue

@@ -3,7 +3,6 @@
     <div class="title" :class="noBg ? 'no-bg' : ''">
       <span class="text">
         <span class="txt">{{ text }}</span>
-        <span class="text-shadow">{{ text }}</span>
       </span>
       <slot name="time"></slot>
       <slot name="info"></slot>
@@ -29,10 +28,10 @@
   <style scoped lang="scss">
   .title {
     // width: 100%;
-    height: 40px;
+    height: 30px;
     background: url(../../../../../assets/images/shuju/overview/title-small-bg.png) no-repeat;
     background-size: 100% 100%;
-    padding: 8px 16px 8px 36px;
+    padding: 7px 0px 5px 34px;
     display: flex;
     align-items: center;
     justify-content: space-between;