bug修复

pages/deviceManage/deviceManage.vue

@@ -75,14 +75,14 @@
 								</view>
 
 							</view>
-							<view class="nav-right num">
+							<!-- <view class="nav-right num">
 								<view class="text-grey">
 									<span class="online" v-if="item.device_state=='在线'">在线</span>
 									<span class="offline" v-if="item.device_state==='离线'">离线</span>
 									<span class="error" v-if="item.device_state==='故障'">故障</span>
 									<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
 								</view>
-							</view>
+							</view> -->
 						</view>
 					</view>
 				</checkbox-group>

pages/inspectList/processList/processList.vue

@@ -5,9 +5,14 @@
 			<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">
+					<!-- <view v-if="TabCur==index" class="cu-tag badge">
 						<block class="cu-tag badge">{{TabCur? unporcessList.length:record_count}} </block>
+					</view> -->
+					
+					<view v-if="TabCur==index&&!TabCur" class="cu-tag badge">
+						<block class="cu-tag badge">{{record_count}} </block>
 					</view>
+					
 					{{item}}
 				</view>
 			</scroll-view>
@@ -35,7 +40,10 @@
 							<view class="unProcess" @tap="goUnprocessDetail(item)">未处理</view>
 						</view>
 					</view>
-					<view class=" text-center margin-top" v-if="record_count === 0">暂无数据...</view>
+					<view class=" text-center margin-top" v-if="record_count == 0">暂无数据...</view>
+					<view v-show="isLoadMore&&record_count != 0">
+						<uni-load-more :status="loadStatus"></uni-load-more>
+					</view>
 				</view>
 			</view>
 		</block>
@@ -60,9 +68,12 @@
 						</view>
 						<view class="action" style="z-index:99">
 							<view class="processed" @tap="goProcessedDetail(item)">已处理</view>
-						</view>
+						</view>	
+					</view>
+					<view class="text-center margin-top" v-if="record_count1 == 0">暂无数据...</view>
+					<view v-show="isLoadMore&&record_count1 != 0&&this.page>1">
+						<uni-load-more :status="loadStatus"></uni-load-more>
 					</view>
-					<view class="text-center margin-top" v-if="record_count1 === 0">暂无数据...</view>
 				</view>
 			</view>
 		</block>
@@ -88,11 +99,36 @@
 				record_count1: '',
 				
 				requestUrl:'',
-				keyWords:''
+				keyWords:'',
+				
+				
+				page: 1,
+				pageSize: 10,
+				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
+				isLoadMore: false, //是否加载中
+				bottomFlag:false
 
 
 			};
 		},
+		
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.isLoadMore = true
+				this.page += 1;
+				
+				this.getProcessData({
+					"company_code": uni.getStorageSync('selectedCode'),
+					"clzt":this.TabCur,
+					"page": this.page,
+					"pageSize": this.pageSize,
+				}, this.TabCur);
+				
+				
+				
+			}
+		},
+		
 		onLoad: function(option) {
 			this.type=option.type;
 			if(option.type==1){
@@ -109,7 +145,9 @@
 
 			this.getProcessData({
 				"company_code": uni.getStorageSync('selectedCode'),
-				"clzt": 0
+				"clzt": 0,
+				"page": this.page,
+				"pageSize": this.pageSize,
 			}, 0);
 
 
@@ -131,13 +169,25 @@
 					data: params,
 					showLoading: true
 				})
-				this.unporcessList = res.data.data;
-				if (whichTab == 0) {
-					this.unporcessList = res.data.data;
-					this.record_count = parseInt(res.data.record_count)
+				if (res.data.record_count) {
+					if (whichTab == 0) {
+						this.unporcessList = this.unporcessList.concat(res.data.data)
+						this.record_count = parseInt(res.data.record_count)
+				
+					} else {
+						this.porcessedList = this.porcessedList.concat(res.data.data);
+						this.record_count1 = parseInt(res.data.record_count)
+					}
+				
+					if (res.data.data.length < this.pageSize) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
+						this.isLoadMore = true
+						this.loadStatus = 'nomore'
+					} else {
+						this.isLoadMore = false
+					}
 				} else {
-					this.porcessedList = res.data.data;
-					this.record_count1 = parseInt(res.data.record_count)
+					this.isLoadMore = true
+					this.loadStatus = 'nomore'
 				}
 			},
 

pages/inspectList/processedDetail/processedDetail.vue

@@ -12,8 +12,10 @@
 					基本信息
 				</view>
 				<view class="info-content">
-					<view class="info-one-info ">
-						<text style="width:90px!important">{{type==1?this.getData.artificial_code:this.getData.supervise_code}}:</text>  
+					<view class="info-one-info " style="display:block">
+						<text >{{type==1?this.getData.artificial_code:this.getData.supervise_code}}:</text>  
+						<br>
+					
 						<text>{{this.getData.content}}</text>
 					</view>
 					<!-- <view>
@@ -31,7 +33,7 @@
 				</view>
 				<view class="info-content">
 					<view class="info-one-info ">
-						<text style="width:100px!important">处理账号/电话：</text>
+						<text style="width:140px!important">处理账号/电话：</text>
 						<text>{{this.getData.clr_phone}}</text>
 					</view>
 					<view>

pages/processList/processList.vue

@@ -38,9 +38,9 @@
 							<view class="unProcess" @tap="goUnprocessDetail(item)">未处理</view>
 						</view>
 					</view>
-					<view class=" text-center margin-top" v-if="alarm_count == 0">暂无数据...</view>
+					<view class=" text-center margin-top" v-if="alarm_count == 0&&data_res == 0">暂无数据...</view>
 					
-					<view v-show="isLoadMore&&alarm_count != 0">
+					<view v-show="isLoadMore&&alarm_count != 0&&this.page>1">
 						<uni-load-more :status="loadStatus"></uni-load-more>
 					</view>
 					
@@ -70,10 +70,10 @@
 							<view class="processed" @tap="goProcessedDetail(item)">已处理</view>
 						</view>
 					</view>
-					<view v-show="isLoadMore&&alarm_count1 != 0">
+					<view v-show="isLoadMore&&alarm_count1 != 0&&this.page>1">
 						<uni-load-more :status="loadStatus"></uni-load-more>
 					</view>
-					<view class="text-center margin-top" v-if="alarm_count1 == 0">暂无数据...</view>
+					<view class="text-center margin-top" v-if="alarm_count1 == 0&&data_res == 0">暂无数据...</view>
 				</view>
 			</view>
 		</block>
@@ -97,6 +97,8 @@
 				tabNav: ['未处理', '已处理'],
 				alarm_count: '',
 				alarm_count1: '',
+				
+				data_res:1,
 
 				page: 1,
 				pageSize: 10,
@@ -192,16 +194,15 @@
 					data: params,
 					showLoading: true
 				})
+				this.data_res = res.data.alarm_count?1:0
 				if (res.data.alarm_count) {
 					if (whichTab == 0) {
 						this.unporcessList = this.unporcessList.concat(res.data.data)
 						this.alarm_count = parseInt(res.data.alarm_count)
-
 					} else {
 						this.porcessedList = this.porcessedList.concat(res.data.data);
 						this.alarm_count1 = parseInt(res.data.alarm_count)
 					}
-
 					if (res.data.data.length < this.pageSize) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
 						this.isLoadMore = true
 						this.loadStatus = 'nomore'

pages/repair/repair.vue

@@ -47,10 +47,10 @@
 						</view>
 						<view class="action margin-right-sm" style="text-align:right;z-index:999" >
 							<view style="color:#FDCA60" v-if="item.cl_type==1" @tap="goRepairDetail(item)">未处理</view>
-							<view style="color:#59D1EA" v-if="item.cl_type==2">未审核</view>
-							<view style="color:#F77070" v-if="item.cl_type==3">未通过</view>
-							<view style="color:#72D06A" v-if="item.cl_type==4" >已完成</view>
-							<view style="color:#F7895E" v-if="item.cl_type==5">超时完成</view>
+							<view style="color:#59D1EA" v-if="item.cl_type==2" @tap="goRepairDetail(item)">未审核</view>
+							<view style="color:#F77070" v-if="item.cl_type==3" @tap="goRepairDetail(item)">未通过</view>
+							<view style="color:#72D06A" v-if="item.cl_type==4" @tap="goRepairDetail(item)" >已完成</view>
+							<view style="color:#F7895E" v-if="item.cl_type==5" @tap="goRepairDetail(item)">超时完成</view>
 						</view>
 					</view>
 				</view>
@@ -113,9 +113,11 @@
 			},
 					
 			// 页面跳转
-			goRepairDetail(item) {
+			goRepairDetail(item) {
+				console.log('item')
+				console.log(item)
 				uni.navigateTo({
-					url: '/pages/repair/repairDetail/repairDetail?id='+item.id,
+					url: '/pages/repair/repairDetail/repairDetail?id='+item.id+'&cl_type='+item.cl_type,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}

pages/repair/repairDetail/repairDetail.vue

@@ -4,39 +4,77 @@
 			<view style='height:30rpx'></view>
 			<view class="form-item">
 				<view class="title">
-					<text class="necessary">*</text>
 					报修地址：
 				</view>
-				<input type="text" v-model="this.getData.address">
+				<view>{{this.getData.address}}</view>
+				<!-- <input type="text" v-model="this.getData.address"> -->
 			</view>
 			<view class="form-item margin-top">
 				<view class="title">
-					<text class="necessary">*</text>
 					故障状态：
 				</view>
 				<view>{{this.getData.type_name}}</view>
 			</view>
 			<view class="form-item margin-top">
-				<view class="title"> 
-					<text class="necessary">*</text>
-					上传图片：
-				</view>
-				<view style="width:500rpx">
-					<view ref="input" class="input">
-					</view>
+				<view class="title">
+					
+					处理状态：
 				</view>
+				<view style="color:#FDCA60" v-if="cl_type==1">未处理</view>
+				<view style="color:#59D1EA" v-if="cl_type==2">未审核</view>
+				<view style="color:#F77070" v-if="cl_type==3">未通过</view>
+				<view style="color:#72D06A" v-if="cl_type==4" >已完成</view>
+				<view style="color:#F7895E" v-if="cl_type==5">超时完成</view>
 			</view>
-			<view class="form-item margin-top">
-				<view class="title">
-					<text class="necessary">*</text>
-					报修描述：
+			<view v-if="cl_type!=1" style="color:#aaa">
+				<view class="form-item margin-top">
+					<view style="font-weight:bold;">处理记录:</view>
 				</view>
-				<textarea maxlength="-1" @input="textareaAInput" placeholder="" v-model="msg" width="250"></textarea>
+				<block v-for="(item,index) in getData2" :key="index">
+					<view class="form-item">
+						<view class="title">图片：</view>
+						<img :src="imgFront+item.picture_path" alt="" style="max-width:50%">
+					</view>
+					<view class="form-item">
+						<view class="title">处理时间：</view>
+						<view>{{item.cl_time}}</view>
+					</view>
+					<view class="form-item">
+						<view class="title">处理结果：</view>
+						<view>{{item.jg_remarks}}</view>
+					</view>
+					<br>
+					
+					
+				</block>
+				
 			</view>
-
-			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="addSubmit">提 交 </button>
+			<view v-if="cl_type==1||cl_type==3">
+				
+				<view class="form-item margin-top">
+					<view class="title"> 
+						<text class="necessary">*</text>
+						上传图片：
+					</view>
+					<view style="width:500rpx">
+						<view ref="input" class="input">
+						</view>
+					</view>
+				</view>
+				<view class="form-item margin-top">
+					<view class="title">
+						<text class="necessary">*</text>
+						报修描述：
+					</view>
+					<textarea maxlength="-1" @input="textareaAInput" placeholder="" v-model="msg" width="250"></textarea>
+				</view>
+				
+				<view class="btn-area submitBottomBtn padding-lr-sm">
+					<button class="bg-blue round  margin-top" @click="addSubmit">提 交 </button>
+				</view>
+				
 			</view>
+			
 		</form>
 	</view>
 </template>
@@ -46,12 +84,15 @@
 		data() {
 			return {
 				getData:{},
+				getData2:[],
+				imgFront:'',
 				
 				msg: '',
 				id: '',
 				reportName: '',
 				radioOne: 0,
-				zb_id: 0
+				zb_id: 0,
+				cl_type:''
 			}
 		},
 
@@ -59,9 +100,13 @@
 
 		
 		onLoad: function(option) {
+			
+			this.imgFront=this.$websiteUrl
 			this.id = option.id;
 			this.zb_id = option.zb_id,
+			this.cl_type=option.cl_type
 			this.getRepairDetail({'company_code':uni.getStorageSync('selectedCode'),"id":option.id})
+			this.getRepairDetail2({'company_code':uni.getStorageSync('selectedCode'),"event_processing_id":option.id})
 		},
 
 		mounted() {
@@ -111,6 +156,17 @@
 			
 				console.log(this.getData)
 			},
+			//回显请求 记录回显
+			async getRepairDetail2(params = {}) {
+				const res = await this.$myRequest({
+					url: 'Repair/getRecordDetails',
+					data:params,
+					showLoading: true
+				})
+				this.getData2=res.data.data;
+			console.log('this.getData2')
+				console.log(this.getData2)
+			},
 
 			addSubmit() {
 				if (!this.img) {
@@ -156,4 +212,9 @@
 		}
 	}
 </script>
+<style scoped>
+	.form-item .title{
+		width:180rpx!important
+	}
+</style>
 

pages/xunJian/planDetail/planDetail.vue

@@ -9,12 +9,12 @@
 				</view>
 				<input type="text" v-model="reportName">
 			</view>
-			<view class="form-item margin-top" >
+			<view class="form-item margin-top">
 				<view class="title">
 					<text class="necessary">*</text>
 					巡检状态：
 				</view>
-				<radio-group name="gender" @change="radioChange" >
+				<radio-group name="gender" @change="radioChange">
 					<label class="">
 						<radio value="0" checked /><text>正常</text>
 					</label>
@@ -34,9 +34,14 @@
 					<text class="necessary">*</text>
 					上传图片：
 				</view>
-				<view class="unload-box">
-					<view ref="input" class="input" >
-					</view>
+
+				
+				<view class="unload-box"  @tap="goCamera()">
+					
+			
+					<image v-if="this.imgUrl" mode="aspectFit" style="width:70rpx;height:70rpx" :src="this.imgUrl"
+						:data-src="this.imgUrl"></image>
+						<view v-else style="background:rgb(223 215 215 / 63%);font-size:22rpx;line-height:40rpx;margin-top:20rpx;padding:0 20px;display:inline-block;border-radius:10rpx">请上传 + </view>
 				</view>
 			</view>
 			<view class="form-item margin-top">
@@ -58,10 +63,12 @@
 	export default {
 		data() {
 			return {
-				noClick:true,
+				noClick: true,
 				imgList: [],
 				msg: '',
 				id: '',
+				img: '',
+				imgUrl: '',
 				reportName: '',
 				radioOne: 0,
 				zb_id: 0
@@ -75,13 +82,13 @@
 
 		mounted() {
 			// 创建附件上传
-			var _self = this;
-			var input = document.createElement('input'); //创建元素
-			input.type = 'file' //添加file类型
-			input.onchange = (event) => {
-				_self.upFile(input, event)
-			}
-			this.$refs.input.$el.appendChild(input)
+			// var _self = this;
+			// var input = document.createElement('input'); //创建元素
+			// input.type = 'file' //添加file类型
+			// input.onchange = (event) => {
+			// 	_self.upFile(input, event)
+			// }
+			// this.$refs.input.$el.appendChild(input)
 
 		},
 		methods: {
@@ -90,51 +97,83 @@
 				this.radioOne = e.detail.value;
 			},
 
-			upFile(input, event) {
-				var _self = this;
-				uni.uploadFile({
-					url:this.$BASE_URL+'Inspection/setUpload',
-					files: [{
-						file: input.files[0],
-						uri: event.srcElement.value
-					}],
-					success: (uploadFileRes) => {
-						var data = JSON.parse(uploadFileRes.data)
-						this.img = data.img_url;
-						alert(this.img)
-					},
-					fail: (err) => {
-						console.log(err)
+			goCamera() {
+				const that = this;
+				uni.chooseImage({
+					count: 1, // 最多可以选择的图片张数
+					sizeType: ['original', 'compressed'], //original 原图，compressed 压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: function(res) {
+						console.log(res);
+						const tempFilePaths = res.tempFilePaths;
+						that.imgUrl = res.tempFilePaths[0];
+						alert(res.tempFilePaths[0])
+
+						uni.uploadFile({
+							url: that.$BASE_URL + 'Inspection/setUpload',
+							filePath: tempFilePaths[0],
+							name: 'file',
+							formData: {
+								'user': 'test'
+							},
+							success: (uploadFileRes) => {
+								console.log('uploadFileRes')
+								that.img = JSON.parse(uploadFileRes.data).img_url;
+								alert(uploadFileRes.data)
+								alert(that.img)
+							}
+						});
 					}
-				});
+				})
+
 			},
 
+			// upFile(input, event) {
+			// 	var _self = this;
+			// 	uni.uploadFile({
+			// 		url:this.$BASE_URL+'Inspection/setUpload',
+			// 		files: [{
+			// 			file: input.files[0],
+			// 			uri: event.srcElement.value
+			// 		}],
+			// 		success: (uploadFileRes) => {
+			// 			var data = JSON.parse(uploadFileRes.data)
+			// 			this.img = data.img_url;
+			// 			alert(this.img)
+			// 		},
+			// 		fail: (err) => {
+			// 			console.log(err)
+			// 		}
+			// 	});
+			// },
+
 			addSubmit() {
-				
-				if (!this.img) {
+
+
+
+				if (!this.reportName.replace(/^\s*/g, '')) {
 					uni.showToast({
-						title: "请上传图片",
+						title: "请输入上报名称",
 						icon: "none"
 					});
 					return
 				}
-				
-				if (!this.reportName.replace(/^\s*/g,'')) {
+				if (!this.img) {
 					uni.showToast({
-						title: "请输入上报名称",
+						title: "请上传图片",
 						icon: "none"
 					});
 					return
 				}
-				
-				if (!this.msg.replace(/^\s*/g,'')) {
+
+				if (!this.msg.replace(/^\s*/g, '')) {
 					uni.showToast({
 						title: "请输入巡检描述",
 						icon: "none"
 					});
 					return
 				}
-				
+
 				this.powerSubmitRes({
 					"zb_id": this.zb_id,
 					"spot_id": this.id,
@@ -168,11 +207,11 @@
 </script>
 
 <style lang="scss">
-.unload-box{
-	width:calc(100% - 200rpx)
-}
-.textarea{
-	width:calc(100% - 200rpx)
-	
-}
+	.unload-box {
+		width: calc(100% - 200rpx)
+	}
+
+	.textarea {
+		width: calc(100% - 200rpx)
+	}
 </style>

pages/xunJian/planInnerList/planInnerList.vue

@@ -15,7 +15,7 @@
 				<view class="cu-item deviceTypeItem" v-for="(item,index) in planList" :key="index"
 					@tap="goDetailPage(item)">
 					<view class="content" style="left:0!important;width:80%">
-						<view class="title">{{item.spot_name}}</view>
+						<view class="title text-cut" style="display:block">{{item.spot_name}}</view>
 					</view>
 					<view class="nav-right num">
 						<view class="text-grey">