bug修复，前后联调

common/common.scss

@@ -426,7 +426,7 @@ radio,checkbox {
 		input,
 		select {
 			width: 500rpx;
-			font-size: 28rpx;
+			font-size: 24rpx;
 		}
 	}
 	

pages/deviceManage/deviceManage.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="site-wrapper">
 		<!-- 筛选框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">
@@ -16,7 +17,7 @@
 		<!-- 筛选框end -->
 
 		<!-- 站点列表start -->
-		<view class="site-items">
+		<view class="site-items" style="margin-top:0;height: calc(100vh - 352rpx);">
 			<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/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" @tap="goDeviceDetail(item)">
+				 :key="index" :data-target="'move-box-' + index" >
 					<view class="cu-avatar round lg" style="background-image:url(../../../static/controlReportIcon.png)"></view>
 					<view class="content" >
 						<view class="pro-title">

pages/eleControl/controlReport/controlReportAdd/controlReportAdd.vue

@@ -110,8 +110,14 @@
 			   }
 			  ],
 			  success: (uploadFileRes) => {
-			   console.log(uploadFileRes)
-			   this.img='http://121.40.217.77:8080/Device_Manager/upload/card-bg1-active.png'
+				 
+			   var data=JSON.parse(uploadFileRes.data)
+			   
+			   console.log('data')
+			   console.log(data.img_url)
+			   
+			     console.log('uploadFileRes')
+			   this.img=data.img_url
 			  },
 			  fail: (err) => {
 			   console.log(err)
@@ -123,7 +129,7 @@
 			async addSubmit() {
 				if (!this.supervision_title) {
 					uni.showToast({
-						title: "请选择监察标题",
+						title: "请输入监察标题",
 						icon: "none"
 					});
 					return
@@ -162,7 +168,7 @@
 					"site_id": this.site_id,
 					"supervision_content": this.supervision_content,
 					// "img":this.imgList[0]
-					"img":this.img
+					"img_url":this.img
 				})
 
 				if (!res.data.flag) {

pages/processedDetail/processedDetail.vue

@@ -256,7 +256,7 @@
 			},
 			goArchiveDetail() {
 				uni.navigateTo({
-					url: '/pages/siteArchive/archiveDetail/archiveDetail?id='+this.detailMessage.siteId,
+					url: '/pages/siteArchive/archiveDetail/archiveDetail?siteId='+this.detailMessage.siteId,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}

pages/processedDetail1/processedDetail1.vue

@@ -259,7 +259,7 @@
 			},
 			goArchiveDetail() {
 				uni.navigateTo({
-					url: '/pages/siteArchive/archiveDetail/archiveDetail?id='+this.detailMessage.siteId,
+					url: '/pages/siteArchive/archiveDetail/archiveDetail?siteId='+this.detailMessage.siteId,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}

pages/siteArchive/archiveDetail/archiveDetail.vue

@@ -272,7 +272,15 @@
 			}
 		},
 		onLoad: function(option) {
-			this.getDataList({"id":option.id})
+			console.log('option')
+			if(option.siteId){
+				// alert(1)
+				this.getDataList({"site_id":option.siteId})
+			}else{
+				// alert(2)
+				this.getDataList({"id":option.id})
+			}
+			
 		},
 		methods: {
 			//数据请求
@@ -284,8 +292,15 @@
 				})
 				console.log('res.data.data')
 				console.log(res.data.data[0])
-				this.detailInfo = res.data.data[0]
+				this.detailInfo = res.data.data[0];
+				if(!this.detailInfo){
+					uni.showToast({
+						title: "暂无数据!",
+						icon: "none"
+					});
+				}
 			},
+			
 	
 	
 

pages/siteArchive/siteArchiveAdd/siteArchiveAdd.vue

@@ -7,22 +7,22 @@
 					<text class="necessary">*</text>
 					户号:
 				</view>
-				<input name="input" v-model="formMess.account_number"></input>
+				<input name="input" v-model="formMess.account_number"  maxlength="8"></input>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>流变变比:</view>
-				<input name="input" v-model="formMess.rheological_change"></input>
+				<input name="input" v-model="formMess.rheological_change"  maxlength="8"></input>
 			</view>
 			<view class="form-item">
 				<view class="title" style="width:240rpx"><text class="necessary">*</text>单路电源容量:</view>
-				<input name="input" v-model="formMess.power_capacity"></input>
+				<input name="input" v-model="formMess.power_capacity"  maxlength="8"></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="formMess.route_id">
 					<option value="0">请选择</option>
-					<option :value=item.id v-for="item in routeListData">{{ item.route_name}}</option>
+					<option :value=item.id v-for="item in routeListData" :title="item.route_name">{{ item.route_name}}</option>
 				</select>
 				
 				
@@ -30,8 +30,9 @@
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>站点名称:</view>
 				<select name="" id="" v-model="formMess.site_id" filterable clearable>
-					<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></optgroup>
+					
 				</select>
 			</view>
 			<view class="form-item">

pages/siteManage/siteManage.vue

@@ -5,8 +5,6 @@
 		<view class="ding">
 			<view class="cu-bar search bg-gray filter-section" style="padding-top:10rpx">
 				<view class="search-form round bg-white">
-
-					
 					<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>

pages/unprocessDetail/unprocessDetail.vue

@@ -359,7 +359,7 @@
 			},
 			goArchiveDetail() {
 				uni.navigateTo({
-					url: '/pages/siteArchive/archiveDetail/archiveDetail?id='+this.detailMessage.siteId,
+					url: '/pages/siteArchive/archiveDetail/archiveDetail?siteId='+this.detailMessage.siteId,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}

pages/unprocessDetail1/unprocessDetail1.vue

@@ -361,7 +361,7 @@
 			},
 			goArchiveDetail() {
 				uni.navigateTo({
-					url: '/pages/siteArchive/archiveDetail/archiveDetail?id='+this.detailMessage.siteId,
+					url: '/pages/siteArchive/archiveDetail/archiveDetail?siteId='+this.detailMessage.siteId,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}