Переглянути джерело

修改样式,删除无用资源

zhnghongrui 1 рік тому
батько
коміт
0eb79a73de

+ 2 - 2
components/selectPicker/select_picker.vue

@@ -28,10 +28,10 @@
 								</view>
 								<!-- 	<view class="liy-search-desc" v-if="subtitleKey">{{item[subtitleKey]}}</view> -->
 							</view>
-							<view class="liy-search-icon" v-if="mapSelectIndex == index">
+							<!-- <view class="liy-search-icon" v-if="mapSelectIndex == index">
 								<image class="lsi-icon" src="../../static/images/check_mark.png" mode="widthFix">
 								</image>
-							</view>
+							</view> -->
 						</view>
 						<!-- <view class="liy-loading">
 							<image class="liy-loading-img" src="../../static/images/complete.png" mode="widthFix">

+ 0 - 5
pages.json

@@ -5,11 +5,6 @@
 				"navigationBarTitleText": "登录"
 			}
 		}, {
-			"path": "pages/register",
-			"style": {
-				"navigationBarTitleText": "注册"
-			}
-		}, {
 			"path": "pages/index",
 			"style": {
 				"navigationBarTitleText": "通知公告"

+ 18 - 7
pages/TopPipeWork/TopPipeWork.vue

@@ -10,9 +10,11 @@
 					<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>
 					</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>
 					</view>
 				</view>
 
@@ -118,8 +120,9 @@
 						<view>
 							施工时间
 						</view>
-						<view style="margin-top: 10;" @click="openDatetimePicker()">
+						<view @click="openDatetimePicker()">
 							<span style="color: black;">{{time}}</span>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 					</view>
 					<view class="container">
@@ -141,12 +144,15 @@
 							<view>
 								材 质
 							</view>
-							<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
-								@click="pickerShow('cz')">
+							<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>
 							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz')">
+							<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>
 							</view>
 						</view>
 					</view>
@@ -156,12 +162,15 @@
 							<view>
 								规 格
 							</view>
-							<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
-								@click="pickerShow('gg')">
+							<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>
 							</view>
-							<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg')">
+							<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>
 							</view>
 						</view>
 					</view>
@@ -780,6 +789,8 @@
 		border: 15px solid hsla(0, 0%, 100%, .5);
 		background: white;
 		background-clip: padding-box;
+		padding-left: 5px;
+		padding-right: 10px;
 		/*从padding开始往外面裁剪背景*/
 
 	}

+ 9 - 3
pages/dangerous/dangerous.vue

@@ -11,9 +11,11 @@
 					<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>
 					</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>
 					</view>
 				</view>
 			</view>
@@ -49,11 +51,13 @@
 					<view>
 						工程时间
 					</view>
-					<view v-if="isEmpty(this.projectTime)" style="margin-top: 10;" @click="openDatetimePicker">
+					<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>
 					</view>
-					<view v-else style="margin-top: 10;" @click="openDatetimePicker">
+					<view v-else @click="openDatetimePicker">
 						<span style="color: black;">{{projectTime}}</span>
+						<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 					</view>
 				</view>
 			</view>
@@ -571,7 +575,7 @@
 				})
 			},
 			submit() {
-				if(this.fileArr.length<=0){
+				if (this.fileArr.length <= 0) {
 					this.$modal.msg('请选择附件')
 					return;
 				}
@@ -645,6 +649,8 @@
 		padding: 10px;
 		background-color: #fff;
 		border-radius: 5px;
+		padding-left: 5px;
+		padding-right: 10px;
 	}
 
 	.uni-list-cell {

+ 24 - 147
pages/enginproject/enginproject.vue

@@ -9,9 +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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -23,9 +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>
 						</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>
 						</view>
 					</view>
 
@@ -104,23 +112,14 @@
 				</view>
 				<view class="uni-list">
 					<view class="align-items" style="margin-bottom: 20px;">
-						<!-- 	<view class="container" style="color: gainsboro;">*请上传文件</view> -->
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-							<!-- <image src="/static/images/chooseimg.png" mode=""
-								style="width: 100rpx; height: 100rpx; margin: 0 12rpx;; " @click="chooseFile()"></image> -->
 							<view v-for="(item,index) in fileArr" :key="index" style="position: relative;">
 								<view style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
 									@click="chooseModel(item.picUrl,item.fileName)">
 									{{item.fileName}}
-									<!-- <image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;">
-									</image> -->
 
 								</view>
 
-								<!-- <view @click="removeFile(index)"
-									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<uni-icons type="close" color="darkgray" size="18"></uni-icons>
-								</view> -->
 							</view>
 						</view>
 					</view>
@@ -152,8 +151,10 @@
 							<view>
 								施工时间
 							</view>
-							<view style="margin-top: 10;" @click="openDatetimePicker()">
+							<view @click="openDatetimePicker()">
 								<span style="color: black;">{{time}}</span>
+								<uni-icons style=" position: absolute;" type="right" color="darkgray"
+									size="15"></uni-icons>
 							</view>
 						</view>
 
@@ -165,8 +166,10 @@
 								<view>
 									材质
 								</view>
-								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz',index)">
+								<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>
 								</view>
 
 							</view>
@@ -176,8 +179,10 @@
 									规格
 								</view>
 
-								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg',index)">
+								<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>
 								</view>
 							</view>
 							<view class="container">
@@ -185,6 +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>
 							</view>
 							<button v-if="index!=0" @click="this.czggslList.splice(index,1)">删除</button>
 						</view>
@@ -454,77 +461,7 @@
 				},
 
 
-				chooseFile() {
-					let _this = this;
-					console.log('文件')
-					uni.chooseMessageFile({
-						// sizeType: ['album', 'camera'],
-						type: 'all',
-						success(resp) {
-							resp.tempFiles.forEach((item, index) => {
-								const task = uni.uploadFile({
-									url: _this.$HTTP + `/obs`,
-									filePath: item.path,
-									name: 'file',
-									formData: {},
-									header: _this.headers,
-
-									success: res => {
-										// 判断是否json字符串,将其转为json格式
-										console.log("结果", res)
-										// let data = _this.$u.test.jsonString(res
-										// 	.data) ? JSON.parse(res.data) : res.data;
-										let data = JSON.parse(res.data);
-										if (![200].includes(data.code)) {
-											// this.uploadError(index, data);
-											_this.$modal.msg(data.msg)
-										} else {
-											if (_this.progress === 100) {
-												console.log('_this.progress', _this.progress)
-												//console.log('data----', data)data
-												console.log('res--', res)
-												_this.fileArr.push({
-													'name': item.name,
-													'url': data.data.url
-												})
-												_this.fileNameArr.push(item.name)
-												console.log('fileArr', _this.fileArr)
-												_this.$modal.msg('上传成功!')
-											}
-										}
-									},
-									fail: e => {
-										console.log(e)
-										_this.$modal.msg('上传失败!')
-										//_this.uploadError(index, e);
-									},
-									complete: res => {
-										uni.hideLoading();
-										_this.uploading = false;
-
-									}
-								});
-								task.onProgressUpdate(res => {
-									_this.progress = res.progress;
-									console.log('onProgressUpdate', res)
-									console.log('task.onProgressUpdate', _this.progress)
-									uni.showLoading({
-										title: '上传中'
-									})
-									if (_this.progress != 100) {
-										_this.loading = false
-										console.log('_this.loading false', _this.loading)
-									} else {
-										_this.loading = true
-										console.log('_this.loading true', _this.loading)
-									}
-								});
-
-							})
-
-						},
-					})
-				},
+			
 				showPhoto(index) {
 					uni.previewImage({
 						current: index,
@@ -532,20 +469,7 @@
 					})
 
 				},
-				removeFile(index) {
-					uni.showModal({
-						title: '提示',
-						content: '是否删除该文件?',
-						success: (res) => {
-							if (res.confirm) {
-								this.fileArr.splice(index, 1)
-								this.fileNameArr.splice(index, 1)
-								console.log('this.fileArr', this.fileArr)
-
-							}
-						}
-					})
-				},
+				
 				remove(index) {
 					uni.showModal({
 						title: '提示',
@@ -901,56 +825,7 @@
 						this.$modal.msg('请选择工程名称')
 						return
 					}
-					// if (this.isEmpty(this.jsdwValue)) {
-					// 	this.$modal.msg('建设单位不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.xmfzrValue)) {
-					// 	this.$modal.msg('项目负责人不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.xcfzrValue)) {
-					// 	this.$modal.msg('现场负责人不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.sjdwValue)) {
-					// 	this.$modal.msg('设计单位不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.sjfzrValue)) {
-					// 	this.$modal.msg('设计负责人不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.sjPhoneValue)) {
-					// 	this.$modal.msg('设计联系电话不能为空')
-					// 	return
-					// }
-					// if (!this.$validation.mobile(this.sjPhoneValue)) {
-					// 	this.$modal.msg('设计联系电话格式错误')
-					// 	return
-					// }
-					// if (this.isEmpty(this.jldwValue)) {
-					// 	this.$modal.msg('监理单位不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.jlfzrValue)) {
-					// 	this.$modal.msg('监理负责人不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.jlPhoneValue)) {
-					// 	this.$modal.msg('监理联系电话不能为空')
-					// 	return
-					// }
-					// if (!this.$validation.mobile(this.jlPhoneValue)) {
-					// 	this.$modal.msg('监理联系电话格式错误')
-					// 	return
-					// }
-
-					// if (this.fileArr.length <= 0) {
-					// 	this.$modal.msg('请上传文件')
-					// } else if (this.loadingFile == false) {
-					// 	this.$modal.msg('文件未上传完毕,无法提交!')
-					// }
+					
 
 					try {
 						//console.log("刚开始", this.czggslList);
@@ -1070,6 +945,8 @@
 			border: 15px solid hsla(0, 0%, 100%, .5);
 			background: white;
 			background-clip: padding-box;
+			padding-left: 5px;
+			padding-right: 10px;
 			/*从padding开始往外面裁剪背景*/
 
 		}

+ 23 - 6
pages/index.vue

@@ -72,18 +72,35 @@
 				});
 			},
 			lists() {
+				uni.showLoading()
 				getNoticeList('3', '1', '').then(res => { //查注意事项
+					uni.hideLoading();
+					if (res.code == '200') {
 
-					this.list = res.rows
+						if (res.rows.length > 0) {
+							this.list = res.rows
+						} else {
+							this.$modal.msg('暂无数据')
+						}
+
+					} else {
+						this.$modal.msg(res.msg)
+					}
 
 				})
 				getNoticeList('1', '1', '').then(res => { //通知公告
 
-					if (res.rows.length > 0) {
-						this.noticeDetails = res.rows[0]
-						this.content.push(
-							res.rows[0]
-						)
+					if (res.code == '200') {
+						if (res.rows.length > 0) {
+							this.noticeDetails = res.rows[0]
+							this.content.push(
+								res.rows[0]
+							)
+						} else {
+							this.$modal.msg('暂无数据')
+						}
+					} else {
+						this.$modal.msg(res.msg)
 					}
 
 				})

+ 20 - 4
pages/infrastructure/infrastructure.vue

@@ -11,9 +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>
 					</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>
 					</view>
 				</view>
 
@@ -121,8 +125,10 @@
 						<view>
 							施工时间
 						</view>
-						<view style="margin-top: 10;" @click="openDatetimePicker()">
+						<view  @click="openDatetimePicker()">
 							<span style="color: black;">{{time}}</span>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray"
+								size="15"></uni-icons>
 						</view>
 					</view>
 
@@ -136,12 +142,16 @@
 								材 质
 							</view>
 							<view v-if="isNew==false">
-								<view v-if="this.isEmpty(this.materialValue.id)" style="margin-top: 10;"
+								<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>
 								</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>
 								</view>
 							</view>
 							<view v-else-if="isNew==true">
@@ -158,12 +168,16 @@
 								规 格
 							</view>
 							<view v-if="isNew==false">
-								<view v-if="this.isEmpty(this.specificationValue.id)" style="margin-top: 10;"
+								<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>
 								</view>
-								<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg')">
+								<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>
 								</view>
 							</view>
 							<view v-else-if="isNew==true">
@@ -816,6 +830,8 @@
 		border: 15px solid hsla(0, 0%, 100%, .5);
 		background: white;
 		background-clip: padding-box;
+		padding-left: 5px;
+		padding-right: 10px;
 		/*从padding开始往外面裁剪背景*/
 
 	}

+ 3 - 28
pages/login.vue

@@ -1,10 +1,6 @@
 <template>
   <view class="normal-login-container">
-    <view class="logo-content align-center justify-center flex">
-      <image style="width: 100rpx;height: 100rpx;"  mode="widthFix">
-      </image>
-      <text class="title">若依移动端登录</text>
-    </view>
+  
     <view class="login-form-content">
       <view class="input-item flex align-center">
         <view class="iconfont icon-user icon"></view>
@@ -24,15 +20,7 @@
       <view class="action-btn">
         <button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>
       </view>
-    <!-- <view class="reg text-center" v-if="register">
-        <text class="text-grey1">没有账号?</text>
-        <text @click="handleUserRegister" class="text-blue">立即注册</text>
-      </view>
-      <view class="xieyi text-center">
-        <text class="text-grey1">登录即代表同意</text>
-        <text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
-        <text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
-      </view> -->
+   
     </view>
      
   </view>
@@ -62,20 +50,7 @@
       this.getCode()
     },
     methods: {
-      // 用户注册
-      handleUserRegister() {
-        this.$tab.redirectTo(`/pages/register`)
-      },
-      // // 隐私协议
-      // handlePrivacy() {
-      //   let site = this.globalConfig.appInfo.agreements[0]
-      //   this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
-      // },
-      // // 用户协议
-      // handleUserAgrement() {
-      //   let site = this.globalConfig.appInfo.agreements[1]
-      //   this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
-      // },
+      
       // 获取图形验证码
       getCode() {
         getCodeImg().then(res => {

+ 22 - 146
pages/municipal/municipal.vue

@@ -9,9 +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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -23,9 +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>
 						</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>
 						</view>
 					</view>
 
@@ -106,21 +114,13 @@
 					<view class="align-items" style="margin-bottom: 20px;">
 						<!-- 	<view class="container" style="color: gainsboro;">*请上传文件</view> -->
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-							<!-- <image src="/static/images/chooseimg.png" mode=""
-								style="width: 100rpx; height: 100rpx; margin: 0 12rpx;; " @click="chooseFile()"></image> -->
 							<view v-for="(item,index) in fileArr" :key="index" style="position: relative;">
 								<view style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
 									@click="chooseModel(item.picUrl,item.fileName)">
 									{{item.fileName}}
-									<!-- <image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;">
-									</image> -->
 
 								</view>
 
-								<!-- <view @click="removeFile(index)"
-									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<uni-icons type="close" color="darkgray" size="18"></uni-icons>
-								</view> -->
 							</view>
 						</view>
 					</view>
@@ -152,8 +152,10 @@
 							<view>
 								施工时间
 							</view>
-							<view style="margin-top: 10;" @click="openDatetimePicker()">
+							<view @click="openDatetimePicker()">
 								<span style="color: black;">{{time}}</span>
+								<uni-icons style=" position: absolute;" type="right" color="darkgray"
+									size="15"></uni-icons>
 							</view>
 						</view>
 
@@ -165,8 +167,10 @@
 								<view>
 									材质
 								</view>
-								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('cz',index)">
+								<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>
 								</view>
 
 							</view>
@@ -176,8 +180,10 @@
 									规格
 								</view>
 
-								<view class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gg',index)">
+								<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>
 								</view>
 							</view>
 							<view class="container">
@@ -453,77 +459,7 @@
 				},
 
 
-				chooseFile() {
-					let _this = this;
-					console.log('文件')
-					uni.chooseMessageFile({
-						// sizeType: ['album', 'camera'],
-						type: 'all',
-						success(resp) {
-							resp.tempFiles.forEach((item, index) => {
-								const task = uni.uploadFile({
-									url: _this.$HTTP + `/obs`,
-									filePath: item.path,
-									name: 'file',
-									formData: {},
-									header: _this.headers,
-
-									success: res => {
-										// 判断是否json字符串,将其转为json格式
-										console.log("结果", res)
-										// let data = _this.$u.test.jsonString(res
-										// 	.data) ? JSON.parse(res.data) : res.data;
-										let data = JSON.parse(res.data);
-										if (![200].includes(data.code)) {
-											// this.uploadError(index, data);
-											_this.$modal.msg(data.msg)
-										} else {
-											if (_this.progress === 100) {
-												console.log('_this.progress', _this.progress)
-												//console.log('data----', data)data
-												console.log('res--', res)
-												_this.fileArr.push({
-													'name': item.name,
-													'url': data.data.url
-												})
-												_this.fileNameArr.push(item.name)
-												console.log('fileArr', _this.fileArr)
-												_this.$modal.msg('上传成功!')
-											}
-										}
-									},
-									fail: e => {
-										console.log(e)
-										_this.$modal.msg('上传失败!')
-										//_this.uploadError(index, e);
-									},
-									complete: res => {
-										uni.hideLoading();
-										_this.uploading = false;
-
-									}
-								});
-								task.onProgressUpdate(res => {
-									_this.progress = res.progress;
-									console.log('onProgressUpdate', res)
-									console.log('task.onProgressUpdate', _this.progress)
-									uni.showLoading({
-										title: '上传中'
-									})
-									if (_this.progress != 100) {
-										_this.loading = false
-										console.log('_this.loading false', _this.loading)
-									} else {
-										_this.loading = true
-										console.log('_this.loading true', _this.loading)
-									}
-								});
-
-							})
-
-						},
-					})
-				},
+			
 				showPhoto(index) {
 					uni.previewImage({
 						current: index,
@@ -531,20 +467,7 @@
 					})
 
 				},
-				removeFile(index) {
-					uni.showModal({
-						title: '提示',
-						content: '是否删除该文件?',
-						success: (res) => {
-							if (res.confirm) {
-								this.fileArr.splice(index, 1)
-								this.fileNameArr.splice(index, 1)
-								console.log('this.fileArr', this.fileArr)
-
-							}
-						}
-					})
-				},
+				
 				remove(index) {
 					uni.showModal({
 						title: '提示',
@@ -900,56 +823,7 @@
 						this.$modal.msg('请选择工程名称')
 						return
 					}
-					// if (this.isEmpty(this.jsdwValue)) {
-					// 	this.$modal.msg('建设单位不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.xmfzrValue)) {
-					// 	this.$modal.msg('项目负责人不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.xcfzrValue)) {
-					// 	this.$modal.msg('现场负责人不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.sjdwValue)) {
-					// 	this.$modal.msg('设计单位不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.sjfzrValue)) {
-					// 	this.$modal.msg('设计负责人不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.sjPhoneValue)) {
-					// 	this.$modal.msg('设计联系电话不能为空')
-					// 	return
-					// }
-					// if (!this.$validation.mobile(this.sjPhoneValue)) {
-					// 	this.$modal.msg('设计联系电话格式错误')
-					// 	return
-					// }
-					// if (this.isEmpty(this.jldwValue)) {
-					// 	this.$modal.msg('监理单位不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.jlfzrValue)) {
-					// 	this.$modal.msg('监理负责人不能为空')
-					// 	return
-					// }
-					// if (this.isEmpty(this.jlPhoneValue)) {
-					// 	this.$modal.msg('监理联系电话不能为空')
-					// 	return
-					// }
-					// if (!this.$validation.mobile(this.jlPhoneValue)) {
-					// 	this.$modal.msg('监理联系电话格式错误')
-					// 	return
-					// }
-
-					// if (this.fileArr.length <= 0) {
-					// 	this.$modal.msg('请上传文件')
-					// } else if (this.loadingFile == false) {
-					// 	this.$modal.msg('文件未上传完毕,无法提交!')
-					// }
+					
 
 					try {
 						//console.log("刚开始", this.czggslList);
@@ -1069,6 +943,8 @@
 			border: 15px solid hsla(0, 0%, 100%, .5);
 			background: white;
 			background-clip: padding-box;
+			padding-right: 10px;
+			padding-left: 5px;
 			/*从padding开始往外面裁剪背景*/
 
 		}

+ 35 - 1
pages/oldrenovation/courtyard/courtyard.vue

@@ -9,9 +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>
 						</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>
 						</view>
 
 					</view>
@@ -24,9 +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>
 						</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>
 						</view>
 
 					</view>
@@ -40,9 +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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -54,9 +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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -86,8 +102,10 @@
 							<view>
 								施工时间
 							</view>
-							<view style="margin-top: 10;" @click="openDatetimePicker('sg')">
+							<view  @click="openDatetimePicker('sg')">
 								<span style="color: black;">{{time}}</span>
+								<uni-icons style=" position: absolute;" type="right" color="darkgray"
+									size="15"></uni-icons>
 							</view>
 						</view>
 
@@ -98,6 +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>
 							</view>
 						</view>
 						<view class="container" v-else-if="objValue.enginClassValue=='打压'">
@@ -107,9 +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>
 							</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>
 							</view>
 						</view>
 						<view class="container">
@@ -132,9 +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>
 							</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>
 							</view>
 						</view>
 						<view class="container">
@@ -145,9 +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>
 							</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>
 							</view>
 						</view>
 						<view class="container">
@@ -877,6 +909,8 @@
 			border: 15px solid hsla(0, 0%, 100%, .5);
 			background: white;
 			background-clip: padding-box;
+			padding-left: 5px;
+			padding-right: 10px;
 			/*从padding开始往外面裁剪背景*/
 
 		}

+ 73 - 7
pages/oldrenovation/indoor/indoor.vue

@@ -6,17 +6,21 @@
 						<view>
 							工程周期
 						</view>
-						<view v-if="this.isEmpty(this.projectValue.dictValue)" style="margin-top: 10;"
-							@click="pickerShow('gczq')">
-							<span style="color: darkgray;">请选择工程周期
-						
-							</span>
-								<uni-icons type="right" color="darkgray" size="15"></uni-icons>
+						<view v-if="this.isEmpty(this.projectValue.dictValue)" @click="pickerShow('gczq')">
+							<view>
+
+
+								<span style="color: darkgray;">请选择工程周期
+
+								</span>
+								<uni-icons style=" position: absolute;" type="right" color="darkgray"
+									size="15"></uni-icons>
+							</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 type="right" color="darkgray" size="15"></uni-icons>
+							<uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
 						</view>
 
 					</view>
@@ -29,9 +33,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>
 						</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>
 						</view>
 
 					</view>
@@ -45,9 +53,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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -59,9 +71,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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -73,9 +89,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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -87,9 +107,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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -128,9 +152,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>
 							</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>
 							</view>
 						</view>
 					</view>
@@ -153,9 +181,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>
 							</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>
 							</view>
 						</view>
 					</view>
@@ -179,9 +211,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>
 							</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>
 							</view>
 						</view>
 						<view class="container">
@@ -192,9 +228,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>
 							</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>
 							</view>
 						</view>
 						<view class="container">
@@ -224,9 +264,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>
 							</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>
 							</view>
 						</view>
 
@@ -270,9 +314,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>
 							</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>
 							</view>
 						</view>
 						<view class="container">
@@ -301,9 +349,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>
 							</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>
 							</view>
 						</view>
 						<view class="container">
@@ -314,9 +366,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>
 							</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>
 							</view>
 						</view>
 						<view class="container">
@@ -327,9 +383,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>
 							</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>
 							</view>
 						</view>
 						<view class="container">
@@ -340,9 +400,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>
 							</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>
 							</view>
 						</view>
 						<view class="container">
@@ -1184,6 +1248,8 @@
 		.background {
 			border: 15px solid hsla(0, 0%, 100%, .5);
 			background: white;
+			padding-left: 5px;
+			padding-right: 10px;
 			background-clip: padding-box;
 			/*从padding开始往外面裁剪背景*/
 

+ 37 - 1
pages/oldrenovation/overhead/overhead.vue

@@ -9,9 +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>
 						</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>
 						</view>
 
 					</view>
@@ -24,9 +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>
 						</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>
 						</view>
 
 					</view>
@@ -40,9 +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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -54,9 +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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -68,9 +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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -99,8 +119,10 @@
 							<view>
 								施工时间
 							</view>
-							<view style="margin-top: 10;" @click="openDatetimePicker('sg')">
+							<view @click="openDatetimePicker('sg')">
 								<span style="color: black;">{{time}}</span>
+								<uni-icons style=" position: absolute;" type="right" color="darkgray"
+									size="15"></uni-icons>
 							</view>
 						</view>
 
@@ -111,6 +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>
 							</view>
 						</view>
 						<view class="container" v-else-if="objValue.enginClassValue=='打压'">
@@ -120,9 +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>
 							</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>
 							</view>
 						</view>
 						<view class="container">
@@ -145,9 +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>
 							</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>
 							</view>
 						</view>
 						<view class="container">
@@ -158,9 +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>
 							</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>
 							</view>
 						</view>
 						<view class="container">

+ 0 - 196
pages/register.vue

@@ -1,196 +0,0 @@
-<template>
-  <view class="normal-login-container">
-    <view class="logo-content align-center justify-center flex">
-      <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
-      </image>
-      <text class="title">若依移动端注册</text>
-    </view>
-    <view class="login-form-content">
-      <view class="input-item flex align-center">
-        <view class="iconfont icon-user icon"></view>
-        <input v-model="registerForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
-      </view>
-      <view class="input-item flex align-center">
-        <view class="iconfont icon-password icon"></view>
-        <input v-model="registerForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
-      </view>
-      <view class="input-item flex align-center">
-        <view class="iconfont icon-password icon"></view>
-        <input v-model="registerForm.confirmPassword" type="password" class="input" placeholder="请输入重复密码" maxlength="20" />
-      </view>
-      <view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
-        <view class="iconfont icon-code icon"></view>
-        <input v-model="registerForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
-        <view class="login-code"> 
-          <image :src="codeUrl" @click="getCode" class="login-code-img"></image>
-        </view>
-      </view>
-      <view class="action-btn">
-        <button @click="handleRegister()" class="register-btn cu-btn block bg-blue lg round">注册</button>
-      </view>
-    </view>
-    <view class="xieyi text-center">
-      <text @click="handleUserLogin" class="text-blue">使用已有账号登录</text>
-    </view>
-  </view>
-</template>
-
-<script>
-  import { getCodeImg, register } from '@/api/login'
-
-  export default {
-    data() {
-      return {
-        codeUrl: "",
-        captchaEnabled: true,
-        globalConfig: getApp().globalData.config,
-        registerForm: {
-          username: "",
-          password: "",
-          confirmPassword: "",
-          code: "",
-          uuid: ''
-        }
-      }
-    },
-    created() {
-      this.getCode()
-    },
-    methods: {
-      // 用户登录
-      handleUserLogin() {
-        this.$tab.navigateTo(`/pages/login`)
-      },
-      // 获取图形验证码
-      getCode() {
-        getCodeImg().then(res => {
-          this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
-          if (this.captchaEnabled) {
-            this.codeUrl = 'data:image/gif;base64,' + res.img
-            this.registerForm.uuid = res.uuid
-          }
-        })
-      },
-      // 注册方法
-      async handleRegister() {
-        if (this.registerForm.username === "") {
-          this.$modal.msgError("请输入您的账号")
-        } else if (this.registerForm.password === "") {
-          this.$modal.msgError("请输入您的密码")
-        } else if (this.registerForm.confirmPassword === "") {
-          this.$modal.msgError("请再次输入您的密码")
-        } else if (this.registerForm.password !== this.registerForm.confirmPassword) {
-          this.$modal.msgError("两次输入的密码不一致")
-        } else if (this.registerForm.code === "" && this.captchaEnabled) {
-          this.$modal.msgError("请输入验证码")
-        } else {
-          this.$modal.loading("注册中,请耐心等待...")
-          this.register()
-        }
-      },
-      // 用户注册
-      async register() {
-        register(this.registerForm).then(res => {
-          this.$modal.closeLoading()
-          uni.showModal({
-          	title: "系统提示",
-          	content: "恭喜你,您的账号 " + this.registerForm.username + " 注册成功!",
-          	success: function (res) {
-          		if (res.confirm) {
-                uni.redirectTo({ url: `/pages/login` });
-          		}
-          	}
-          })
-        }).catch(() => {
-          if (this.captchaEnabled) {
-            this.getCode()
-          }
-        })
-      },
-      // 注册成功后,处理函数
-      registerSuccess(result) {
-        // 设置用户信息
-        this.$store.dispatch('GetInfo').then(res => {
-          this.$tab.reLaunch('/pages/index')
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  page {
-    background-color: #ffffff;
-  }
-
-  .normal-login-container {
-    width: 100%;
-
-    .logo-content {
-      width: 100%;
-      font-size: 21px;
-      text-align: center;
-      padding-top: 15%;
-
-      image {
-        border-radius: 4px;
-      }
-
-      .title {
-        margin-left: 10px;
-      }
-    }
-
-    .login-form-content {
-      text-align: center;
-      margin: 20px auto;
-      margin-top: 15%;
-      width: 80%;
-
-      .input-item {
-        margin: 20px auto;
-        background-color: #f5f6f7;
-        height: 45px;
-        border-radius: 20px;
-
-        .icon {
-          font-size: 38rpx;
-          margin-left: 10px;
-          color: #999;
-        }
-
-        .input {
-          width: 100%;
-          font-size: 14px;
-          line-height: 20px;
-          text-align: left;
-          padding-left: 15px;
-        }
-
-      }
-
-      .register-btn {
-        margin-top: 40px;
-        height: 45px;
-      }
-
-      .xieyi {
-        color: #333;
-        margin-top: 20px;
-      }
-      
-      .login-code {
-        height: 38px;
-        float: right;
-      
-        .login-code-img {
-          height: 38px;
-          position: absolute;
-          margin-left: 10px;
-          width: 200rpx;
-        }
-      }
-    }
-  }
-
-</style>

+ 21 - 1
pages/statistics/statistics.vue

@@ -11,9 +11,11 @@
 						<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>
 						</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>
 						</view>
 					</view>
 
@@ -26,9 +28,11 @@
 						<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>
 						</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>
 						</view>
 					</view>
 
@@ -41,9 +45,11 @@
 					<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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -55,9 +61,11 @@
 						<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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -69,9 +77,11 @@
 						<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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -103,9 +113,11 @@
 						<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>
 						</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>
 						</view>
 					</view>
 				</view>
@@ -117,9 +129,11 @@
 						<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>
 						</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>
 						</view>
 					</view>
 
@@ -130,9 +144,11 @@
 					<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>
 						</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>
 						</view>
 					</view>
 
@@ -142,9 +158,11 @@
 					<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>
 						</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>
 						</view>
 					</view>
 
@@ -154,9 +172,11 @@
 					<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>
 						</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>
 						</view>
 					</view>
 
@@ -530,9 +550,9 @@
 		margin-left: 8px;
 		margin-right: 8px;
 		margin-top: 8px;
-		padding: 10px;
 		background-color: #fff;
 		border-radius: 5px;
+		padding: 10px 20px 10px 10px;
 	}
 
 	.uni-list

+ 2 - 21
pages/work/index.vue

@@ -1,16 +1,6 @@
 <template>
 	<view class="work-container">
-		<!-- 轮播图 -->
-		<!-- <uni-swiper-dot class="uni-swiper-dot-box" :info="data" :current="current" field="content">
-			<swiper class="swiper-box" :current="swiperDotIndex" @change="changeSwiper">
-				<swiper-item v-for="(item, index) in data" :key="index">
-					<view class="swiper-item" @click="clickBannerItem(item)">
-						<image :src="item.image" mode="aspectFill" :draggable="false" />
-					</view>
-				</swiper-item>
-			</swiper>
-		</uni-swiper-dot> -->
-
+		
 		<!-- 宫格组件 -->
 		<!-- <uni-section title="系统管理" type="line"></uni-section> -->
 		<view class="grid-body">
@@ -133,16 +123,7 @@
 				enginClassValue: '', //二次节点  数据字典
 				current: 0,
 				swiperDotIndex: 0,
-				// data: [{
-				// 		image: '/static/images/banner/banner01.jpg'
-				// 	},
-				// 	{
-				// 		image: '/static/images/banner/banner02.jpg'
-				// 	},
-				// 	{
-				// 		image: '/static/images/banner/banner03.jpg'
-				// 	}
-				// ]
+			
 			}
 		},
 		methods: {

BIN
static/images/check_mark.png