处理冲突

miniprogram/subpages/governRanking/components/gridEvaListItem/gridEvaListItem.ts

@@ -37,7 +37,8 @@ Component({
     },
     colorList: ['#fe6963', '#ffc600', '#e7a756', '#cfedec'],
     echartsColorList: [],
-    chartData: []
+    chartData: [],
+    width:0
   },
   properties: {
     order: {
@@ -122,9 +123,23 @@ Component({
   },
   lifetimes: {
     attached () {
+      this.setData({
+        width:wx.getSystemInfoSync().windowWidth
+      })
       // @ts-ignore
       this.ecComponent = this.selectComponent('#mychart-dom-bar')
       this.init()
+    },
+    ready(){
+        wx.createSelectorQuery().in(this).selectAll('.street-name').boundingClientRect((res)=>{
+          console.log(this.data.width)
+          let height = this.data.width > 500?"60":"30"
+          if(res[0].height>height){
+            this.setData({
+              "contentObj.overHeight": true
+            })
+          }
+        }).exec()
     }
   },
   methods: {

miniprogram/subpages/governRanking/components/gridEvaListItem/gridEvaListItem.wxml

@@ -10,7 +10,7 @@
     <view
       class="order"
       style="background: {{order == 2 ? '#ffc600' : order == 3 ? '#e7a756' : order >= 4 ? '#cfedec' : '#fe6963'}}; color: {{ order >= 4 ? '#29B9A5' : '#fff'}}">{{order}}</view>
-    <view class="street-name">{{contentObj.deptName}}</view>
+    <view class="street-name" style="{{contentObj.overHeight?'margin-top:20rpx':'margin-top:4rpx'}}">{{contentObj.deptName}}</view>
   </view>
   <view wx:if="{{contentObj.officerName}}" class="dj-name">
    党建指导员-{{contentObj.officerName}}

miniprogram/subpages/governRanking/components/gridEvaListItem/gridEvaListItem.wxss

@@ -44,11 +44,10 @@
 .list-item .street .street-name {
   font-size: 30rpx;
   color: #333;
-  position: relative;
+  position: absolute;
-  top: 4rpx;
   overflow: hidden;
   text-overflow : ellipsis;
-	white-space: nowrap;
+  margin-left: 60rpx;
 }
 
 .list-item .detail {

miniprogram/subpages/governRanking/components/gridListItem/gridListItem.ts

@@ -37,7 +37,8 @@ Component({
     },
     colorList: ['#fe6963', '#ffc600', '#e7a756', '#cfedec'],
     echartsColorList: [],
-    chartData: []
+    chartData: [],
+    width:0
   },
   properties: {
     order: {
@@ -107,9 +108,23 @@ Component({
   },
   lifetimes: {
     attached () {
+      this.setData({
+        width:wx.getSystemInfoSync().windowWidth
+      })
       // @ts-ignore
       this.ecComponent = this.selectComponent('#mychart-dom-bar')
       this.init()
+    },
+    ready(){
+      wx.createSelectorQuery().in(this).selectAll('.street-name').boundingClientRect((res)=>{
+        console.log(this.data.width)
+        let height = this.data.width > 500?"60":"30"
+        if(res[0].height>height){
+          this.setData({
+            "contentObj.overHeight": true
+          })
+        }
+      }).exec()
   }
   },
   methods: {

miniprogram/subpages/governRanking/components/gridListItem/gridListItem.wxml

@@ -10,7 +10,7 @@
     <view
       class="order"
       style="background: {{order == 2 ? '#ffc600' : order == 3 ? '#e7a756' : order >= 4 ? '#cfedec' : '#fe6963'}}; color: {{ order >= 4 ? '#29B9A5' : '#fff'}}">{{order}}</view>
-    <view class="street-name">{{contentObj.deptName}}</view>
+    <view class="street-name" style="{{contentObj.overHeight?'margin-top:20rpx':'margin-top:4rpx'}}">{{contentObj.deptName}}</view>
   </view>
   <view wx:if="{{contentObj.officerName}}" class="dj-name">
   党建指导员-{{contentObj.officerName}}

miniprogram/subpages/governRanking/components/gridListItem/gridListItem.wxss

@@ -44,11 +44,10 @@
 .list-item .street .street-name {
   font-size: 30rpx;
   color: #333;
-  position: relative;
+  position: absolute;
-  top: 4rpx;
   overflow: hidden;
   text-overflow : ellipsis;
-	white-space: nowrap;
+  margin-left: 60rpx;
 }
 
 .list-item .detail {

miniprogram/subpages/governRanking/pages/governRanking/governRanking.ts

@@ -13,7 +13,7 @@ Page({
     gridByselfStatisticsList:[],//网格自治
     gridEvaList:[],//网格满意度
   },
-  onShow: function () {
+  onLoad:function(){
     this.deptStatisticsList()//初始化加载街道报道
   },
     /**