modify

pages.json

@@ -2,16 +2,7 @@
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 
 
-		{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "登录"
-			}
-		},
-		{
-			"path": "pages/alarmingList/alarmingList"
-
-		},
+		
 
 		{
 			"path": "pages/index/index",
@@ -36,6 +27,17 @@
 
 			}
 		},
+		
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		},
+		{
+			"path": "pages/alarmingList/alarmingList"
+		
+		},
 		{
 			"path": "pages/siteList/siteList",
 			"style": {
@@ -440,6 +442,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/test2/test2",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/eleControl/controlReport/controlReportAdd/controlReportAdd.vue

@@ -57,6 +57,10 @@
 					</view> -->
 				</view>
 			</view>
+			<br>
+			<view class="form-item">
+				<view style="color:#4074E7;border-bottom:1px solid #4074E7" @tap="goArchivePage()">现场档案</view>
+			</view>
 
 			<view class="btn-area submitBottomBtn padding-lr-sm">
 				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(addSubmit)">提 交 </button>
@@ -101,6 +105,12 @@
 			
 		},
 		methods: {
+			
+			goArchivePage(){
+				uni.navigateTo({
+					url: '/pages/siteArchive/siteArchive',
+				});
+			},
 			upFile(input, event) {
 			 var _self = this;
 			 
@@ -193,7 +203,7 @@
 				}
 				setTimeout(() => {
 					uni.navigateTo({
-						url: '/pages/eleControl/controlReport/controlReport',
+						url: '/pages/siteArchive/controlReport/controlReport',
 					});
 				}, 1000);
 

pages/siteList/siteList.vue

@@ -2,7 +2,15 @@
 	<view class="site-wrapper" ref="contentWrapper">
 
 		<!-- 筛选框start -->
+		<view style="height:200rpx"></view>
 		<view class="ding">
+			<view class="cu-bar search bg-gray filter-section" style="padding-top:10rpx">
+				<view class="search-form round bg-white" style="position:relative;overflow:auto">
+					<input name="siteName" v-model="formMess.siteName" @click="toggleShow" @focus="focusfns"
+						@input="handleInput()" placeholder="请输入或选择所属线路"></input>
+				</view>
+			
+			</view>
 			<view class="cu-bar search bg-gray filter-section">
 				<view class="search-form round bg-white">
 					<text class="cuIcon-search"></text>
@@ -12,13 +20,22 @@
 				<view class="action">
 					<button class="cu-btn bg-blue round" @click="searchData()">查询</button>
 				</view>
+				
 			</view>
+			
 		</view>
+		<view class="siteItems" v-if="isShow2" style="max-height:60vh;overflow:auto;position:absolute;z-index:999; margin: 0 32rpx;
+		width: calc(100% - 64rpx);top:100rpx">
+				<view class=" site-item" v-if="!siteItemData.length">暂无结果</view>
+				<view class="site-item" v-for="(item,index) in siteItemData" @click="changeModel(item,index)" :key="index" style="padding:16rpx 22rpx">
+					{{item.route_name}}
+				</view>
+			</view>
 		<!-- 筛选框end -->
 
 
 		<!-- 站点列表start -->
-		<view class="site-items">
+		<view class="site-items" style="margin-top: 0px">
 			<view class="cu-list menu-avatar longPressUl">
 				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in newSiteListData"
 				 :key="index" :data-target="'move-box-' + index">
@@ -63,6 +80,13 @@
 				listTouchStart: 0,
 				listTouchDirection: null,
 				CustomBar: this.CustomBar,
+				
+				isShow2: false,
+				formMess: {
+					"siteName": "",
+				},
+				siteItemDataOrigin: [],
+				siteItemData: [],
 			};
 		},
 
@@ -94,13 +118,58 @@
 			})
 		},
 		onLoad() {
-			this.getSiteList()
+			this.getSiteList();
+			this.getRoutrBox()
 		},
 
 		methods: {
+			
+			
+			
+			//线路名称下拉数据请求
+			async getRoutrBox(params = {}) {
+				const res = await this.$myRequest({
+					url: 'Archives/getRoutrBox',
+					showLoading: true,
+					data: params
+				})
+				// this.routeListData = res.data.data;
+				// console.log(this.routeListData)
+			
+				this.siteItemData = res.data.data;
+				this.siteItemDataOrigin = res.data.data;
+				this.siteItemData = this.siteItemDataOrigin;
+			},
+			//选中下拉选项，隐藏框，赋值
+			changeModel: function(item, index) {
+				this.isShow2 = false;
+				this.formMess.siteName = item.route_name;
+			},
+			
+			// 输入框点击 显示隐藏下拉框
+			toggleShow: function() {
+				this.isShow2 = !this.isShow2;
+			},
+			//点击下拉筛选
+			handleInput() {
+				//将元素根据搜索内容过滤出来  这里改变了siteItemData
+				this.siteItemData = this.siteItemDataOrigin;
+				this.siteItemData = this.siteItemData.filter(item => item.route_name.indexOf(this.formMess.siteName) > -1);
+			},
+			focusfns: function(e) {
+				//将元素根据搜索内容过滤出来  这里改变了siteItemData
+				this.siteItemData = this.siteItemDataOrigin;
+				this.siteItemData = this.siteItemData.filter(item => item.route_name.indexOf(this.formMess.siteName) >
+					-1);
+			},
+			
+			
+			
+			
 			searchData() {
 				this.getSiteList({
-					"siteName": this.siteName
+					"siteName": this.siteName,
+					"route_name": this.formMess.siteName
 				})
 			},
 

pages/siteManage/siteManage.vue

@@ -5,14 +5,8 @@
 		<view class="ding">
 			<view class="cu-bar search bg-gray filter-section" style="padding-top:10rpx">
 				<view class="search-form round bg-white" style="position:relative;overflow:auto">
-
-					<!-- <select name="" id="" filterable clearable v-model="router_id" style="padding-left:40rpx;background-size: 4.6%;">
-						<option value="0">请选择线路名称</option>
-						<option :value=item.route_name v-for="item in routeListData">{{ item.route_name}}</option>
-					</select> -->
-
 					<input name="siteName" v-model="formMess.siteName" @click="toggleShow" @focus="focusfns"
-						@input="handleInput()" placeholder="请输入或选择"></input>
+						@input="handleInput()" placeholder="请输入或选择所属线路"></input>
 				</view>
 			</view>
 			<view class="cu-bar search bg-gray filter-section">

pages/test2/test2.vue

@@ -0,0 +1,122 @@
+<template>
+	<view>
+		<view @tap="goCamera()" class="cameraButton">
+			拍照按钮
+		</view>
+		
+		<view class="uni-list list-pd">
+			<view class="uni-uploader__files">
+				<view v-for="(image, index) in imageList" :key="index" class="abc">
+					<view class="uni-uploader__file" style="inline-block">
+						<view class="delete " :style="{'z-index': 99}" @tap="onDeleteClick(index)">x</view>
+						<view class=" images-one">
+							<image class="uni-uploader__img image-bg" :src="image" :data-src="image"
+								@tap="previewImage"></image>
+						</view>
+
+					</view>
+				</view>
+				<view class="uni-uploader__input-box" v-show="imageList.length > 0">
+					<view class="uni-uploader__input" @tap="onGetImgClick"></view>
+				</view>
+			</view>
+		</view>
+
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+				imageList: [],
+
+			}
+		},
+		mounted() {
+
+		},
+
+
+		//拍照
+		methods: {
+
+			// 删除图片
+			onDeleteClick(index) {
+				this.imageList.splice(index, 1)
+			},
+			// previewImage() {
+			// 	// 预览功能，相关博客有
+			// },
+
+
+
+			goCamera() {
+				const that = this
+				uni.chooseImage({
+					count: 2, // 最多可以选择的图片张数，默认9
+					sizeType: ['original', 'compressed'], //original 原图，compressed 压缩图，默认二者都有
+					sourceType: ['camera'], //album 从相册选图，camera 使用相机，默认二者都有。如需直接开相机或直接选相册，请只使用一个选项
+					success: function(res) {
+						const len = that.imageList.length
+						if (len >= 2) {
+							uni.showToast({
+								title: '图片最多上传2张'
+							})
+						} else {
+							for (let i = 0; i < 2 - len; i++) {
+								if (res.tempFilePaths[i]) that.imageList.push(res.tempFilePaths[i])
+							}
+						}
+					}
+				})
+
+			},
+
+
+
+
+		}
+
+	}
+</script>
+
+<style>
+	.cameraButton {
+		border: 1px solid red;
+		display: inline-block;
+		border-radius: 10rpx;
+		padding: 10rpx
+	}
+
+	.images-one {
+		white-space: nowrap;
+		position: relative;
+		width: 150rpx;
+		height: 150rpx;
+		background-size: cover;
+		background-position: center;
+		vertical-align: middle;
+		font-size: 1.5em;
+		display: inline-block;
+		margin-right: 20rpx
+	}
+
+	.image-bg {
+		position: absolute;
+		z-index: -1;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		right: 0;
+		width: 100%;
+		height: 100%;
+	}
+
+	.abc {
+		display: inline-block
+	}
+</style>

util/api.js

@@ -1,5 +1,5 @@
-// const BASE_URL = 'https://iot.usky.cn/USKYOF/USKYOF.php/Home/' //(测试域名)  
-const BASE_URL = 'https://wx.ewoogi.com/wx/USKYOF/USKYOF.php/Home/' //(正式域名新)  
+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/'