云服务-巡检保养工单系统-工单管理、巡检管理开发

api/home.js

@@ -41,22 +41,64 @@ const navButtons = [
 		badge: false,
 		value: 0,
 	},
+	{
+		name: '报表',
+		img: '/static/images/home/contact.png',
+		url: '/pages/serviceperson/servicepersonmanage?add=0',
+		badge: false,
+		value: 0,
+	},
+	{
+		name: 'IOT整合',
+		img: '/static/images/home/contact.png',
+		url: '/pages/serviceperson/servicepersonmanage?add=0',
+		badge: false,
+		value: 0,
+	},
+	{
+		name: '企业微信',
+		img: '/static/images/home/contact.png',
+		url: '/pages/serviceperson/servicepersonmanage?add=0',
+		badge: false,
+		value: 0,
+	},
+	{
+		name: '钉钉',
+		img: '/static/images/home/contact.png',
+		url: '/pages/serviceperson/servicepersonmanage?add=0',
+		badge: false,
+		value: 0,
+	},
+	{
+		name: '飞书',
+		img: '/static/images/home/contact.png',
+		url: '/pages/serviceperson/servicepersonmanage?add=0',
+		badge: false,
+		value: 0,
+	},
+	{
+		name: '短信',
+		img: '/static/images/home/contact.png',
+		url: '/pages/serviceperson/servicepersonmanage?add=0',
+		badge: false,
+		value: 0,
+	},
 ]
 
 //获取系统管理员导航按钮
-const sysAdminNavButton = [true,false,false,false,true,false];
+const sysAdminNavButton = [true,false,false,false,true,false,true,true,true,true,true,true];
 
 //获取盟市管理员导航按钮
-const orgAdminNavButton = [true,true,false,false,true,false];
+const orgAdminNavButton = [true,true,false,false,true,false,true,true,true,true,true,true];
 
 //获取运维公司管理员导航按钮
-const companyAdminNavButton = [true,true,true,true,true,false];
+const companyAdminNavButton = [true,true,true,true,true,false,true,true,true,true,true,true];
 
 //获取运维公司技术员导航按钮
-const companyServicePersonNavButton = [true,false,false,false,false,false];
+const companyServicePersonNavButton = [true,false,false,false,false,false,true,true,true,true,true,true];
 
 //获取运应急人员导航按钮
-const yjServicePersonNavButton = [false,false,false,false,true,false];
+const yjServicePersonNavButton = [false,false,false,false,true,false,true,true,true,true,true,true];
 
 
 export default {

pages.json

@@ -291,58 +291,56 @@
 			}
 		},
 		{
-			"path": "pages/equipment-inspection/finishedinspectionreportlist",
+			"path": "pages/equipment-inspection/inspection-list",
 			"style": {
-				"navigationBarTitleText": "已巡检设备",
+				"navigationBarTitleText": "巡检任务信息",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/equipment-inspection/servicepersonfinishedinspectionreportlist",
+			"path": "pages/equipment-inspection/inspection-report-list",
 			"style": {
-				"navigationBarTitleText": "已巡检设备",
+				"navigationBarTitleText": "巡检填报信息",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/equipment-inspection/companyfinishedinspectionreportlist",
+			"path": "pages/equipment-inspection/finishedinspectionreportlist",
 			"style": {
-				"navigationBarTitleText": "公司已巡检设备",
+				"navigationBarTitleText": "已巡检设备",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/equipment-inspection/equipment-inspection-report",
+			"path": "pages/equipment-inspection/servicepersonfinishedinspectionreportlist",
 			"style": {
-				"navigationBarTitleText": "设备巡检填报",
+				"navigationBarTitleText": "已巡检设备",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
 		},
 		{
-			"path": "pages/equipment-inspection/inspectionreportview",
+			"path": "pages/equipment-inspection/companyfinishedinspectionreportlist",
 			"style": {
-				"navigationBarTitleText": "设备巡检填报页面",
+				"navigationBarTitleText": "公司已巡检设备",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
 		},
 		{
-			"path": "pages/equipment-inspection/rtuinspectionreportview",
+			"path": "pages/equipment-inspection/equipment-inspection-report",
 			"style": {
-				"navigationBarTitleText": "设备巡检填报页面",
+				"navigationBarTitleText": "设备巡检填报",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 
 		},
 		{
-			"path": "pages/equipment-inspection/inspectionreportdetail",
+			"path": "pages/equipment-inspection/inspection-report-detail",
 			"style": {
 				"navigationBarTitleText": "设备巡检填报详情",
 				"enablePullDownRefresh": false,
@@ -350,14 +348,6 @@
 			}
 
 		},
-		{
-			"path": "pages/equipment-inspection/inspectionreportlist",
-			"style": {
-				"navigationBarTitleText": "巡检填报信息",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/equipment-inspection/inspectionremainingproblemslist",
 			"style": {

pages/check-order/check-order-manage.vue

@@ -15,12 +15,48 @@
 			</view>
 		</uni-nav-bar>
 		<view class="container">
-            <uni-section title="工单统计" type="circle">
-				
+			<uni-section title="工单统计" type="circle">
+				<uni-group>
+					<uni-row>
+						<uni-col :span="12">
+							<view class="list-item-block">
+								<view class="line">
+									<view class="text" style="color: gray;">工单共有:<span
+											style="margin-left: 10px;color: cornflowerblue;">{{countInfo.orderCount}}</span>
+									</view>
+								</view>
+								<view class="line">
+									<view class="text" style="color: gray;">待处理工单共有:<span
+											style="margin-left: 10px;color: cornflowerblue;">{{countInfo.orderProcessingCount}}</span>
+									</view>
+								</view>
+								<view class="line">
+									<view class="text" style="color: gray;">完结工单共有:<span
+											style="margin-left: 10px;color: cornflowerblue;">{{countInfo.closeOrderCount}}</span>
+									</view>
+								</view>
+							</view>
+						</uni-col>
+						<uni-col :span="12">
+							<view class="list-item-block">
+								<view class="line">
+									<view class="text" style="color: gray;">未接工单共有:<span
+											style="margin-left: 10px;color: cornflowerblue;">{{countInfo.orderUnconfirmCount}}</span>
+									</view>
+								</view>
+								<view class="line">
+									<view class="text" style="color: gray;">待完结审批共有:<span
+											style="margin-left: 10px;color: cornflowerblue;">{{countInfo.closeApproveOrderCount}}</span>
+									</view>
+								</view>
+							</view>
+						</uni-col>
+					</uni-row>
+				</uni-group>
 			</uni-section>
 			<uni-section title="工单查询" type="circle">
 				<view class="search-block">
-					<view style="margin-top: 10px;padding-left: 0px;padding-right: 0px;">
+					<view style="margin-top: 10px;padding-left: 10px;padding-right: 10px;">
 						<view class="select-checkbox">
 							<uni-data-checkbox v-model="orderStatusOption" :localdata="orderStatusItems">
 							</uni-data-checkbox>
@@ -34,7 +70,7 @@
 			<uni-section title="工单列表信息" type="circle">
 				<uni-list>
 					<uni-list-item v-for="item in list" :key="item.id" showArrow clickable
-							@click="toOrderProcessDetail(item)">
+						@click="toOrderProcessDetail(item)">
 						<template v-slot:body>
 							<view class="list-item-block">
 								<view class="line">
@@ -106,7 +142,7 @@
 				}, {
 					'value': 2,
 					'text': '待处理工单'
-				},  {
+				}, {
 					'value': 6,
 					'text': '待完结审批工单'
 				}, {
@@ -116,9 +152,10 @@
 				orderStatusOption: 0,
 				countInfo: {
 					orderCount: 0,
-					orderUnconfirm: 0,
-					orderProcessing: 0,
-					reportOrder: 0
+					orderUnconfirmCount: 0,
+					orderProcessingCount: 0,
+					closeApproveOrderCount: 0,
+					closeOrderCount: 0,
 				},
 				warnKindItems: [{
 					'value': 0,
@@ -189,6 +226,7 @@
 					this.postName = "servicePerson";
 				}
 			}
+			this.getCountInfo();
 			this.pageCurrent = 1;
 			this.getPage()
 		},
@@ -408,14 +446,11 @@
 					console.log(err)
 				})
 			},
-			getCountInfo(adCode) {
+			getCountInfo() {
 				let that = this;
 				http.request({
-					url: '/galaxy-business/rtu/check/order/count',
+					url: '/galaxy-business/order/count',
 					method: 'GET',
-					data: {
-						adCode
-					}
 				}).then(res => {
 					that.countInfo = res.data;
 				})

pages/equipment-inspection/inspection-list.vue

@@ -0,0 +1,411 @@
+<!--
+ * @Title: 
+ * @Description: 巡检上报列表
+ * @Author: swp
+ * @Date: 2022-08-24 10:49:21
+ * @LastEditors: 
+ * @LastEditTime: 2022-08-24 10:49:21
+-->
+<template>
+	<view class="wrap">
+		<uni-nav-bar dark :fixed="true" backgroundColor="#3F9EFF" statusBar="false" left-icon="left" left-text="返回"
+			@clickLeft="toBack">
+			<view class="nav-title">
+				<text>{{title}}</text>
+			</view>
+		</uni-nav-bar>
+		<view class="container">
+<!-- 			<uni-section title="任务统计" type="circle">
+			</uni-section> -->
+			<uni-section title="查询条件" type="circle">
+				<view class="search-block">
+					<view style="margin-top: 10px;padding-left: 10px;padding-right: 10px;margin-bottom: 10px;">
+						<view class="select-checkbox">
+							<uni-data-checkbox v-model="inspectionStatusOption" :localdata="inspectionStatusItems">
+							</uni-data-checkbox>
+						</view>
+					</view>
+					<view class="submit-btn">
+						<button type="default" @click="search">查 询</button>
+					</view>
+				</view>
+			</uni-section>
+			<uni-section title="巡检任务信息" type="circle">
+				<uni-list>
+					<uni-list-item v-for="(item,index) in list" :key="item.id">
+						<template v-slot:body>
+							<uni-collapse v-if="index ==0" @change="change">
+								<uni-collapse-item :open="true" :show-animation="true" title-border="none"
+									:border="false">
+									<template v-slot:title>
+										<view class="list-item-block">
+											<view class="items-line">
+												<!-- 					<image class="item-title-run-status-icon"
+													style="box-shadow:0 0 2px 2px lightblue"
+													src="/static/images/list/inspection_item.png" mode="widthFix">
+												</image> -->
+												<uni-icons class="input-uni-icon" type="compose" size="18"
+													color="lightblue" />
+												<text class="item-title-rtu-name">{{item.inspectionTitle}}</text>
+											</view>
+											<view v-if="item.inspectionStatus==0" class="items-line"
+												style="padding-left: 0px;">
+												<uni-icons class="input-uni-icon" type="gear" size="18"
+													color="lightblue" />
+												<!-- <text class="item-text-lable">巡检状态：</text> -->
+												<text class="item-text-content" style="color:red;">待巡检</text>
+											</view>
+											<view v-else-if="item.inspectionStatus==2" class="items-line"
+												style="padding-left: 0px;">
+												<!-- <text class="item-text-lable">巡检状态：</text> -->
+												<uni-icons class="input-uni-icon" type="gear" size="18"
+													color="lightblue" />
+												<text class="item-text-content" style="color:orange;">待审批</text>
+											</view>
+											<view v-else-if="item.inspectionStatus==3" class="items-line"
+												style="padding-left: 0px;">
+												<!-- <text class="item-text-lable">巡检状态：</text> -->
+												<uni-icons class="input-uni-icon" type="gear" size="18"
+													color="lightblue" />
+												<text class="item-text-content" style="color:green;">已完结</text>
+											</view>
+										</view>
+									</template>
+									<view class="list-item-block">
+										<view v-if="item.inspectionStatus==0" class="items-line" style="height: 50px;">
+
+											<view v-if="item.planScheduledType ==1" class="items-line">
+												<text class="item-text-lable">完成时限：</text>
+												<text class="item-text-content"
+													style="color:gray;">{{item.inspectionCompleteTime}}</text>
+											</view>
+											<view v-else-if="item.planScheduledType ==2" class="items-line">
+												<text class="item-text-lable">巡检日期：</text>
+												<text class="item-text-content"
+													style="color:gray;">{{item.inspectionDate}}</text>
+											</view>
+										</view>
+										<view v-else-if="item.inspectionStatus==2" class="items-line">
+											<uni-list style="width: 100%;">
+												<uni-list-item v-for="reportItem in item.reportList"
+													:key="reportItem.id" showArrow clickable
+													@click="toReportDetail(reportItem)">
+													<template v-slot:body>
+														<view class="list-item-block">
+															<view class="items-line">
+																<text class="item-text-lable">处理人：</text>
+																<text
+																	class="item-text-content-ellipsis">{{reportItem.servicePersonName}}</text>
+															</view>
+
+															<view class="items-line">
+																<text class="item-text-lable">处理时间：</text>
+																<text
+																	class="item-text-content-ellipsis">{{reportItem.createTime}}</text>
+															</view>
+															<view class="items-line">
+																<text class="item-text-lable">巡检内容：</text>
+																<text
+																	class="item-text-content-ellipsis">{{reportItem.inspectionDesc}}</text>
+															</view>
+														</view>
+													</template>
+												</uni-list-item>
+											</uni-list>
+										</view>
+										<view v-else-if="item.inspectionStatus==3" class="items-line">
+											<uni-list style="width: 100%;">
+												<uni-list-item v-for="reportItem in item.reportList"
+													:key="reportItem.id" showArrow clickable
+													@click="toReportDetail(reportItem)">
+													<template v-slot:body>
+														<view class="list-item-block">
+															<view class="items-line">
+																<text class="item-text-lable">处理人：</text>
+																<text
+																	class="item-text-content-ellipsis">{{reportItem.servicePersonName}}</text>
+															</view>
+
+															<view class="items-line">
+																<text class="item-text-lable">处理时间：</text>
+																<text
+																	class="item-text-content-ellipsis">{{reportItem.createTime}}</text>
+															</view>
+															<view class="items-line">
+																<text class="item-text-lable">巡检内容：</text>
+																<text
+																	class="item-text-content-ellipsis">{{reportItem.inspectionDesc}}</text>
+															</view>
+														</view>
+													</template>
+												</uni-list-item>
+											</uni-list>
+										</view>
+									</view>
+								</uni-collapse-item>
+							</uni-collapse>
+							<uni-collapse v-else @change="change">
+								<uni-collapse-item :title="item.inspectionTitle" :show-animation="true"
+									title-border="none" :border="false">
+									<template v-slot:title>
+										<view class="list-item-block">
+											<view class="items-line">
+												<!-- 			<image class="item-title-run-status-icon"
+													style="box-shadow:0 0 2px 2px lightblue"
+													src="/static/images/list/inspection_item.png" mode="widthFix">
+												</image> -->
+												<uni-icons class="input-uni-icon" type="compose" size="18"
+													color="lightblue" />
+												<text class="item-title-rtu-name">{{item.inspectionTitle}}</text>
+											</view>
+											<view v-if="item.inspectionStatus==0" class="items-line"
+												style="padding-left: 0px;">
+												<!-- <text class="item-text-lable">巡检状态：</text> -->
+												<uni-icons class="input-uni-icon" type="gear" size="18"
+													color="lightblue" />
+												<text class="item-text-content" style="color:red;">待巡检</text>
+											</view>
+											<view v-else-if="item.inspectionStatus==2" class="items-line"
+												style="padding-left: 0px;">
+												<!-- <text class="item-text-lable">巡检状态：</text> -->
+												<uni-icons class="input-uni-icon" type="gear" size="18"
+													color="lightblue" />
+												<text class="item-text-content" style="color:orange;">待审批</text>
+											</view>
+											<view v-else-if="item.inspectionStatus==3" class="items-line"
+												style="padding-left: 0px;">
+												<!-- <text class="item-text-lable">巡检状态：</text> -->
+												<uni-icons class="input-uni-icon" type="gear" size="18"
+													color="lightblue" />
+												<text class="item-text-content" style="color:green;">已完结</text>
+											</view>
+										</view>
+									</template>
+
+									<view class="list-item-block">
+										<view v-if="item.inspectionStatus==0" class="items-line" style="height: 50px;">
+											<view v-if="item.planScheduledType ==1" class="items-line">
+												<text class="item-text-lable">完成时限：</text>
+												<text class="item-text-content"
+													style="color:gray;">{{item.inspectionCompleteTime}}</text>
+											</view>
+											<view v-else-if="item.planScheduledType ==2" class="items-line">
+												<text class="item-text-lable">巡检日期：</text>
+												<text class="item-text-content"
+													style="color:gray;">{{item.inspectionDate}}</text>
+											</view>
+										</view>
+										<view v-else-if="item.inspectionStatus==2" class="items-line">
+											<uni-list style="width: 100%;">
+												<uni-list-item v-for="reportItem in item.reportList"
+													:key="reportItem.id" showArrow clickable
+													@click="toReportDetail(reportItem)">
+													<template v-slot:body>
+														<view class="list-item-block">
+															<view class="items-line">
+																<text class="item-text-lable">处理人：</text>
+																<text
+																	class="item-text-content-ellipsis">{{reportItem.servicePersonName}}</text>
+															</view>
+
+															<view class="items-line">
+																<text class="item-text-lable">处理时间：</text>
+																<text
+																	class="item-text-content-ellipsis">{{reportItem.createTime}}</text>
+															</view>
+															<view class="items-line">
+																<text class="item-text-lable">巡检内容：</text>
+																<text
+																	class="item-text-content-ellipsis">{{reportItem.inspectionDesc}}</text>
+															</view>
+														</view>
+													</template>
+												</uni-list-item>
+											</uni-list>
+										</view>
+										<view v-else-if="item.inspectionStatus==3" class="items-line">
+											<uni-list style="width: 100%;">
+												<uni-list-item v-for="reportItem in item.reportList"
+													:key="reportItem.id" showArrow clickable
+													@click="toReportDetail(reportItem)">
+													<template v-slot:body>
+														<view class="list-item-block">
+															<view class="items-line">
+																<text class="item-text-lable">处理人：</text>
+																<text
+																	class="item-text-content-ellipsis">{{reportItem.servicePersonName}}</text>
+															</view>
+
+															<view class="items-line">
+																<text class="item-text-lable">处理时间：</text>
+																<text
+																	class="item-text-content-ellipsis">{{reportItem.createTime}}</text>
+															</view>
+															<view class="items-line">
+																<text class="item-text-lable">巡检内容：</text>
+																<text
+																	class="item-text-content-ellipsis">{{reportItem.inspectionDesc}}</text>
+															</view>
+														</view>
+													</template>
+												</uni-list-item>
+											</uni-list>
+										</view>
+									</view>
+								</uni-collapse-item>
+							</uni-collapse>
+						</template>
+					</uni-list-item>
+				</uni-list>
+			</uni-section>
+			<uni-group>
+				<view class="pagination-block">
+					<uni-pagination show-icon :page-size="pageSize" :current="pageCurrent" :total="total"
+						@change="pageChange" />
+				</view>
+			</uni-group>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		role
+	} from "@/api/role.js";
+	import http from '@/http/api.js';
+
+	export default {
+		components: {
+
+		},
+		onLoad(option) {
+			this.planId = option.planId;
+			this.query['inspectionPlanId'] = this.planId;
+			this.getPage();
+		},
+		data() {
+			return {
+				title: '巡检任务信息',
+				planId: '',
+				inspectionStatusItems: [{
+					'value': 0,
+					'text': '全部'
+				}, {
+					'value': 1,
+					'text': '待巡检'
+				}, {
+					'value': 2,
+					'text': '待审批'
+				}, {
+					'value': 3,
+					'text': '已完结'
+				}],
+				inspectionStatusOption: 0,
+				list: [],
+				pageSize: 10,
+				// 当前页
+				pageCurrent: 1,
+				// 数据总量
+				total: 0,
+				query: {},
+				inputStyles: {
+					color: '#808080',
+					borderColor: '#d3d3d3'
+				},
+				value: ['0'],
+			}
+		},
+		computed: {},
+		onShow() {},
+		methods: {
+			toBack() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			onBackPress() {
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord();
+				// #endif
+			},
+			change(e) {
+				console.log(e);
+			},
+			// 分页触发
+			pageChange(e) {
+				this.pageCurrent = e.current;
+				this.getPage()
+			},
+			//录入查询
+			search() {
+				this.pageCurrent = 1;
+				let params = {};
+				this.getPage(params);
+			},
+			getPage(params = {}) {
+				let that = this;
+				const current = this.pageCurrent;
+				const size = this.pageSize;
+				params['inspectionStatusOption'] = this.inspectionStatusOption;
+				let postData = Object.assign(params, this.query);
+				http.request({
+					url: '/galaxy-business/equipment/inspection/page',
+					method: 'GET',
+					params: {
+						current,
+						size,
+					},
+					data: postData,
+				}).then(res => {
+					if (res.data != null) {
+						if (res.data.records != null) {
+							that.list = res.data.records;
+						}
+						this.total = res.data.total;
+					}
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+			toReportDetail(reportItem){
+				let url = '/pages/equipment-inspection/inspection-report-detail?id=' + reportItem.id;
+				uni.navigateTo({
+					url: url
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	/* page {
+		background-color: rgb(240, 242, 244);
+	} */
+</style>
+
+<style lang="scss" scoped>
+	.line {
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-start;
+	}
+
+	.line .lineText {
+		margin-left: 10px;
+		margin-right: 0px;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+
+	.line .lineText .inspectionCount {
+		color: dodgerblue;
+		font-size: 0.7rem;
+	}
+
+	.line .lineText .content {
+		margin-left: 10px;
+		color: gray;
+		font-size: 0.7rem;
+	}
+</style>

pages/equipment-inspection/inspection-manage.vue

@@ -16,9 +16,54 @@
 		</uni-nav-bar>
 		<view class="container">
 			<uni-section title="巡检统计" titleFontSize="0.8rem" type="circle">
+				<uni-group>
+					<uni-row>
+						<uni-col :span="12">
+							<view class="list-item-block">
+								<view class="line">
+									<view class="text" style="color: gray;">巡检计划共有:<span
+											style="margin-left: 10px;color: cornflowerblue;">{{countInfo.planCount}}</span>
+									</view>
+								</view>
+								<view class="line">
+									<view class="text" style="color: gray;">定期计划共有:<span
+											style="margin-left: 10px;color: cornflowerblue;">{{countInfo.runPlanCount}}</span>
+									</view>
+								</view>
 
+							</view>
+						</uni-col>
+						<uni-col :span="12">
+							<view class="list-item-block">
+								<view class="line">
+									<view class="text" style="color: gray;">单次计划共有:<span
+											style="margin-left: 10px;color: cornflowerblue;">{{countInfo.onlyOnePlanCount}}</span>
+									</view>
+								</view>
+								<view class="line">
+									<view class="text" style="color: gray;">预警计划共有:<span
+											style="margin-left: 10px;color: cornflowerblue;">{{countInfo.planWarnCount}}</span>
+									</view>
+								</view>
+							</view>
+						</uni-col>
+					</uni-row>
+				</uni-group>
+			</uni-section>
+			<uni-section title="查询条件" type="circle">
+				<view class="search-block">
+					<view style="margin-top: 10px;padding-left: 10px;padding-right: 10px;margin-bottom: 10px;">
+						<view class="select-checkbox">
+							<uni-data-checkbox v-model="planTypeOption" :localdata="planTypeItems">
+							</uni-data-checkbox>
+						</view>
+					</view>
+					<view class="submit-btn">
+						<button type="default" @click="search">查 询</button>
+					</view>
+				</view>
 			</uni-section>
-			<uni-section title="巡检任务信息" type="circle">
+			<uni-section title="巡检计划信息" type="circle">
 				<uni-list>
 					<uni-list-item v-for="item in list" :key="item.id" showArrow clickable @click="toDetail(item)">
 						<template v-slot:body>
@@ -36,7 +81,7 @@
 								<view v-if="item.planScheduledType ==1">
 									<view class="items-line">
 										<text class="item-text-lable">计划执行周期：</text>
-										<text class="item-text-content-ellipsis">仅一次</text>
+										<text class="item-text-content-ellipsis">单次</text>
 									</view>
 									<view class="items-line">
 										<text class="item-text-lable">完成时限：</text>
@@ -87,19 +132,6 @@
 	export default {
 		components: {
 
-		},
-		onLoad(option) {
-			// if (this.userInfo.role_name === role['admin']) {
-			// 	this.permission.admin = true;
-			// } else if (this.userInfo.role_name === role['orgAdmin']) {
-			// 	this.permission.orgAdmin = true;
-			// } else if (this.userInfo.role_name === role['companyAdmin']) {
-			// 	this.permission.companyAdmin = true;
-			// } else if (this.userInfo.role_name === role['companyServciePerson']) {
-			// 	this.permission.companyServciePerson = true;
-			// }
-			// this.getRegionTree();
-			this.getPage();
 		},
 		data() {
 			return {
@@ -111,13 +143,26 @@
 					'companyServciePerson': false,
 				},
 				countInfo: {
-					rainKind: 0,
+					planCount: 0,
+					onlyOnePlanCount: 0,
+					runPlanCount: 0,
+					planWarnCount: 0,
 				},
+				planTypeItems: [{
+					'value': 0,
+					'text': '全部'
+				}, {
+					'value': 1,
+					'text': '单次'
+				}, {
+					'value': 2,
+					'text': '定期'
+				}],
+				planTypeOption: 0,
 				//planId: 0,
 				//orgId: '',
 				//projectId: '',
 				list: [],
-
 				pageSize: 10,
 				// 当前页
 				pageCurrent: 1,
@@ -142,6 +187,20 @@
 				}
 			},
 		},
+		onLoad(option) {
+			// if (this.userInfo.role_name === role['admin']) {
+			// 	this.permission.admin = true;
+			// } else if (this.userInfo.role_name === role['orgAdmin']) {
+			// 	this.permission.orgAdmin = true;
+			// } else if (this.userInfo.role_name === role['companyAdmin']) {
+			// 	this.permission.companyAdmin = true;
+			// } else if (this.userInfo.role_name === role['companyServciePerson']) {
+			// 	this.permission.companyServciePerson = true;
+			// }
+			// this.getRegionTree();
+			this.getCountInfo();
+			this.getPage();
+		},
 		onShow() {
 			// this.pageCurrent = 1;
 			// this.getPage()
@@ -329,20 +388,17 @@
 					}
 				}
 			},
-			getCountInfo(adCode) {
+			getCountInfo() {
 				let that = this;
 				http.request({
-					url: '/galaxy-business/equipment/inspection/count',
+					url: '/galaxy-business/equipment/inspection/plan/count',
 					method: 'GET',
-					data: {
-						adCode
-					}
 				}).then(res => {
 					that.countInfo = res.data;
 				})
 			},
-			toDetail(item){
-				let url = '/pages/equipment-inspection/inspectionreportlist?planId='+item.id;
+			toDetail(item) {
+				let url = '/pages/equipment-inspection/inspection-list?planId=' + item.id;
 				uni.navigateTo({
 					url: url
 				})
@@ -410,6 +466,7 @@
 				let that = this;
 				const current = this.pageCurrent;
 				const size = this.pageSize;
+				params['planTypeOption'] = this.planTypeOption;
 				let postData = Object.assign(params, this.query);
 				http.request({
 					url: '/galaxy-business/equipment/inspection/plan/page',

pages/equipment-inspection/inspection-report-detail.vue

@@ -0,0 +1,580 @@
+<!--
+ * @Title: 
+ * @Description: 巡检填报详情
+ * @Author: swp
+ * @Date: 2022-08-24 10:49:21
+ * @LastEditors: 
+ * @LastEditTime: 2022-08-24 10:49:21
+-->
+<template>
+	<view class="wrap">
+		<uni-nav-bar dark :fixed="true" backgroundColor="#3F9EFF" statusBar="false" left-icon="left" left-text="返回"
+			@clickLeft="toBack">
+			<view class="nav-title">
+				<text>{{title}}</text>
+			</view>
+		</uni-nav-bar>
+		<view class="container">
+			<uni-card title="处理人">
+				<view class="item-text-line">
+					<text class="item-title">{{dataInfo.servicePersonName}}</text>
+				</view>
+			</uni-card>
+			<uni-card title="处理时间">
+				<view class="item-text-line">
+					<text class="item-title">{{dataInfo.createTime}}</text>
+				</view>
+			</uni-card>
+			<uni-card title="巡检内容">
+				<view class="item-text-line">
+					<text class="item-title">{{dataInfo.inspectionDesc}}</text>
+				</view>
+			</uni-card>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		role
+	} from "@/api/role.js";
+	import http from '@/http/api.js';
+	import {
+		oss
+	} from '@/common/setting';
+	export default {
+		components: {
+
+		},
+		props: {
+			// id: {
+			// 	type: String,
+			// 	required: true,
+			// },
+		},
+		data() {
+			return {
+				query: {},
+				title: '巡检详情',
+				dataInfo: {
+
+				},
+				data: {
+					rtuCode: '',
+					rtuName: '',
+					isRain: false,
+					isRiver: false,
+					isRes: false,
+					isGround: false,
+					isCamera: false,
+					lng: '',
+					lat: '',
+					adCity: '',
+					adDist: '',
+					locationDesc: '',
+					//站点状态检查项
+					siteCheckStatus: {
+						items: [{
+							'id': '0',
+							'dictValue': '水毁'
+						}, {
+							'id': '1',
+							'dictValue': '丢失'
+						}, {
+							'id': '2',
+							'dictValue': '损坏'
+						}, {
+							'id': '3',
+							'dictValue': '正常'
+						}],
+						current: 3
+					},
+					siteCheckPhotos: [],
+					siteCheckRemark: '',
+					//雨量站检查数据
+					rainSiteCheckItems: {
+						items: [{
+							'id': '0',
+							'checked': false,
+							'dictValue': '故障排查'
+						}, {
+							'id': '1',
+							'checked': false,
+							'dictValue': '清理堵塞'
+						}, {
+							'id': '2',
+							'checked': false,
+							'dictValue': '雨量计校核'
+						}],
+						current: 0
+					},
+					rainSiteCheckPhotos: [],
+					rainSiteCheckResult: 1,
+					rainSiteCheckRemark: '',
+					//水位站检查数据
+					waterSiteCheckItems: {
+						items: [{
+							'id': '0',
+							'checked': false,
+							'dictValue': '故障排查'
+						}, {
+							'id': '1',
+							'checked': false,
+							'dictValue': '水位计校核'
+						}],
+						current: 0
+					},
+					waterSiteCheckPhotos: [],
+					waterSiteCheckResult: 1,
+					waterSiteCheckRemark: '',
+					//墒情站检查数据
+					groundSiteCheckItems: {
+						items: [{
+							'id': '0',
+							'checked': false,
+							'dictValue': '故障排查'
+						}, {
+							'id': '1',
+							'checked': false,
+							'dictValue': '墒情计校核'
+						}],
+						current: 0
+					},
+					groundSiteCheckPhotos: [],
+					groundSiteCheckRemark: '',
+					groundSiteCheckResult: 1,
+					//其他设备检查
+					othersEquipmentCheckItems: {
+						items: [{
+							'id': '0',
+							'checked': false,
+							'dictValue': '设备接地检测'
+						}, {
+							'id': '1',
+							'checked': false,
+							'dictValue': '电源电压检测'
+						}, {
+							'id': '2',
+							'checked': false,
+							'dictValue': '太阳能板检查'
+						}, {
+							'id': '3',
+							'checked': false,
+							'dictValue': '蓄电池检查'
+						}, {
+							'id': '4',
+							'checked': false,
+							'dictValue': '网络通信检查'
+						}],
+						current: 0
+					},
+					othersEquipmentCheckPhotos: [],
+					othersEquipmentCheckRemark: '',
+					otherEquipmentCheckResult: 1,
+					//设备替换
+					equipmentsReplaceItems: {
+						items: [{
+							'id': '0',
+							'checked': false,
+							'dictValue': 'RTU'
+						}, {
+							'id': '1',
+							'checked': false,
+							'dictValue': '雨量计'
+						}, {
+							'id': '2',
+							'checked': false,
+							'dictValue': '水位计'
+						}, {
+							'id': '3',
+							'checked': false,
+							'dictValue': '墒情计'
+						}, {
+							'id': '4',
+							'checked': false,
+							'dictValue': '蓄电池'
+						}, {
+							'id': '5',
+							'checked': false,
+							'dictValue': '太阳能板'
+						}, {
+							'id': '6',
+							'checked': false,
+							'dictValue': '充电控制器'
+						}, {
+							'id': '7',
+							'checked': false,
+							'dictValue': '其他'
+						}],
+						current: 0
+					},
+					rtuModelRemark: '',
+					rtuReplacePhotos: [],
+					rainSensorModelRemark: '',
+					rainSensorReplacePhotos: [],
+					waterSensorModelRemark: '',
+					waterSensorReplacePhotos: [],
+					groundSensorModelRemark: '',
+					groundSensorReplacePhotos: [],
+					batteryModelRemark: '',
+					batteryReplacePhotos: [],
+					sunPowerModelRemark: '',
+					sunPowerReplacePhotos: [],
+					batteryControlModelRemark: '',
+					batteryControlReplacePhotos: [],
+					otherEquipmentModelRemark: '',
+					otherEquipmentReplacePhotos: [],
+					//巡检遗留问题描述
+					inspectionRemainProblemsRemark: '',
+					//工作留存数据
+					inspectionWorkPhotos: [],
+					id: '',
+				},
+			}
+		},
+		onLoad(options) {
+			// console.log("ddddd onLoad")
+			let params = {};
+			params['id'] = options.id;
+			// console.log("id " + this.inspectionId)
+			this.getDetail(params);
+		},
+		onShow() {
+			// console.log("ddd onShow")
+		},
+		created() {
+			// console.log("dddd created")
+			// console.log("id " + this.inspectionId)
+			// let params = {};
+			// params['id'] = this.inspectionId;
+			// console.log("id " + this.inspectionId)
+			// this.getDetail(params);
+		},
+		computed: {
+			getSiteKind() {
+				let htmltext = '';
+				if (this.data.isRain === 1) {
+					htmltext = htmltext + "雨量站";
+				}
+				if (this.data.isRiver == 1 || this.data.isRes == 1) {
+					if (htmltext.length > 0) {
+						htmltext = htmltext + ' / ';
+					}
+					htmltext = htmltext + '水位站';
+				}
+				if (this.data.isGround == 1) {
+					if (htmltext.length > 0) {
+						htmltext = htmltext + ' / ';
+					}
+					htmltext = htmltext + '墒情站';
+				}
+				if (this.data.isVideo == 1) {
+					if (htmltext.length > 0) {
+						htmltext = htmltext + ' / ';
+					}
+					htmltext = htmltext + '视频站';
+				}
+				return htmltext;
+			},
+			getAreaName() {
+				let htmltext = '';
+				if (this.data.adCity) {
+					htmltext = htmltext + this.data.adCity;
+				}
+				if (this.data.adDist) {
+					if (htmltext.length > 0) {
+						htmltext = htmltext + ' / ';
+					}
+					htmltext = htmltext + this.data.adDist;
+				}
+				return htmltext;
+			},
+			getSiteCheckStatus() {
+				return this.data.siteCheckStatus.items[this.data.siteCheckStatus.current].dictValue;
+			},
+			getRainSiteCheckItems() {
+				//console.log(JSON.stringify(this.data.rainSiteCheckItems))
+				let text = '';
+				for (let i = 0; i < this.data.rainSiteCheckItems.items.length; i++) {
+					if (this.data.rainSiteCheckItems.items[i].checked) {
+						if (text.length > 0) {
+							text = text + ' / ';
+						}
+						text = text + this.data.rainSiteCheckItems.items[i].dictValue;
+					}
+				}
+				return text;
+			},
+			getWaterSiteCheckItems() {
+				let text = '';
+				for (let i = 0; i < this.data.waterSiteCheckItems.items.length; i++) {
+					if (this.data.waterSiteCheckItems.items[i].checked) {
+						if (text.length > 0) {
+							text = text + ' / ';
+						}
+						text = text + this.data.waterSiteCheckItems.items[i].dictValue;
+					}
+				}
+				return text;
+			},
+			getGroundSiteCheckItems() {
+				let text = '';
+				for (let i = 0; i < this.data.groundSiteCheckItems.items.length; i++) {
+					if (this.data.groundSiteCheckItems.items[i].checked) {
+						if (text.length > 0) {
+							text = text + ' / ';
+						}
+						text = text + this.data.groundSiteCheckItems.items[i].dictValue;
+					}
+				}
+				return text;
+			},
+			getOthersEquipmentCheckItems() {
+				let text = '';
+				for (let i = 0; i < this.data.othersEquipmentCheckItems.items.length; i++) {
+					if (this.data.othersEquipmentCheckItems.items[i].checked) {
+						if (text.length > 0) {
+							text = text + ' / ';
+						}
+						text = text + this.data.othersEquipmentCheckItems.items[i].dictValue;
+					}
+				}
+				return text;
+			},
+		},
+		methods: {
+			toOss(path) {
+				return oss + path;
+			},
+			toBack() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			getDetail(params = {}) {
+				let that = this;
+				this.query = {};
+				Object.assign(this.query, params);
+				http.request({
+					url: '/galaxy-business/equipment/inspection/report/detail',
+					method: 'GET',
+					params: this.query
+				}).then(res => {
+					if (res.success) {
+						that.dataInfo = res.data;
+					}
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+	/* page {
+		background-color: rgb(240, 242, 244);
+	} */
+</style>
+
+<style lang="scss" scoped>
+	.uni-body {
+		font-size: 0.7rem;
+	}
+
+	.decoration {
+		width: 6px;
+		height: 6px;
+		margin-right: 4px;
+		border-radius: 50%;
+		background-color: cadetblue;
+	}
+
+	.view-flex-rs {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.view-flex-rs-flex-wrap {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+	}
+
+	.view-flex-rc {
+		display: flex;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.view-flex-re {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-end;
+		align-items: center;
+	}
+
+	.view-flex-cs {
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.view-flex-cc {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.view-flex-ce {
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-end;
+		align-items: center;
+	}
+
+	.cell-hover-class {
+		background-color: rgb(235, 237, 238);
+	}
+
+	.view-flex-ce {
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-end;
+	}
+
+	.line-body {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+
+	.item-text-line {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+
+		.item-title {
+			font-size: 0.7rem;
+			font-weight: bold;
+		}
+
+		.item-text {
+			overflow: hidden;
+			margin-left: 5px;
+			font-size: 0.7rem;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+
+		.item-text-block {
+			margin-left: 5px;
+			font-size: 0.7rem;
+			word-wrap: break-word;
+			word-break: normal;
+		}
+
+		.error-text {
+			color: #FF0000;
+		}
+
+		.normally-text {
+			color: darkgreen;
+		}
+
+		.select-text {
+			color: royalblue;
+		}
+	}
+
+	.required-star {
+		color: #FF0000;
+		font-size: 15px;
+		width: 20px;
+		text-align: center;
+		padding-left: 0px;
+		padding-right: 2px;
+	}
+
+	.item-title {
+		color: #909399;
+		font-size: 15px;
+	}
+
+	.mline-text {
+		padding-left: 2px;
+		width: 100%;
+		/* background-color:#909399; */
+		height: 70px;
+		border: 1px solid #FF5A5F;
+		border-radius: 5px;
+	}
+
+
+	.img-container {
+		margin-bottom: 0px;
+		width: 100px;
+		height: 100px;
+
+		.note-image-box {
+			margin-top: 0px;
+			display: flex;
+			flex-wrap: wrap;
+			padding: 10px;
+
+			.note-image-item {
+				position: relative;
+				width: 100%;
+				height: 0;
+				padding-top: 100%;
+				box-sizing: border-box;
+				// background-color: #18B566;
+
+				.close-icon {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					position: absolute;
+					right: 0px;
+					top: 0px;
+					width: 22px;
+					height: 22px;
+					border-radius: 50%;
+					background-color: #d5d5d5;
+					z-index: 2;
+				}
+
+				.image-box {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					position: absolute;
+					top: 0px;
+					right: 0px;
+					border: 0px;
+					left: 0px;
+					border: 1px #eee solid;
+					border-radius: 5px;
+					overflow: hidden;
+					width: 99%;
+					height: 99%;
+
+				}
+
+
+			}
+		}
+	}
+
+	.input-body {
+		background-color: #fff;
+		padding: 10px;
+	}
+</style>

pages/equipment-inspection/inspectionreportlist.vue → pages/equipment-inspection/inspection-report-list.vue

@@ -1,480 +1,480 @@
-<!--
- * @Title: 
- * @Description: 巡检上报列表
- * @Author: swp
- * @Date: 2022-08-24 10:49:21
- * @LastEditors: 
- * @LastEditTime: 2022-08-24 10:49:21
--->
-<template>
-	<view class="wrap">
-		<uni-nav-bar dark :fixed="true" backgroundColor="#3F9EFF" statusBar="false" left-icon="left" left-text="返回"
-			@clickLeft="toBack">
-			<view class="nav-title">
-				<text>{{title}}</text>
-			</view>
-		</uni-nav-bar>
-		<view class="container">
-<!-- 			<uni-section title="查询" titleFontSize="0.8rem" type="line">
-				<view class="search-block">
-					<view class="adcd-adnm">
-						<uni-data-picker placeholder="请选择地区" popup-title="请选择所在地区" :localdata="regionTree"
-							v-model="selectedTreeNode" @change="onTreeChange" @nodeclick="onTreeNodeClick"
-							@popupopened="onTreePopupOpened" @popupclosed="onTreePopupClosed" :clear-icon="false">
-						</uni-data-picker>
-					</view>
-					<view class="rtu-code">
-						<uni-easyinput :styles="inputStyles" @input="searchRtuCodeValClear" prefixIcon="search"
-							v-model="searchRtuCodeVal" placeholder="请输入测站编码">
-						</uni-easyinput>
-					</view>
-					<view class="rtu-name">
-						<uni-easyinput :styles="inputStyles" @input="searchRtuNameValClear" prefixIcon="search"
-							v-model="searchRtuNameVal" placeholder="请输入测站名称">
-						</uni-easyinput>
-					</view>
-					<view class="submit-btn">
-						<button type="default" @click="search">查 询</button>
-					</view>
-				</view>
-			</uni-section> -->
-<!-- 			<view style="margin-top: 5px;padding-left: 10px;padding-right: 10px;margin-bottom: 5px;">
-				<view class="line">
-					<view class="lineText">
-						<text class="inspectionCount">当前汛期: </text>
-						<text v-if="countInfo.rainKind==1" class="content">汛前巡检</text>
-						<text v-else-if="countInfo.rainKind==2" class="content">汛中（一）巡检</text>
-						<text v-else-if="countInfo.rainKind==3" class="content">汛中（二）巡检</text>
-						<text v-else class="content">--</text>
-					</view>
-					<view class="lineText">
-						<text class="beforeRainInspectionCount">巡检设备总数量: </text>
-						<text class="content">{{ countInfo.rtus }}</text>
-					</view>
-
-					<view class="lineText">
-						<text class="rainSencodInspectionCount">汛前已巡检数量: </text>
-						<text class="content">{{ countInfo.beforeRainInspectionCount }}</text>
-					</view>
-					<view class="lineText">
-						<text class="rainSencodInspectionCount">汛中（一）已巡检数量: </text>
-						<text class="content">{{ countInfo.firstRainInspectionCount }}</text>
-					</view>
-					<view class="lineText">
-						<text class="rainSencodInspectionCount">汛中（二）已巡检数量: </text>
-						<text class="content">{{ countInfo.sencodRainInspectionCount }}</text>
-					</view>
-					<view style="margin-top: 5px;">
-						<uni-data-checkbox v-model="countOption" :localdata="countItems" @change="countOptionChange">
-						</uni-data-checkbox>
-					</view>
-				</view>
-			</view> -->
-			<uni-list>
-				<uni-list-item v-for="item in list" :key="item.id">
-					<template v-slot:body>
-						<view class="list-item-block">
-							<view class="items-line">
-								<image class="item-title-run-status-icon" style="box-shadow:0 0 2px 2px lightblue"
-									src="/static/images/list/inspection_item.png" mode="widthFix">
-								</image>
-								<text class="item-title-rtu-name">{{item.inspectionTitle}}</text>
-								<!-- <text class="item-title-rtu-code">[{{item.rtuCode}}]</text> -->
-							</view>
-							<view class="items-line">
-								<!-- <uni-icons class="input-uni-icon" type="compose" size="18" color="lightblue" /> -->
-								<text class="item-text-lable">巡检日期：</text>
-								<!-- <view v-if="item.beforeRainSeasonStatus ==1"> -->
-									<text class="item-text-content" style="color:dodgerblue;">{{item.inspectionDate}}</text>
-								<!-- 	<text class="item-text-content" style="color:gray;">/</text>
-									<text class="item-text-content"
-										style="color:gray;">{{item.beforeRainSeasonReportTime}}</text> -->
-							<!-- 	</view> -->
-							<!-- 	<text v-else class="item-text-content" style="color:darkorange;">未填报</text> -->
-							</view>
-<!-- 							<view class="items-line">
-								<uni-icons class="input-uni-icon" type="compose" size="18" color="lightblue" />
-								<text class="item-text-lable">汛中（一）填报：</text>
-								<view v-if="item.rainSeasonFirstStatus ==1">
-									<text class="item-text-content" style="color:dodgerblue;">已填报</text>
-									<text class="item-text-content" style="color:gray;">/</text>
-									<text class="item-text-content"
-										style="color:gray;">{{item.rainSeasonFirstReportTime}}</text>
-								</view>
-								<text v-else class="item-text-content" style="color:darkorange;">未填报</text>
-							</view> -->
-			<!-- 				<view class="items-line">
-								<uni-icons class="input-uni-icon" type="compose" size="18" color="lightblue" />
-								<text class="item-text-lable">汛中（二）填报：</text>
-								<view v-if="item.rainSeasonSecondStatus ==1">
-									<text class="item-text-content" style="color:dodgerblue;">已填报</text>
-									<text class="item-text-content" style="color:gray;">/</text>
-									<text class="item-text-content"
-										style="color:gray;">{{item.rainSeasonSecondReportTime}}</text>
-								</view>
-								<text v-else class="item-text-content" style="color:darkorange;">未填报</text>
-							</view> -->
-<!-- 							<view class="item-button-group">
-								<view v-if="item.beforeRainSeasonStatus ==1" class="item-button" style="width: 120px;"
-									@click="onBeforeRainDetailViewClick(item.beforeRainSeasonReportId)">
-									<view class="items-line">
-										<uni-icons class="input-uni-icon" type="info" size="18" color="coral" />
-										<text class="button-text">汛前详情</text>
-									</view>
-								</view>
-								<view v-else class="item-button-disabled" style="width: 120px;">
-									<view class="items-line">
-										<uni-icons class="input-uni-icon" type="info" size="18" color="gray" />
-										<text class="button-text">汛前详情</text>
-									</view>
-								</view>
-								<view v-if="item.rainSeasonFirstStatus ==1" class="item-button" style="width: 120px;"
-									@click="onRainFirstDetailViewClick(item.rainSeasonFirstReportId)">
-									<view class="items-line">
-										<uni-icons class="input-uni-icon" type="info" size="18" color="coral" />
-										<text class="button-text">汛中(一)详情</text>
-									</view>
-								</view>
-								<view v-else class="item-button-disabled" style="width: 120px;">
-									<view class="items-line">
-										<uni-icons class="input-uni-icon" type="info" size="18" color="gray" />
-										<text class="button-text">汛中(一)详情</text>
-									</view>
-								</view>
-								<view v-if="item.rainSeasonSecondStatus ==1" class="item-button" style="width: 120px;"
-									@click="onRainSencodDetailViewClick(item.rainSeasonSecondReportId)">
-									<view class="items-line">
-										<uni-icons class="input-uni-icon" type="info" size="18" color="coral" />
-										<text class="button-text">汛中(二)详情</text>
-									</view>
-								</view>
-								<view v-else class="item-button-disabled" style="width: 120px;">
-									<view class="items-line">
-										<uni-icons class="input-uni-icon" type="info" size="18" color="gray" />
-										<text class="button-text">汛中(二)详情</text>
-									</view>
-								</view>
-							</view> -->
-						</view>
-					</template>
-				</uni-list-item>
-			</uni-list>
-			<uni-group>
-				<view class="pagination-block">
-					<uni-pagination show-icon :page-size="pageSize" :current="pageCurrent" :total="total"
-						@change="pageChange" />
-				</view>
-			</uni-group>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		role
-	} from "@/api/role.js";
-	import http from '@/http/api.js';
-
-	export default {
-		components: {
-
-		},
-		onLoad(option) {
-			this.planId = option.planId;
-			// if (this.userInfo.role_name === role['admin']) {
-			// 	this.permission.admin = true;
-			// } else if (this.userInfo.role_name === role['orgAdmin']) {
-			// 	this.permission.orgAdmin = true;
-			// } else if (this.userInfo.role_name === role['companyAdmin']) {
-			// 	this.permission.companyAdmin = true;
-			// } else if (this.userInfo.role_name === role['companyServciePerson']) {
-			// 	this.permission.companyServciePerson = true;
-			// }
-			// this.getRegionTree();
-			this.getPage();
-		},
-		data() {
-			return {
-				title: '巡检填报信息',
-				planId:'',
-				permission: {
-					'admin': false,
-					'orgAdmin': false,
-					'companyAdmin': false,
-					'companyServciePerson': false,
-				},
-				countItems: [{
-					'value': 0,
-					'text': '全部'
-				}, {
-					'value': 1,
-					'text': '汛前巡检'
-				}, {
-					'value': 2,
-					'text': '汛中(一)巡检'
-				}, {
-					'value': 3,
-					'text': '汛中(二)巡检'
-				}],
-				countOption: 0,
-				countInfo: {
-					rainKind: 0,
-				},
-				list: [],
-				pageSize: 10,
-				// 当前页
-				pageCurrent: 1,
-				// 数据总量
-				total: 0,
-				regionTree: [],
-				regionCode: '',
-				selectedTreeNode: '',
-				searchRtuNameVal: '',
-				searchRtuCodeVal: '',
-				query: {},
-				inputStyles: {
-					color: '#808080',
-					borderColor: '#d3d3d3'
-				}
-			}
-		},
-		computed: {},
-		onShow() {},
-		methods: {
-			toBack() {
-				uni.navigateBack({
-					delta: 1
-				})
-			},
-			onBackPress() {
-				// #ifdef APP-PLUS
-				plus.key.hideSoftKeybord();
-				// #endif
-			},
-			// 分页触发
-			pageChange(e) {
-				this.pageCurrent = e.current;
-				this.getPage()
-			},
-			onTreeNodeClick(node) {
-				console.log(JSON.stringify(node))
-			},
-			onTreePopupOpened(e) {
-				console.log(JSON.stringify(e))
-			},
-			onTreePopupClosed(e) {
-				console.log(JSON.stringify(e))
-			},
-			onTreeChange(e) {
-				console.log(JSON.stringify(e))
-				let nodes = e.detail.value;
-				if (nodes.length > 0) {
-					let node = nodes[nodes.length - 1];
-					this.regionCode = node.value;
-					this.query = {};
-					this.query['adCode'] = this.regionCode;
-					this.searchRtuNameVal = '';
-					this.searchRtuCodeVal = '';
-					this.pageCurrent = 1;
-					this.getPage();
-					this.getCountInfo(this.regionCode);
-				} else {
-					this.regionCode = '';
-					this.query = {};
-					this.searchRtuNameVal = '';
-					this.searchRtuCodeVal = '';
-					this.pageCurrent = 1;
-					this.getPage();
-					this.getCountInfo(this.regionCode);
-				}
-			},
-			onBeforeRainDetailViewClick(id) {
-				console.log("onDetailViewClick " + id)
-				var url = '/pages/equipment-inspection/inspectionreportview?type=1&id=' + id;
-				uni.navigateTo({
-					url: url
-				})
-			},
-			onRainFirstDetailViewClick(id) {
-				console.log("onDetailViewClick " + id)
-				var url = '/pages/equipment-inspection/inspectionreportview?type=2&id=' + id;
-				uni.navigateTo({
-					url: url
-				})
-			},
-			onRainSencodDetailViewClick(id) {
-				console.log("onDetailViewClick " + id)
-				var url = '/pages/equipment-inspection/inspectionreportview?type=3&id=' + id;
-				uni.navigateTo({
-					url: url
-				})
-			},
-			//录入查询
-			search() {
-				this.pageCurrent = 1;
-				let params = {};
-				if (this.searchRtuCodeVal.length > 0) {
-					params['rtuCode'] = this.searchRtuCodeVal;
-				}
-				if (this.searchRtuNameVal.length > 0) {
-					params['rtuName'] = this.searchRtuNameVal;
-				}
-				this.getPage(params);
-			},
-			searchRtuNameValClear(e) {
-				if (e == null || e.length == 0) {
-					this.searchRtuNameVal = '';
-					if (this.searchRtuNameVal.length == 0) {
-						let params = {};
-						if (this.searchRtuCodeVal.length > 0) {
-							params['rtuCode'] = this.searchRtuCodeVal;
-						}
-						this.getPage(params);
-					}
-				}
-			},
-			searchRtuCodeValClear(e) {
-				if (e == null || e.length == 0) {
-					this.searchRtuCodeVal = '';
-					if (this.searchRtuCodeVal.length == 0) {
-						let params = {};
-						if (this.searchRtuNameVal.length > 0) {
-							params['rtuName'] = this.searchRtuNameVal;
-						}
-						this.getPage(params);
-					}
-				}
-			},
-			countOptionChange: function(evt) {
-				//console.log("sensor" + JSON.stringify(evt))
-				let params = {};
-				// if (this.countOption == 0) {
-
-				// } else if (this.countOption == 1) {
-				// 	params['rainSeasonKind'] = 1;
-				// } else if (this.countOption == 2) {
-				// 	params['rainSeasonKind'] = 2;
-				// } else if (this.countOption == 3) {
-				// 	params['rainSeasonKind'] = 3;
-				// }
-				this.pageCurrent=1;
-				this.getPage(params);
-			},
-			getCountInfo(adCode) {
-				let that = this;
-				http.request({
-					url: '/galaxy-business/equipment/inspection/count',
-					method: 'GET',
-					data: {
-						adCode
-					}
-				}).then(res => {
-					that.countInfo = res.data;
-				})
-			},
-			getRegionTree() {
-				var that = this;
-				http.request({
-					url: '/galaxy-business/baseinfo/region/tree',
-					method: 'GET',
-				}).then(res => {
-					if (res.data != null) {
-						that.regionTree = res.data;
-						that.selectedTreeNode = that.regionTree[0].value;
-						that.regionCode = that.regionTree[0].value;
-						that.query = {};
-						that.query['adCode'] = that.regionCode;
-						//that.orgId = that.projectTree[0].orgId;
-						//that.projectId = that.projectTree[0].projectId;
-						that.getPage();
-						that.getCountInfo(that.regionCode);
-					}
-				}).catch(err => {
-					console.log(err)
-				})
-			},
-			getPage(params = {}) {
-				let that = this;
-				const current = this.pageCurrent;
-				const size = this.pageSize;
-				// if (this.countOption == 0) {
-				
-				// } else if (this.countOption == 1) {
-					params['inspectionPlanId'] = this.planId;
-				// } else if (this.countOption == 2) {
-				// 	params['rainSeasonKind'] = 2;
-				// } else if (this.countOption == 3) {
-				// 	params['rainSeasonKind'] = 3;
-				// }
-				let postData = Object.assign(params, this.query);
-				http.request({
-					url: '/galaxy-business/equipment/inspection/page',
-					method: 'GET',
-					params: {
-						current,
-						size,
-
-					},
-					data: postData,
-				}).then(res => {
-					if (res.data != null) {
-						if (res.data.records != null) {
-							that.list = res.data.records;
-						}
-						this.total = res.data.total;
-					}
-				}).catch(err => {
-					console.log(err)
-				})
-			},
-		}
-	}
-</script>
-
-<style>
-	/* page {
-		background-color: rgb(240, 242, 244);
-	} */
-</style>
-
-<style lang="scss" scoped>
-	.line {
-		display: flex;
-		flex-direction: column;
-		justify-content: flex-start;
-	}
-
-	.line .lineText {
-		margin-left: 10px;
-		margin-right: 0px;
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-start;
-	}
-
-	.line .lineText .inspectionCount {
-		color: dodgerblue;
-		font-size: 0.7rem;
-	}
-
-	.line .lineText .content {
-		margin-left: 10px;
-		color: gray;
-		font-size: 0.7rem;
-	}
-
-	.line .lineText .beforeRainInspectionCount {
-		color: dodgerblue;
-		font-size: 0.7rem;
-	}
-
-	.line .lineText .rainFirstInspectionCount {
-		color: dodgerblue;
-		font-size: 0.7rem;
-	}
-
-	.line .lineText .rainSencodInspectionCount {
-		color: dodgerblue;
-		font-size: 0.7rem;
-	}
+<!--
+ * @Title: 
+ * @Description: 巡检上报列表
+ * @Author: swp
+ * @Date: 2022-08-24 10:49:21
+ * @LastEditors: 
+ * @LastEditTime: 2022-08-24 10:49:21
+-->
+<template>
+	<view class="wrap">
+		<uni-nav-bar dark :fixed="true" backgroundColor="#3F9EFF" statusBar="false" left-icon="left" left-text="返回"
+			@clickLeft="toBack">
+			<view class="nav-title">
+				<text>{{title}}</text>
+			</view>
+		</uni-nav-bar>
+		<view class="container">
+<!-- 			<uni-section title="查询" titleFontSize="0.8rem" type="line">
+				<view class="search-block">
+					<view class="adcd-adnm">
+						<uni-data-picker placeholder="请选择地区" popup-title="请选择所在地区" :localdata="regionTree"
+							v-model="selectedTreeNode" @change="onTreeChange" @nodeclick="onTreeNodeClick"
+							@popupopened="onTreePopupOpened" @popupclosed="onTreePopupClosed" :clear-icon="false">
+						</uni-data-picker>
+					</view>
+					<view class="rtu-code">
+						<uni-easyinput :styles="inputStyles" @input="searchRtuCodeValClear" prefixIcon="search"
+							v-model="searchRtuCodeVal" placeholder="请输入测站编码">
+						</uni-easyinput>
+					</view>
+					<view class="rtu-name">
+						<uni-easyinput :styles="inputStyles" @input="searchRtuNameValClear" prefixIcon="search"
+							v-model="searchRtuNameVal" placeholder="请输入测站名称">
+						</uni-easyinput>
+					</view>
+					<view class="submit-btn">
+						<button type="default" @click="search">查 询</button>
+					</view>
+				</view>
+			</uni-section> -->
+<!-- 			<view style="margin-top: 5px;padding-left: 10px;padding-right: 10px;margin-bottom: 5px;">
+				<view class="line">
+					<view class="lineText">
+						<text class="inspectionCount">当前汛期: </text>
+						<text v-if="countInfo.rainKind==1" class="content">汛前巡检</text>
+						<text v-else-if="countInfo.rainKind==2" class="content">汛中（一）巡检</text>
+						<text v-else-if="countInfo.rainKind==3" class="content">汛中（二）巡检</text>
+						<text v-else class="content">--</text>
+					</view>
+					<view class="lineText">
+						<text class="beforeRainInspectionCount">巡检设备总数量: </text>
+						<text class="content">{{ countInfo.rtus }}</text>
+					</view>
+
+					<view class="lineText">
+						<text class="rainSencodInspectionCount">汛前已巡检数量: </text>
+						<text class="content">{{ countInfo.beforeRainInspectionCount }}</text>
+					</view>
+					<view class="lineText">
+						<text class="rainSencodInspectionCount">汛中（一）已巡检数量: </text>
+						<text class="content">{{ countInfo.firstRainInspectionCount }}</text>
+					</view>
+					<view class="lineText">
+						<text class="rainSencodInspectionCount">汛中（二）已巡检数量: </text>
+						<text class="content">{{ countInfo.sencodRainInspectionCount }}</text>
+					</view>
+					<view style="margin-top: 5px;">
+						<uni-data-checkbox v-model="countOption" :localdata="countItems" @change="countOptionChange">
+						</uni-data-checkbox>
+					</view>
+				</view>
+			</view> -->
+			<uni-list>
+				<uni-list-item v-for="item in list" :key="item.id">
+					<template v-slot:body>
+						<view class="list-item-block">
+							<view class="items-line">
+								<image class="item-title-run-status-icon" style="box-shadow:0 0 2px 2px lightblue"
+									src="/static/images/list/inspection_item.png" mode="widthFix">
+								</image>
+								<text class="item-title-rtu-name">{{item.inspectionTitle}}</text>
+								<!-- <text class="item-title-rtu-code">[{{item.rtuCode}}]</text> -->
+							</view>
+							<view class="items-line">
+								<!-- <uni-icons class="input-uni-icon" type="compose" size="18" color="lightblue" /> -->
+								<text class="item-text-lable">巡检日期：</text>
+								<!-- <view v-if="item.beforeRainSeasonStatus ==1"> -->
+									<text class="item-text-content" style="color:dodgerblue;">{{item.inspectionDate}}</text>
+								<!-- 	<text class="item-text-content" style="color:gray;">/</text>
+									<text class="item-text-content"
+										style="color:gray;">{{item.beforeRainSeasonReportTime}}</text> -->
+							<!-- 	</view> -->
+							<!-- 	<text v-else class="item-text-content" style="color:darkorange;">未填报</text> -->
+							</view>
+<!-- 							<view class="items-line">
+								<uni-icons class="input-uni-icon" type="compose" size="18" color="lightblue" />
+								<text class="item-text-lable">汛中（一）填报：</text>
+								<view v-if="item.rainSeasonFirstStatus ==1">
+									<text class="item-text-content" style="color:dodgerblue;">已填报</text>
+									<text class="item-text-content" style="color:gray;">/</text>
+									<text class="item-text-content"
+										style="color:gray;">{{item.rainSeasonFirstReportTime}}</text>
+								</view>
+								<text v-else class="item-text-content" style="color:darkorange;">未填报</text>
+							</view> -->
+			<!-- 				<view class="items-line">
+								<uni-icons class="input-uni-icon" type="compose" size="18" color="lightblue" />
+								<text class="item-text-lable">汛中（二）填报：</text>
+								<view v-if="item.rainSeasonSecondStatus ==1">
+									<text class="item-text-content" style="color:dodgerblue;">已填报</text>
+									<text class="item-text-content" style="color:gray;">/</text>
+									<text class="item-text-content"
+										style="color:gray;">{{item.rainSeasonSecondReportTime}}</text>
+								</view>
+								<text v-else class="item-text-content" style="color:darkorange;">未填报</text>
+							</view> -->
+<!-- 							<view class="item-button-group">
+								<view v-if="item.beforeRainSeasonStatus ==1" class="item-button" style="width: 120px;"
+									@click="onBeforeRainDetailViewClick(item.beforeRainSeasonReportId)">
+									<view class="items-line">
+										<uni-icons class="input-uni-icon" type="info" size="18" color="coral" />
+										<text class="button-text">汛前详情</text>
+									</view>
+								</view>
+								<view v-else class="item-button-disabled" style="width: 120px;">
+									<view class="items-line">
+										<uni-icons class="input-uni-icon" type="info" size="18" color="gray" />
+										<text class="button-text">汛前详情</text>
+									</view>
+								</view>
+								<view v-if="item.rainSeasonFirstStatus ==1" class="item-button" style="width: 120px;"
+									@click="onRainFirstDetailViewClick(item.rainSeasonFirstReportId)">
+									<view class="items-line">
+										<uni-icons class="input-uni-icon" type="info" size="18" color="coral" />
+										<text class="button-text">汛中(一)详情</text>
+									</view>
+								</view>
+								<view v-else class="item-button-disabled" style="width: 120px;">
+									<view class="items-line">
+										<uni-icons class="input-uni-icon" type="info" size="18" color="gray" />
+										<text class="button-text">汛中(一)详情</text>
+									</view>
+								</view>
+								<view v-if="item.rainSeasonSecondStatus ==1" class="item-button" style="width: 120px;"
+									@click="onRainSencodDetailViewClick(item.rainSeasonSecondReportId)">
+									<view class="items-line">
+										<uni-icons class="input-uni-icon" type="info" size="18" color="coral" />
+										<text class="button-text">汛中(二)详情</text>
+									</view>
+								</view>
+								<view v-else class="item-button-disabled" style="width: 120px;">
+									<view class="items-line">
+										<uni-icons class="input-uni-icon" type="info" size="18" color="gray" />
+										<text class="button-text">汛中(二)详情</text>
+									</view>
+								</view>
+							</view> -->
+						</view>
+					</template>
+				</uni-list-item>
+			</uni-list>
+			<uni-group>
+				<view class="pagination-block">
+					<uni-pagination show-icon :page-size="pageSize" :current="pageCurrent" :total="total"
+						@change="pageChange" />
+				</view>
+			</uni-group>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		role
+	} from "@/api/role.js";
+	import http from '@/http/api.js';
+
+	export default {
+		components: {
+
+		},
+		onLoad(option) {
+			this.planId = option.planId;
+			// if (this.userInfo.role_name === role['admin']) {
+			// 	this.permission.admin = true;
+			// } else if (this.userInfo.role_name === role['orgAdmin']) {
+			// 	this.permission.orgAdmin = true;
+			// } else if (this.userInfo.role_name === role['companyAdmin']) {
+			// 	this.permission.companyAdmin = true;
+			// } else if (this.userInfo.role_name === role['companyServciePerson']) {
+			// 	this.permission.companyServciePerson = true;
+			// }
+			// this.getRegionTree();
+			this.getPage();
+		},
+		data() {
+			return {
+				title: '巡检填报信息',
+				planId:'',
+				permission: {
+					'admin': false,
+					'orgAdmin': false,
+					'companyAdmin': false,
+					'companyServciePerson': false,
+				},
+				countItems: [{
+					'value': 0,
+					'text': '全部'
+				}, {
+					'value': 1,
+					'text': '汛前巡检'
+				}, {
+					'value': 2,
+					'text': '汛中(一)巡检'
+				}, {
+					'value': 3,
+					'text': '汛中(二)巡检'
+				}],
+				countOption: 0,
+				countInfo: {
+					rainKind: 0,
+				},
+				list: [],
+				pageSize: 10,
+				// 当前页
+				pageCurrent: 1,
+				// 数据总量
+				total: 0,
+				regionTree: [],
+				regionCode: '',
+				selectedTreeNode: '',
+				searchRtuNameVal: '',
+				searchRtuCodeVal: '',
+				query: {},
+				inputStyles: {
+					color: '#808080',
+					borderColor: '#d3d3d3'
+				}
+			}
+		},
+		computed: {},
+		onShow() {},
+		methods: {
+			toBack() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			onBackPress() {
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord();
+				// #endif
+			},
+			// 分页触发
+			pageChange(e) {
+				this.pageCurrent = e.current;
+				this.getPage()
+			},
+			onTreeNodeClick(node) {
+				console.log(JSON.stringify(node))
+			},
+			onTreePopupOpened(e) {
+				console.log(JSON.stringify(e))
+			},
+			onTreePopupClosed(e) {
+				console.log(JSON.stringify(e))
+			},
+			onTreeChange(e) {
+				console.log(JSON.stringify(e))
+				let nodes = e.detail.value;
+				if (nodes.length > 0) {
+					let node = nodes[nodes.length - 1];
+					this.regionCode = node.value;
+					this.query = {};
+					this.query['adCode'] = this.regionCode;
+					this.searchRtuNameVal = '';
+					this.searchRtuCodeVal = '';
+					this.pageCurrent = 1;
+					this.getPage();
+					this.getCountInfo(this.regionCode);
+				} else {
+					this.regionCode = '';
+					this.query = {};
+					this.searchRtuNameVal = '';
+					this.searchRtuCodeVal = '';
+					this.pageCurrent = 1;
+					this.getPage();
+					this.getCountInfo(this.regionCode);
+				}
+			},
+			onBeforeRainDetailViewClick(id) {
+				console.log("onDetailViewClick " + id)
+				var url = '/pages/equipment-inspection/inspectionreportview?type=1&id=' + id;
+				uni.navigateTo({
+					url: url
+				})
+			},
+			onRainFirstDetailViewClick(id) {
+				console.log("onDetailViewClick " + id)
+				var url = '/pages/equipment-inspection/inspectionreportview?type=2&id=' + id;
+				uni.navigateTo({
+					url: url
+				})
+			},
+			onRainSencodDetailViewClick(id) {
+				console.log("onDetailViewClick " + id)
+				var url = '/pages/equipment-inspection/inspectionreportview?type=3&id=' + id;
+				uni.navigateTo({
+					url: url
+				})
+			},
+			//录入查询
+			search() {
+				this.pageCurrent = 1;
+				let params = {};
+				if (this.searchRtuCodeVal.length > 0) {
+					params['rtuCode'] = this.searchRtuCodeVal;
+				}
+				if (this.searchRtuNameVal.length > 0) {
+					params['rtuName'] = this.searchRtuNameVal;
+				}
+				this.getPage(params);
+			},
+			searchRtuNameValClear(e) {
+				if (e == null || e.length == 0) {
+					this.searchRtuNameVal = '';
+					if (this.searchRtuNameVal.length == 0) {
+						let params = {};
+						if (this.searchRtuCodeVal.length > 0) {
+							params['rtuCode'] = this.searchRtuCodeVal;
+						}
+						this.getPage(params);
+					}
+				}
+			},
+			searchRtuCodeValClear(e) {
+				if (e == null || e.length == 0) {
+					this.searchRtuCodeVal = '';
+					if (this.searchRtuCodeVal.length == 0) {
+						let params = {};
+						if (this.searchRtuNameVal.length > 0) {
+							params['rtuName'] = this.searchRtuNameVal;
+						}
+						this.getPage(params);
+					}
+				}
+			},
+			countOptionChange: function(evt) {
+				//console.log("sensor" + JSON.stringify(evt))
+				let params = {};
+				// if (this.countOption == 0) {
+
+				// } else if (this.countOption == 1) {
+				// 	params['rainSeasonKind'] = 1;
+				// } else if (this.countOption == 2) {
+				// 	params['rainSeasonKind'] = 2;
+				// } else if (this.countOption == 3) {
+				// 	params['rainSeasonKind'] = 3;
+				// }
+				this.pageCurrent=1;
+				this.getPage(params);
+			},
+			getCountInfo(adCode) {
+				let that = this;
+				http.request({
+					url: '/galaxy-business/equipment/inspection/count',
+					method: 'GET',
+					data: {
+						adCode
+					}
+				}).then(res => {
+					that.countInfo = res.data;
+				})
+			},
+			getRegionTree() {
+				var that = this;
+				http.request({
+					url: '/galaxy-business/baseinfo/region/tree',
+					method: 'GET',
+				}).then(res => {
+					if (res.data != null) {
+						that.regionTree = res.data;
+						that.selectedTreeNode = that.regionTree[0].value;
+						that.regionCode = that.regionTree[0].value;
+						that.query = {};
+						that.query['adCode'] = that.regionCode;
+						//that.orgId = that.projectTree[0].orgId;
+						//that.projectId = that.projectTree[0].projectId;
+						that.getPage();
+						that.getCountInfo(that.regionCode);
+					}
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+			getPage(params = {}) {
+				let that = this;
+				const current = this.pageCurrent;
+				const size = this.pageSize;
+				// if (this.countOption == 0) {
+				
+				// } else if (this.countOption == 1) {
+					params['inspectionPlanId'] = this.planId;
+				// } else if (this.countOption == 2) {
+				// 	params['rainSeasonKind'] = 2;
+				// } else if (this.countOption == 3) {
+				// 	params['rainSeasonKind'] = 3;
+				// }
+				let postData = Object.assign(params, this.query);
+				http.request({
+					url: '/galaxy-business/equipment/inspection/page',
+					method: 'GET',
+					params: {
+						current,
+						size,
+
+					},
+					data: postData,
+				}).then(res => {
+					if (res.data != null) {
+						if (res.data.records != null) {
+							that.list = res.data.records;
+						}
+						this.total = res.data.total;
+					}
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	/* page {
+		background-color: rgb(240, 242, 244);
+	} */
+</style>
+
+<style lang="scss" scoped>
+	.line {
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-start;
+	}
+
+	.line .lineText {
+		margin-left: 10px;
+		margin-right: 0px;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+
+	.line .lineText .inspectionCount {
+		color: dodgerblue;
+		font-size: 0.7rem;
+	}
+
+	.line .lineText .content {
+		margin-left: 10px;
+		color: gray;
+		font-size: 0.7rem;
+	}
+
+	.line .lineText .beforeRainInspectionCount {
+		color: dodgerblue;
+		font-size: 0.7rem;
+	}
+
+	.line .lineText .rainFirstInspectionCount {
+		color: dodgerblue;
+		font-size: 0.7rem;
+	}
+
+	.line .lineText .rainSencodInspectionCount {
+		color: dodgerblue;
+		font-size: 0.7rem;
+	}
 </style>

pages/equipment-inspection/inspectionreportdetail.vue

@@ -1,1048 +0,0 @@
-<!--
- * @Title: 
- * @Description: 巡检填报详情
- * @Author: swp
- * @Date: 2022-08-24 10:49:21
- * @LastEditors: 
- * @LastEditTime: 2022-08-24 10:49:21
--->
-<template>
-	<view class="container">
-		<uni-section title="站点基础信息">
-			<template v-slot:decoration>
-				<view class="decoration"></view>
-			</template>
-			<uni-card title="测站名称">
-				<view class="item-text-line">
-					<text class="item-title">{{data.rtuName}}</text>/<text class="item-text">{{data.rtuCode}}</text>
-				</view>
-			</uni-card>
-			<uni-card title="测站类型">
-				<view class="item-text-line">
-					<text class="item-text">{{getSiteKind}}</text>
-				</view>
-			</uni-card>
-			<uni-card title="测站安装地址">
-				<view class="item-text-line">
-					<text class="item-text-block">{{data.locationDesc}}</text>
-				</view>
-			</uni-card>
-			<uni-card title="经纬度">
-				<view class="item-text-line">
-					<text class="item-text">{{data.lng}}/{{data.lat}}</text>
-				</view>
-			</uni-card>
-			<uni-card title="行政区划">
-				<view class="item-text-line">
-					<text class="item-text">{{getAreaName}}</text>
-				</view>
-			</uni-card>
-		</uni-section>
-		<uni-section title="站点状态检查信息">
-			<template v-slot:decoration>
-				<view class="decoration"></view>
-			</template>
-			<uni-card title="已选检查项">
-				<view class="item-text-line">
-					<text class="item-title select-text">{{getSiteCheckStatus}}</text>
-				</view>
-			</uni-card>
-			<uni-card title="站点检查补充说明">
-				<view class="item-text-line">
-					<text class="item-text-block">{{data.siteCheckRemark}}</text>
-				</view>
-			</uni-card>
-			<uni-card title="拍摄照片">
-				<view v-if="data.siteCheckPhotos && data.siteCheckPhotos.length>0" class="view-flex-cc">
-					<image v-for="(item, index) in data.siteCheckPhotos" :key="index" class="cover-image"
-						mode="widthFix" style="width: 100%;" :src="toOss(item)">
-					</image>
-				</view>
-			</uni-card>
-		</uni-section>
-		<uni-section title="雨量站检查信息">
-			<template v-slot:decoration>
-				<view class="decoration"></view>
-			</template>
-			<uni-card title="已选检查项">
-				<view class="item-text-line">
-					<text class="item-title select-text">{{getRainSiteCheckItems}}</text>
-				</view>
-			</uni-card>
-			<uni-card title="拍摄照片">
-				<view v-if="data.rainSiteCheckPhotos && data.rainSiteCheckPhotos.length>0" class="view-flex-cc">
-					<image v-for="(item, index) in data.rainSiteCheckPhotos" :key="index" class="cover-image"
-						mode="widthFix" style="width: 100%;" :src="toOss(item)">
-					</image>
-				</view>
-			</uni-card>
-			<uni-card title="巡检结果">
-				<view class="item-text-line">
-					<text v-if="data.rainSiteCheckResult==0" class="item-title error-text">异常</text>
-					<text v-else class="item-title normally-text">正常</text>
-				</view>
-			</uni-card>
-			<uni-card title="雨量站检查补充说明">
-				<view class="item-text-line">
-					<text class="item-text-block">{{data.rainSiteCheckRemark}}</text>
-				</view>
-			</uni-card>
-		</uni-section>
-		<uni-section title="水位站检查信息">
-			<template v-slot:decoration>
-				<view class="decoration"></view>
-			</template>
-			<uni-card title="已选检查项">
-				<view class="item-text-line">
-					<text class="item-title select-text">{{getWaterSiteCheckItems}}</text>
-				</view>
-			</uni-card>
-			<uni-card v-if="data.waterSiteCheckPhotos.length>0" title="拍摄照片">
-				<view class="view-flex-cc">
-					<image v-for="(item, index) in data.waterSiteCheckPhotos" :key="index" class="cover-image"
-						mode="widthFix" style="width: 100%;" :src="toOss(item)">
-					</image>
-				</view>
-			</uni-card>
-			<uni-card title="巡检结果">
-				<view class="item-text-line">
-					<text v-if="data.waterSiteCheckResult==0" class="item-title error-text">异常</text>
-					<text v-else class="item-title normally-text">正常</text>
-				</view>
-			</uni-card>
-			<uni-card title="检查补充说明">
-				<view class="item-text-line">
-					<text class="item-text-block">{{data.waterSiteCheckRemark}}</text>
-				</view>
-			</uni-card>
-		</uni-section>
-		<uni-section title="墒情站检查信息">
-			<template v-slot:decoration>
-				<view class="decoration"></view>
-			</template>
-			<uni-card title="已选检查项">
-				<view class="item-text-line">
-					<text class="item-title select-text">{{getGroundSiteCheckItems}}</text>
-				</view>
-			</uni-card>
-			<uni-card title="拍摄照片">
-				<view v-if="data.groundSiteCheckPhotos && data.groundSiteCheckPhotos.length>0" class="view-flex-cc">
-					<image v-for="(item, index) in data.groundSiteCheckPhotos" :key="index" class="cover-image"
-						mode="widthFix" style="width: 100%;" :src="toOss(item)">
-					</image>
-				</view>
-			</uni-card>
-			<uni-card title="巡检结果">
-				<view class="item-text-line">
-					<text v-if="data.groundSiteCheckResult==0" class="item-title error-text">异常</text>
-					<text v-else class="item-title normally-text">正常</text>
-				</view>
-			</uni-card>
-			<uni-card title="检查补充说明">
-				<view class="item-text-line">
-					<text class="item-text-block">{{data.groundSiteCheckRemark}}</text>
-				</view>
-			</uni-card>
-		</uni-section>
-		<uni-section title="其他设备检查信息">
-			<template v-slot:decoration>
-				<view class="decoration"></view>
-			</template>
-			<uni-card title="已选检查项">
-				<view class="item-text-line">
-					<text class="item-title select-text">{{getOthersEquipmentCheckItems}}</text>
-				</view>
-			</uni-card>
-			<uni-card title="拍摄照片">
-				<view v-if="data.othersEquipmentCheckPhotos && data.othersEquipmentCheckPhotos.length>0"
-					class="view-flex-cc">
-					<image v-for="(item, index) in data.othersEquipmentCheckPhotos" :key="index" class="cover-image"
-						mode="widthFix" style="width: 100%;" :src="toOss(item)">
-					</image>
-				</view>
-			</uni-card>
-			<uni-card title="巡检结果">
-				<view class="item-text-line">
-					<text v-if="data.otherEquipmentCheckResult==0" class="item-title error-text">异常</text>
-					<text v-else class="item-title normally-text">正常</text>
-				</view>
-			</uni-card>
-			<uni-card title="其他设备检查补充说明">
-				<view class="item-text-line">
-					<text class="item-text-block">{{data.othersEquipmentCheckRemark}}</text>
-				</view>
-			</uni-card>
-		</uni-section>
-		<uni-section title="设备更换信息">
-			<template v-slot:decoration>
-				<view class="decoration"></view>
-			</template>
-			<view style="min-height: 50px;">
-				<uni-card v-if="data.equipmentsReplaceItems.items[0].checked" title="更换RTU">
-					<view class="item-text-line">
-						<text class="item-text-block">{{data.rtuModelRemark}}</text>
-					</view>
-				</uni-card>
-				<uni-card title="RTU更换照片">
-					<view v-if="data.rtuReplacePhotos && data.rtuReplacePhotos.length>0" class="view-flex-cc">
-						<image v-for="(item, index) in data.rtuReplacePhotos" :key="index" class="cover-image"
-							mode="widthFix" style="width: 100%;" :src="toOss(item)">
-						</image>
-					</view>
-				</uni-card>
-
-				<uni-card v-if="data.equipmentsReplaceItems.items[1].checked" title="更换雨量计">
-					<view class="item-text-line">
-						<text class="item-text-block">{{data.rainSensorModelRemark}}</text>
-					</view>
-				</uni-card>
-				<uni-card title="雨量计更换照片">
-					<view v-if="data.rainSensorReplacePhotos&&data.rainSensorReplacePhotos.length>0"
-						class="view-flex-cc">
-						<image v-for="(item, index) in data.rainSensorReplacePhotos" :key="index" class="cover-image"
-							mode="widthFix" style="width: 100%;" :src="toOss(item)">
-						</image>
-					</view>
-				</uni-card>
-				<uni-card v-if="data.equipmentsReplaceItems.items[2].checked" title="更换水位计">
-					<view class="item-text-line">
-						<text class="item-text-block">{{data.waterSensorModelRemark}}</text>
-					</view>
-				</uni-card>
-				<uni-card title="水位计更换照片">
-					<view v-if="data.waterSensorReplacePhotos &&data.waterSensorReplacePhotos.length>0"
-						class="view-flex-cc">
-						<image v-for="(item, index) in data.waterSensorReplacePhotos" :key="index" class="cover-image"
-							mode="widthFix" style="width: 100%;" :src="toOss(item)">
-						</image>
-					</view>
-				</uni-card>
-				<uni-card v-if="data.equipmentsReplaceItems.items[3].checked" title="更换墒情计">
-					<view class="item-text-line">
-						<text class="item-text-block">{{data.groundSensorModelRemark}}</text>
-					</view>
-				</uni-card>
-				<uni-card v-if="data.groundSensorReplacePhotos&&data.groundSensorReplacePhotos.length>0"
-					title="墒情计更换照片">
-					<view class="view-flex-cc">
-						<image v-for="(item, index) in data.groundSensorReplacePhotos" :key="index" class="cover-image"
-							mode="widthFix" style="width: 100%;" :src="toOss(item)">
-						</image>
-					</view>
-				</uni-card>
-				<uni-card v-if="data.equipmentsReplaceItems.items[4].checked" title="更换蓄电池">
-					<view class="item-text-line">
-						<text class="item-text-block">{{data.batteryModelRemark}}</text>
-					</view>
-				</uni-card>
-				<uni-card v-if="data.batteryReplacePhotos&&data.batteryReplacePhotos.length>0" title="蓄电池更换照片">
-					<view class="view-flex-cc">
-						<image v-for="(item, index) in data.batteryReplacePhotos" :key="index" class="cover-image"
-							mode="widthFix" style="width: 100%;" :src="toOss(item)">
-						</image>
-					</view>
-				</uni-card>
-				<uni-card v-if="data.equipmentsReplaceItems.items[5].checked" title="更换太阳能板">
-					<view class="item-text-line">
-						<text class="item-text-block">{{data.sunPowerModelRemark}}</text>
-					</view>
-				</uni-card>
-				<uni-card v-if="data.sunPowerReplacePhotos&&data.sunPowerReplacePhotos.length>0" title="太阳能板更换照片">
-					<view class="view-flex-cc">
-						<image v-for="(item, index) in data.sunPowerReplacePhotos" :key="index" class="cover-image"
-							mode="widthFix" style="width: 100%;" :src="toOss(item)">
-						</image>
-					</view>
-				</uni-card>
-				<uni-card v-if="data.equipmentsReplaceItems.items[6].checked" title="更换充电控制器">
-					<view class="item-text-line">
-						<text class="item-text-block">{{data.batteryControlModelRemark}}</text>
-					</view>
-				</uni-card>
-				<uni-card v-if="data.batteryControllerReplacePhotos&&data.batteryControllerReplacePhotos.length>0"
-					title="充电控制器更换照片">
-					<view class="view-flex-cc">
-						<image v-for="(item, index) in data.batteryControllerReplacePhotos" :key="index"
-							class="cover-image" mode="widthFix" style="width: 100%;" :src="toOss(item)">
-						</image>
-					</view>
-				</uni-card>
-				<uni-card v-if="data.equipmentsReplaceItems.items[7].checked" title="更换其他设备">
-					<view class="item-text-line">
-						<text class="item-text-block">{{data.otherEquipmentModelRemark}}</text>
-					</view>
-				</uni-card>
-				<uni-card v-if="data.otherEquipmentReplacePhotos&&data.otherEquipmentReplacePhotos.length>0"
-					title="其他设备更换照片">
-					<view class="view-flex-cc">
-						<image v-for="(item, index) in data.otherEquipmentReplacePhotos" :key="index"
-							class="cover-image" mode="widthFix" style="width: 100%;" :src="toOss(item)">
-						</image>
-					</view>
-				</uni-card>
-			</view>
-		</uni-section>
-		<uni-section title="遗留问题补充说明">
-			<template v-slot:decoration>
-				<view class="decoration"></view>
-			</template>
-			<view class="item-text-line"
-				style="padding-left: 10px;padding-right: 10px;padding-top: 10px;min-height: 50px;">
-				<text class="item-text-block">{{data.inspectionRemainProblemsRemark}}</text>
-			</view>
-		</uni-section>
-		<uni-section title="巡检工作留存照片">
-			<template v-slot:decoration>
-				<view class="decoration"></view>
-			</template>
-			<view style="min-height: 50px;">
-				<uni-card v-if="data.inspectionWorkPhotos&&data.inspectionWorkPhotos.length>0" title="拍摄照片">
-					<view class="view-flex-cc">
-						<image v-for="(item, index) in data.inspectionWorkPhotos" :key="index" class="cover-image"
-							mode="widthFix" style="width: 100%;" :src="toOss(item)">
-						</image>
-					</view>
-				</uni-card>
-			</view>
-		</uni-section>
-	</view>
-
-</template>
-
-<script>
-	import {
-		role
-	} from "@/api/role.js";
-	import http from '@/http/api.js';
-	import {
-		oss
-	} from '@/common/setting';
-	export default {
-		components: {
-
-		},
-		props: {
-			inspectionId: {
-				type: String,
-				required: true,
-			},
-		},
-		data() {
-			return {
-				query: {},
-				title: '巡检填报详情',
-				data: {
-					rtuCode: '',
-					rtuName: '',
-					isRain: false,
-					isRiver: false,
-					isRes: false,
-					isGround: false,
-					isCamera: false,
-					lng: '',
-					lat: '',
-					adCity: '',
-					adDist: '',
-					locationDesc: '',
-					//站点状态检查项
-					siteCheckStatus: {
-						items: [{
-							'id': '0',
-							'dictValue': '水毁'
-						}, {
-							'id': '1',
-							'dictValue': '丢失'
-						}, {
-							'id': '2',
-							'dictValue': '损坏'
-						}, {
-							'id': '3',
-							'dictValue': '正常'
-						}],
-						current: 3
-					},
-					siteCheckPhotos: [],
-					siteCheckRemark: '',
-					//雨量站检查数据
-					rainSiteCheckItems: {
-						items: [{
-							'id': '0',
-							'checked': false,
-							'dictValue': '故障排查'
-						}, {
-							'id': '1',
-							'checked': false,
-							'dictValue': '清理堵塞'
-						}, {
-							'id': '2',
-							'checked': false,
-							'dictValue': '雨量计校核'
-						}],
-						current: 0
-					},
-					rainSiteCheckPhotos: [],
-					rainSiteCheckResult: 1,
-					rainSiteCheckRemark: '',
-					//水位站检查数据
-					waterSiteCheckItems: {
-						items: [{
-							'id': '0',
-							'checked': false,
-							'dictValue': '故障排查'
-						}, {
-							'id': '1',
-							'checked': false,
-							'dictValue': '水位计校核'
-						}],
-						current: 0
-					},
-					waterSiteCheckPhotos: [],
-					waterSiteCheckResult: 1,
-					waterSiteCheckRemark: '',
-					//墒情站检查数据
-					groundSiteCheckItems: {
-						items: [{
-							'id': '0',
-							'checked': false,
-							'dictValue': '故障排查'
-						}, {
-							'id': '1',
-							'checked': false,
-							'dictValue': '墒情计校核'
-						}],
-						current: 0
-					},
-					groundSiteCheckPhotos: [],
-					groundSiteCheckRemark: '',
-					groundSiteCheckResult: 1,
-					//其他设备检查
-					othersEquipmentCheckItems: {
-						items: [{
-							'id': '0',
-							'checked': false,
-							'dictValue': '设备接地检测'
-						}, {
-							'id': '1',
-							'checked': false,
-							'dictValue': '电源电压检测'
-						}, {
-							'id': '2',
-							'checked': false,
-							'dictValue': '太阳能板检查'
-						}, {
-							'id': '3',
-							'checked': false,
-							'dictValue': '蓄电池检查'
-						}, {
-							'id': '4',
-							'checked': false,
-							'dictValue': '网络通信检查'
-						}],
-						current: 0
-					},
-					othersEquipmentCheckPhotos: [],
-					othersEquipmentCheckRemark: '',
-					otherEquipmentCheckResult: 1,
-					//设备替换
-					equipmentsReplaceItems: {
-						items: [{
-							'id': '0',
-							'checked': false,
-							'dictValue': 'RTU'
-						}, {
-							'id': '1',
-							'checked': false,
-							'dictValue': '雨量计'
-						}, {
-							'id': '2',
-							'checked': false,
-							'dictValue': '水位计'
-						}, {
-							'id': '3',
-							'checked': false,
-							'dictValue': '墒情计'
-						}, {
-							'id': '4',
-							'checked': false,
-							'dictValue': '蓄电池'
-						}, {
-							'id': '5',
-							'checked': false,
-							'dictValue': '太阳能板'
-						}, {
-							'id': '6',
-							'checked': false,
-							'dictValue': '充电控制器'
-						}, {
-							'id': '7',
-							'checked': false,
-							'dictValue': '其他'
-						}],
-						current: 0
-					},
-					rtuModelRemark: '',
-					rtuReplacePhotos: [],
-					rainSensorModelRemark: '',
-					rainSensorReplacePhotos: [],
-					waterSensorModelRemark: '',
-					waterSensorReplacePhotos: [],
-					groundSensorModelRemark: '',
-					groundSensorReplacePhotos: [],
-					batteryModelRemark: '',
-					batteryReplacePhotos: [],
-					sunPowerModelRemark: '',
-					sunPowerReplacePhotos: [],
-					batteryControlModelRemark: '',
-					batteryControlReplacePhotos: [],
-					otherEquipmentModelRemark: '',
-					otherEquipmentReplacePhotos: [],
-					//巡检遗留问题描述
-					inspectionRemainProblemsRemark: '',
-					//工作留存数据
-					inspectionWorkPhotos: [],
-
-				},
-			}
-		},
-		onLoad(options) {
-			console.log("ddddd onLoad")
-		},
-		onShow() {
-			console.log("ddd onShow")
-		},
-		created() {
-			console.log("dddd created")
-			console.log("id " + this.inspectionId)
-			let params = {};
-			params['id'] = this.inspectionId;
-			console.log("id " + this.inspectionId)
-			this.getDetail(params);
-		},
-		computed: {
-			getSiteKind() {
-				let htmltext = '';
-				if (this.data.isRain === 1) {
-					htmltext = htmltext + "雨量站";
-				}
-				if (this.data.isRiver == 1 || this.data.isRes == 1) {
-					if (htmltext.length > 0) {
-						htmltext = htmltext + ' / ';
-					}
-					htmltext = htmltext + '水位站';
-				}
-				if (this.data.isGround == 1) {
-					if (htmltext.length > 0) {
-						htmltext = htmltext + ' / ';
-					}
-					htmltext = htmltext + '墒情站';
-				}
-				if (this.data.isVideo == 1) {
-					if (htmltext.length > 0) {
-						htmltext = htmltext + ' / ';
-					}
-					htmltext = htmltext + '视频站';
-				}
-				return htmltext;
-			},
-			getAreaName() {
-				let htmltext = '';
-				if (this.data.adCity) {
-					htmltext = htmltext + this.data.adCity;
-				}
-				if (this.data.adDist) {
-					if (htmltext.length > 0) {
-						htmltext = htmltext + ' / ';
-					}
-					htmltext = htmltext + this.data.adDist;
-				}
-				return htmltext;
-			},
-			getSiteCheckStatus() {
-				return this.data.siteCheckStatus.items[this.data.siteCheckStatus.current].dictValue;
-			},
-			getRainSiteCheckItems() {
-				//console.log(JSON.stringify(this.data.rainSiteCheckItems))
-				let text = '';
-				for (let i = 0; i < this.data.rainSiteCheckItems.items.length; i++) {
-					if (this.data.rainSiteCheckItems.items[i].checked) {
-						if (text.length > 0) {
-							text = text + ' / ';
-						}
-						text = text + this.data.rainSiteCheckItems.items[i].dictValue;
-					}
-				}
-				return text;
-			},
-			getWaterSiteCheckItems() {
-				let text = '';
-				for (let i = 0; i < this.data.waterSiteCheckItems.items.length; i++) {
-					if (this.data.waterSiteCheckItems.items[i].checked) {
-						if (text.length > 0) {
-							text = text + ' / ';
-						}
-						text = text + this.data.waterSiteCheckItems.items[i].dictValue;
-					}
-				}
-				return text;
-			},
-			getGroundSiteCheckItems() {
-				let text = '';
-				for (let i = 0; i < this.data.groundSiteCheckItems.items.length; i++) {
-					if (this.data.groundSiteCheckItems.items[i].checked) {
-						if (text.length > 0) {
-							text = text + ' / ';
-						}
-						text = text + this.data.groundSiteCheckItems.items[i].dictValue;
-					}
-				}
-				return text;
-			},
-			getOthersEquipmentCheckItems() {
-				let text = '';
-				for (let i = 0; i < this.data.othersEquipmentCheckItems.items.length; i++) {
-					if (this.data.othersEquipmentCheckItems.items[i].checked) {
-						if (text.length > 0) {
-							text = text + ' / ';
-						}
-						text = text + this.data.othersEquipmentCheckItems.items[i].dictValue;
-					}
-				}
-				return text;
-			},
-		},
-		methods: {
-			toOss(path) {
-				return oss + path;
-			},
-			toBack() {
-				uni.navigateBack({
-					delta: 1
-				})
-			},
-			getDetail(params = {}) {
-				console.log(JSON.stringify(params))
-				let that = this;
-				this.query = {};
-				Object.assign(this.query, params);
-				console.log(JSON.stringify(this.query))
-				http.request({
-					url: '/galaxy-business/equipment/inspection/report/detail',
-					method: 'GET',
-					params: this.query
-				}).then(res => {
-					if (res.success) {
-						that.data.rtuName = res.data['rtuName'];
-						that.data.rtuCode = res.data['rtuCode'];
-						that.data.isRain = res.data['isRain'];
-						that.data.isRiver = res.data['isRiver'];
-						that.data.isRes = res.data['isRes'];
-						that.data.isGround = res.data['isGround'];
-						that.data.lng = res.data['lng'];
-						that.data.lat = res.data['lat'];
-						that.data.adCity = res.data['adCity'];
-						that.data.adDist = res.data['adDist'];
-						that.data.locationDesc = res.data['locationDesc'];
-						that.data.siteCheckStatus.current = Number(res.data['siteCheckItem']);
-						that.data.siteCheckRemark = res.data['siteCheckRemark'];
-						that.data.siteCheckPhotoCount = 0;
-						that.data.siteCheckPhotos = [];
-						let photos = res.data['siteCheckPhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.siteCheckPhotos = photoList;
-							//that.data.siteCheckPhotoCount = photoList.length;
-						}
-						//雨量站检查
-						let items = res.data['rainSiteCheckItem'];
-						if (null != items && items.length > 0) {
-							let itemList = items.split(",");
-							that.data.rainSiteCheckItems.items[0].checked = (itemList[0] == 0) ? false : true;
-							that.data.rainSiteCheckItems.items[1].checked = (itemList[1] == 0) ? false : true;
-							that.data.rainSiteCheckItems.items[2].checked = (itemList[2] == 0) ? false : true;
-						}
-
-						that.data.rainSiteCheckResult = res.data['rainSiteCheckResult'];
-						//that.data.rainSiteCheckPhotoCount = 0;
-						that.data.rainSiteCheckPhotos = [];
-						photos = res.data['rainSiteCheckPhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.rainSiteCheckPhotos = photoList;
-							//that.data.rainSiteCheckPhotoCount = photoList.length;
-						}
-						that.data.rainSiteCheckRemark = res.data['rainSiteCheckRemark'];
-						//水位站检查
-						items = res.data['waterSiteCheckItem'];
-						if (null != items && items.length > 0) {
-							let itemList = items.split(",");
-							that.data.waterSiteCheckItems.items[0].checked = (itemList[0] == 0) ? false : true;
-							that.data.waterSiteCheckItems.items[1].checked = (itemList[1] == 0) ? false : true;
-						}
-						//that.data.waterSiteCheckPhotoCount = 0;
-						that.data.waterSiteCheckPhotos = [];
-						photos = res.data['waterSiteCheckPhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.waterSiteCheckPhotos = photoList;
-							//that.data.waterSiteCheckPhotoCount = photoList.length;
-						}
-						that.data.waterSiteCheckRemark = res.data['waterSiteCheckRemark'];
-						that.data.waterSiteCheckResult = res.data['waterSiteCheckResult'];
-						items = res.data['groundSiteCheckItem'];
-						if (null != items && items.length > 0) {
-							let itemList = items.split(",");
-							that.data.groundSiteCheckItems.items[0].checked = itemList[0] == 0 ? false : true;
-							that.data.groundSiteCheckItems.items[1].checked = itemList[1] == 0 ? false : true;
-						}
-						//that.data.groundSiteCheckPhotoCount = 0;
-						that.data.groundSiteCheckPhotos = [];
-						photos = res.data['groundSiteCheckPhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.groundSiteCheckPhotos = photoList;
-							//that.data.groundSiteCheckPhotoCount = photoList.length;
-						}
-						that.data.groundSiteCheckRemark = res.data['groundSiteCheckRemark'];
-						that.data.groundSiteCheckResult = res.data['groundSiteCheckResult'];
-						items = res.data['otherEquipmentCheckItem'];
-						if (null != items && items.length > 0) {
-							let itemList = items.split(",");
-							that.data.othersEquipmentCheckItems.items[0].checked = itemList[0] == 0 ? false : true;
-							that.data.othersEquipmentCheckItems.items[1].checked = itemList[1] == 0 ? false : true;
-							that.data.othersEquipmentCheckItems.items[2].checked = itemList[2] == 0 ? false : true;
-							that.data.othersEquipmentCheckItems.items[3].checked = itemList[3] == 0 ? false : true;
-							that.data.othersEquipmentCheckItems.items[4].checked = itemList[4] == 0 ? false : true;
-
-						}
-						//that.data.othersEquipmentCheckPhotoCount = 0;
-						that.data.othersEquipmentCheckPhotos = [];
-						photos = res.data['otherEquipmentCheckPhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.othersEquipmentCheckPhotos = photoList;
-							//that.data.othersEquipmentCheckPhotoCount = photoList.length;
-						}
-						that.data.othersEquipmentCheckRemark = res.data['otherEquipmentCheckRemark'];
-						that.data.otherEquipmentCheckResult = res.data['otherEquipmentCheckResult'];
-						that.data.equipmentsReplaceItems.items[0].checked = res.data['rtuReplace'] == 0 ? false :
-							true;
-						that.data.equipmentsReplaceItems.items[1].checked = res.data['rainSensorReplace'] == 0 ?
-							false :
-							true;
-						that.data.equipmentsReplaceItems.items[2].checked = res.data['waterSensorReplace'] == 0 ?
-							false :
-							true;
-						that.data.equipmentsReplaceItems.items[3].checked = res.data['groundSensorReplace'] == 0 ?
-							false : true;
-						that.data.equipmentsReplaceItems.items[4].checked = res.data['batteryReplace'] == 0 ?
-							false :
-							true;
-						that.data.equipmentsReplaceItems.items[5].checked = res.data['sunPowerReplace'] == 0 ?
-							false :
-							true;
-						that.data.equipmentsReplaceItems.items[6].checked = res.data['batteryControllerReplace'] ==
-							0 ?
-							false : true;
-						that.data.equipmentsReplaceItems.items[7].checked = res.data['otherEquipmentReplace'] ==
-							0 ?
-							false : true;
-
-						that.data.rtuModelRemark = res.data['rtuModelRemark'];
-						that.data.rtuReplacePhotos = [];
-						photos = res.data['rtuReplacePhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.rtuReplacePhotos = photoList;
-							//that.data.inspectionWorkPhotoCount = photoList.length;
-						}
-						that.data.inspectionRemainProblemsRemark = res.data['remainQuestion'];
-						that.data.rtuReplacePhotos = [];
-						photos = res.data['rtuReplacePhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.rtuReplacePhotos = photoList;
-							//that.data.inspectionWorkPhotoCount = photoList.length;
-						}
-						that.data.rainSensorModelRemark = res.data['rainSensorModelRemark'];
-						that.data.rainSensorReplacePhotos = [];
-						photos = res.data['rainSensorReplacePhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.rainSensorReplacePhotos = photoList;
-							//that.data.inspectionWorkPhotoCount = photoList.length;
-						}
-						that.data.waterSensorModelRemark = res.data['waterSensorModelRemark'];
-						that.data.waterSensorReplacePhotos = [];
-						photos = res.data['waterSensorReplacePhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.waterSensorReplacePhotos = photoList;
-							//that.data.inspectionWorkPhotoCount = photoList.length;
-						}
-						that.data.groundSensorModelRemark = res.data['groundSensorModelRemark'];
-						that.data.groundSensorReplacePhotos = [];
-						photos = res.data['groundSensorReplacePhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.groundSensorReplacePhotos = photoList;
-							//that.data.inspectionWorkPhotoCount = photoList.length;
-						}
-						that.data.batteryModelRemark = res.data['batteryModelRemark'];
-						that.data.batteryReplacePhotos = [];
-						photos = res.data['batteryReplacePhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.batteryReplacePhotos = photoList;
-							//that.data.inspectionWorkPhotoCount = photoList.length;
-						}
-						that.data.sunPowerModelRemark = res.data['sunPowerModelRemark'];
-						that.data.sunPowerReplacePhotos = [];
-						photos = res.data['sunPowerReplacePhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.sunPowerReplacePhotos = photoList;
-							//that.data.inspectionWorkPhotoCount = photoList.length;
-						}
-						that.data.batteryControlModelRemark = res.data['batteryControllerModelRemark'];
-						that.data.batteryControllerReplacePhotos = [];
-						photos = res.data['batteryControllerReplacePhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.batteryControllerReplacePhotos = photoList;
-							//that.data.inspectionWorkPhotoCount = photoList.length;
-						}
-						that.data.otherEquipmentModelRemark = res.data['otherEquipmentModelRemark'];
-						that.data.otherEquipmentReplacePhotos = [];
-						photos = res.data['otherEquipmentReplacePhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.otherEquipmentReplacePhotos = photoList;
-							//that.data.inspectionWorkPhotoCount = photoList.length;
-						}
-						//that.data.inspectionWorkPhotoCount = 0;
-						that.data.inspectionWorkPhotos = [];
-						photos = res.data['inspectionWorkPhotos'];
-						if (null != photos && photos.length > 0) {
-							let photoList = photos.split(",");
-							that.data.inspectionWorkPhotos = photoList;
-							//that.data.inspectionWorkPhotoCount = photoList.length;
-						}
-						that.data.inspectionRemainProblemsRemark = res.data['remainQuestion'];
-
-					}
-				}).catch(err => {
-					console.log(err)
-				})
-			},
-
-		}
-	}
-</script>
-
-<style>
-	/* page {
-		background-color: rgb(240, 242, 244);
-	} */
-</style>
-
-<style lang="scss" scoped>
-
-	.uni-body {
-		font-size: 0.7rem;
-	}
-
-	.decoration {
-		width: 6px;
-		height: 6px;
-		margin-right: 4px;
-		border-radius: 50%;
-		background-color: cadetblue;
-	}
-
-	.view-flex-rs {
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-start;
-		align-items: center;
-	}
-
-	.view-flex-rs-flex-wrap {
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-start;
-		flex-wrap: wrap;
-	}
-
-	.view-flex-rc {
-		display: flex;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.view-flex-re {
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-end;
-		align-items: center;
-	}
-
-	.view-flex-cs {
-		display: flex;
-		flex-direction: column;
-		justify-content: flex-start;
-		align-items: center;
-	}
-
-	.view-flex-cc {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.view-flex-ce {
-		display: flex;
-		flex-direction: column;
-		justify-content: flex-end;
-		align-items: center;
-	}
-
-	.cell-hover-class {
-		background-color: rgb(235, 237, 238);
-	}
-
-	.view-flex-ce {
-		display: flex;
-		flex-direction: column;
-		justify-content: flex-end;
-	}
-
-	.line-body {
-		padding-left: 10px;
-		padding-right: 10px;
-	}
-
-	.item-text-line {
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-start;
-
-		.item-title {
-			font-size: 0.7rem;
-			font-weight: bold;
-		}
-
-		.item-text {
-			overflow: hidden;
-			margin-left: 5px;
-			font-size: 0.7rem;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-		}
-
-		.item-text-block {
-			margin-left: 5px;
-			font-size: 0.7rem;
-			word-wrap: break-word;
-			word-break: normal;
-		}
-
-		.error-text {
-			color: #FF0000;
-		}
-
-		.normally-text {
-			color: darkgreen;
-		}
-
-		.select-text {
-			color: royalblue;
-		}
-	}
-
-	.required-star {
-		color: #FF0000;
-		font-size: 15px;
-		width: 20px;
-		text-align: center;
-		padding-left: 0px;
-		padding-right: 2px;
-	}
-
-	.item-title {
-		color: #909399;
-		font-size: 15px;
-	}
-
-	.mline-text {
-		padding-left: 2px;
-		width: 100%;
-		/* background-color:#909399; */
-		height: 70px;
-		border: 1px solid #FF5A5F;
-		border-radius: 5px;
-	}
-
-
-	.img-container {
-		margin-bottom: 0px;
-		width: 100px;
-		height: 100px;
-
-		.note-image-box {
-			margin-top: 0px;
-			display: flex;
-			flex-wrap: wrap;
-			padding: 10px;
-
-			.note-image-item {
-				position: relative;
-				width: 100%;
-				height: 0;
-				padding-top: 100%;
-				box-sizing: border-box;
-				// background-color: #18B566;
-
-				.close-icon {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					position: absolute;
-					right: 0px;
-					top: 0px;
-					width: 22px;
-					height: 22px;
-					border-radius: 50%;
-					background-color: #d5d5d5;
-					z-index: 2;
-				}
-
-				.image-box {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					position: absolute;
-					top: 0px;
-					right: 0px;
-					border: 0px;
-					left: 0px;
-					border: 1px #eee solid;
-					border-radius: 5px;
-					overflow: hidden;
-					width: 99%;
-					height: 99%;
-
-				}
-
-
-			}
-		}
-	}
-
-	.input-body {
-		background-color: #fff;
-		padding: 10px;
-	}
-</style>

pages/equipment-inspection/inspectionreportview.vue

@@ -1,146 +0,0 @@
-<!--
- * @Title: 
- * @Description: 巡检填报信息
- * @Author: swp
- * @Date: 2022-08-24 10:49:21
- * @LastEditors: 
- * @LastEditTime: 2022-08-24 10:49:21
--->
-<template>
-	<view class="wrap">
-		<uni-nav-bar dark :fixed="true" backgroundColor="#3F9EFF" statusBar="false" left-icon="left" left-text="返回"
-			@clickLeft="toBack">
-			<view class="nav-title">
-				<text>{{title}}</text>
-			</view>
-		</uni-nav-bar>
-		<view class="container">
-			<inspectionreportdetail v-if="isShow"  ref="inspectionreportdetail" :inspectionId="id">
-			</inspectionreportdetail>
-		</view>
-	</view>
-</template>
-
-<script>
-	import http from '@/http/api.js';
-	import inspectionreportdetail from '@/pages/equipment-inspection/inspectionreportdetail.vue'
-	export default {
-		components: {
-		
-			inspectionreportdetail
-		},
-		onLoad(options) {
-			this.id = options.id;
-			console.log("vvvvvvvv " + this.id);
-			this.inspectionreportRainType = options.type;
-			if (this.inspectionreportRainType == 1) {
-				this.title = '汛前巡检填报详情';
-			} else if (this.inspectionreportRainType == 2) {
-				this.title = '汛中（一）巡检填报详情';
-			} else if (this.inspectionreportRainType == 3) {
-				this.title = '汛中（二）巡检填报详情';
-			}
-		    
-		},
-		data() {
-			return {
-				isShow:false,
-				id: '',
-				inspectionreportRainType: 0,
-				// items: ['汛前巡检', '汛中（一）巡检', '汛中（二）巡检'],
-				// current: 0,
-				// inspectionReportStatus: {
-				// 	beforeRainSeasonReportId: '',
-				// 	rainSeasonFirstReportId: '',
-				// 	rainSeasonSecondReportId: '',
-				// 	beforeRainSeasonStatus: 0,
-				// 	rainSeasonFirstStatus: 0,
-				// 	rainSeasonSecondStatus: 0,
-				// },
-				query: {},
-				title: '巡检填报详情',
-			}
-		},
-		computed: {},
-		onShow() {
-			console.log("vvvvvvvvvv onShow")
-			this.isShow=true;
-		},
-		created() {
-			console.log("vvvvvvvvvvvvvvvv created")
-
-		},
-		methods: {
-			toBack() {
-				uni.navigateBack({
-					delta: 1
-				})
-			},
-			getInspectionReportStatus(params = {}) {
-				let that = this;
-				let postData = Object.assign(params, this.query);
-				//console.log(JSON.stringify(postData))
-				http.request({
-					url: '/galaxy-business/equipment/inspection/reportStatus',
-					method: 'GET',
-					data: postData
-				}).then(res => {
-					//console.log(JSON.stringify(res))
-					if (res != null && res.success) {
-						if (res.data != null) {
-							that.inspectionReportStatus = res.data;
-							if (that.inspectionReportStatus.rainSeasonSecondStatus == 1) {
-								that.current = 2;
-							} else if (that.inspectionReportStatus.rainSeasonFirstStatus == 1) {
-								that.current = 1;
-							} else if (that.inspectionReportStatus.beforeRainSeasonStatus == 1) {
-								that.current = 0;
-							}
-						}
-					}
-				}).catch(err => {
-					console.log(err)
-				})
-			},
-			onClickItem(e) {
-				if (this.current != e.currentIndex) {
-					this.current = e.currentIndex;
-				}
-			},
-		}
-	}
-</script>
-
-<style>
-
-</style>
-
-<style lang="scss" scoped>
-	.nav-title {
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-
-		text {
-			color: white;
-			font-size: 1rem;
-		}
-	}
-
-	.container {
-		padding: 0 0 50rpx;
-		width: 100%;
-	}
-
-	.content {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: flex-start;
-		flex-direction: column;
-		width: 100%;
-
-	}
-</style>

pages/equipment-inspection/rtuinspectionreportview.vue

@@ -1,159 +0,0 @@
-<!--
- * @Title: 
- * @Description: 巡检填报信息
- * @Author: swp
- * @Date: 2022-08-24 10:49:21
- * @LastEditors: 
- * @LastEditTime: 2022-08-24 10:49:21
--->
-<template>
-	<view class="wrap">
-		<uni-nav-bar dark :fixed="true" backgroundColor="#3F9EFF" statusBar="false" left-icon="left" left-text="返回"
-			@clickLeft="toBack">
-			<view class="nav-title">
-				<text>{{title}}</text>
-			</view>
-		</uni-nav-bar>
-		<view class="container">
-			<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
-				activeColor="#585b61"></uni-segmented-control>
-			<view class="content">
-				<view v-show="current === 0">
-					<inspectionreportdetail :inspectionId="inspectionReportStatus.beforeRainSeasonReportId"
-						v-if="inspectionReportStatus.beforeRainSeasonStatus==1">
-					</inspectionreportdetail>
-					<view v-else style="display: flex;flex-direction: row;justify-content: center;">
-						<text style="color: red;font-size: 0.7rem;margin-top: 20px;">汛前巡检暂未填报</text>
-					</view>
-				</view>
-				<view v-show="current === 1">
-					<inspectionreportdetail :inspectionId="inspectionReportStatus.rainSeasonFirstReportId"
-						v-if="inspectionReportStatus.rainSeasonFirstStatus==1">
-					</inspectionreportdetail>
-					<view v-else style="display: flex;flex-direction: row;justify-content: center;">
-						<text style="color: red;font-size: 0.7rem;margin-top: 20px;">汛中第一次巡检暂未填报</text>
-					</view>
-				</view>
-				<view v-show="current === 2">
-					<inspectionreportdetail :inspectionId="inspectionReportStatus.rainSeasonSecondReportId"
-						v-if="inspectionReportStatus.rainSeasonSecondStatus==1">
-					</inspectionreportdetail>
-					<view v-else style="display: flex;flex-direction: row;justify-content: center;">
-						<text style="color: red;font-size: 0.7rem;margin-top: 20px;">汛中第二次巡检暂未填报</text>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import http from '@/http/api.js';
-	import inspectionreportdetail from '@/pages/equipment-inspection/inspectionreportdetail.vue'
-	export default {
-		components: {
-			inspectionreportdetail
-		},
-		onLoad(options) {
-			this.rtuCode = options.rtuCode;
-			this.query['rtuCode'] = this.rtuCode;
-			console.log("onLoad")
-			this.getInspectionReportStatus();
-		},
-		data() {
-			return {
-				rtuCode: '',
-				items: ['汛前巡检', '汛中（一）巡检', '汛中（二）巡检'],
-				current: -1,
-				inspectionReportStatus: {
-					beforeRainSeasonReportId: 0,
-					rainSeasonFirstReportId: 0,
-					rainSeasonSecondReportId: 0,
-					beforeRainSeasonStatus: 0,
-					rainSeasonFirstStatus: 0,
-					rainSeasonSecondStatus: 0,
-				},
-				query: {},
-				title: '测站巡检填报详情',
-			}
-		},
-		computed: {
-
-		},
-		onShow() {
-			console.log("onShow")
-		},
-		methods: {
-			toBack() {
-				uni.navigateBack({
-					delta: 1
-				})
-			},
-			getInspectionReportStatus(params = {}) {
-				let that = this;
-				let postData = Object.assign(params, this.query);
-				console.log(JSON.stringify(postData))
-				http.request({
-					url: '/galaxy-business/equipment/inspection/rtu/reportStatus',
-					method: 'GET',
-					data: postData
-				}).then(res => {
-					//console.log(JSON.stringify(res))
-					if (res != null && res.success) {
-						if (res.data != null) {
-							that.inspectionReportStatus = res.data;
-							if (that.inspectionReportStatus.rainSeasonSecondStatus == 1) {
-								that.current = 2;
-							} else if (that.inspectionReportStatus.rainSeasonFirstStatus == 1) {
-								that.current = 1;
-							} else if (that.inspectionReportStatus.beforeRainSeasonStatus == 1) {
-								that.current = 0;
-							}
-						}
-					}
-				}).catch(err => {
-					console.log(err)
-				})
-			},
-			onClickItem(e) {
-				if (this.current != e.currentIndex) {
-					this.current = e.currentIndex;
-				}
-			},
-		}
-	}
-</script>
-
-<style>
-
-</style>
-
-<style lang="scss" scoped>
-	.nav-title {
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-
-		text {
-			color: white;
-			font-size: 1rem;
-		}
-	}
-
-	.container {
-		padding: 0 0 50rpx;
-		width: 100%;
-	}
-
-	.content {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: flex-start;
-		flex-direction: column;
-		width: 100%;
-
-	}
-</style>

pages/manage/manage.vue

@@ -46,10 +46,27 @@
 			</swiper>
 		</uni-group>
 		<uni-section title="系统运行实时信息" type="circle">
+			<uni-card title="运维项目">
+             <view class="list-item-block">
+             	<view class="items-line">
+             		<uni-icons class="input-uni-icon" type="auth" size="18" color="lightblue" />
+             		<text class="item-title-rtu-name">共 10 个项目在运维中</text>
+             	</view>
+             
+             </view>
+			</uni-card>
+			<uni-card title="人员">
+				<view class="list-item-block">
+					<view class="items-line">
+						<uni-icons class="input-uni-icon" type="auth" size="18" color="lightblue" />
+						<text class="item-title-rtu-name">团队成员：10</text>
+					</view>
 
+				</view>
+			</uni-card>
 		</uni-section>
-		
-		
+
+
 	</view>
 </template>