Parcourir la source

绘制表格、删除无用资源减少包的体积

zhnghongrui il y a 1 an
Parent
commit
04d2316240

+ 3 - 0
package.json

@@ -0,0 +1,3 @@
+{
+  
+}

+ 16 - 12
pages/TopPipeWork/TopPipeWork.vue

@@ -10,11 +10,13 @@
 					<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
 						@click="pickerShow('gcmc',0)">
 						<span style="color: darkgray;">请选择工程名称</span>
-						<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+						<image src="../../static/images/icon_right.png"
+							style=" position: absolute; width: 15px;height: 15px;"></image>
 					</view>
 					<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
 						<span style="color: black;">{{projectName.name}}</span>
-						<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+							style=" position: absolute; width: 15px;height: 15px;"></image>
 					</view>
 				</view>
 
@@ -122,7 +124,8 @@
 						</view>
 						<view @click="openDatetimePicker()">
 							<span style="color: black;">{{time}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+								<image src="../../static/images/icon_right.png"
+							style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 					<view class="container">
@@ -146,13 +149,13 @@
 							</view>
 							<view v-if="this.isEmpty(this.materialValue.id)" @click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择材质</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" @click="pickerShow('cz')">
 								<span style="color: black;">{{materialValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 					</view>
@@ -164,13 +167,13 @@
 							</view>
 							<view v-if="this.isEmpty(this.specificationValue.id)" @click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" @click="pickerShow('gg')">
 								<span style="color: black;">{{specificationValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 					</view>
@@ -202,7 +205,8 @@
 						</view>
 						<view @click="remove(index)"
 							style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-							<uni-icons type="close" color="darkgray" size="18"></uni-icons>
+							<image src="../../../static/images/icon_close.png"
+								style=" width: 15px; height: 15px;"></image>
 						</view>
 					</view>
 				</view>

+ 10 - 5
pages/dangerous/dangerous.vue

@@ -11,11 +11,13 @@
 					<view v-if="this.isEmpty(this.projectObj.enginName)" style="margin-top: 10;"
 						@click="pickerShow('name')">
 						<span style="color: darkgray;">请选择工程</span>
-						<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+						<image src="../../static/images/icon_right.png"
+							style=" position: absolute; width: 15px;height: 15px;"></image>
 					</view>
 					<view v-else style="margin-top: 10;" @click="pickerShow('name')">
 						<span style="color: black;">{{projectObj.enginName}}</span>
-						<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+						<image src="../../static/images/icon_right.png"
+							style=" position: absolute; width: 15px;height: 15px;"></image>
 					</view>
 				</view>
 			</view>
@@ -53,11 +55,13 @@
 					</view>
 					<view v-if="isEmpty(this.projectTime)" @click="openDatetimePicker">
 						<span style="color: darkgray;">请选择工程时间</span>
-						<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+						<image src="../../static/images/icon_right.png"
+							style=" position: absolute; width: 15px;height: 15px;"></image>
 					</view>
 					<view v-else @click="openDatetimePicker">
 						<span style="color: black;">{{projectTime}}</span>
-						<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+						<image src="../../static/images/icon_right.png"
+							style=" position: absolute; width: 15px;height: 15px;"></image>
 					</view>
 				</view>
 			</view>
@@ -335,7 +339,8 @@
 
 							<view @click="removeFile(index)"
 								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-								<uni-icons type="close" color="darkgray" size="18"></uni-icons>
+								<image src="../../../static/images/icon_close.png"
+									style=" width: 15px; height: 15px;"></image>
 							</view>
 						</view>
 					</view>

+ 18 - 17
pages/enginproject/enginproject.vue

@@ -9,13 +9,13 @@
 						<view v-if="this.isEmpty(this.projectType.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('gclx',0)">
 							<span style="color: darkgray;">请选择工程类型</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gclx',0)">
 							<span style="color: black;">{{projectType.dictLabel}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -27,13 +27,13 @@
 						<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
 							@click="pickerShow('gcmc',0)">
 							<span style="color: darkgray;">请选择工程名称</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
 							<span style="color: black;">{{projectName.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 
@@ -153,8 +153,8 @@
 							</view>
 							<view @click="openDatetimePicker()">
 								<span style="color: black;">{{time}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 
@@ -168,8 +168,8 @@
 								</view>
 								<view class="uni-list-cell-db"  @click="pickerShow('cz',index)">
 									<span style="color: black;">{{a.cz.id==''?'请选择材质':a.cz.name}}</span>
-									<uni-icons style=" position: absolute;" type="right" color="darkgray"
-										size="15"></uni-icons>
+									<image src="../../static/images/icon_right.png"
+										style=" position: absolute; width: 15px;height: 15px;"></image>
 								</view>
 
 							</view>
@@ -181,8 +181,8 @@
 
 								<view class="uni-list-cell-db" @click="pickerShow('gg',index)">
 									<span style="color: black;">{{a.gg.id==''?'请选择规格':a.gg.name}}</span>
-									<uni-icons style=" position: absolute;" type="right" color="darkgray"
-										size="15"></uni-icons>
+									<image src="../../static/images/icon_right.png"
+										style=" position: absolute; width: 15px;height: 15px;"></image>
 								</view>
 							</view>
 							<view class="container">
@@ -190,8 +190,8 @@
 								<text>数量</text>
 								<input class="uni-input" type="number" v-model="a.sl" placeholder="请填写数量" maxlength="11"
 									style="margin-left: 10px;text-align: right;"></input>
-									<uni-icons style=" position: absolute;" type="right" color="darkgray"
-										size="15"></uni-icons>
+									<image src="../../static/images/icon_right.png"
+										style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<button v-if="index!=0" @click="this.czggslList.splice(index,1)">删除</button>
 						</view>
@@ -217,7 +217,8 @@
 								</view>
 								<view @click="remove(index)"
 									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<uni-icons type="close" color="darkgray" size="18"></uni-icons>
+									<image src="../../../static/images/icon_close.png"
+										style=" width: 15px; height: 15px;"></image>
 								</view>
 							</view>
 						</view>

+ 40 - 41
pages/index.vue

@@ -13,7 +13,8 @@
 					style=" margin: auto; width: 100%;" @onClick="goDetails"></yxp-txt-scroll>
 
 				<view style=" text-align: right;width: 70px;margin-top: 10px;color: darkgray" @click="more()"> 更多
-					<uni-icons type="right" color="darkgray" size="15"></uni-icons>
+					<image src="../static/images/icon_right.png" style="width: 15px;height: 15px;" mode="widthFix">
+					</image>
 				</view>
 			</view>
 			<view class="notice" v-for="(item,index) in list" :key="index" v-if="index==0">
@@ -34,14 +35,12 @@
 </template>
 
 <script>
-	import uniIcons from '../uni_modules/uni-icons/components/uni-icons/uni-icons.vue'
 	import yxpTxtScroll from '../components/yxp-txt-scroll/yxp-txt-scroll.nvue'
 	import {
 		getNoticeList,
 	} from '@/api/common'
 	export default {
 		components: {
-			uniIcons,
 			yxpTxtScroll
 		},
 		data() {
@@ -111,42 +110,42 @@
 
 <style>
 	.content {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-		}
-	
-		.background {
-			border: 15px solid hsla(0, 0%, 100%, .5);
-			background: white;
-			background-clip: padding-box;
-			/*从padding开始往外面裁剪背景*/
-	
-		}
-	
-		.container {
-			display: flex;
-			margin-left: 10px;
-			margin-top: 10px;
-			margin-right: 10px;
-			align-items: flex-start;
-			justify-content: space-between;
-		}
-	
-	
-	
-	
-		.notice {
-			margin: 20rpx;
-			padding: 20rpx;
-			background: #FFFFFF;
-			box-shadow: 0rpx 8rpx 17rpx 0rpx rgba(0, 0, 0, 0.04);
-			border-radius: 10rpx;
-		}
-	
-		 .text {
-		 	border-left: 15rpx solid #3857F3;
-		 	padding-left: 20rpx;
-		 }
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.background {
+		border: 15px solid hsla(0, 0%, 100%, .5);
+		background: white;
+		background-clip: padding-box;
+		/*从padding开始往外面裁剪背景*/
+
+	}
+
+	.container {
+		display: flex;
+		margin-left: 10px;
+		margin-top: 10px;
+		margin-right: 10px;
+		align-items: flex-start;
+		justify-content: space-between;
+	}
+
+
+
+
+	.notice {
+		margin: 20rpx;
+		padding: 20rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 8rpx 17rpx 0rpx rgba(0, 0, 0, 0.04);
+		border-radius: 10rpx;
+	}
+
+	.text {
+		border-left: 15rpx solid #3857F3;
+		padding-left: 20rpx;
+	}
 </style>

+ 16 - 15
pages/infrastructure/infrastructure.vue

@@ -11,13 +11,13 @@
 					<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
 						@click="pickerShow('gcmc',0)">
 						<span style="color: darkgray;">请选择工程名称</span>
-						<uni-icons style=" position: absolute;" type="right" color="darkgray"
-							size="15"></uni-icons>
+						<image src="../../static/images/icon_right.png"
+							style=" position: absolute; width: 15px;height: 15px;"></image>
 					</view>
 					<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
 						<span style="color: black;">{{projectName.name}}</span>
-						<uni-icons style=" position: absolute;" type="right" color="darkgray"
-							size="15"></uni-icons>
+						<image src="../../static/images/icon_right.png"
+							style=" position: absolute; width: 15px;height: 15px;"></image>
 					</view>
 				</view>
 
@@ -127,8 +127,8 @@
 						</view>
 						<view  @click="openDatetimePicker()">
 							<span style="color: black;">{{time}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 
@@ -145,13 +145,13 @@
 								<view v-if="this.isEmpty(this.materialValue.id)" 
 									@click="pickerShow('cz')">
 									<span style="color: darkgray;">请选择材质</span>
-									<uni-icons style=" position: absolute;" type="right" color="darkgray"
-										size="15"></uni-icons>
+									<image src="../../static/images/icon_right.png"
+										style=" position: absolute; width: 15px;height: 15px;"></image>
 								</view>
 								<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz')">
 									<span style="color: black;">{{materialValue.name}}</span>
-									<uni-icons style=" position: absolute;" type="right" color="darkgray"
-										size="15"></uni-icons>
+									<image src="../../static/images/icon_right.png"
+										style=" position: absolute; width: 15px;height: 15px;"></image>
 								</view>
 							</view>
 							<view v-else-if="isNew==true">
@@ -171,13 +171,13 @@
 								<view v-if="this.isEmpty(this.specificationValue.id)"
 									@click="pickerShow('gg')">
 									<span style="color: darkgray;">请选择规格</span>
-									<uni-icons style=" position: absolute;" type="right" color="darkgray"
-										size="15"></uni-icons>
+									<image src="../../static/images/icon_right.png"
+										style=" position: absolute; width: 15px;height: 15px;"></image>
 								</view>
 								<view v-else class="uni-list-cell-db"  @click="pickerShow('gg')">
 									<span style="color: black;">{{specificationValue.name}}</span>
-									<uni-icons style=" position: absolute;" type="right" color="darkgray"
-										size="15"></uni-icons>
+									<image src="../../static/images/icon_right.png"
+										style=" position: absolute; width: 15px;height: 15px;"></image>
 								</view>
 							</view>
 							<view v-else-if="isNew==true">
@@ -215,7 +215,8 @@
 						</view>
 						<view @click="remove(index)"
 							style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-							<uni-icons type="close" color="darkgray" size="18"></uni-icons>
+							<image src="../../../static/images/icon_close.png"
+								style=" width: 15px; height: 15px;"></image>
 						</view>
 					</view>
 				</view>

+ 16 - 15
pages/municipal/municipal.vue

@@ -9,13 +9,13 @@
 						<view v-if="this.isEmpty(this.projectType.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('gclx',0)">
 							<span style="color: darkgray;">请选择工程类型</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gclx',0)">
 							<span style="color: black;">{{projectType.dictLabel}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -27,13 +27,13 @@
 						<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
 							@click="pickerShow('gcmc',0)">
 							<span style="color: darkgray;">请选择工程名称</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
 							<span style="color: black;">{{projectName.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray"
-								size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 
@@ -154,8 +154,8 @@
 							</view>
 							<view @click="openDatetimePicker()">
 								<span style="color: black;">{{time}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 
@@ -169,8 +169,8 @@
 								</view>
 								<view class="uni-list-cell-db"  @click="pickerShow('cz',index)">
 									<span style="color: black;">{{a.cz.id==''?'请选择材质':a.cz.name}}</span>
-									<uni-icons style=" position: absolute;" type="right" color="darkgray"
-										size="15"></uni-icons>
+									<image src="../../static/images/icon_right.png"
+										style=" position: absolute; width: 15px;height: 15px;"></image>
 								</view>
 
 							</view>
@@ -182,8 +182,8 @@
 
 								<view class="uni-list-cell-db"  @click="pickerShow('gg',index)">
 									<span style="color: black;">{{a.gg.id==''?'请选择规格':a.gg.name}}</span>
-									<uni-icons style=" position: absolute;" type="right" color="darkgray"
-										size="15"></uni-icons>
+									<image src="../../static/images/icon_right.png"
+										style=" position: absolute; width: 15px;height: 15px;"></image>
 								</view>
 							</view>
 							<view class="container">
@@ -216,7 +216,8 @@
 								</view>
 								<view @click="remove(index)"
 									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<uni-icons type="close" color="darkgray" size="18"></uni-icons>
+									<image src="../../../static/images/icon_close.png"
+										style=" width: 15px; height: 15px;"></image>
 								</view>
 							</view>
 						</view>

+ 34 - 25
pages/oldrenovation/courtyard/courtyard.vue

@@ -9,11 +9,13 @@
 						<view v-if="this.isEmpty(this.projectValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('gczq')">
 							<span style="color: darkgray;">请选择工程周期</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gczq')">
 							<span style="color: black;">{{projectValue.dictLabel}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 
 					</view>
@@ -26,11 +28,13 @@
 						<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('xzq')">
 							<span style="color: darkgray;">请选择行政区</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq')">
 							<span style="color: black;">{{XZQValue.dictLabel}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 
 					</view>
@@ -44,11 +48,13 @@
 						<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('xq')">
 							<span style="color: darkgray;">请选择小区</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
 							<span style="color: black;">{{XQValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -60,11 +66,13 @@
 						<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('ld')">
 							<span style="color: darkgray;">请选择楼栋</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
 							<span style="color: black;">{{LDValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -96,8 +104,8 @@
 							</view>
 							<view @click="openDatetimePicker('sg')">
 								<span style="color: black;">{{time}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 
@@ -108,8 +116,8 @@
 							</view>
 							<view style="margin-top: 10;" @click="openDatetimePicker('ht')">
 								<span style="color: black;">{{BackfillingTime ? BackfillingTime:'请选择回填时间'}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container" v-else-if="objValue.enginClassValue=='打压'">
@@ -119,13 +127,13 @@
 							</view>
 							<view v-if="this.isEmpty(this.isOkValue)" style="margin-top: 10;" @click="showActionsheet()">
 								<span style="color: darkgray;">请选择分段打压是否合格</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="showActionsheet()">
 								<span style="color: black;">{{isOkLabel}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -148,13 +156,13 @@
 							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
 								@click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择材质</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz')">
 								<span style="color: black;">{{materialValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -165,13 +173,13 @@
 							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
 								@click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg')">
 								<span style="color: black;">{{specificationValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -200,7 +208,8 @@
 								</view>
 								<view @click="remove(index)"
 									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<uni-icons type="close" color="darkgray" size="18"></uni-icons>
+									<image src="../../../static/images/icon_close.png" style=" width: 15px; height: 15px;">
+									</image>
 								</view>
 							</view>
 						</view>

+ 70 - 58
pages/oldrenovation/indoor/indoor.vue

@@ -13,14 +13,15 @@
 								<span style="color: darkgray;">请选择工程周期
 
 								</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gczq')">
 							<span style="color: black;">{{projectValue.dictLabel}}
 							</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 
 					</view>
@@ -33,11 +34,13 @@
 						<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('xzq')">
 							<span style="color: darkgray;">请选择行政区</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq')">
 							<span style="color: black;">{{XZQValue.dictLabel}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 
 					</view>
@@ -51,11 +54,13 @@
 						<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('xq')">
 							<span style="color: darkgray;">请选择小区</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
 							<span style="color: black;">{{XQValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -67,11 +72,13 @@
 						<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('ld')">
 							<span style="color: darkgray;">请选择楼栋</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
 							<span style="color: black;">{{LDValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -83,11 +90,13 @@
 						<view v-if="this.isEmpty(this.DYValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('dy')">
 							<span style="color: darkgray;">请选择单元</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('dy')">
 							<span style="color: black;">{{DYValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -99,11 +108,13 @@
 						<view v-if="this.isEmpty(this.FJValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('fj')">
 							<span style="color: darkgray;">请选择房间</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('fj')">
 							<span style="color: black;">{{FJValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -140,13 +151,13 @@
 							<view v-if="this.isEmpty(this.brandValue.dictValue)" style="margin-top: 10;"
 								@click="pickerShow('brand')">
 								<span style="color: darkgray;">请选择厂家</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('brand')">
 								<span style="color: black;">{{brandValue.dictLabel}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 					</view>
@@ -172,13 +183,13 @@
 							<view v-if="this.isEmpty(this.LevelValue.dictValue)" style="margin-top: 10;"
 								@click="pickerShow('fsdj')">
 								<span style="color: darkgray;">请选择腐蚀等级</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('fsdj')">
 								<span style="color: black;">{{LevelValue.dictLabel}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 					</view>
@@ -201,13 +212,13 @@
 							<view v-if="this.isEmpty(this.LevelValue.dictValue)" style="margin-top: 10;"
 								@click="pickerShow('kj')">
 								<span style="color: darkgray;">请选择孔距</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('kj')">
 								<span style="color: black;">{{LevelValue.dictLabel}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 					</view>
@@ -231,13 +242,13 @@
 							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
 								@click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择材质</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz')">
 								<span style="color: black;">{{materialValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -248,13 +259,13 @@
 							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
 								@click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg')">
 								<span style="color: black;">{{specificationValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -284,13 +295,13 @@
 							<view v-if="this.isEmpty(this.brandValue.dictValue)" style="margin-top: 10;"
 								@click="pickerShow('brand')">
 								<span style="color: darkgray;">请选择品牌</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('brand')">
 								<span style="color: black;">{{brandValue.dictLabel}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 
@@ -334,13 +345,13 @@
 							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
 								@click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg')">
 								<span style="color: black;">{{specificationValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -369,13 +380,13 @@
 							<view v-if="this.isEmpty(this.doorValue.dictValue)" style="margin-top: 10;"
 								@click="pickerShow('door')">
 								<span style="color: darkgray;">请选择上门类型</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('door')">
 								<span style="color: black;">{{doorValue.dictLabel}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -386,13 +397,13 @@
 							<view v-if="this.isEmpty(this.SelfClosValve.dictValue)" style="margin-top: 10;"
 								@click="pickerShow('zbf')">
 								<span style="color: darkgray;">请选择自闭阀类型</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('zbf')">
 								<span style="color: black;">{{SelfClosValve.dictLabel}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -403,13 +414,13 @@
 							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
 								@click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择材质</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz')">
 								<span style="color: black;">{{materialValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -420,13 +431,13 @@
 							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
 								@click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg')">
 								<span style="color: black;">{{specificationValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -454,7 +465,8 @@
 							</view>
 							<view @click="remove(index)"
 								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-								<uni-icons type="close" color="darkgray" size="18"></uni-icons>
+								<image src="../../../static/images/icon_close.png" style=" width: 15px; height: 15px;">
+								</image>
 							</view>
 						</view>
 					</view>

+ 38 - 27
pages/oldrenovation/overhead/overhead.vue

@@ -9,11 +9,13 @@
 						<view v-if="this.isEmpty(this.projectValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('gczq')">
 							<span style="color: darkgray;">请选择工程周期</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gczq')">
 							<span style="color: black;">{{projectValue.dictLabel}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 
 					</view>
@@ -26,11 +28,13 @@
 						<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('xzq')">
 							<span style="color: darkgray;">请选择行政区</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq')">
 							<span style="color: black;">{{XZQValue.dictLabel}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 
 					</view>
@@ -44,11 +48,13 @@
 						<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('xq')">
 							<span style="color: darkgray;">请选择小区</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
 							<span style="color: black;">{{XQValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -60,11 +66,13 @@
 						<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('ld')">
 							<span style="color: darkgray;">请选择楼栋</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
 							<span style="color: black;">{{LDValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -76,11 +84,13 @@
 						<view v-if="this.isEmpty(this.DYValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
 							@click="pickerShow('dy')">
 							<span style="color: darkgray;">请选择单元</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('dy')">
 							<span style="color: black;">{{DYValue.name}}</span>
-							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -111,8 +121,8 @@
 							</view>
 							<view @click="openDatetimePicker('sg')">
 								<span style="color: black;">{{time}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 
@@ -123,8 +133,8 @@
 							</view>
 							<view style="margin-top: 10;" @click="openDatetimePicker('ht')">
 								<span style="color: black;">{{BackfillingTime ? BackfillingTime:'请选择回填时间'}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container" v-else-if="objValue.enginClassValue=='打压'">
@@ -134,13 +144,13 @@
 							</view>
 							<view v-if="this.isEmpty(this.isOkValue)" style="margin-top: 10;" @click="showActionsheet()">
 								<span style="color: darkgray;">请选择分段打压是否合格</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="showActionsheet()">
 								<span style="color: black;">{{isOkLabel}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -163,13 +173,13 @@
 							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
 								@click="pickerShow('cz')">
 								<span style="color: darkgray;">请选择材质</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz')">
 								<span style="color: black;">{{materialValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -180,13 +190,13 @@
 							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
 								@click="pickerShow('gg')">
 								<span style="color: darkgray;">请选择规格</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg')">
 								<span style="color: black;">{{specificationValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray"
-									size="15"></uni-icons>
+								<image src="../../../static/images/icon_right.png"
+									style=" position: absolute; width: 15px;height: 15px;"></image>
 							</view>
 						</view>
 						<view class="container">
@@ -215,7 +225,8 @@
 								</view>
 								<view @click="remove(index)"
 									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<uni-icons type="close" color="darkgray" size="18"></uni-icons>
+									<image src="../../../static/images/icon_close.png" style=" width: 15px; height: 15px;">
+									</image>
 								</view>
 							</view>
 						</view>

+ 121 - 47
pages/statistics/statistics.vue

@@ -11,11 +11,13 @@
 						<view v-if="this.isEmpty(this.projectValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('gczq')">
 							<span style="color: darkgray;">请选择工程周期</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else style="margin-top: 10;" @click="pickerShow('gczq')">
 							<span style="color: black;">{{projectValue.dictLabel}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 
@@ -28,11 +30,13 @@
 						<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('xzq')">
 							<span style="color: darkgray;">请选择行政区</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else style="margin-top: 10;" @click="pickerShow('xzq')">
 							<span style="color: black;">{{XZQValue.dictLabel}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 
@@ -45,11 +49,13 @@
 					<view class="uni-list-cell-db">
 						<view v-if="this.isEmpty(this.XQValue.id)" style="margin-top: 10;" @click="pickerShow('xq')">
 							<span style="color: darkgray;">请选择小区</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else style="margin-top: 10;" @click="pickerShow('xq')">
 							<span style="color: black;">{{XQValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -61,11 +67,13 @@
 						<view v-if="this.isEmpty(this.materialValue.name)" style="margin-top: 10;"
 							@click="pickerShow('cz')">
 							<span style="color: darkgray;">请选择材料</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else style="margin-top: 10;" @click="pickerShow('cz')">
 							<span style="color: black;">{{materialValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -77,31 +85,36 @@
 						<view v-if="this.isEmpty(this.specificationValue.name)" style="margin-top: 10;"
 							@click="pickerShow('gg')">
 							<span style="color: darkgray;">请选择规格</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else style="margin-top: 10;" @click="pickerShow('gg')">
 							<span style="color: black;">{{specificationValue.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
 
 			</view>
-			<uni-divider></uni-divider>
-			<uni-table ref="table">
-				<uni-tr>
-					<uni-th width="20" align="left"></uni-th>
-					<uni-th width="20" align="right">预计用量</uni-th>
-					<uni-th width="20" align="right">实际用量</uni-th>
-				</uni-tr>
-				<uni-tr v-for="(item, index) in materialUsageList" :key="index">
-					<uni-td>
-						<view class="name">{{ item.materialQuality }}</view>
-					</uni-td width="20" align="left">
-					<uni-td width="20" align="right">{{ item.estimatedSize }}</uni-td>
-					<uni-td width="20" align="right">{{ item.realitySize }}</uni-td>
-				</uni-tr>
-			</uni-table>
+
+
+			<view class="table">
+				<view class="felx-row">
+					<view class="h-tr" style="flex: 1">名称</view>
+					<view class="h-tr" style="flex: 1;align-items: center;">预计用量</view>
+					<view class="h-tr" style="flex: 1">实际用量</view>
+				</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>
+
+
 		</view>
 
 		<view class="view-bg">
@@ -113,11 +126,13 @@
 						<view v-if="this.isEmpty(this.projectValue2.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('gczq2')">
 							<span style="color: darkgray;">请选择工程周期</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else style="margin-top: 10;" @click="pickerShow('gczq2')">
 							<span style="color: black;">{{projectValue2.dictLabel}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 				</view>
@@ -129,11 +144,13 @@
 						<view v-if="this.isEmpty(this.XZQValue2.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('xzq2')">
 							<span style="color: darkgray;">请选择行政区</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else style="margin-top: 10;" @click="pickerShow('xzq2')">
 							<span style="color: black;">{{XZQValue2.dictLabel}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 
@@ -144,11 +161,13 @@
 					<view class="uni-list-cell-db">
 						<view v-if="this.isEmpty(this.XQValue2.id)" style="margin-top: 10;" @click="pickerShow('xq2')">
 							<span style="color: darkgray;">请选择小区</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else style="margin-top: 10;" @click="pickerShow('xq2')">
 							<span style="color: black;">{{XQValue2.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 
@@ -158,11 +177,13 @@
 					<view class="uni-list-cell-db">
 						<view v-if="this.isEmpty(this.LDValue2.id)" style="margin-top: 10;" @click="pickerShow('ld2')">
 							<span style="color: darkgray;">请选择楼栋</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view style="margin-top: 10;" @click="pickerShow('ld2')">
 							<span style="color: black;">{{LDValue2.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 
@@ -172,11 +193,13 @@
 					<view class="uni-list-cell-db">
 						<view v-if="this.isEmpty(this.DYValue2.id)" style="margin-top: 10;" @click="pickerShow('dy2')">
 							<span style="color: darkgray;">请选择单元</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 						<view v-else style="margin-top: 10;" @click="pickerShow('dy2')">
 							<span style="color: black;">{{DYValue2.name}}</span>
-								<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
+							<image src="../../static/images/icon_right.png"
+								style=" position: absolute; width: 15px;height: 15px;"></image>
 						</view>
 					</view>
 
@@ -185,7 +208,7 @@
 			</view>
 			<uni-divider></uni-divider>
 			<view class="view_bg_build" v-if="roomList.length > 0">
- 
+
 				<view v-for="(item,index) in roomList" :key="index">
 					<uni-grid :border="false" :column="roomCount" :highlight="true" @change="change">
 						<uni-grid-item v-for="(item2, index2) in roomList[index]" :index="index2" :key="index2">
@@ -196,17 +219,17 @@
 					</uni-grid>
 				</view>
 			</view>
-			<view  v-if="roomList.length == 0">暂无数据</view>
-			<view style="align-items: center;"> 
+			<view v-if="roomList.length == 0">暂无数据</view>
+			<view style="align-items: center;">
 				<view style="display: flex;align-items: center;">
 					<image class="block-iv" src="../../static/images/ic_legend.png"></image>
-					<text style="margin-right: 20px;margin-left: 5px;">图例: </text> 
+					<text style="margin-right: 20px;margin-left: 5px;">图例: </text>
 					<div class="block-iv" style="background-color: #80d9ae;"></div>
-					<text  style="margin-right: 20px;margin-left: 5px;">完工</text> 
+					<text style="margin-right: 20px;margin-left: 5px;">完工</text>
 					<div class="block-iv" style="background-color: #5bd3ff;"></div>
-					<text  style="margin-right: 20px;margin-left: 5px;">未完工</text> 
+					<text style="margin-right: 20px;margin-left: 5px;">未完工</text>
 					<div class="block-iv" style="background-color: #ffc881;"></div>
-					<text  style="margin-right: 20px;margin-left: 5px;">未开工</text> 
+					<text style="margin-right: 20px;margin-left: 5px;">未开工</text>
 				</view>
 
 			</view>
@@ -555,16 +578,14 @@
 		padding: 10px 20px 10px 10px;
 	}
 
-	.uni-list
-	/* {
+	.uni-list {
 		background-color: #FFFFFF;
 		position: relative;
 		width: 100%;
 		display: flex;
 		flex-direction: column;
-	} */
+	}
 
-	.uni-list-cell-db,
 	.uni-list-cell {
 		position: relative;
 		display: flex;
@@ -619,8 +640,61 @@
 		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
-	.block-iv{
+
+	.block-iv {
 		width: 10px;
 		height: 10px;
 	}
+
+
+	.table {
+		width: 100%;
+		border-radius: 8rpx;
+		background: #FFFFFF;
+		/* border: 1rpx solid #EFEFEF; */
+		font-size: 28rpx;
+	}
+
+	.felx-row {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+	}
+
+
+
+	.h-tr {
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		justify-content: center;
+		align-items: center;
+		align-content: center;
+
+		border-color: #ccc;
+		border-style: solid;
+		border-width: 0;
+		border-width: 1px;
+		color: #333;
+	}
+
+	.h-td {
+		box-sizing: border-box;
+		padding: 3px;
+		word-break: break-all;
+		border-color: #ccc;
+		border-style: solid;
+		border-width: 1px;
+		border-right-width: 1px;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		justify-content: center;
+		align-items: center;
+		align-content: center;
+		min-height: 64rpx;
+	}
 </style>

+ 6 - 6
pages/work/index.vue

@@ -7,7 +7,7 @@
 			<uni-grid :column="2" :showBorder="false">
 				<uni-grid-item>
 					<view class="grid-item-box" @click="showMinYong">
-						<uni-icons type="person-filled" size="30"></uni-icons>
+					
 						<text class="text">民用工程</text>
 					</view>
 				</uni-grid-item>
@@ -16,31 +16,31 @@
 
 				<uni-grid-item>
 					<view class="grid-item-box" @click="showGongYe">
-						<uni-icons type="staff-filled" size="30"></uni-icons>
+					
 						<text class="text">工业工程</text>
 					</view>
 				</uni-grid-item>
 				<uni-grid-item>
 					<view class="grid-item-box" @click="municipalProjectClick">
-						<uni-icons type="color" size="30"></uni-icons>
+					
 						<text class="text">市政工程</text>
 					</view>
 				</uni-grid-item>
 				<uni-grid-item>
 					<view class="grid-item-box" @click="showDangerous">
-						<uni-icons type="settings-filled" size="30"></uni-icons>
+					
 						<text class="text">危险作业工程</text>
 					</view>
 				</uni-grid-item>
 				<uni-grid-item>
 					<view class="grid-item-box" @click="showTopPipe">
-						<uni-icons type="heart-filled" size="30"></uni-icons>
+					
 						<text class="text">顶管工程</text>
 					</view>
 				</uni-grid-item>
 				<uni-grid-item>
 					<view class="grid-item-box" @click="showInfrastructureDialog">
-						<uni-icons type="bars" size="30"></uni-icons>
+						
 						<text class="text">基建工程</text>
 					</view>
 				</uni-grid-item>

BIN
static/images/icon_close.png


BIN
static/images/icon_right.png


+ 2 - 0
uni_modules/uni-table/changelog.md

@@ -1,3 +1,5 @@
+## 1.2.4(2023-12-19)
+- 修复 uni-tr只有一列时minWidth计算错误,列变化实时计算更新
 ## 1.2.3(2023-03-28)
 - 修复 在vue3模式下可能会出现错误的问题
 ## 1.2.2(2022-11-29)

+ 5 - 1
uni_modules/uni-table/components/uni-tr/uni-tr.vue

@@ -71,7 +71,7 @@ export default {
 	mounted() {
 		if (this.widthThArr.length > 0) {
 			const selectionWidth = this.selection === 'selection' ? 50 : 0
-			this.root.minWidth = this.widthThArr.reduce((a, b) => Number(a) + Number(b)) + selectionWidth
+			this.root.minWidth = Number(this.widthThArr.reduce((a, b) => Number(a) + Number(b))) + selectionWidth;
 		}
 	},
 	// #ifndef VUE3
@@ -91,6 +91,10 @@ export default {
 	methods: {
 		minWidthUpdate(width) {
 			this.widthThArr.push(width)
+			if (this.widthThArr.length > 0) {
+				const selectionWidth = this.selection === 'selection' ? 50 : 0;
+				this.root.minWidth = Number(this.widthThArr.reduce((a, b) => Number(a) + Number(b))) + selectionWidth;
+			}
 		},
 		// 选中
 		checkboxSelected(e) {

+ 1 - 1
uni_modules/uni-table/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-table",
   "displayName": "uni-table 表格",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "表格组件,多用于展示多条结构类似的数据,如",
   "keywords": [
     "uni-ui",