wanghao 1 år sedan
förälder
incheckning
41cf85ca6d
3 ändrade filer med 30 tillägg och 18 borttagningar
  1. 2 2
      config.js
  2. 28 16
      pages/statistics/statistics.vue
  3. BIN
      static/images/lou-img-bg.png

+ 2 - 2
config.js

@@ -2,8 +2,8 @@
 module.exports = {
   
 
-  // baseUrl: 'http://192.168.4.11:8080',
-  baseUrl: 'http://192.168.4.20:8080',
+  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.14:8089',

+ 28 - 16
pages/statistics/statistics.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<scroll-view>
 		<view class="view-bg">
 			<text class="title-txt">工程用料统计</text>
 			<view>
@@ -105,7 +105,7 @@
 
 		</view>
 
-		<view class="view-bg">
+		<view class="view-bg" style="margin-bottom: 40rpx;">
 			<text class="title-txt">工程进度统计</text>
 			<view>
 				<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
@@ -196,12 +196,16 @@
 					</uni-grid>
 				</view>
 			</view> -->
-			<scroll-view :scroll-x="true"  class="view_bg_build" v-if="roomList.length > 0">
-
-
+			<image src="../../static/images/lou-img-bg.png" style="width: 110%;
+    height: 121px;
+    position: absolute;
+    bottom: 15px;
+    left: -5px;
+    z-index: 1;
+"></image>
+			<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.slice().reverse()" :key="index">
+					<view class="NeiRong" v-for="(item,index) in roomList" :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>
@@ -209,9 +213,13 @@
 						</view>
 					</view>
 				</view>
+				<view
+					style="width: 48rpx;height: 63rpx;background: #C7EAFF; position:relative; left: 50%; transform: translateX(-50%); bottom: -10rpx;">
+				</view>
+
 			</scroll-view>
 			<view v-if="roomList.length == 0" style="padding:50rpx;text-align: center;">暂无数据</view>
-			<view style="align-items: center;">
+			<view style="align-items: center; margin-top: 20rpx;">
 				<view style="display: flex;align-items: center;justify-content:center">
 					<image class="block-iv" src="../../static/images/ic_legend.png"></image>
 					<text style="margin-right: 20px;margin-left: 5px;">图例: </text>
@@ -231,7 +239,7 @@
 
 		<SelectPicker :list="dictOptions" @change="changeSelect" v-if="openDict" @close="closeDict" titleKey="dictLabel"
 			subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
-	</view>
+	</scroll-view>
 </template>
 
 <script>
@@ -579,7 +587,7 @@
 		margin-top: 8px;
 		background-color: #fff;
 		border-radius: 5px;
-		padding: 10px 20px 10px 10px;
+		padding: 20px;
 		display: flex;
 		flex-direction: column;
 	}
@@ -619,10 +627,12 @@
 
 	.view_bg_build {
 		background-color: #e2f4ff;
-		padding: 10px;
+		padding: 10px 10px 0 10px;
 		margin: 0 auto;
 		border: 1px solid #5bd3ff;
 		white-space: nowrap;
+		position: relative;
+		z-index: 2;
 	}
 
 	.grid-text {
@@ -662,6 +672,7 @@
 		background: #FFFFFF;
 		/* border: 1rpx solid #EFEFEF; */
 		font-size: 28rpx;
+		margin-top: 40rpx;
 	}
 
 	.felx-row {
@@ -687,7 +698,7 @@
 		border-style: solid;
 		border-width: 0;
 		border-width: 1px;
-		color: #333;
+		color: #3d7dd7;
 	}
 
 	.h-td {
@@ -716,7 +727,7 @@
 	}
 
 	.Fang {
-		width:100%;
+		width: 100%;
 		display: inline-block;
 		line-height: 50rpx;
 		text-align: center;
@@ -727,11 +738,10 @@
 	}
 
 	.HuaDongBiao {
-		overflow: hidden;
 		display: flex;
 		flex-direction: column-reverse;
 		position: relative;
-		
+
 
 	}
 
@@ -740,7 +750,9 @@
 		flex-wrap: nowrap;
 
 	}
-
+     .NeiRong :last-child{
+		margin-right:0 !important;
+	}
 
 
 

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