wang_xy vor 10 Monaten
Ursprung
Commit
3829ac59b2

+ 24 - 1
api/login.js

@@ -4,5 +4,28 @@ export default {
 	login (data) {
 		return utils.requestEn('/mobile/user', data,'POST')
 	},
-	
+	formatTime() {
+		return new Promise((resolve, reject) => {
+			uni.request({
+				url: 'https://www.cczdsz.cn/prod-api/mobile/notice/getDate',
+				method: 'GET',
+				success: res => {
+					resolve(res.data);
+				}
+			})
+		})
+		// const date = new Date();
+		// // // 获取年月日时分秒
+		// const year = date.getFullYear();
+		// const month = date.getMonth() + 1;
+		// const day = date.getDate();
+		// const hours = date.getHours();
+		// const minutes = date.getMinutes();
+		// const seconds = date.getSeconds();
+		
+		// // 将数字转换为字符串,并补零
+		// const pad = (num) => (num < 10 ? '0' + num : num);
+		// // 格式化输出
+		// return `${year}-${pad(month)}-${pad(day)} ${pad(hours)}:${pad(minutes)}:${pad(seconds)}`;
+	},
 }

+ 0 - 3
pages/mapindex/mapindex.vue

@@ -288,9 +288,6 @@ import service from '@/api/index.js'
 		  							console.log(res)
 		  							that.latitude=res.latitude;
 		  							that.longitude=res.longitude;
-		  							that.latitude=res.latitude;
-		  							that.longitude=res.longitude;
-		  							console.log(this.latitude,this.longitude)
 		  						}
 		  					});
 		  				}

+ 4 - 4
pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement.vue

@@ -28,7 +28,7 @@
 		</u-form-item>
 		<u-form-item borderBottom ref="item1">
 			<view>备注</view>
-			<u-input v-model="form.remarks" type="textarea" placeholder="请输入备注"   ></u-input>
+			<u-input v-model="form.remarks" type="textarea" placeholder="请输入备注" maxlength="500"  ></u-input>
 		</u-form-item>
 		<u-form-item borderBottom ref="item1">
 			<view>巡检照片</view>
@@ -54,10 +54,10 @@
 			</view>
 		</u-form-item>
 	</u-form>
-	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()" v-if="type!=1" 
+	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()" v-if="type!=1"
 		type='primary'>确认上传</u-button>
-		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()" v-else
-			type='primary'>确认修改</u-button>
+<!--		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()" v-else-->
+<!--			type='primary'>确认修改</u-button>-->
 </view>
 </view>
 </template>

+ 17 - 17
pages/noLogin/GRegulatingBoxMaintenance/GRegulatingBoxMaintenance.vue

@@ -15,11 +15,11 @@
 			</u-form-item>
 		</view>
 		<view style="flex-flow: row;display: flex; justify-content: flex-end;">
-		<view class="small-title">调压箱 </view> 
+		<view class="small-title">调压箱 </view>
 		<view class="small-title" style="margin-left: auto;" @click="BoxDetails()">详情<u-icon name="arrow-right"></u-icon></view>
 		</view>
 		<u-form-item label="名称" borderBottom ref="item1" placeholder="请输入名称" labelWidth="140">
-			<u-input v-model="form.name" length='20px' placeholder="请输入名称" 
+			<u-input v-model="form.name" length='20px' placeholder="请输入名称"
 				   type="digit" :clearable="false"  disabled></u-input>
 		</u-form-item>
 		<u-form-item label="管理所" borderBottom ref="item1" labelWidth="140">
@@ -34,10 +34,10 @@
 		</u-form-item>
 		<u-form-item label="维护项目" labelWidth="140" borderBottom ref="item1">
 			<u-checkbox-group   @change="changeconfirm" >
-				<u-checkbox  
+				<u-checkbox
 					v-for="(item, index) in typelist.regulating_box_maintenance"
-					:key="index" 
-					v-model="item.default" 
+					:key="index"
+					v-model="item.default"
 					:name="item.dictValue">
 					{{item.dictLabel}}
 				</u-checkbox>
@@ -66,16 +66,16 @@
 				</view>
 			</view>
 		</u-form-item>
-		
+
 		<u-form-item borderBottom ref="item1">
 			<view>备注</view>
-			<u-input v-model="form.remarks" type="textarea" placeholder="请输入备注"  ></u-input>
+			<u-input v-model="form.remarks" type="textarea" placeholder="请输入备注" maxlength="500" ></u-input>
 		</u-form-item>
 	</u-form>
-	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()"  
+	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()"
 		type='primary' v-if="type!=1">确认上传</u-button>
-		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()"  
-			type='primary' v-else>确认修改</u-button>
+<!--		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()"  -->
+<!--			type='primary' v-else>确认修改</u-button>-->
 </view>
 <view>
 			<u-popup v-model="showBoxDetails" height= "400px" border-radius="14" mode=bottom closeable=true   close-icon-color="#000000">
@@ -238,7 +238,7 @@ data() {
 		managementOfficeId:null,
 		boxform:{},
 		pressureRegulatingBoxDetailsBo:{}
-		
+
 	}
 },
 onLoad(e) {
@@ -289,7 +289,7 @@ methods: {
 			this.pressureRegulatingBoxDetailsBo = res.pressureRegulatingBoxDetailsVo[0];
 			this.showBoxDetails=true
 		})
-		
+
 	},
 	getAdministrativeOffice(userId){
 		service.getAdministrativeOffice({userId:userId}).then(res=>{
@@ -402,7 +402,7 @@ methods: {
 			// this.imgArr=[]
 			// this.imgymxs=[]
 		})
-		
+
 	},
 	save() {
 		let _this = this
@@ -445,7 +445,7 @@ methods: {
 				yesandnolist.push(item)
 			})
 			this.typelist.regulating_box_maintenance=yesandnolist
-			
+
 			// this.buildingName=''
 			this.imgArr=[]
 			this.imgymxs=[]
@@ -497,8 +497,8 @@ methods: {
 					this.managementOfficeId=this.form.parentId
 				})
 			}
-			
-			
+
+
 			console.log(res)
 		})
 	},
@@ -566,7 +566,7 @@ methods: {
 							_this.$UTILS.showPrompt('选取失败!')
 							this.uploadError(index, e);
 						},
-						
+
 						complete: res => {
 							_this.uploading = false;
 							// _this.uploadFile(index + 1);

+ 3 - 3
pages/noLogin/LNGStation/LNGStation.vue

@@ -170,10 +170,10 @@
 			<u-input v-model="form.remark" type="textarea" placeholder="请输入备注"  ></u-input>
 		</u-form-item> -->
 	</u-form>
-	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;margin-top: 20px;" @click="save()"  
+	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;margin-top: 20px;" @click="save()"
 		type='primary' v-if="type!=1">确认上传</u-button>
-		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;margin-top: 20px;" @click="update()"
-			type='primary' v-else>确认修改</u-button>
+<!--		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;margin-top: 20px;" @click="update()"-->
+<!--			type='primary' v-else>确认修改</u-button>-->
 </view>
 </view>
 </template>

+ 15 - 15
pages/noLogin/PipelineGasUser/PipelineGasUser.vue

@@ -46,7 +46,7 @@
 							</u-form-item>
 						</u-col>
 					</u-col>
-					<view class="small-title">调压箱检查</view> 
+					<view class="small-title">调压箱检查</view>
 					<u-col>
 						<u-form-item label="类型" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
 							<u-radio-group v-model="form.type"   >
@@ -67,7 +67,7 @@
 							</u-radio-group>
 						</u-form-item>
 					</u-col>
-					<view class="small-title">用气设施检查-锅炉及直燃机设备</view> 
+					<view class="small-title">用气设施检查-锅炉及直燃机设备</view>
 					<u-col>
 						<u-form-item label="运行情况" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
 							<u-radio-group v-model="form.boilerExterior"   >
@@ -88,7 +88,7 @@
 							</u-radio-group>
 						</u-form-item>
 					</u-col>
-					<!-- <view class="small-title">用气设施检查-餐饮设施检查</view> 
+					<!-- <view class="small-title">用气设施检查-餐饮设施检查</view>
 					<u-col>
 						<u-form-item label="运行情况" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
 							<u-radio-group v-model="form.cateringStatus"   >
@@ -109,7 +109,7 @@
 							</u-radio-group>
 						</u-form-item>
 					</u-col> -->
-					<view class="small-title">用气设施检查-餐饮设施检查</view> 
+					<view class="small-title">用气设施检查-餐饮设施检查</view>
 					<u-col>
 						<u-form-item label="运行情况" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
 							<u-radio-group v-model="form.cateringStatus"   >
@@ -130,7 +130,7 @@
 							</u-radio-group>
 						</u-form-item>
 					</u-col>
-					<view class="small-title" style="font-size: 32rpx" >燃气管道及设施检查-管道(含公共管道)</view> 
+					<view class="small-title" style="font-size: 32rpx" >燃气管道及设施检查-管道(含公共管道)</view>
 					<u-row>
 					<u-col>
 						<u-form-item label="管道(含公共管道)" borderBottom ref="item1" placeholder="请输入编号" labelWidth="140">
@@ -379,12 +379,12 @@
 					</u-form-item>
 				</u-col>
 				</u-row>
-				
+
 				<view class="small-title">其他</view>
 				<u-row>
 					<u-col>
 						<u-form-item label=" " labelWidth="0" borderBottom ref="item1">
-							<u-input v-model="form.other" type="textarea" borderBottom placeholder="请填写备注信息内容"
+							<u-input v-model="form.other" type="textarea" borderBottom placeholder="请填写备注信息内容" maxlength="500"
 								  ></u-input>
 						</u-form-item>
 					</u-col>
@@ -406,7 +406,7 @@
 										<video :src="item"
 											style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
 									</view>
-									<view @click="remove(index)"   
+									<view @click="remove(index)"
 										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
 										<u-icon name="close" color="#FFFFFF" size="35"   ></u-icon>
 									</view>
@@ -417,13 +417,13 @@
 				</u-row>
 			</u-form>
 
-			<u-button class="from-but" style="margin: 40rpx 0;" @click="save() " v-if="type!=1"   
+			<u-button class="from-but" style="margin: 40rpx 0;" @click="save() " v-if="type!=1"
 				type='primary'>确认上传</u-button>
-				<u-button class="from-but" style="margin: 40rpx 0;" @click="update()"   
-					type='primary' v-else>确认修改</u-button>
+<!--				<u-button class="from-but" style="margin: 40rpx 0;" @click="update()"   -->
+<!--					type='primary' v-else>确认修改</u-button>-->
 		</view>
 		</u-form>
-	
+
 	</view>
 	</view>
 </template>
@@ -567,7 +567,7 @@
 			this.time = year + "/" + month + "/" + date + "-" + hours + ":" + Min
 			this.getdictsysinfo()
 			this.getUserName()
-			
+
 			//this.getAdministrativeOffice(this.userId)
 
 		},
@@ -657,7 +657,7 @@
 					console.log(this.communityName)
 				})
 			},
-		
+
 			getdictsysinfo() {
 				let _this = this
 				service.getDictInfoList({
@@ -854,7 +854,7 @@
 					// }, 2000)
 				// 	this.form={businessService:0,
 				// 	administrativeOffice:0,
-				
+
 				// 	businessService:0,
 				// 	isNotXtv:0,
 				// 	appearance:0,

+ 3 - 3
pages/noLogin/PressureRegulatingBox/PressureRegulatingBox.vue

@@ -376,7 +376,7 @@
 				<u-row>
 					<u-col>
 						<u-form-item label=" " labelWidth="0" borderBottom ref="item1">
-							<u-input v-model="form.remarks" type="textarea" borderBottom placeholder="请填写备注信息内容"
+							<u-input v-model="form.remarks" type="textarea" borderBottom placeholder="请填写备注信息内容" maxlength="500"
 								  ></u-input>
 						</u-form-item>
 					</u-col>
@@ -411,8 +411,8 @@
 
 			<u-button class="from-but" style="margin: 40rpx 0;" @click="save() " v-if="type!=1"
 				type='primary'>确认上传</u-button>
-				<u-button class="from-but" style="margin: 40rpx 0;" @click="update()"
-					type='primary' v-else>确认修改</u-button>
+<!--				<u-button class="from-but" style="margin: 40rpx 0;" @click="update()"-->
+<!--					type='primary' v-else>确认修改</u-button>-->
 		</view>
 		</u-form>
 		<view>

Datei-Diff unterdrückt, da er zu groß ist
+ 15 - 6
pages/noLogin/listProject.vue


+ 3 - 3
pages/noLogin/patrolFleet/patrolFleet.vue

@@ -35,7 +35,7 @@
 
         <u-form-item borderBottom ref="item1">
           <view>备注</view>
-          <u-input v-model="form.remark" borderBottom type="textarea"   ></u-input>
+          <u-input v-model="form.remark" borderBottom type="textarea" maxlength="500"  ></u-input>
         </u-form-item>
         <u-form-item label="时间" labelWidth="140" borderBottom ref="item1">
           <u-input v-model="time" borderBottom placeholder="请选择时间" disabled
@@ -68,8 +68,8 @@
       </u-form>
       <u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()"
                 type='primary' v-if="type!=1">确认上传</u-button>
-      <u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()"
-                type='primary' v-else>确认修改</u-button>
+<!--      <u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()"-->
+<!--                type='primary' v-else>确认修改</u-button>-->
     </view>
   </view>
 </template>

+ 4 - 4
pages/noLogin/roadSection/roadSection.vue

@@ -50,13 +50,13 @@
 		</u-form-item>
 		<u-form-item borderBottom ref="item1">
 			<view>备注</view>
-			<u-input v-model="form.remark" type="textarea" placeholder="请输入备注"  ></u-input>
+			<u-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="500" ></u-input>
 		</u-form-item>
 	</u-form>
-	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()"  
+	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()"
 		type='primary' v-if="type!=1">确认上传</u-button>
-		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()"
-			type='primary ' v-else>确认修改</u-button>
+<!--		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()"-->
+<!--			type='primary ' v-else>确认修改</u-button>-->
 </view>
 </view>
 </template>

+ 1 - 1
pages/noLogin/typeList.vue

@@ -294,7 +294,7 @@
 					})
 					
 					this.list1.push({
-						dictLabel: '庭院管',
+						dictLabel: '庭院管',
 						dictValue: '3',
 						visable: false,
 						image:'https://cczdsz.cn/app/images/tywg.png'

+ 6 - 6
pages/noLogin/valveWellInspection/valveWellInspection.vue

@@ -4,7 +4,7 @@
 <view class="project-content">
 	<u-form :model="form" :rules="rules" ref="form">
 		<view style="flex-flow: row;display: flex; justify-content: flex-end;">
-		<view class="small-title">阀井 </view> 
+		<view class="small-title">阀井 </view>
 		<view class="small-title" style="margin-left: auto;" @click="BoxDetails()">详情<u-icon name="arrow-right"></u-icon></view>
 		</view>
 		<u-form-item label="阀井名称" borderBottom ref="item1" labelWidth="140">
@@ -57,13 +57,13 @@
 		</u-form-item>
 		<u-form-item borderBottom ref="item1">
 			<view>备注</view>
-			<u-input v-model="form.remark" type="textarea" placeholder="请输入备注" ></u-input>
+			<u-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="500" ></u-input>
 		</u-form-item>
 	</u-form>
 	<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="save()" v-if="type!=1"
 		type='primary'>确认上传</u-button>
-		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()" 
-			type='primary' v-else>确认修改</u-button>
+<!--		<u-button style="background: #2d95f4;color: #fff;border-radius: 20rpx;" @click="update()" -->
+<!--			type='primary' v-else>确认修改</u-button>-->
 </view>
 	<view>
 			<u-popup v-model="showBoxDetails" height= "400px" border-radius="14" mode=bottom closeable=true   close-icon-color="#000000">
@@ -147,7 +147,7 @@ data() {
 		showBoxDetails:false,
 		boxform:{},
 		managementOfficeId:null,
-		
+
 	}
 },
 onLoad(e) {
@@ -185,7 +185,7 @@ methods: {
 			this.boxform=res
 			this.showBoxDetails=true
 		})
-		
+
 	},
 	time(e) {
 		console.log(`${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`)