新增静态页面

common/common.scss

@@ -165,7 +165,7 @@ radio,checkbox {
 .site-items .cu-avatar {}
 
 /* 新增按钮 */
-.site-wrapper .plus {
+.plus {
 	position: fixed;
 	bottom: 20rpx;
 	right: 20rpx
@@ -342,6 +342,14 @@ radio,checkbox {
 			padding:20rpx 0
 		}
 		
+	}
+	
+	.search-form select{
+		padding-left:20rpx;
+		width:100%;
+		border:none;
+		outline:none;
+		color:grey
 	}
 	
 	

data/json.js

@@ -88,6 +88,12 @@ let cuIconList = [{
 	badge: 0,
 	name: '风险保障',
 	redirectUrl: ''
+}, {
+	imgUrl: '../../static/square-bz.png',
+	badge: 0,
+	badge: 0,
+	name: '电力监察',
+	redirectUrl: ''
 }];
 let unprocessList = [{
 		title: '母线停电',
@@ -201,11 +207,175 @@ let processedList = [{
 		time: '2020-01-08 15:15:12'
 	}
 ]
+//监察上报
+let controlReport = [{
+		"id": "1",
+		"title": "监察上报1",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 0
+	},
+	{
+		"id": "2",
+		"title": "监察上报2",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 0
+	},
+	{
+		"id": "3",
+		"title": "监察上报3",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 0
+	},
+	{
+		"id": "4",
+		"title": "监察上报4",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 0
+	},
+	{
+		"id": "5",
+		"title": "监察上报5",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 0
+	},
+	{
+		"id": "6",
+		"title": "监察上报6",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 0
+	},
+	{
+		"id": "7",
+		"title": "监察上报7",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 1
+	},
+	{
+		"id": "8",
+		"title": "监察上报8",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 2
+	}
+];
+
+let inspectUnprocessList = [{
+		"id": "561",
+		"title": "停电计划一",
+		"des": "事件未处理测试",
+		"time": "2020-01-08 15:15:12"
+	},
+	{
+		"id": "561",
+		"title": "停电计划二",
+		"des": "事件未处理测试",
+		"time": "2020-01-08 15:15:12"
+	},
+	{
+		"id": "561",
+		"title": "停电计划三",
+		"des": "事件未处理测试",
+		"time": "2020-01-08 15:15:12"
+	}
+];
+let inspectProcessedList = [{
+		"id": "561",
+		"title": "停电计划四",
+		"des": "事件未处理测试",
+		"time": "2020-01-08 15:15:12"
+	},
+	{
+		"id": "561",
+		"title": "停电计划五",
+		"des": "事件未处理测试",
+		"time": "2020-01-08 15:15:12"
+	},
+	{
+		"id": "561",
+		"title": "停电计划六",
+		"des": "事件未处理测试",
+		"time": "2020-01-08 15:15:12"
+	},{
+		"id": "561",
+		"title": "停电计划四",
+		"des": "事件未处理测试",
+		"time": "2020-01-08 15:15:12"
+	},
+	{
+		"id": "561",
+		"title": "停电计划五",
+		"des": "事件未处理测试",
+		"time": "2020-01-08 15:15:12"
+	},
+	{
+		"id": "561",
+		"title": "停电计划六",
+		"des": "事件未处理测试",
+		"time": "2020-01-08 15:15:12"
+	}
+];
+
+//监察上报
+let archive = [{
+		"id": "1",
+		"title": "111XXX站点+现场档案",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 0
+	},
+	{
+		"id": "2",
+		"title": "222XXX站点+现场档案",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 0
+	},
+	{
+		"id": "3",
+		"title": "333XXX站点+现场档案",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 0
+	},
+	{
+		"id": "4",
+		"title": "444XXX站点+现场档案",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 0
+	},
+	{
+		"id": "5",
+		"title": "555XXX站点+现场档案",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 0
+	},
+	{
+		"id": "6",
+		"title": "666XXX站点+现场档案",
+		"des": "三楼茶水间",
+		"time": "2021-01-20 15:23:43",
+		"status": 0
+	},
+];
 
 // 定义数据出口
 module.exports = {
 	siteListData: siteListData,
 	cuIconList: cuIconList,
 	unprocessList: unprocessList,
-	processedList: processedList
+	processedList: processedList,
+	controlReport:controlReport,
+	
+	inspectUnprocessList: inspectUnprocessList,
+	inspectProcessedList: inspectProcessedList,
+	archive:archive
 }

pages.json

@@ -15,36 +15,20 @@
 
 		{
 			"path": "pages/index/index",
-			"style": {
-				"autoBackButton": false,
-				"h5": {
-					"titleNView": {
-						"autoBackButton": false
-					}
-				},
+			"style": {
+				"autoBackButton": false,
+				"h5": {
+					"titleNView": {
+						"autoBackButton": false
+					}
+				},
 
 				"navigationBarTitleText": "首页",
 				"app-plus": {
 
 					"titleNView": {
 						"buttons": [
-							// {
-							// 	"text": "\ue607",
-							// 	"fontSize": "18px",
-							// 	 // "redDot": true,
-							// 	 "float":"right",
-							// 	"fontSrc": "/static/iconfont/iconfont.ttf",
-							// 	 "width": "auto"
-
-							// }
-							// {
-
-							// 	"text": "\ue63d",
-							// 	"fontSize": "18px",
-							// 	"float":"left",
-							// 	"fontSrc": "/static/iconfont/iconfont.ttf",
-							// 	 "width": "auto"
-							// }
+							
 						]
 					}
 
@@ -70,28 +54,28 @@
 			"style": {
 				"navigationBarTitleText": "未处理"
 			}
-		},
-		{
-			"path": "pages/unprocessDetail1/unprocessDetail1",
-			"style": {
-				"navigationBarTitleText": "未处理",
-				"h5": {
-					"titleNView": {
-						"autoBackButton": false
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/processedDetail1/processedDetail1",
-			"style": {
-				"navigationBarTitleText": "已处理",
-				"h5": {
-					"titleNView": {
-						"autoBackButton": false
-					}
-				}
-			}
+		},
+		{
+			"path": "pages/unprocessDetail1/unprocessDetail1",
+			"style": {
+				"navigationBarTitleText": "未处理",
+				"h5": {
+					"titleNView": {
+						"autoBackButton": false
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/processedDetail1/processedDetail1",
+			"style": {
+				"navigationBarTitleText": "已处理",
+				"h5": {
+					"titleNView": {
+						"autoBackButton": false
+					}
+				}
+			}
 		},
 		{
 			"path": "pages/processedDetail/processedDetail",
@@ -113,15 +97,6 @@
 			}
 		},
 
-
-
-
-		// {
-		// 	"path": "pages/info/info",
-		// 	"style": {
-		// 		"navigationBarTitleText": "消息"
-		// 	}
-		// },
 		{
 			"path": "pages/analyse/analyse",
 			"style": {
@@ -365,7 +340,71 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/eleControl/eleControl",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "监察类型",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+      
+        ,{
+            "path" : "pages/siteArchive/siteArchive",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "现场档案",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/siteArchive/archiveDetail/archiveDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "现场档案详情页",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/eleControl/powerCut/powerCut",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "计划停电",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/eleControl/controlReport/controlReport",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "监察上报",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/eleControl/controlReport/controlReportAdd/controlReportAdd",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "监测上报新增",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/eleControl/powerCut/powerCutAdd/powerCutAdd",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "计划停电新增",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

pages/eleControl/controlReport/controlReport.vue

@@ -0,0 +1,69 @@
+<template>
+	<view class="site-wrapper">
+		
+		<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)">
+					<view class="cu-avatar round lg" style="background-image:url(../../../static/controlReportIcon.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="nav-right num">
+						<view class="text-grey">
+							<text class="icon iconfont margin-right-sm margin-left-lg">&#xe629;</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 新增按钮start -->
+		<view class="plus">
+			<image src="../../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage()"></image>
+		</view>
+		<!-- 新增按钮end -->
+	</view>
+
+	
+</template>
+
+<script>
+	import json from '../../../data/json.js';
+	export default {
+		data() {
+			return {
+				controlReport: json.controlReport,
+				modalName: null,
+			};
+		},
+		
+		onLoad:function(option){
+			
+		},
+	
+		methods: {
+		
+			// 页面跳转
+			goAddPage(item) {
+				uni.navigateTo({
+					url: '/pages/eleControl/controlReport/controlReportAdd/controlReportAdd',
+				});
+			},
+		}
+
+	}
+</script>
+
+<style lang="scss">
+	.cu-item{
+		height:160rpx!important
+	}
+	.cu-list.menu-avatar > .cu-item .content {
+	    left: 110rpx;
+	}
+</style>

pages/eleControl/controlReport/controlReportAdd/controlReportAdd.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		  监测上报新增
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/eleControl/eleControl.vue

@@ -0,0 +1,95 @@
+<template>
+	<view class="eleControlWrapper">
+	
+		<view class="cu-list menu-avatar">
+			<view class="cu-item" @tap="goPowerCut()">
+				<view class="cu-avatar " style="background-image:url(../../static/powerCut.png)"></view>
+				<view class="content">
+					<view class="">计划停电</view>
+				</view>
+				<view class="nav-right">
+					<view class="text-grey">
+						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+					</view>
+				</view>
+			</view>
+			
+			<view class="cu-item" @tap="goControlReport()">
+				<view class="cu-avatar " style="background-image:url(../../static/controlReport.png)"></view>
+				<view class="content">
+					<view class="">监察上报</view>
+				</view>
+				<view class="nav-right">
+					<view class="text-grey">
+						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+					</view>
+				</view>
+			</view>
+
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				permissionLabel:0
+			}
+		},
+		onLoad() {
+			this.getAuthorization()
+		},
+		methods: {
+			
+			async getAuthorization(params) {
+				const res = await this.$myRequest({
+					url: 'Com/getAuthorization',
+					showLoading: true,
+					data: params
+				})
+			
+				console.log(res.data.permissionLabel)
+				 this.permissionLabel = res.data.permissionLabel
+			},
+			
+			goControlReport() {
+				uni.navigateTo({
+					url: '/pages/eleControl/controlReport/controlReport',
+				});
+			},
+			
+			goPowerCut() {
+				uni.navigateTo({
+					url: '/pages/eleControl/powerCut/powerCut',
+				});
+				
+				}
+				
+				
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.eleControlWrapper {
+
+		.cu-avatar {
+			// width:40rpx;height:40rpx;
+			background-color:#fff;
+		
+		}
+		.cu-list.menu-avatar>.cu-item {
+			height:120rpx;
+			.content{
+				left:80rpx;
+			}
+			.nav-right{
+				margin-right:10rpx;
+			}
+		}
+
+	}
+</style>

pages/eleControl/powerCut/powerCut.vue

@@ -0,0 +1,175 @@
+<template>
+	<view class="processWrapper ">
+		<view style="height:196rpx"></view>
+		<view class="ding">
+
+			<!-- 筛选框start -->
+			<view class="cu-bar search bg-gray filter-section">
+				<view class="search-form round bg-white">
+					<text class="cuIcon-search"></text>
+					<input class="" type="text" placeholder="请输入站点名称" confirm-type="search"></input>
+				</view>
+				<view class="action">
+					<button class="cu-btn bg-blue round" @click="searchSiteList">查询</button>
+				</view>
+			</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>
+
+
+		<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-avatar lg" style="background-image:url(../../../static/unprocessIcon.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="unProcess" @tap="goUnprocessDetail(item.id)">未执行</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 class="cu-list menu-avatar ">
+					<view class="cu-item" v-for="(item,index) in porcessedList" :key="index">
+						<view class="cu-avatar lg" style="background-image:url(../../../static/processedIcon.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="processed" @tap="goProcessedDetail(item.id)">已执行</view>
+						</view>
+					</view>
+					<view class="text-center margin-top" v-if="porcessedList.length === 0">暂无数据...</view>
+				</view>
+			</view>
+		</block>
+
+
+		<!-- 新增按钮start -->
+		<view class="plus">
+			<image src="../../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage()"></image>
+		</view>
+		<!-- 新增按钮end -->
+
+
+
+	</view>
+</template>
+
+<script>
+	import json from '../../../data/json.js';
+	export default {
+		data() {
+			return {
+				unporcessList: json.inspectUnprocessList,
+				porcessedList: json.inspectProcessedList,
+
+				type: '0',
+				modalName: null,
+				listTouchStart: 0,
+				listTouchDirection: null,
+				CustomBar: this.CustomBar,
+				TabCur: 0,
+				tabNav: ['已执行', '未执行'],
+
+
+			};
+		},
+		onLoad: function(option) {
+
+
+		},
+
+		onNavigationBarButtonTap(e) {
+			console.log(e)
+			uni.navigateTo({
+				url: '/pages/export/export',
+				success: res => {},
+				fail: () => {},
+				complete: () => {}
+			});
+		},
+		methods: {
+
+
+
+			tabSelect(e) {
+
+				console.log(e.currentTarget);
+				this.TabCur = e.currentTarget.dataset.id;
+				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
+
+
+
+			},
+
+
+			goAddPage(id) {
+				uni.navigateTo({
+					url: '/pages/eleControl/powerCut/powerCutAdd/powerCutAdd',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	//已处理未处理消息个数样式
+
+	.cu-list.menu-avatar .cu-item {
+		height: 89px;
+	}
+
+	.nav .cu-item.cur {
+		position: relative;
+		border-bottom: 8rpx solid;
+	}
+
+	.cu-tag.badge {
+		top: 14rpx;
+		right: 96rpx;
+	}
+
+	.nav .cu-item {
+		width: 50%;
+		margin: 0;
+
+		.text-blue,
+		.line-blue,
+		.lines-blue {
+			color: #4274E7
+		}
+	}
+</style>

pages/eleControl/powerCut/powerCutAdd/powerCutAdd.vue

@@ -0,0 +1,151 @@
+<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">所属站点:</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>
+
+			<view class="btn-area submitBottomBtn padding-lr-sm">
+				<button class="bg-blue round  margin-top" @click="submit()">提 交 </button>
+			</view>
+		</form>
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		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/index/index.vue

@@ -134,6 +134,12 @@
 					badge: 0,
 					name: '风险保障',
 					redirectUrl: ''
+				}, {
+					imgUrl: '../../static/square-dljc.png',
+					badge: 0,
+					badge: 0,
+					name: '电力监察',
+					redirectUrl: ''
 				}],
 				Inv: 0,
 				searchList: [],
@@ -410,6 +416,9 @@
 					case 1:
 						url = "/pages/siteList/siteList"
 						break;
+					case 7:
+						url = "/pages/eleControl/eleControl"
+						break;
 					default:
 						break;
 				}

pages/processedDetail/processedDetail.vue

@@ -15,6 +15,10 @@
 					<view class="info-one-info ">
 						<text>站点名称：</text>
 						<text>{{detailMessage.siteName}}</text>
+					</view>
+					<view class="info-one-info ">
+						<text>台区展示：</text>
+						<text>等待对接中.....</text>
 					</view>
 					<view>
 						<text>线路名称：</text>
@@ -51,6 +55,10 @@
 					<view>
 						<text>视频：</text>
 						<text class="checkMore" @tap="goVideoDetail">点击查看</text>
+					</view>
+					<view>
+						<text>现场档案：</text>
+						<text class="checkMore" @tap="goArchiveDetail">点击查看</text>
 					</view>
 				</view>
 			</view>
@@ -246,6 +254,14 @@
 					complete: () => {}
 				});
 			},
+			goArchiveDetail() {
+				uni.navigateTo({
+					url: '/pages/siteArchive/archiveDetail/archiveDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
 			RadioChange(e) {
 				this.radio = e.detail.value
 			},

pages/processedDetail1/processedDetail1.vue

@@ -15,6 +15,10 @@
 					<view class="info-one-info ">
 						<text>站点名称：</text>
 						<text>{{detailMessage.siteName}}</text>
+					</view>
+					<view class="info-one-info ">
+						<text>台区展示：</text>
+						<text>等待对接中.....</text>
 					</view>
 					<view>
 						<text>线路名称：</text>
@@ -51,6 +55,10 @@
 					<view>
 						<text>视频：</text>
 						<text class="checkMore" @tap="goVideoDetail">点击查看</text>
+					</view>
+					<view>
+						<text>现场档案：</text>
+						<text class="checkMore" @tap="goArchiveDetail">点击查看</text>
 					</view>
 				</view>
 			</view>
@@ -249,6 +257,14 @@
 					complete: () => {}
 				});
 			},
+			goArchiveDetail() {
+				uni.navigateTo({
+					url: '/pages/siteArchive/archiveDetail/archiveDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
 			RadioChange(e) {
 				this.radio = e.detail.value
 			},

pages/setting/setting.vue

@@ -18,7 +18,20 @@
 						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
 					</view>
 				</view>
-			</view>
+			</view>
+			
+			<view class="cu-item" @tap="goSiteArchive()">
+				<view class="cu-avatar " style="background-image:url(../../static/settingIconDa.png)"></view>
+				<view class="content">
+					<view class="">现场档案</view>
+				</view>
+				<view class="nav-right">
+					<view class="text-grey">
+						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+					</view>
+				</view>
+			</view>
+			
 			<view class="cu-item" @tap="goSiteManage" v-if="permissionLabel==1">
 				<view class="cu-avatar " style="background-image:url(../../static/setting-icon2.png)"></view>
 				<view class="content">
@@ -67,6 +80,13 @@
 			
 				console.log(res.data.permissionLabel)
 				 this.permissionLabel = res.data.permissionLabel
+			},
+			
+			goSiteArchive() {
+				uni.navigateTo({
+					url: '/pages/siteArchive/siteArchive',
+			
+				});
 			},
 			
 			

pages/siteArchive/archiveDetail/archiveDetail.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		现场档案详情页
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/siteArchive/siteArchive.vue

@@ -0,0 +1,67 @@
+<template>
+	<view class="site-wrapper">
+		
+		<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)">
+					<view class="cu-avatar round lg" style="background-image:url(../../../static/archiveIcon.png)"></view>
+					<view class="content" >
+						<view class="pro-title">
+							<view class="cut">{{item.title}}</view>
+						</view>
+					</view>
+					<view class="nav-right num">
+						<view class="text-grey">
+							<text class="icon iconfont margin-right-sm margin-left-lg">&#xe629;</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 新增按钮start -->
+		<view class="plus">
+			<image src="../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage()"></image>
+		</view>
+		<!-- 新增按钮end -->
+	</view>
+
+	
+</template>
+
+<script>
+	import json from '../../data/json.js';
+	export default {
+		data() {
+			return {
+				controlReport: json.archive,
+				modalName: null,
+			};
+		},
+		
+		onLoad:function(option){
+			
+		},
+	
+		methods: {
+		
+			// 页面跳转
+			goAddPage(item) {
+				uni.navigateTo({
+					url: '/pages/eleControl/controlReport/controlReportAdd/controlReportAdd',
+				});
+			},
+		}
+
+	}
+</script>
+
+<style lang="scss">
+	.cu-item{
+		height:160rpx!important
+	}
+	.cu-list.menu-avatar > .cu-item .content {
+	    left: 110rpx;
+	}
+</style>

pages/siteManage/siteManage.vue

@@ -1,9 +1,20 @@
 <template>
 	<view class="site-wrapper">
 		<!-- 筛选框start -->
-		<view style="height:100rpx"></view>
+		<view style="height:200rpx"></view>
 		<view class="ding">
-			<view class="cu-bar search bg-gray filter-section">
+			<view class="cu-bar search bg-gray filter-section" style="padding-top:10rpx">
+				<view class="search-form round bg-white">
+					<select name="" id="" style="width:100%">
+						<option value="">线路名称1</option>
+						<option value="">线路名称2</option>
+						<option value="">线路名称3</option>
+					</select>
+					<!-- <input class="" type="text" placeholder="监察" confirm-type="search" v-model="siteName"></input> -->
+				</view>
+
+			</view>
+			<view class="cu-bar search bg-gray filter-section" >
 				<view class="search-form round bg-white">
 					<text class="cuIcon-search"></text>
 					<input class="" type="text" placeholder="请输入站点名称" confirm-type="search" v-model="siteName"></input>
@@ -16,7 +27,7 @@
 		<!-- 筛选框end -->
 
 		<!-- 站点列表start -->
-		<view class="site-items" style="margin-top:0;height: calc(100vh - 300rpx);">
+		<view class="site-items" style="margin-top:0;height: calc(100vh - 500rpx);">
 			<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">

pages/unprocessDetail/unprocessDetail.vue

@@ -17,6 +17,12 @@
 						<text>站点名称：</text>
 						<text>{{detailMessage.siteName}}</text>
 					</view>
+					
+					<view class="info-one-info ">
+						<text>台区展示：</text>
+						<text>等待对接中.....</text>
+					</view>
+					
 					<view>
 						<text>线路名称：</text>
 						<text>{{detailMessage.deviceName}}</text>
@@ -58,6 +64,10 @@
 						<text>视频：</text>
 						<text class="checkMore" @tap="goVideoDetail">点击查看</text>
 					</view>
+					<view>
+						<text>现场档案：</text>
+						<text class="checkMore" @tap="goArchiveDetail">点击查看</text>
+					</view>
 				</view>
 			</view>
 			<!-- 处理状态start -->
@@ -346,7 +356,14 @@
 					fail: () => {},
 					complete: () => {}
 				});
-
+			},
+			goArchiveDetail() {
+				uni.navigateTo({
+					url: '/pages/siteArchive/archiveDetail/archiveDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
 			},
 
 

pages/unprocessDetail1/unprocessDetail1.vue

@@ -17,6 +17,12 @@
 						<text>站点名称：</text>
 						<text>{{detailMessage.siteName}}</text>
 					</view>
+					
+					<view class="info-one-info ">
+						<text>台区展示：</text>
+						<text>等待对接中.....</text>
+					</view>
+					
 					<view>
 						<text>线路名称：</text>
 						<text>{{detailMessage.deviceName}}</text>
@@ -56,6 +62,10 @@
 						<text>视频：</text>
 						<text class="checkMore" @tap="goVideoDetail">点击查看</text>
 					</view>
+					<view>
+						<text>现场档案：</text>
+						<text class="checkMore" @tap="goArchiveDetail">点击查看</text>
+					</view>
 				</view>
 			</view>
 			<!-- 处理状态start -->
@@ -349,6 +359,14 @@
 				});
 
 			},
+			goArchiveDetail() {
+				uni.navigateTo({
+					url: '/pages/siteArchive/archiveDetail/archiveDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
 
 
 			RadioChange(e) {

util/api.js

@@ -1,5 +1,6 @@
-// const BASE_URL = 'https://iot.usky.cn/USKYOF/USKYOF.php/Home/' //(测试域名)
-const BASE_URL='https://qhome.usky.cn/USKYOF/USKYOF.php/Home/'
+const BASE_URL = 'https://iot.usky.cn/USKYOF/USKYOF.php/Home/' //(测试域名)  
+// const BASE_URL = 'http://124.71.174.104/USKYOF/USKYOF.php/Home/' //(测试域名新)  
+// const BASE_URL='https://qhome.usky.cn/USKYOF/USKYOF.php/Home/'
 // 同时发送异步代码的次数，防止一次点击中有多次请求，用于处理
 let ajaxTimes = 0;