Bladeren bron

测试完成

ming 3 jaren geleden
bovenliggende
commit
9b6d1db627

+ 1 - 1
pages/eleControl/controlReport/controlReportAdd/controlReportAdd.vue

@@ -216,7 +216,7 @@
 				}
 				setTimeout(() => {
 					uni.navigateTo({
-						url: '/pages/siteArchive/controlReport/controlReport',
+						url: '/pages/eleControl/controlReport/controlReport',
 					});
 				}, 1000);
 

+ 3 - 3
pages/eleControl/controlReport/controlReportDetail/controlReportDetail.vue

@@ -29,7 +29,7 @@
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>上传图片:</view>
 				<view style="width:500rpx">
-					<img :src=bathUrl+controlReportDetail.scene_pictures style="width:90%">
+					<img :src=bathUrl+controlReportDetail.scene_pictures style="width:30%">
 
 				</view>
 			</view>
@@ -66,7 +66,7 @@
 			return {
 				siteListData: [],
 				controlReportDetail: {},
-				bathUrl: 'https://wx.ewoogi.com/wx/'
+				bathUrl: 'https://wx.ewoogi.com/wx'
 			}
 		},
 		onLoad: function(option) {
@@ -82,7 +82,7 @@
 				if(this.controlReportDetail.site_id){
 				
 					uni.navigateTo({
-						url: '/pages/siteArchive/archiveDetail/archiveDetail?id='+this.site_id+'&mark=control',
+						url: '/pages/siteArchive/archiveDetail/archiveDetail?id='+this.controlReportDetail.site_id+'&mark=control',
 					});
 				}else{
 					uni.showToast({

+ 17 - 13
pages/messagePush/messagePush.vue

@@ -1,19 +1,23 @@
 <template>
-	<view class="padding-sm messagePush" style="padding-bottom:150rpx">
-		<form action="">
-			<checkbox-group class="block" @change="CheckboxChange" style="height: calc(100vh - 200rpx);overflow: scroll">
-				<view class="margin-top  ">
-					<view class="flex align-left checkItems" v-for="(item,index) in checkbox">
-						<checkbox class="blue" :class="item.checked==1?'checked':''"
-							:checked="item.checked==1?true:false" :value="item.value"></checkbox>
-						<view class="title">{{item.title}}</view>
+	<view class=" messagePush" style="padding-bottom:150rpx">
+		<view class="text-center" style="line-height:88rpx;background:#EFF4FF;color:#666666">告警通知类型</view>
+		<view  class="padding-sm " style="height: calc(100vh - 310rpx);overflow: scroll">
+			<form action="">
+				<checkbox-group class="block" @change="CheckboxChange" >
+					<view class="margin-top  ">
+						<view class="flex align-left checkItems" v-for="(item,index) in checkbox">
+							<checkbox class="blue" :class="item.checked==1?'checked':''"
+								:checked="item.checked==1?true:false" :value="item.value"></checkbox>
+							<view class="title">{{item.title}}</view>
+						</view>
 					</view>
+				</checkbox-group>
+				<view class="btn-area submitBottomBtn padding-lr-sm">
+					<button class="bg-blue round  margin-top" @click="$noMultipleClicks(pushSubmit)">提 交 </button>
 				</view>
-			</checkbox-group>
-			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(pushSubmit)">提 交 </button>
-			</view>
-		</form>
+			</form>
+		</view>
+		
 	</view>
 </template>
 <script>

+ 2 - 1
pages/siteArchive/archiveDetail/archiveDetail.vue

@@ -75,7 +75,8 @@
 
 				<view class="form-item remark">
 					<view class="title">备注:</view>
-					<textarea name="" id="" disabled="true" v-model="detailInfo.remarks"></textarea>
+					<view>{{detailInfo.remarks}}</view>
+					<!-- <textarea name="" id="" disabled="true" v-model="detailInfo.remarks"></textarea> -->
 				</view>
 			</block>
 

+ 1 - 1
pages/siteArchive/siteArchive.vue

@@ -9,7 +9,7 @@
 				<view class="search-form round bg-white">
 					<text class="cuIcon-search"></text>
 					<input class="" @focus="InputFocus" v-model="siteName" @blur="InputBlur" :adjust-position="false"
-						type="text" placeholder="请输入" confirm-type="search"></input>
+						type="text" placeholder="请输入站点" confirm-type="search"></input>
 				</view>
 				<view class="action">
 					<button class="cu-btn bg-blue round" @click="searchData()">查询</button>

+ 3 - 23
pages/siteArchive/siteArchiveAdd/siteArchiveAdd.vue

@@ -1,6 +1,5 @@
 <template>
 	<view class="appWrapper">
-		<!-- 现场档案start -->
 		<form action="">
 			<view style="height:30rpx"></view>
 			<view class="form-item">
@@ -8,11 +7,7 @@
 					<text class="necessary">*</text>
 					户号:
 				</view>
-
 				<input name="input" v-model="formMess.account_number" maxlength="20" :disabled="isdisabledFn"></input>
-				<!-- <input v-if="this.id" name="input" v-model="formMess.account_number" maxlength="20" disabled></input>
-				<input v-else name="input" v-model="formMess.account_number" maxlength="20"></input>  -->
-
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>流变变比:</view>
@@ -44,7 +39,6 @@
 					<option :value=item.id v-for="item in supervisionListData">{{ item.supervision_name}}</option>
 				</select>
 			</view>
-
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				电试
@@ -53,7 +47,6 @@
 				<view class="title"><text class="necessary">*</text>电试报告时间:</view>
 				<input name="input" v-model="formMess.electric_test_overdue" maxlength="20"></input>
 			</view>
-
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles "></text>
 				四防一通
@@ -168,7 +161,6 @@
 						:src="this.formMess.serious_ash_deposition_picture?this.formMess.serious_ash_deposition_picture:'/static/cameraIcon.png'"
 						@tap="goCamera('serious_ash_deposition_image','serious_ash_deposition_picture')"></image>
 				</view>
-
 			</view>
 			<view class="form-item extraDis radioSec">
 				<view class="title"><text class="necessary">*</text>配电房周围环境潮湿:</view>
@@ -187,7 +179,6 @@
 						@tap="goCamera('around_environment_humid_image','around_environment_humid_picture')"></image>
 				</view>
 			</view>
-
 			<view class="form-item extraDis radioSec">
 				<view class="title"><text class="necessary">*</text>配电房周围对方杂物:</view>
 				<view class="radioCameraflex">
@@ -205,7 +196,6 @@
 						@tap="goCamera('around_pile_up_sundries_image','around_pile_up_sundries_picture')"></image>
 				</view>
 			</view>
-
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				电工
@@ -256,8 +246,6 @@
 					</image>
 				</view>
 			</view>
-
-			<!-- 设备 -->
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				设备
@@ -266,8 +254,6 @@
 				<view class="title">设备老旧(标明出厂或投运日期):</view>
 				<input type="text" style="width:35%" v-model="formMess.old_equipment">
 			</view>
-
-			<!-- 安全工器具 -->
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				安全工器具
@@ -304,7 +290,6 @@
 						@tap="goCamera('ground_wire_image','ground_wire_picture')"></image>
 				</view>
 			</view>
-			<!-- 安全工器具 -->
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				模拟屏
@@ -332,8 +317,6 @@
 			</view>
 			<br>
 		</form>
-		<!-- 现场档案end -->
-
 	</view>
 </template>
 
@@ -435,9 +418,7 @@
 					return this.isdisabled = true;
 				}
 			}
-
 		},
-
 		onLoad: function(option) {
 			this.getDataList();
 			this.getTitleList();
@@ -462,7 +443,8 @@
 			// 正则表达式匹配年月日
 			isDate(d) {
 				return (
-						/^((((1[6-9]|[2-9]\d)\d{2})-(0?[13578]|1[02])-(0?[1-9]|[12]\d|3[01]))|(((1[6-9]|[2-9]\d)\d{2})-(0?[13456789]|1[012])-(0?[1-9]|[12]\d|30))|(((1[6-9]|[2-9]\d)\d{2})-0?2-(0?[1-9]|1\d|2[0-8]))|(((1[6-9]|[2-9]\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00))-0?2-29))$/)
+						/^((((1[6-9]|[2-9]\d)\d{2})-(0?[13578]|1[02])-(0?[1-9]|[12]\d|3[01]))|(((1[6-9]|[2-9]\d)\d{2})-(0?[13456789]|1[012])-(0?[1-9]|[12]\d|30))|(((1[6-9]|[2-9]\d)\d{2})-0?2-(0?[1-9]|1\d|2[0-8]))|(((1[6-9]|[2-9]\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00))-0?2-29))$/
+					)
 					.test(d);
 			},
 			// 相机拍照
@@ -484,7 +466,6 @@
 								'user': 'test'
 							},
 							success: (uploadFileRes) => {
-
 								that.formMess[upimage] = 'https://wx.ewoogi.com' + JSON.parse(
 										uploadFileRes.data)
 									.img_url;
@@ -535,7 +516,7 @@
 				this.siteListData = res.data.data
 			},
 
-			//新增修改提交
+			//修改提交
 			async addSubmit() {
 				//提交验证
 				if (!this.formMess.account_number.replace(/^\s*/g, '')) {
@@ -595,7 +576,6 @@
 					return
 				}
 
-
 				let data = this.formMess;
 				// let url = 'Archives/addArchives';