bug修复， 功能新增

common/common.scss

@@ -178,8 +178,10 @@ radio,checkbox {
 /* 新增按钮 */
 .plus {
 	position: fixed;
-	bottom: 20rpx;
-	right: 20rpx
+	bottom: 6rpx;
+	right: 6rpx;
+	img{
+	}
 }
 
 .ding{

pages.json

@@ -431,6 +431,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/eleControl/controlReport/controlReportDetail/controlReportDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "监察上报详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/authManage/authManage.vue

@@ -3,6 +3,7 @@
 
 
 		<!-- 筛选框start -->
+		<view style="height:90rpx"></view>
 		<view class="ding">
 			<view class="cu-bar search bg-gray filter-section">
 				<view class="search-form round bg-white">
@@ -18,7 +19,7 @@
 		<!-- 筛选框end -->
 
 		<!-- 权限管理start -->
-		<view class="site-items">
+		<view class="site-items" style="margin-top:0;height: calc(100vh - 286rpx);">
 			<view class="cu-list menu-avatar">
 
 				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in authList" :key="index"
@@ -41,7 +42,7 @@
 
 		<!-- 新增按钮start -->
 		<view class="plus">
-			<image src="../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage(type)"></image>
+			<image src="../../static/plus.png" style="width:100rpx;height:100rpx" @tap="goAddPage(type)"></image>
 		</view>
 		<!-- 新增按钮end -->
 	</view>

pages/deviceAdd/deviceAdd.vue

@@ -74,7 +74,7 @@
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>设备名称:</view>
-				<input name="input" v-model="deviceMessage.deviceName" disabled="disabled"></input>
+				<input name="input" v-model="deviceMessage.deviceName" ></input>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>安装位置:</view>

pages/deviceManage/deviceManage.vue

@@ -17,7 +17,7 @@
 		<!-- 筛选框end -->
 
 		<!-- 站点列表start -->
-		<view class="site-items" style="margin-top:0;height: calc(100vh - 352rpx);">
+		<view class="site-items" style="margin-top:0;height: calc(100vh - 286rpx);">
 			<view class="cu-list menu-avatar">
 				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in siteList" :key="index"
 				 @touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd" :data-target="'move-box-' + index">
@@ -42,7 +42,7 @@
 
 		<!-- 新增按钮start -->
 		<view class="plus">
-			<image src="../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage()"></image>
+			<image src="../../static/plus.png" style="width:100rpx;height:100rpx" @tap="goAddPage()"></image>
 		</view>
 		<!-- 新增按钮end -->
 	</view>

pages/eleControl/controlReport/controlReport.vue

@@ -4,7 +4,7 @@
 		<view style="height: calc(100vh - 200rpx);overflow:scroll">
 			<view class="cu-list menu-avatar">
 				<view class="cu-item"  :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in controlReport"
-				 :key="index" :data-target="'move-box-' + index" >
+				 :key="index" :data-target="'move-box-' + index"  @tap="goDetail(item.id)" >
 					<view class="cu-avatar round lg" style="background-image:url(../../../static/controlReportIcon.png)"></view>
 					<view class="content" >
 						<view class="pro-title">
@@ -23,7 +23,7 @@
 		
 		<!-- 新增按钮start -->
 		<view class="plus">
-			<image src="../../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage()"></image>
+			<image src="../../../static/plus.png" style="width:100rpx;height:100rpx" @tap="goAddPage()"></image>
 		</view>
 		<!-- 新增按钮end -->
 	</view>
@@ -53,6 +53,12 @@
 					url: '/pages/eleControl/controlReport/controlReportAdd/controlReportAdd',
 				});
 			},
+			
+			goDetail(id) {
+				uni.navigateTo({
+					url: '/pages/eleControl/controlReport/controlReportDetail/controlReportDetail?id='+id,
+				});
+			},
 			//数据请求
 			async getDataList(params = {}) {
 				const res = await this.$myRequest({

pages/eleControl/controlReport/controlReportAdd/controlReportAdd.vue

@@ -103,7 +103,7 @@
 			 var _self = this;
 			 
 			 uni.uploadFile({
-			  url: 'http://124.71.174.104:8081/USKYOF/USKYOF.php/Home/MonitoringReporting/setUpload',
+			  url: 'https://wx.ewoogi.com/wx/USKYOF/USKYOF.php/Home/MonitoringReporting/setUpload',
 			 
 			  files: [
 			   {
@@ -111,26 +111,21 @@
 			    uri: event.srcElement.value
 			   }
 			  ],
-			  
-			  
-
-
-
 
 
 
 			  success: (uploadFileRes) => {
 
 			   var data=JSON.parse(uploadFileRes.data)
-			    alert('上传成功')
-				alert(data.img_url)
-			   console.log('data')
-			   console.log(data.img_url)
-			   console.log('uploadFileRes')
+			    // alert('上传成功')
+				// alert(data.img_url)
+			   // console.log('data')
+			   // console.log(data.img_url)
+			   // console.log('uploadFileRes')
 			   this.img=data.img_url
 			  },
 			  fail: (err) => {
-				  alert('上传失败')
+				  // alert('上传失败')
 			   console.log(err)
 			  }
 			 });
@@ -138,6 +133,7 @@
 		
 			//新增提交
 			async addSubmit() {
+				
 				if (!this.supervision_title.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入监察标题",
@@ -166,6 +162,7 @@
 					});
 					return
 				}
+				
 				// if (!this.msg ) {
 				// 	uni.showToast({
 				// 		title: "请上传图片",

pages/eleControl/controlReport/controlReportDetail/controlReportDetail.vue

@@ -0,0 +1,88 @@
+<template>
+	<view class="appWrapper">
+		<form action="">
+			<view style="height:30rpx"></view>
+
+			<view class="form-item">
+				<view class="title">
+					<text class="necessary">*</text>
+					监察标题:
+				</view>
+				<input type="text" v-model="controlReportDetail.supervision_title" disabled>
+			</view>
+
+			<view class="form-item">
+				<view class="title"><text class="necessary">*</text>所属站点:</view>
+				<select name="" id="" filterable clearable v-model="controlReportDetail.site_id" disabled>
+					<option value="">请选择</option>
+					<option :value=item.id v-for="item in siteListData">{{ item.site_name}}</option>
+				</select>
+			</view>
+
+			<view class="form-item">
+				<view class="title"><text class="necessary">*</text>监察内容:</view>
+				<textarea maxlength="-1" width="250" v-model="controlReportDetail.supervision_content"
+					disabled></textarea>
+			</view>
+
+
+			<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%">
+
+				</view>
+			</view>
+		</form>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				siteListData: [],
+				controlReportDetail: {},
+				bathUrl: 'https://wx.ewoogi.com/wx/'
+			}
+		},
+		onLoad: function(option) {
+			this.getDataList({
+				"id": option.id
+			});
+			this.getSiteList();
+		},
+		mounted() {},
+		methods: {
+
+			//数据请求
+			async getDataList(params = {}) {
+				const res = await this.$myRequest({
+					url: 'MonitoringReporting/getMonitoringReportingList',
+					showLoading: true,
+					data: params
+				})
+				// console.log('res.data.data')
+				// console.log(res.data.data)
+				this.controlReportDetail = res.data.data[0];
+				console.log(this.controlReportDetail)
+			},
+			//站带下拉数据请求
+			async getSiteList(params = {}) {
+				const res = await this.$myRequest({
+					url: 'BlackoutPlan/getSiteBox',
+					showLoading: true,
+					data: params
+				})
+				this.siteListData = res.data.data
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	select {
+		background-size: 6%;
+	}
+</style>

pages/eleControl/powerCut/powerCut.vue

@@ -30,7 +30,7 @@
 
 		<!-- 未执行 -->
 		<block v-if="TabCur==0">
-			<view>
+			<view style=" height: calc(100vh - 400rpx);overflow: scroll;">
 				<view class="cu-list menu-avatar">
 					<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''"
 						@touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd"
@@ -109,7 +109,7 @@
 
 		<!-- 新增按钮start -->
 		<view class="plus">
-			<image src="../../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage()"></image>
+			<image src="../../../static/plus.png" style="width:100rpx;height:100rpx" @tap="goAddPage()"></image>
 		</view>
 		<!-- 新增按钮end -->
 

pages/siteAdd/siteAdd.vue

@@ -175,8 +175,7 @@
 				});
 			}
 			
-			this.getRoutrBox()
-			 
+			this.getRoutrBox() 
 		},
 
 		methods: {

pages/siteArchive/siteArchive.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="site-wrapper">
 		
-		<view style="height: calc(100vh - 200rpx);overflow:scroll">
+		<view style="height: calc(100vh - 190rpx);overflow:scroll">
 			<view class="cu-list menu-avatar">
 				<view class="cu-item"  :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in siteArchiveData"
-				 :key="index" :data-target="'move-box-' + index" @tap="goArchiveDetail(item.id)">
+				 :key="index" :data-target="'move-box-' + index" @tap="goArchiveDetail(item.id)"  @touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd">
 					<view class="cu-avatar round lg" style="background-image:url(../../../static/archiveIcon.png)"></view>
 					<view class="content" >
 						<view class="pro-title">
@@ -16,13 +16,17 @@
 							<text class="icon iconfont margin-right-sm margin-left-lg">&#xe629;</text>
 						</view>
 					</view>
+					
+					<view class="move" style="    width: 66px;">
+						<view class="bg-grey" @click.stop="editItem(item)">编辑</view>
+					</view>
 				</view>
 			</view>
 		</view>
 		
 		<!-- 新增按钮start -->
 		<view class="plus">
-			<image src="../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage()"></image>
+			<image src="../../static/plus.png" style="width:100rpx;height:100rpx" @tap="goAddPage()"></image>
 		</view>
 		<!-- 新增按钮end -->
 	</view>
@@ -34,14 +38,26 @@
 		data() {
 			return {
 				modalName: null,
-				siteArchiveData:[]
+				siteArchiveData:[],
+				
+				
+				
 			};
 		},
 		onLoad:function(option){
-			this.getDataList()
+			
+			this.getDataList();
+			
 		},
 	
 		methods: {
+			
+			//编辑
+			editItem(item) {
+				uni.navigateTo({
+					url: '/pages/siteArchive/siteArchiveAdd/siteArchiveAdd?id=' + item.id + '',
+				});
+			},
 			//数据请求
 			async getDataList(params = {}) {
 				const res = await this.$myRequest({
@@ -65,6 +81,27 @@
 					url: '/pages/siteArchive/siteArchiveAdd/siteArchiveAdd',
 				});
 			},
+			
+			
+			// ListTouch触摸开始
+			ListTouchStart(e) {
+				this.listTouchStart = e.touches[0].pageX
+			},
+			
+			// ListTouch计算方向
+			ListTouchMove(e) {
+				this.listTouchDirection = e.touches[0].pageX - this.listTouchStart < -80 ? 'left' : 'right'
+			},
+			
+			// ListTouch计算滚动
+			ListTouchEnd(e) {
+				if (this.listTouchDirection == 'left') {
+					this.modalName = e.currentTarget.dataset.target
+				} else {
+					this.modalName = null
+				}
+				this.listTouchDirection = null
+			}
 		}
 	}
 </script>
@@ -76,4 +113,8 @@
 	.cu-list.menu-avatar > .cu-item .content {
 	    left: 110rpx;
 	}
+	.cu-list>.cu-item.move-cur {
+	    -webkit-transform: translateX(-66px);
+		}
+	   
 </style>

pages/siteArchive/siteArchiveAdd/siteArchiveAdd.vue

@@ -1,13 +1,14 @@
 <template>
 	<view class="appWrapper">
-		<form action="">
+		<!-- 现场档案新增start -->
+		<form action="" v-if="!id">
 			<view style="height:30rpx"></view>
 			<view class="form-item">
 				<view class="title">
 					<text class="necessary">*</text>
 					户号:
 				</view>
-				<input name="input" v-model="formMess.account_number"  maxlength="20"></input>
+				<input name="input" v-model="detailInfo.account_number"  maxlength="20"></input>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>流变变比:</view>
@@ -24,15 +25,12 @@
 					<option value="0">请选择</option>
 					<option :value=item.id v-for="item in routeListData" :title="item.route_name">{{ item.route_name}}</option>
 				</select>
-				
-				
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>站点名称:</view>
 				<select name="" id="" v-model="formMess.site_id" filterable clearable>
-					<optgroup><option value="0">请选择</option>
-					<option :value="item.id"  v-for="item in siteListData">{{ item.site_name}}</option></optgroup>
-					
+					<option value="0">请选择</option>
+					<option :value="item.id"  v-for="item in siteListData">{{ item.site_name}}</option>
 				</select>
 			</view>
 			<view class="form-item">
@@ -42,7 +40,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 "></text>
 				四防一通
@@ -51,14 +48,12 @@
 				<view class="title"><text class="necessary">*</text>电缆孔洞:</view>
 				<evan-radio v-model="formMess.cable_hole" label="1" class="margin-right-xl">是</evan-radio>
 				<evan-radio v-model="formMess.cable_hole" label="0">否</evan-radio>
-			
 			</view>
 			<view class="form-item extraDis">
 				<view class="title"><text class="necessary">*</text>门窗、墙壁破损:</view>
 				<evan-radio v-model="formMess.damage" label="1" class="margin-right-xl">是</evan-radio>
 				<evan-radio v-model="formMess.damage" label="0">否</evan-radio>
 			</view>
-			
 			<view class="form-item extraDis">
 				<view class="title"><text class="necessary">*</text>屋顶墙壁渗漏水:</view>
 				<evan-radio v-model="formMess.water_leakage" label="1" class="margin-right-xl">是</evan-radio>
@@ -74,7 +69,6 @@
 				<evan-radio v-model="formMess.annihilator_overdue" label="1" class="margin-right-xl">是</evan-radio>
 				<evan-radio v-model="formMess.annihilator_overdue" label="0">否</evan-radio>
 			</view>
-			
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				室内环境
@@ -157,7 +151,6 @@
 				<evan-radio v-model="formMess.ground_wire" label="1" class="margin-right-xl">是</evan-radio>
 				<evan-radio v-model="formMess.ground_wire" label="0">否</evan-radio>
 			</view>
-			
 			<!-- 安全工器具 -->
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
@@ -171,14 +164,190 @@
 			<view class="form-item">
 				<view class="title">备注:</view>
 				<textarea name="" id=""v-model="formMess.remarks"></textarea>
-				<!-- <input type="text" v-model="formMess.remarks"> -->
+			</view>
+			<view class="btn-area submitBottomBtn padding-lr-sm  " style="position:static">
+				<button class="bg-blue round  margin-top" @click="addSubmit">提 交 </button>
+			</view>
+			<br>
+		</form>
+		<!-- 现场档案新增end -->
+		
+		
+		
+		
+		<!-- 现场档案修改start -->
+		<form action="" v-else>
+			<view style="height:30rpx"></view>
+			<view class="form-item">
+				<view class="title">
+					<text class="necessary">*</text>
+					户号:
+				</view>
+				<input name="input" v-model="detailInfo.account_number"  maxlength="20"></input>
+			</view>
+			<view class="form-item">
+				<view class="title"><text class="necessary">*</text>流变变比:</view>
+				<input name="input" v-model="detailInfo.rheological_change"  maxlength="20"></input>
+			</view>
+			<view class="form-item">
+				<view class="title" style="width:240rpx"><text class="necessary">*</text>单路电源容量:</view>
+				<input name="input" v-model="detailInfo.power_capacity"  maxlength="20"></input>
+			</view>
+			<view class="form-item">
+				<view class="title"><text class="necessary">*</text>线路:</view>
+				<!-- <input name="input" v-model="formMess.route_id"></input> -->
+				<select name="" id="" filterable clearable v-model="detailInfo.route_id">
+					<option value="0">请选择</option>
+					<option :value=item.id v-for="item in routeListData" :title="item.route_name">{{ item.route_name}}</option>
+				</select>
+			</view>
+			<view class="form-item">
+				<view class="title"><text class="necessary">*</text>站点名称:</view>
+				<select name="" id="" v-model="detailInfo.site_id" filterable clearable disabled>
+					<option value="0">请选择</option>
+					<option :value="item.id"  v-for="item in siteListData">{{ item.site_name}}</option>
+				</select>
+			</view>
+			<view class="form-item">
+				<view class="title"><text class="necessary">*</text>监察:</view>
+				<select name="" id="" filterable clearable v-model="detailInfo.supervision_department_id">
+					<option value="0">请选择</option>
+					<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 "></text>
+				四防一通
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>电缆孔洞:</view>
+				<evan-radio v-model="detailInfo.cable_hole" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.cable_hole" label="0">否</evan-radio>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>门窗、墙壁破损:</view>
+				<evan-radio v-model="detailInfo.damage" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.damage" label="0">否</evan-radio>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>屋顶墙壁渗漏水:</view>
+				<evan-radio v-model="detailInfo.water_leakage" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.water_leakage" label="0">否</evan-radio>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>灭火器配置不足:</view>
+				<evan-radio v-model="detailInfo.annihilator_insufficient_configuration" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.annihilator_insufficient_configuration" label="0">否</evan-radio>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>灭火器超期:</view>
+				<evan-radio v-model="detailInfo.annihilator_overdue" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.annihilator_overdue" label="0">否</evan-radio>
+			</view>
+			<view class="info-tit margin-left-xs">
+				<text class="cuIcon-titles margin-right-xs"></text>
+				室内环境
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>堆放杂物:</view>
+				<evan-radio v-model="detailInfo.pile_up_sundries" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.pile_up_sundries" label="0">否</evan-radio>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>积灰严重:</view>
+				<evan-radio v-model="detailInfo.serious_ash_deposition" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.serious_ash_deposition" label="0">否</evan-radio>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>配电房周围环境潮湿:</view>
+				<evan-radio v-model="detailInfo.around_environment_humid" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.around_environment_humid" label="0">否</evan-radio>
 			</view>
 			
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>配电房周围对方杂物:</view>
+				<evan-radio v-model="detailInfo.around_pile_up_sundries" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.around_pile_up_sundries" label="0">否</evan-radio>
+			</view>
+			
+			<view class="info-tit margin-left-xs">
+				<text class="cuIcon-titles margin-right-xs"></text>
+				电工
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>无电工:</view>
+				<evan-radio v-model="detailInfo.no_electrician" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.no_electrician" label="0">否</evan-radio>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>电工人数配置不足:</view>
+				<evan-radio v-model="detailInfo.electrician_lack" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.electrician_lack" label="0">否</evan-radio>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>电工证超期:</view>
+				<evan-radio v-model="detailInfo.overdue_electrician_certificate" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.overdue_electrician_certificate" label="0">否</evan-radio>
+			</view>
+			
+			<!-- 电试 -->
+			<view class="info-tit margin-left-xs">
+				<text class="cuIcon-titles margin-right-xs"></text>
+				电试
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>电试超期:</view>
+				<evan-radio v-model="detailInfo.electric_test_overdue" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.electric_test_overdue" label="0">否</evan-radio>
+			</view>
+			
+			<!-- 设备 -->
+			<view class="info-tit margin-left-xs">
+				<text class="cuIcon-titles margin-right-xs"></text>
+				设备
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">设备老旧(标明出厂或投运日期):</view>
+				<input type="text" style="width:35%" v-model="detailInfo.old_equipment">
+			</view>
+			
+			<!-- 安全工器具 -->
+			<view class="info-tit margin-left-xs">
+				<text class="cuIcon-titles margin-right-xs"></text>
+				安全工器具
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>配置不足（绝缘体）:</view>
+				<evan-radio v-model="detailInfo.blanket_insufficient_configuration" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.blanket_insufficient_configuration" label="0">否</evan-radio>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>接地线与存放位置编号:</view>
+				<evan-radio v-model="detailInfo.ground_wire" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.ground_wire" label="0">否</evan-radio>
+			</view>
+			<!-- 安全工器具 -->
+			<view class="info-tit margin-left-xs">
+				<text class="cuIcon-titles margin-right-xs"></text>
+				模拟屏
+			</view>
+			<view class="form-item extraDis">
+				<view class="title"><text class="necessary">*</text>模拟屏:</view>
+				<evan-radio v-model="detailInfo.analog_screen" label="1" class="margin-right-xl">是</evan-radio>
+				<evan-radio v-model="detailInfo.analog_screen" label="0">否</evan-radio>
+			</view>
+			<view class="form-item">
+				<view class="title">备注:</view>
+				<textarea name="" id=""v-model="detailInfo.remarks"></textarea>
+			</view>
 			<view class="btn-area submitBottomBtn padding-lr-sm  " style="position:static">
 				<button class="bg-blue round  margin-top" @click="addSubmit">提 交 </button>
 			</view>
 			<br>
 		</form>
+		<!-- 现场档案修改end -->
+		
+		
 	</view>
 </template>
 
@@ -228,6 +397,9 @@
 					"analog_screen": "0",
 					"remarks": "",
 				},
+				
+				id: 0,
+				detailInfo:{}
 
 
 			}
@@ -236,12 +408,36 @@
 			this.getDataList();
 			this.getTitleList();
 			this.getRoutrBox();
-			console.log('this.formMess.cable_hole')
-		console.log(this.formMess.cable_hole)
-
+			
+			this.id=option.id;
+			if (option.id) {
+				uni.setNavigationBarTitle({
+					title: '现场档案修改'
+				});
+				// this.getSiteList({"id":option.id})
+			} else {
+				uni.setNavigationBarTitle({
+					title: '现场档案新增'
+				});
+			}
+			this.getDetailList({"id":option.id})
 		},
 		methods: {
 			
+			
+			// 修改回显请求
+			async getDetailList(ming = {}) {
+				const res = await this.$myRequest({
+					url: 'Archives/getArchivesList',
+					showLoading: true,
+					data: ming
+				})
+				this.detailInfo = res.data.data[0];
+				console.log('this.detailInfo')
+				console.log(this.detailInfo)
+			},
+
+			
 			//线路名称下拉数据请求
 			async getRoutrBox(params = {}) {
 				const res = await this.$myRequest({
@@ -250,7 +446,7 @@
 					data: params
 				})
 				this.routeListData = res.data.data;
-				console.log(this.routeListData)
+				// console.log(this.routeListData)
 			},
 			
 			//监察下拉下拉数据请求
@@ -263,18 +459,15 @@
 			
 				this.supervisionListData = res.data.data
 			},
-			//数据请求
+			//站点下拉请求
 			async getDataList(params = {}) {
 				const res = await this.$myRequest({
 					url: 'BlackoutPlan/getSiteBox',
 					showLoading: true,
 					data: params
 				})
-				console.log('res.data.data')
-				console.log(res.data.data)
 				this.siteListData = res.data.data
 			},
-			
 			radioChange(e) {
 				console.log('type:' + e.detail.value);
 				this.radioOne = e.detail.value;
@@ -282,7 +475,6 @@
 			
 			//新增提交
 			async addSubmit() {
-				
 				//提交验证
 				if (!this.formMess.account_number.replace(/^\s*/g,'')) {
 					uni.showToast({
@@ -377,7 +569,6 @@
 				}, 1000);
 			
 			},
-			
 			addArchive(params = {}) {
 				return this.$myRequest({
 					url: 'Archives/addArchives',
@@ -386,6 +577,111 @@
 			},
 			
 			
+			//修改提交
+			async addSubmit() {
+				//提交验证
+				if (!this.detailInfo.account_number.replace(/^\s*/g,'')) {
+					uni.showToast({
+						title: "请输入户号",
+						icon: "none"
+					});
+					return
+				}
+				if (!this.detailInfo.rheological_change.replace(/^\s*/g,'')) {
+					uni.showToast({
+						title: "请输入流变变化",
+						icon: "none"
+					});
+					return
+				}
+				if (!this.detailInfo.power_capacity.replace(/^\s*/g,'')) {
+					uni.showToast({
+						title: "请输入单路电源容量",
+						icon: "none"
+					});
+					return
+				}
+				if (!this.detailInfo.route_id) {
+					uni.showToast({
+						title: "请输入所属线路",
+						icon: "none"
+					});
+					return
+				}
+				if (!this.detailInfo.site_id) {
+					uni.showToast({
+						title: "请选择所属站点",
+						icon: "none"
+					});
+					return
+				}
+				if (!this.detailInfo.supervision_department_id.replace(/^\s*/g,'')) {
+					uni.showToast({
+						title: "请输入所属监察",
+						icon: "none"
+					});
+					return
+				}
+				
+				
+				let res = await this.editArchive({
+					"id":this.id,
+					"account_number": this.detailInfo.account_number,
+					"rheological_change": this.detailInfo.rheological_change,
+					"power_capacity": this.detailInfo.power_capacity,
+					"route_id": this.detailInfo.route_id,
+					"site_id": this.detailInfo.site_id,
+					"supervision_department_id": this.detailInfo.supervision_department_id,
+					"cable_hole":this.detailInfo.cable_hole,
+					"damage":this.detailInfo.damage,
+					"water_leakage":this.detailInfo.water_leakage,
+					"annihilator_insufficient_configuration":this.detailInfo.annihilator_insufficient_configuration,
+					"annihilator_overdue":this.detailInfo.annihilator_overdue,
+					"pile_up_sundries":this.detailInfo.pile_up_sundries,
+					"serious_ash_deposition":this.detailInfo.serious_ash_deposition,
+					"around_environment_humid":this.detailInfo.around_environment_humid,
+					"around_pile_up_sundries":this.detailInfo.around_pile_up_sundries,
+					"no_electrician":this.detailInfo.no_electrician,
+					"electrician_lack":this.detailInfo.electrician_lack,
+					"overdue_electrician_certificate":this.detailInfo.overdue_electrician_certificate,
+					"electric_test_overdue":this.detailInfo.electric_test_overdue,
+					"blanket_insufficient_configuration":this.detailInfo.blanket_insufficient_configuration,
+					
+					"ground_wire":this.detailInfo.ground_wire,
+					"analog_screen":this.detailInfo.analog_screen,					
+					
+					"old_equipment": this.detailInfo.old_equipment,
+					"remarks": this.detailInfo.remarks,
+					
+			
+				})
+			
+				if (!res.data.flag) {
+					uni.showToast({
+						title: "添加失败",
+						icon: "none"
+					});
+				} else {
+					uni.showToast({
+						title: "添加成功",
+					});
+				}
+				setTimeout(() => {
+					uni.navigateTo({
+						url: '/pages/siteArchive/siteArchive',
+			
+					});
+				}, 1000);
+			
+			},
+			editArchive(params = {}) {
+				return this.$myRequest({
+					url: 'Archives/setArchives',
+					data: params
+				})
+			},
+			
+			
 			
 	
 	

pages/siteManage/siteManage.vue

@@ -36,7 +36,7 @@
 		<!-- 筛选框end -->
 
 		<!-- 站点列表start -->
-		<view class="site-items" style="margin-top:0;height: calc(100vh - 500rpx);">
+		<view class="site-items" style="margin-top:0;height: calc(100vh - 380rpx);">
 			<view class="cu-list menu-avatar">
 				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''"
 					v-for="(item,index) in siteList" :key="index" @touchstart="ListTouchStart"
@@ -65,7 +65,7 @@
 
 		<!-- 新增按钮start -->
 		<view class="plus">
-			<image src="../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage()"></image>
+			<image src="../../static/plus.png" style="width:100rpx;height:100rpx" @tap="goAddPage()"></image>
 		</view>
 		<!-- 新增按钮end -->
 	</view>

util/api.js

@@ -1,5 +1,7 @@
 // const BASE_URL = 'https://iot.usky.cn/USKYOF/USKYOF.php/Home/' //(测试域名)  
 const BASE_URL = 'https://wx.ewoogi.com/wx/USKYOF/USKYOF.php/Home/' //(测试域名新)  
+// const websiteUrl = 'https://wx.ewoogi.com'
+
 // const BASE_URL='http://https://qhome.usky.cn/USKYOF/USKYOF.php/Home/'
 // 同时发送异步代码的次数，防止一次点击中有多次请求，用于处理
 let ajaxTimes = 0;
@@ -89,7 +91,7 @@ export const myRequest = (options) => {
 }
 
 
-export default {
-	BASE_URL
-
-}
+export default {  
+  // websiteUrl,   
+}
+