modify

common/common.scss

@@ -57,7 +57,8 @@ radio,checkbox {
 				input{
 					padding-left:20rpx;
 					padding-right:0rpx
-				}
+				}
+								
 			}
 			.select-item{
 				 padding:12rpx 32rpx;
@@ -127,6 +128,9 @@ radio,checkbox {
 .processed ,.online{
 	color: #08BE04
 }
+.processing{
+	color:#D5AC4A
+}
 
 /* 页面样式 */
 
@@ -140,7 +144,14 @@ radio,checkbox {
 }
 
 .cu-bar .search-form {
-	background: #fff
+	background: #fff;
+	
+	input,
+	select,
+	option{
+		border:none!important
+	
+	}
 }
 
 .cu-btn {
@@ -351,7 +362,76 @@ radio,checkbox {
 		outline:none;
 		color:grey
 	}
-	
-	
-	
+	
+	// 监察上报
+	textarea{
+		border:1px solid #EDEDED;
+		padding:10px;
+		color: #999;
+		width:500rpx;
+	}
+	.cu-form-group {
+		border-top: 0;
+	}
+
+	input,
+	select,
+	option {
+		line-height: 70rpx;
+		padding: 0 20rpx;
+		height: 70rpx;
+		border: 1px solid #EDEDED;
+		// width:500rpx!important;
+		background-color: #fff;
+		box-sizing: border-box;
+		appearance: none;
+		-moz-appearance: none;
+		-webkit-appearance: none;
+		color: #999;
+	
+	
+	}
+	select {
+		background: url(./static/arrow.png) no-repeat scroll 98% center;
+		background-size: 6%;
+	}
+	
+	select:focus,
+	select:active,
+	select:hover {
+		outline: none;
+	}
+	.form-item {
+		padding: 0 40rpx;
+		display: flex;
+		align-items: top;
+		margin-bottom: 20rpx;
+	
+	
+		.title {
+			width: 170rpx;
+			position: relative;
+	
+			.necessary {
+				color: red;
+				display: inline-block;
+				position: absolute;
+				top: -2rpx;
+				left: -20rpx;
+				font-size: 40rpx;
+	
+			}
+		}
+	
+		input,
+		select {
+			width: 500rpx;
+			font-size: 28rpx;
+		}
+	}
+	
+	// 现场档案新增
+	.form-item.extraDis .title{
+		width:65%
+	}
 	

pages.json

@@ -390,7 +390,7 @@
             "path" : "pages/eleControl/controlReport/controlReportAdd/controlReportAdd",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "监测上报新增",
+                "navigationBarTitleText": "新增监察",
                 "enablePullDownRefresh": false
             }
             
@@ -404,6 +404,24 @@
             }
             
         }
+        ,{
+            "path" : "pages/siteArchive/siteArchiveAdd/siteArchiveAdd",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "现场档案新增",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/eleControl/powerCut/powerCutDetail/powerCutDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "计划停电详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/eleControl/controlReport/controlReportAdd/controlReportAdd.vue

@@ -1,6 +1,60 @@
 <template>
-	<view>
-		  监测上报新增
+	<view class="appWrapper">
+
+		<form action="">
+			<view style="height:30rpx"></view>
+			<view class="form-item">
+				<view class="title">
+					<text class="necessary">*</text>
+					监察标题:
+				</view>
+				<select name="" id="">
+					<option value="">标题一</option>
+					<option value="">标题二</option>
+					<option value="">标题三</option>
+				</select>
+			</view>
+			<view class="form-item">
+				<view class="title">所属站点:</view>
+				<select name="" id="">
+					<option value="">站点一</option>
+					<option value="">站点二</option>
+					<option value="">站点三</option>
+				</select>
+			</view>
+
+			<view class="form-item">
+				<view class="title">监察内容:</view>
+				<textarea maxlength="-1"  @input="textareaAInput" placeholder="" width="250"></textarea>
+				
+				
+			</view>
+			
+			<view class="form-item">
+				<view class="title">上传图片:</view>
+				<view style="width:500rpx">
+					<view class="cu-form-group" style="padding:0">
+						<view class="grid col-4 grid-square flex-sub">
+							<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage" :data-url="imgList[index]">
+							 <image :src="imgList[index]" mode="aspectFill"></image>
+								<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="index">
+									<text class='cuIcon-close'></text>
+								</view>
+							</view>
+							<view class="solids" @tap="ChooseImage" v-if="imgList.length<4">
+								<text class='cuIcon-cameraadd'></text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="btn-area submitBottomBtn padding-lr-sm">
+				<button class="bg-blue round  margin-top" @click="submit()">提 交 </button>
+			</view>
+		</form>
+
+
 	</view>
 </template>
 
@@ -8,15 +62,81 @@
 	export default {
 		data() {
 			return {
-				
+				imgList: [],
+				isShow: false,
+				formMess: {
+					"userName": "sss",
+					"siteName": "",
+					"place": "",
+					"longitude": "",
+					"dimension": "",
+					"contactor": "",
+					"mobile": "",
+				},
 			}
 		},
+		onLoad: function(option) {
+		},
 		methods: {
 			
+			radioChange(e) {
+				console.log('type:' + e.detail.value);
+				this.radioOne = e.detail.value;
+			},
+			
+			ChooseImage() {
+				uni.chooseImage({
+					count: 4, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: (res) => {
+						if (this.imgList.length != 0) {
+							this.imgList = this.imgList.concat(res.tempFilePaths)
+						} else {
+							this.imgList = res.tempFilePaths
+						}
+					}
+				});
+			},
+			
+			ViewImage(e) {
+				uni.previewImage({
+					urls: this.imgList,
+					current: e.currentTarget.dataset.url
+				});
+			},
+			DelImg(e) {
+				uni.showModal({
+					title: '删除',
+					content: '确定要删除此图片吗？',
+					cancelText: '取消',
+					confirmText: '确定',
+					success: res => {
+						if (res.confirm) {
+							this.imgList.splice(e.currentTarget.dataset.index, 1)
+						}
+					}
+				})
+			},
+			
+			submit() {
+				uni.navigateTo({
+					url: '/pages/accountManage/success/success',
+				});
+			},
 		}
 	}
 </script>
 
-<style>
+<style lang="scss">
+	
+	
+
+	select {
+		// background: url(../../../../static/arrow.png) no-repeat scroll 98% center;
+		background-size: 6%;
+	}
+
+	
 
 </style>

pages/eleControl/powerCut/calendar/calendar.vue

@@ -0,0 +1,152 @@
+<template>
+	
+	<view>
+		
+		<view class="form-item">
+			<view class="title">
+				<text class="necessary">*</text>
+				开始时间:
+			</view>
+			<picker mode="date" :value="start_date" :start="start_date" :end="other" @change="bindDateChange" style="">
+				<view class="date">{{start_date}}</view>
+			</picker>
+		</view>
+		<view class="form-item">
+			<view class="title">结束时间:</view>
+			<picker mode="date" :value="start_date" :start="start_date" @change="bindDateChange2">
+				<view class="date">{{end_date}}</view>
+			</picker>
+		</view>
+		
+		
+	</view>
+	<!-- <view class="leave_cont">
+		<view class="ul">
+			<view class="li">
+				<view class="flex1">
+					<picker mode="date" :value="start_date" :start="start_date" :end="other" @change="bindDateChange">
+						<view class="date">{{start_date}}</view>
+					</picker>
+				</view>
+			</view>
+			~
+			<view class="li">
+				<view class="flex1">
+					<picker mode="date" :value="start_date" :start="start_date" @change="bindDateChange2">
+						<view class="date">{{end_date}}</view>
+					</picker>
+				</view>
+			</view>
+		</view>
+	</view> -->
+</template>
+
+<script>
+	export default {
+		name: 'calendar',
+		data() {
+			const currentDate = this.getTime({
+				format: true
+			})
+			return {
+				start_date: '2021-07-06 16:05:48',
+				end_date: '2021-07-06 18:05:48',
+				other: '请输入'
+			}
+		},
+		computed: {
+
+		},
+		methods: {
+			// 选择日期
+			bindDateChange: function(e) {
+				this.start_date = e.target.value
+
+			},
+			bindDateChange2: function(e) {
+				this.end_date = e.target.value;
+				this.other = this.end_date;
+			},
+			// 获取当前时间
+			// getDate(type) {
+			// 	const date = new Date();
+			// 	let year = date.getFullYear();
+			// 	let month = date.getMonth() + 1;
+			// 	let day = date.getDate();
+
+			// 	if (type === 'start') {
+			// 		year = year - 60;
+			// 	} else if (type === 'end') {
+			// 		year = year + 2;
+			// 	}
+			// 	month = month > 9 ? month : '0' + month;;
+			// 	day = day > 9 ? day : '0' + day;
+			// 	return `${year}-${month}-${day}`;
+			// },
+			getTime() {
+				var date = new Date(),
+					year = date.getFullYear(),
+					month = date.getMonth() + 1,
+					day = date.getDate(),
+					hour = date.getHours() < 10 ? "0" + date.getHours() : date.getHours(),
+					minute = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(),
+					second = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+				month >= 1 && month <= 9 ? (month = "0" + month) : "";
+				day >= 0 && day <= 9 ? (day = "0" + day) : "";
+				var timer = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
+				return timer;
+			}
+
+		}
+	}
+</script>
+
+<style>
+	picker{
+		border:1px solid #EDEDED;display: block;
+		height: 100%;width:500rpx;line-height:70rpx;height:70rpx;padding:0 20rpx
+		
+	}
+	.date{
+		color:#999
+	}
+	/* .leave_cont .ul {
+		border: 1px solid red;
+		margin: 24rpx 24rpx;
+		border: 1px solid #E8F1FF;
+		border-radius: 36rpx;
+		line-height: 70rpx;
+		position: relative;
+	}
+
+	.leave_cont .ul .li {
+		display: inline-block;
+		text-align: center;
+		width: 35%
+	}
+
+	.leave_cont .ul .li text {
+		padding: 40rpx 0;
+		font-size: 30rpx;
+		color: #666666;
+		text-align: center;
+	}
+
+	.leave_cont .ul .li .flex1 {
+		flex: 1;
+		color: #999999;
+		font-size: 32rpx;
+	}
+
+	.date {
+		height: 42rpx;
+	}
+
+	.canlendar-icon {
+		width: 36rpx;
+		height: 36rpx;
+		position: absolute;
+		right: 30rpx;
+		top: 16rpx;
+	} */
+</style>

pages/eleControl/powerCut/powerCut.vue

@@ -1,7 +1,17 @@
 <template>
 	<view class="processWrapper ">
+
 		<view style="height:196rpx"></view>
 		<view class="ding">
+			<scroll-view scroll-x class="bg-white nav text-center">
+				<view class="cu-item" :class="index==TabCur?'text-blue cur':''" v-for="(item,index) in tabNav"
+					:key="index" @tap="tabSelect" :data-id="index">
+					<view v-if="TabCur==index" class="cu-tag badge">
+						<block class="cu-tag badge">{{TabCur? unporcessList.length:porcessedList.length}} </block>
+					</view>
+					{{item}}
+				</view>
+			</scroll-view>
 
 			<!-- 筛选框start -->
 			<view class="cu-bar search bg-gray filter-section">
@@ -15,23 +25,17 @@
 			</view>
 			<!-- 筛选框end -->
 
-			<scroll-view scroll-x class="bg-white nav text-center">
-				<view class="cu-item" :class="index==TabCur?'text-blue cur':''" v-for="(item,index) in tabNav"
-					:key="index" @tap="tabSelect" :data-id="index">
-					<view v-if="TabCur==index" class="cu-tag badge">
-						<block class="cu-tag badge">{{TabCur? unporcessList.length:porcessedList.length}} </block>
-					</view>
-					{{item}}
-				</view>
-			</scroll-view>
-		</view>
 
+		</view>
 
+		<!-- 未执行 -->
 		<block v-if="TabCur==0">
 			<view>
 				<view class="cu-list menu-avatar">
-
-					<view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
+					<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''"
+						@touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd"
+						:data-target="'move-box-' + index" v-for="(item,index) in unporcessList" :key="index"
+						@tap="goDetail()">
 						<view class="cu-avatar lg" style="background-image:url(../../../static/unprocessIcon.png);">
 						</view>
 						<view class="content">
@@ -43,17 +47,48 @@
 						<view class="action" style="z-index:99">
 							<view class="unProcess" @tap="goUnprocessDetail(item.id)">未执行</view>
 						</view>
+						<view class="move">
+							<view class="bg-grey" @click.stop="editItem(item)">编辑</view>
+							<view class="bg-red" @click.stop="deleteItem(item)">删除</view>
+						</view>
 					</view>
 					<view class=" text-center margin-top" v-if="unporcessList.length === 0">暂无数据...</view>
 				</view>
 			</view>
 		</block>
-
+		<!-- 执行中 -->
 		<block v-if="TabCur==1">
-			<view style="    height: calc(100vh - 400rpx);
-    overflow: scroll;">
+			<view style=" height: calc(100vh - 400rpx);overflow: scroll;">
 				<view class="cu-list menu-avatar ">
-					<view class="cu-item" v-for="(item,index) in porcessedList" :key="index">
+					<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''"
+						@touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd"
+						:data-target="'move-box-' + index" v-for="(item,index) in porcessedList" :key="index"
+						@tap="goDetail()">
+						<view class="cu-avatar lg" style="background-image:url(../../../static/processingIcon.png);">
+						</view>
+						<view class="content">
+							<view class="pro-title">
+								<view class="cut">{{item.title}}</view>
+							</view>
+							<view class="pro-date ">{{item.time}}</view>
+						</view>
+						<view class="action" style="z-index:99">
+							<view class="processing" @tap="goProcessedDetail(item.id)">执行中</view>
+						</view>
+						<view class="move">
+							<view class="bg-grey" @click.stop="editItem(item)">编辑</view>
+							<view class="bg-red" @click.stop="deleteItem(item)">删除</view>
+						</view>
+					</view>
+					<view class="text-center margin-top" v-if="porcessedList.length === 0">暂无数据...</view>
+				</view>
+			</view>
+		</block>
+		<!-- 已执行 -->
+		<block v-if="TabCur==2">
+			<view style="    height: calc(100vh - 400rpx);overflow: scroll;">
+				<view class="cu-list menu-avatar ">
+					<view class="cu-item" v-for="(item,index) in porcessedList" :key="index" @tap="goDetail()">
 						<view class="cu-avatar lg" style="background-image:url(../../../static/processedIcon.png);">
 						</view>
 						<view class="content">
@@ -78,8 +113,6 @@
 		</view>
 		<!-- 新增按钮end -->
 
-
-
 	</view>
 </template>
 
@@ -88,24 +121,24 @@
 	export default {
 		data() {
 			return {
-				unporcessList: json.inspectUnprocessList,
-				porcessedList: json.inspectProcessedList,
 
-				type: '0',
 				modalName: null,
 				listTouchStart: 0,
 				listTouchDirection: null,
+
+				unporcessList: json.inspectUnprocessList,
+				porcessedList: json.inspectProcessedList,
+
+				type: '0',
+
 				CustomBar: this.CustomBar,
 				TabCur: 0,
-				tabNav: ['已执行', '未执行'],
+				tabNav: ['未执行', '执行中', '已执行', ],
 
 
 			};
 		},
-		onLoad: function(option) {
-
-
-		},
+		onLoad: function(option) {},
 
 		onNavigationBarButtonTap(e) {
 			console.log(e)
@@ -117,30 +150,40 @@
 			});
 		},
 		methods: {
-
-
-
 			tabSelect(e) {
-
 				console.log(e.currentTarget);
 				this.TabCur = e.currentTarget.dataset.id;
 				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
-
-
-
+				this.modalName=null
 			},
-
-
 			goAddPage(id) {
 				uni.navigateTo({
 					url: '/pages/eleControl/powerCut/powerCutAdd/powerCutAdd',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
+				});
+			},
+			goDetail() {
+				uni.navigateTo({
+					url: '/pages/eleControl/powerCut/powerCutDetail/powerCutDetail',
 				});
 			},
 
-
+			// 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>
@@ -159,11 +202,11 @@
 
 	.cu-tag.badge {
 		top: 14rpx;
-		right: 96rpx;
+		right: 42rpx;
 	}
 
 	.nav .cu-item {
-		width: 50%;
+		width: 33.333%;
 		margin: 0;
 
 		.text-blue,

pages/eleControl/powerCut/powerCutAdd/powerCutAdd.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="appWrapper">
-
 		<form action="">
 			<view style="height:30rpx"></view>
-			<view class="form-item">
+			<calendar></calendar>
+			<!-- <view class="form-item">
 				<view class="title">
 					<text class="necessary">*</text>
 					开始时间:
@@ -13,8 +13,7 @@
 			<view class="form-item">
 				<view class="title">结束时间:</view>
 				<input name="input" v-model="formMess.deviceName"></input>
-			</view>
-
+			</view> -->
 			<view class="form-item">
 				<view class="title">所属站点:</view>
 				<select name="" id="">
@@ -59,7 +58,11 @@
 </template>
 
 <script>
+	import calendar from '../calendar/calendar.vue';
 	export default {
+		components: {
+		        calendar },
+
 		data() {
 			return {
 				isShow: false,

pages/eleControl/powerCut/powerCutDetail/powerCutDetail.vue

@@ -0,0 +1,151 @@
+<template>
+	<view class="appWrapper">
+		<form action="">
+			<view style="height:30rpx"></view>
+			<calendar></calendar>
+			<!-- <view class="form-item">
+				<view class="title">
+					<text class="necessary">*</text>
+					开始时间:
+				</view>
+				<input name="input" v-model="formMess.deviceNo"></input>
+			</view>
+			<view class="form-item">
+				<view class="title">结束时间:</view>
+				<input name="input" v-model="formMess.deviceName"></input>
+			</view> -->
+			<view class="form-item">
+				<view class="title">所属站点:</view>
+				<select name="" id="">
+					<option value="">站点一</option>
+					<option value="">站点二</option>
+					<option value="">站点三</option>
+				</select>
+			</view>
+			
+			<view class="form-item">
+				<view class="title">计划类型:</view>
+				<select name="" id="">
+					<option value="">类型一</option>
+					<option value="">类型二</option>
+					<option value="">类型三</option>
+				</select>
+			</view>
+			
+			<view class="form-item">
+				<view class="title">
+					<text class="necessary">*</text>
+					报备人:
+				</view>
+				<input name="input" v-model="formMess.deviceNo" placeholder="张三"></input>
+			</view>
+			
+			<view class="form-item">
+				<view class="title">
+					<text class="necessary">*</text>
+					手机号:
+				</view>
+				<input name="input" v-model="formMess.deviceNo" placeholder="18888888888"></input>
+			</view>
+
+		</form>
+
+
+	</view>
+</template>
+
+<script>
+	import calendar from '../calendar/calendar.vue';
+	export default {
+		components: {
+		        calendar },
+
+		data() {
+			return {
+				isShow: false,
+				formMess: {
+					"userName": "sss",
+					"siteName": "",
+					"place": "",
+					"longitude": "",
+					"dimension": "",
+					"contactor": "",
+					"mobile": "",
+				},
+			}
+		},
+		onLoad: function(option) {
+		},
+		methods: {
+			submit() {
+				uni.navigateTo({
+					url: '/pages/accountManage/success/success',
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.cu-form-group {
+		border-top: 0;
+	}
+	input,
+	select,
+	option {
+		line-height: 70rpx;
+		padding: 0 20rpx;
+		height: 70rpx;
+		border: 1px solid #EDEDED;
+		// width:500rpx!important;
+		background-color: #fff;
+		box-sizing: border-box;
+		appearance: none;
+		-moz-appearance: none;
+		-webkit-appearance: none;
+		color: #999;
+
+
+	}
+
+	select:focus,
+	select:active,
+	select:hover {
+		outline: none;
+	}
+
+	select {
+		background: url(../../../../static/arrow.png) no-repeat scroll 98% center;
+		background-size: 6%;
+	}
+
+	.form-item {
+		padding: 0 40rpx;
+		display: flex;
+		align-items: top;
+		margin-bottom: 20rpx;
+
+
+		.title {
+			width: 170rpx;
+			position: relative;
+
+			.necessary {
+				color: red;
+				display: inline-block;
+				position: absolute;
+				top: -2rpx;
+				left: -20rpx;
+				font-size: 40rpx;
+
+			}
+		}
+
+		input,
+		select {
+			width: 500rpx;
+			font-size: 28rpx;
+		}
+	}
+
+</style>

pages/siteArchive/archiveDetail/archiveDetail.vue

@@ -1,22 +1,295 @@
 <template>
-	<view>
-		现场档案详情页
+	<view class="appWrapper">
+		<form action="">
+			<view style="height:30rpx"></view>
+			<view class="form-item">
+				
+				
+				<view class="title">
+					<!-- <text class="necessary">*</text> -->
+					户号:
+				</view>
+				<input name="input" disabled ="true" v-model="formMess.userId" ></input>
+			</view>
+			<view class="form-item">
+				<view class="title">流变变比:</view>
+				<input name="input" disabled ="true" v-model="formMess.ratio"></input>
+			</view>
+			<view class="form-item">
+				<view class="title" style="width:240rpx">单路电源容量:</view>
+				<input name="input" disabled ="true" v-model="formMess.volume"></input>
+			</view>
+			<view class="form-item">
+				<view class="title">线路:</view>
+				<input name="input" disabled ="true" v-model="formMess.route"></input>
+			</view>
+			<view class="form-item">
+				<view class="title">站点名称:</view>
+				<input name="input" disabled ="true" v-model="formMess.siteName"></input>
+			</view>
+			<view class="form-item">
+				<view class="title">监察:</view>
+				<input name="input" disabled ="true" v-model="formMess.supervise"></input>
+			</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>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">门窗、墙壁破损:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">屋顶墙壁渗漏水:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">灭火器配置不足:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">灭火器超期:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</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>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">积灰严重:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">配电房周围环境潮湿:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</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>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">电工人数配置不足:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">电工证超期:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</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>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</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" disabled ="true" v-model="formMess.date" style="width:35%">
+			</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>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">接地线与存放位置编号:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</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>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio disabled ="true" value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio disabled ="true" value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item">
+				<view class="title">备注:</view>
+				<input type="text" disabled="true" v-model="formMess.note">
+			</view>
+			
+			<br>
+		</form>
+
+
 	</view>
 </template>
 
 <script>
 	export default {
+
 		data() {
 			return {
-				
+				index: -1,
+
+				type: '0',
+
+				isShow: false,
+				formMess: {
+					"userId": "0062089102",
+					"ratio": "20/5",
+					"volume": "315",
+					"route": "东4东路",
+					"siteName": "上海马陆葡萄公园有限公司",
+					"supervise": "潘学春13999999999",
+					"date":"1981",
+					"note":"电路老化"
+				},
+
+
 			}
+		},
+		onLoad: function(option) {
+
 		},
 		methods: {
-			
+	
+	
+
 		}
 	}
 </script>
 
-<style>
 
+
+
+<style lang="scss">
+	
 </style>

pages/siteArchive/siteArchive.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" @tap="goDeviceDetail(item)">
+				 :key="index" :data-target="'move-box-' + index" @tap="goArchiveDetail(item)">
 					<view class="cu-avatar round lg" style="background-image:url(../../../static/archiveIcon.png)"></view>
 					<view class="content" >
 						<view class="pro-title">
@@ -47,9 +47,14 @@
 		methods: {
 		
 			// 页面跳转
+			goArchiveDetail(){
+				uni.navigateTo({
+					url: '/pages/siteArchive/archiveDetail/archiveDetail',
+				});
+			},
 			goAddPage(item) {
 				uni.navigateTo({
-					url: '/pages/eleControl/controlReport/controlReportAdd/controlReportAdd',
+					url: '/pages/siteArchive/siteArchiveAdd/siteArchiveAdd',
 				});
 			},
 		}

pages/siteArchive/siteArchiveAdd/siteArchiveAdd.vue

@@ -0,0 +1,298 @@
+<template>
+	<view class="appWrapper">
+		<form action="">
+			<view style="height:30rpx"></view>
+			<view class="form-item">
+				<view class="title">
+					<!-- <text class="necessary">*</text> -->
+					户号:
+				</view>
+				<input name="input" v-model="formMess.deviceNo"></input>
+			</view>
+			<view class="form-item">
+				<view class="title">流变变比:</view>
+				<input name="input" v-model="formMess.deviceName"></input>
+			</view>
+			<view class="form-item">
+				<view class="title" style="width:240rpx">单路电源容量:</view>
+				<input name="input" v-model="formMess.deviceName"></input>
+			</view>
+			<view class="form-item">
+				<view class="title">线路:</view>
+				<input name="input" v-model="formMess.deviceName"></input>
+			</view>
+			<view class="form-item">
+				<view class="title">站点名称:</view>
+				<input name="input" v-model="formMess.deviceName"></input>
+			</view>
+			<view class="form-item">
+				<view class="title">监察:</view>
+				<input name="input" v-model="formMess.deviceName"></input>
+			</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>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">门窗、墙壁破损:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">屋顶墙壁渗漏水:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">灭火器配置不足:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">灭火器超期:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</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>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">积灰严重:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">配电房周围环境潮湿:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</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>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">电工人数配置不足:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">电工证超期:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</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>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</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%">
+			</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>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item extraDis">
+				<view class="title">接地线与存放位置编号:</view>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</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>
+				<radio-group name="gender">
+					<label class="margin-right-xl">
+						<radio value="是" checked /><text>是</text>
+					</label>
+					<label>
+						<radio value="否" /><text>否</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="form-item">
+				<view class="title">备注:</view>
+				<input type="text">
+			</view>
+			
+			
+			
+
+			<view class="btn-area submitBottomBtn padding-lr-sm  " style="position:static">
+				<button class="bg-blue round  margin-top" @click="submit()">提 交 </button>
+			</view>
+			<br>
+		</form>
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+
+		data() {
+			return {
+				index: -1,
+
+				type: '0',
+
+				isShow: false,
+				formMess: {
+					"userName": "sss",
+					"siteName": "",
+					"place": "",
+					"longitude": "",
+					"dimension": "",
+					"contactor": "",
+					"mobile": "",
+				},
+
+
+			}
+		},
+		onLoad: function(option) {
+
+		},
+		methods: {
+	
+	
+
+		}
+	}
+</script>
+
+
+
+
+<style lang="scss">
+	
+</style>

util/api.js

@@ -29,22 +29,23 @@ export const myRequest = (options) => {
 				let notShowToastUrl = ['Login/getLoginAuthorize'];
 				if (!notShowToastUrl.includes(options.url)) {
 					if (res.data.flag == false) {
-						
+
 						// 修复首页操作失败bug start
 						let notIndexFail2 = ['Index/getDataStatistics'];
 						let ua = navigator.userAgent.toLowerCase();
-						if (notIndexFail2.includes(options.url)&& ua.match(/MicroMessenger/i) == "micromessenger") {
+						if (notIndexFail2.includes(options.url) && ua.match(
+							/MicroMessenger/i) == "micromessenger") {
 							// alert('数据拉取失败，请重新进入公众号')
-								// window.location.href = 'https://qhome.usky.cn/index.html#/pages/index/index';
-						}else{
-							
+							// window.location.href = 'https://qhome.usky.cn/index.html#/pages/index/index';
+						} else {
+
 							return uni.showToast({
 								title: res.data.msg ? res.data.msg : "获取数据失败",
 								icon: "none"
 							})
 						}
 						// end
-						
+
 						// return uni.showToast({
 						// 	title: res.data.msg ? res.data.msg : "获取数据失败",
 						// 	icon: "none"
@@ -56,10 +57,11 @@ export const myRequest = (options) => {
 			fail: (err) => {
 
 				// 修复首页请求接口失败bug start
-				let notIndexFail = ['Index/getDataStatistics','Com/getAuthorizationUrl'];
+				let notIndexFail = ['Index/getDataStatistics', 'Com/getAuthorizationUrl'];
 				if (notIndexFail.includes(options.url)) {
-					window.location.href = 'https://qhome.usky.cn/index.html#/pages/index/index';
-				}else{
+					window.location.href =
+					'https://qhome.usky.cn/index.html#/pages/index/index';
+				} else {
 					uni.showModal({
 						showCancel: false,
 						content: '请求接口失败'