wanghao 1 سال پیش
والد
کامیت
a5eef01b4a
3فایلهای تغییر یافته به همراه14 افزوده شده و 15 حذف شده
  1. 2 2
      config.js
  2. 12 13
      pages/statistics/statistics.vue
  3. BIN
      static/images/lou-img-bg.png

+ 2 - 2
config.js

@@ -3,8 +3,8 @@ module.exports = {
   
 
   // baseUrl: 'http://192.168.4.11:8080',
-  // baseUrl: 'http://192.168.4.20:8080',
-    baseUrl: 'http://192.168.4.6:8080',
+  baseUrl: 'http://192.168.4.20:8080',
+    // baseUrl: 'http://192.168.4.6:8080',
 
    // baseUrl: 'http://192.168.4.14:8089',
   // 应用信息

+ 12 - 13
pages/statistics/statistics.vue

@@ -97,11 +97,9 @@
 				</view>
 			</view>
 			<view class="felx-row" v-for="(item, index) in materialUsageList" :key="index">
-
 				<view class="h-td" style="flex: 1">{{ item.materialQuality }}</view>
 				<view class="h-td" style="flex: 1">{{ item.estimatedSize }}</view>
 				<view class="h-td" style="flex: 1">{{ item.realitySize }}</view>
-
 			</view>
 
 
@@ -198,12 +196,12 @@
 					</uni-grid>
 				</view>
 			</view> -->
-			<view class="view_bg_build" v-if="roomList.length > 0">
+			<scroll-view :scroll-x="true"  class="view_bg_build" v-if="roomList.length > 0">
 
 
 				<view class="HuaDongBiao">
 
-					<view class="NeiRong" v-for="(item,index) in roomList" :key="index">
+					<view class="NeiRong" v-for="(item,index) in roomList.slice().reverse()" :key="index">
 						<view class="Fang" v-for="(item2, index2) in roomList[index]" :key="index2">
 							<view v-if="item2.roomStatus=='施工中'" class="ShiGongZhong">{{ item2.roomName }}</view>
 							<view v-else-if="item2.roomStatus=='未施工'" class="WeiShiGong">{{ item2.roomName }}</view>
@@ -211,8 +209,8 @@
 						</view>
 					</view>
 				</view>
-			</view>
-			<view v-if="roomList.length == 0">暂无数据</view>
+			</scroll-view>
+			<view v-if="roomList.length == 0" style="padding:50rpx;text-align: center;">暂无数据</view>
 			<view style="align-items: center;">
 				<view style="display: flex;align-items: center;justify-content:center">
 					<image class="block-iv" src="../../static/images/ic_legend.png"></image>
@@ -622,8 +620,9 @@
 	.view_bg_build {
 		background-color: #e2f4ff;
 		padding: 10px;
-		margin: 20rpx;
+		margin: 0 auto;
 		border: 1px solid #5bd3ff;
+		white-space: nowrap;
 	}
 
 	.grid-text {
@@ -717,7 +716,7 @@
 	}
 
 	.Fang {
-		width: 60px;
+		width:100%;
 		display: inline-block;
 		line-height: 50rpx;
 		text-align: center;
@@ -729,16 +728,16 @@
 
 	.HuaDongBiao {
 		overflow: hidden;
-		display: inline-block;
+		display: flex;
+		flex-direction: column-reverse;
 		position: relative;
-		left: 50%;
-		transform: translateX(-50%);
+		
 
 	}
 
 	.NeiRong {
-		overflow: auto;
-		margin: 0 auto;
+		display: flex;
+		flex-wrap: nowrap;
 
 	}
 

BIN
static/images/lou-img-bg.png