故障列表

apis/pagejs/pagesInspection.js

@@ -0,0 +1,31 @@
+import request from '@/apis/utils/request'
+
+
+export function recordList(data) {
+	var url='/mobile/inspectionRecord/recordList';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
+
+export function recordReport(data) {
+	var url='/mobile/inspectionRecord/recordReport';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
+
+export function recordDetails(data) {
+	var url='/mobile/inspectionRecord/recordDetails';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}

apis/pagejs/pagesTask.js

@@ -12,6 +12,16 @@ export function teamUserStationUpdateList(data) {
 }
 
 
+export function findByCatalogName(data) {
+	var url='/mobile/dataDictionary/findByCatalogName';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
+
 
 export function errList(data) {
 	var url='/mobile/inspectionError/errList';
@@ -84,13 +94,3 @@ export function updateErr(data) {
 	})
 }
 
-
-export function findByCatalogName(data) {
-	var url='/mobile/dataDictionary/findByCatalogName';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
-

apis/utils/index.js

@@ -17,6 +17,8 @@ export const nextMonth=(year,month,day,bl)=>{
 	if(bl){
 		var now= newDate(str);
 		return parseUnixTime(new Date(now.getTime()-1000*60*60*24),'{y}-{m}-{d}')	
+	}else{
+		return str
 	}
 }
 

pages/inspection/list.vue

@@ -88,7 +88,7 @@
 </template>
 
 <script>
-	import * as API from '@/apis/pagejs/pagesTask.js'
+	import * as API from '@/apis/pagejs/pagesInspection.js'
 	
 	export default {
 		data() {
@@ -200,8 +200,8 @@
 					mask: true,
 				})
 							 
-				API.errList(this.listForm).then((res) => {
-					var list=[]
+				API.recordList(this.listForm).then((res) => {
+					var list=this.list
 					
 					if (this.listForm.pageIndex == 1) {
 						list = res.data.data;

pages/task/listTask.vue

@@ -12,13 +12,30 @@
 			</view>
 		</view>
 		
+		<u-select v-model="selectTaskInfoCode" :default-value="selectTaskInfoCodeValue" value-name="value"
+			label-name="name" @confirm="selectTaskInfoCodeConfirm" :list="codeList"></u-select>
+		
+		<u-picker mode="time" v-model="completionTimeShow" @confirm="completionTimeConfirm"
+			:default-time="completionTime" :params="params"></u-picker>
+		
+		
+		
 		<view  class="viewTop" >
 			<u-tabs :list="tabslist" 
 			 style="   width: 50%;"
 			 :current="current" @change="change"></u-tabs>
-			 <view class="select" @click="gotoSelectLock">
+			 
+			 
+			 <view class="select" @click="selectTaskInfoCodeBtn">
+			 				<view class="selectSpan">
+			 					{{codeN?codeN:'全部类型'}}
+			 				</view>
+			 				 <u-icon name="arrow-down" size="32" color="#AAAAAA"></u-icon>
+			 </view>
+			 
+			 <view class="select" @click="completionTimeShow=true">
 				<view class="selectSpan">
-					{{lockName?lockName:'选择地锁'}}
+					{{completionTimeN}}
 				</view>
 				 <u-icon name="arrow-down" size="32" color="#AAAAAA"></u-icon>
 			 </view>
@@ -44,12 +61,12 @@
 					</view>
 					
 					<view class="line2">
-						<view class="value">
-							设备编号 {{item.parkingName}}
+						<view class="value" v-if="item.deviceName">
+							设备编号 {{item.deviceName}}
 		
 						</view>
 						<view class="value">
-							设备网点 {{item.parkingName}} 
+							设备网点 {{item.stationName}} 
 		
 						</view>
 						<view class="value">
@@ -60,9 +77,9 @@
 					
 					<view class="line3">
 						
-						<u-button  type="info"  size="mini">查看</u-button>
+						<u-button  type="info" v-if="item.status==1"  size="mini">查看</u-button>
 						
-						<u-button  type="primary"  size="mini" >去处理</u-button>
+						<u-button  type="primary" v-if="item.status==0" size="mini" >去处理</u-button>
 						
 					</view>
 		
@@ -70,13 +87,13 @@
 				
 			</view>
 			
+			<u-divider :isnone="list.length==0" nonetext="没有找到相关内容" border-color="#CFD2D5">已经到底了</u-divider>
 			
 		</view>
-		<u-divider :isnone="list.length==0" nonetext="没有找到相关内容" border-color="#CFD2D5">已经到底了</u-divider>
 		
 		
 		<view class="floating-button">
-			<view class="button"  @click="submit" >
+			<view class="button"  @click="gotoUrl('/pages/task/addTask')" >
 				
 				故障上报
 
@@ -90,10 +107,19 @@
 <script>
 	import * as API from '@/apis/pagejs/pagesTask.js'
 	
+	import {
+	
+		currentTimeStamp,
+		parseUnixTime,newDate,nextMonth
+	} from '@/apis/utils'
+	
 	export default {
 		data() {
 			return {
+					queryName: "",
+				testName: "",
 				list:[],
+				codeList:[],
 				listForm:{
 					pageIndex: 1,
 					pageSize: 20,
@@ -102,6 +128,22 @@
 				},
 				lockId:"",
 				lockName:"",
+				codeN: "",
+				code: "",
+				selectTaskInfoCode: false,
+				selectTaskInfoCodeValue: [0],
+				completionTime: "",
+				completionTimeShow: false,
+				params: {
+					year: true,
+					month: true,
+					day: false,
+					hour: false,
+					minute: false,
+					second: false,
+					timestamp: false,
+				},
+				
 				current:0,
 				tabslist:[
 					{
@@ -129,6 +171,13 @@
 				this.lockName=op.lockName
 				this.listForm.lockId=op.lockId;
 			}
+			
+			this.completionTime = parseUnixTime(currentTimeStamp(),'{y}-{m}-1')
+			
+			
+			this.findByCatalogName({
+				catalogName: '设备故障类型'
+			}, "codeList")
 			this.getList()
 		},
 		onReachBottom() {
@@ -136,7 +185,62 @@
 				this.myLoadmore();
 			}
 		},
+		computed:{
+			completionTimeN(){
+				return parseUnixTime(newDate(this.completionTime ),'{y}年{m}月')
+			}
+		},
 		methods: {
+			completionTimeConfirm(e) {
+				console.log(e)
+			
+				this.completionTime = e.year+"-"+e.month+"-1"
+			
+			
+				this.getList(1)
+			},
+			findByCatalogName(obj, listName) {
+			
+				API.findByCatalogName(obj).then((res) => {
+			
+					var arr = res.data.dataDictionaryList
+			
+					this.codeList = [
+						{
+							name:"全部类型",
+							value: ""
+						},
+						...arr
+					]
+			
+			
+				}).catch(error => {
+			
+					uni.hideLoading();
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			
+			},
+			selectTaskInfoCodeBtn() {
+				if (this.code) {
+					//this.selectTaskInfoCodeValue=[parseInt(this.bindInfo.type)-1]
+					var i = this.codeList.findIndex(item => {
+						return item.value == this.code
+					})
+					this.selectTaskInfoCodeValue = [i]
+				}
+				this.selectTaskInfoCode = true;
+			},
+			selectTaskInfoCodeConfirm(e) {
+				console.log(e)
+				this.codeN = e[0].label
+				this.code = e[0].value
+				this.listForm.errorCode=this.code
+				this.getList(1)
+			},
 			gotoSelectLock(){
 				uni.navigateTo({
 				  url: '/pages/task/selectStation?isAll=1',
@@ -199,9 +303,15 @@
 					title: "加载中",
 					mask: true,
 				})
+				
+				if(this.completionTime){
+					this.listForm.startTime=this.completionTime
+					var sz=this.completionTime.split('-')
+					this.listForm.endTime=nextMonth(sz[0],sz[1],sz[2])
+				}
 							 
 				API.errList(this.listForm).then((res) => {
-					var list=[]
+					var list=this.list
 					
 					if (this.listForm.pageIndex == 1) {
 						list = res.data.data;
@@ -232,7 +342,7 @@
 
 		.list {
 			padding: 24rpx 24rpx;
-			
+			padding-bottom: 120rpx;
 			.item {
 				border-radius: 16rpx;
 				
@@ -327,13 +437,13 @@
 			    justify-content: space-between;
 				    align-items: center;
 					.select{
-						    padding: 0px 30rpx;
+						    padding: 0px 10rpx;
 							font-size: 30rpx;
 							    display: flex;
 								
 							.selectSpan{
 								    text-align: end;
-								width: 200rpx;
+							
 								overflow: hidden;
 								   text-overflow: ellipsis;
 								   white-space: nowrap; /* 禁止换行，强制单行 */

pages/team/teamList.vue

@@ -142,11 +142,9 @@
 					 
 				API.teamMembers(this.listForm).then((res) => {
 					
-					var list=[]
-					
 				
 					this.list = res.data.memberList
-					console.log(this.list)
+					
 					uni.hideLoading();
 				
 				}).catch(error => {