对接

common/common.scss

@@ -443,7 +443,8 @@ radio,checkbox {
 	select{
 		outline:none;
 		border:none;
-		width:90%;
+		// width:90%;
+		width:98%;
 		padding-left:24rpx;
 		color:#999
 	}

pages/alarmingList/alarmingList.vue

@@ -7,7 +7,7 @@
 				 :key="index">
 					<image :src="item.imgUrl" style="width:100rpx;height:100rpx"></image>
 					<view class="cu-tag badge" v-if="item.badge!=0">
-						<block v-if="item.badge!=1">{{item.badge>99?'99+':item.badge}}</block>
+						<block>{{item.badge>99?'99+':item.badge}}</block>
 					</view>
 					<text>{{item.name}}</text>
 				</view>

pages/analyse/monthDetail/components/chart.vue

@@ -1,62 +1,41 @@
 <template>
 	<view class="content">
 
-		<view @click="echarts.onClick" :prop="option" :change:prop="echarts.updateEcharts" id="echarts" class="echarts"></view>
+		<view @click="echarts.onClick" :prop="option" :change:prop="echarts.updateEcharts" id="echarts" class="echarts">
+		</view>
 
 	</view>
 </template>
 
 <script>
-
-	 let title = '报警总数';
-
 	export default {
-		props:{
-			bindData:{
-				type:Object,
+		props: {
+			bindData: {
+				type: Object,
 				default: ''
 			}
 		},
 		data() {
+
 			return {
 				option: {
-					color: ['#006ED6', '#00E9CD', '#FF5354'],
-
-					title: {
-						left: 'center'
-					},
+					color: ['#006ED6', '#00E9CD', '#FF5354', 'yellow', 'orange'],
 					tooltip: {
 						trigger: 'item',
-						formatter: "{a} <br/>{b}: {c} ({d}%)"
+						formatter: "{b}:\n {c}%"
 					},
 
-					title:false,
-					//  [{ //aa标题
-					// 	text: '{val|' +(parseInt(this.bindData.wubao)+parseInt(this.bindData.unSolve)+ parseInt(this.bindData.truely))+ '}\n{name|' + title + '}',
-					// 	top: '35%',
-					// 	left: 'center',
-					// 	textStyle: {
-					// 		rich: {
-					// 			name: {
-					// 				fontSize: 14,
-					// 				fontWeight: 'normal',
-					// 				color: '#666666',
-					// 				padding: [5, 0]
-					// 			},
-					// 			val: {
-					// 				fontSize: 24,
-					// 				color: '#333333',
-					// 			}
-					// 		}
-					// 	}
-					// }],
+					title: {
+						left: 'center'
+					},
+					title: false,
 					legend: { //aa图例
 						orient: 'horizontal',
 						// icon: 'circle',
 						itemWidth: 12,
 						itemHeight: 12,
-						itemGap: 20,
-						 bottom: -6,
+						itemGap: 10,
+						bottom: -6,
 						textStyle: {
 
 							fontSize: 14,
@@ -66,7 +45,7 @@
 								},
 								value: {
 									fontSize: 14,
-									padding: [0, 20, 0, 5]
+									padding: [0, 20, 10, 5]
 								},
 
 							}
@@ -79,24 +58,29 @@
 						center: ['50%', '45%'],
 						itemStyle: {
 							normal: {
-								// shadowBlur: 20,
-								// shadowColor: '#F9F5F7',
-								// shadowOffsetX: 0,
-								// shadowOffsetY: 0,
+
 							},
 						},
 
 						data: [{
 								name: "火系统告警",
-								value: this.bindData.wubao
+								value: this.bindData.hjtotalCount
 							},
 							{
 								name: "水系统告警",
-								value: this.bindData.unSolve
+								value: this.bindData.sjtotalCount
 							},
 							{
 								name: "TRU系统告警",
-								value: this.bindData.truely
+								value: this.bindData.rtutotalCount
+							},
+							{
+								name: "电气火灾告警",
+								value: this.bindData.eftotalCount
+							},
+							{
+								name: "视频告警",
+								value: this.bindData.videototalCount
 							},
 
 						],
@@ -109,15 +93,14 @@
 						},
 						labelLine: {
 							normal: {
-								length: 10, //aa折线长度
-								length2: 20, //aa折线长度
+								length: 5, //aa折线长度
+								length2: 10, //aa折线长度
 
 							}
 						},
 						label: {
 							normal: {
-								
-								formatter: "{d}%"
+								formatter: '{b}：{d}%',
 								// formatter: params => {
 								// 	var percent = 0;
 								// 	var total = 0;
@@ -138,9 +121,7 @@
 				}
 			}
 		},
-		onLoad() {
-
-		},
+		onLoad() {},
 		methods: {
 			changeOption() {
 				const data = this.option.series[0].data
@@ -166,7 +147,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录，其相对路径相对于 www 计算
-				script.src = 'static/echarts.js'
+				script.src = 'static/echarts.min.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

pages/analyse/monthDetail/components/chart2.vue

@@ -27,7 +27,7 @@
 					},
 					tooltip: {
 						trigger: 'item',
-						formatter: "{a} <br/>{b}: {c} ({d}%)"
+						formatter: "{a}{b}:\n {c} ({d}%)"
 					},
 
 					title:false,
@@ -88,11 +88,11 @@
 
 						data: [{
 								name: "已处理",
-								value: this.bindData.wubao
+								value: this.bindData.process_rate
 							},
 							{
 								name: "未处理",
-								value: this.bindData.unSolve
+								value: this.bindData.unprocess
 							},
 							
 
@@ -163,7 +163,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录，其相对路径相对于 www 计算
-				script.src = 'static/echarts.js'
+				script.src = 'static/echarts.min.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}
@@ -199,6 +199,6 @@
 	.echarts {
 		width: 100%;
 		height: 500rpx;
-		margin-bottom: 70rpx;
+		/* margin-bottom: 70rpx; */
 	}
 </style>

pages/analyse/monthDetail/components/chart3.vue

@@ -27,7 +27,7 @@
 					},
 					tooltip: {
 						trigger: 'item',
-						formatter: "{a} <br/>{b}: {c} ({d}%)"
+						formatter: "{a} \n{b}: {c} ({d}%)"
 					},
 
 					title:false,
@@ -88,11 +88,11 @@
 
 						data: [{
 								name: "已处理",
-								value: this.bindData.wubao
+								value: this.bindData.process_rate
 							},
 							{
 								name: "未处理",
-								value: this.bindData.unSolve
+								value: this.bindData.unprocess
 							},
 							
 
@@ -163,7 +163,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录，其相对路径相对于 www 计算
-				script.src = 'static/echarts.js'
+				script.src = 'static/echarts.min.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

pages/analyse/monthDetail/components/chart4.vue

@@ -27,7 +27,7 @@
 					},
 					tooltip: {
 						trigger: 'item',
-						formatter: "{a} <br/>{b}: {c} ({d}%)"
+						formatter: "{a} \n{b}: {c} ({d}%)"
 					},
 
 					title:false,
@@ -88,11 +88,11 @@
 
 						data: [{
 								name: "已处理",
-								value: this.bindData.wubao
+								value: this.bindData.process_rate
 							},
 							{
 								name: "未处理",
-								value: this.bindData.unSolve
+								value: this.bindData.unprocess
 							},
 							
 
@@ -163,7 +163,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录，其相对路径相对于 www 计算
-				script.src = 'static/echarts.js'
+				script.src = 'static/echarts.min.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

pages/analyse/monthDetail/monthDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="reportD-wrapper">
 		<view class="text-center flex flex-wrap justify-center title-wrapper">
-			<view class=" margin title" style="width:76%">凯撒国际会所消防报警系统监测数据 2020-11月报表</view>
+			<view class=" margin title" style="width:68%">{{company_name}}消防报警系统监测数据 {{event_time}}月报表</view>
 		</view>
 		<view class="basic-info bg-white margin-bottom-sm">
 			<view class="info-tit margin-left-xs">
@@ -11,19 +11,19 @@
 			<view class="info-content">
 				<view class="info-one-info ">
 					<text>单位名称：</text>
-					<text>凯撒国际会所</text>
+					<text>{{project_info.company_name}}</text>
 				</view>
 				<view>
 					<text>进场日期：</text>
-					<text>2019年11月20日</text>
+					<text>{{project_info.approach_time}}</text>
 				</view>
 				<view>
 					<text style="width:auto!important">完工日期：</text>
-					<text>2019年11月20日</text>
+					<text>{{project_info.complete_time}}</text>
 				</view>
 				<view>
 					<text>验收日期：</text>
-					<text>2019年12月11日</text>
+					<text>{{project_info.check_time}}</text>
 				</view>
 			</view>
 		</view>
@@ -40,85 +40,18 @@
 						<th style="width:40%">设备名称</th>
 						<th>规格型号</th>
 						<th>数量</th>
-						<th>备注</th>
 					</tr>
-					<tr>
-						<td>1</td>
-						<td>用户信息传输装置</td>
-						<td>JK-GH2013G</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>2</td>
-						<td>无线远程压力测控置</td>
-						<td>JK-GH2013G</td>
-						<td>3</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>3</td>
-						<td>无线远程压力测控置</td>
-						<td>JK-GH2013G</td>
-						<td>3</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>4</td>
-						<td>无线远程压力测控置</td>
-						<td>JK-GH2013G</td>
-						<td>3</td>
-						<td></td>
+					<tr v-for="(item,index) in instal_device_info" :key="index">
+						<td>{{item.xh}}</td>
+						<td>{{item.device_name}}</td>
+						<td>{{item.specifications}}</td>
+						<td>{{item.device_num}}</td>
 					</tr>
 
 					<tr>
-						<td>5</td>
-						<td>无线远程压力测控置</td>
-						<td>JK-GH2013G</td>
-						<td>3</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>6</td>
-						<td>无线远程压力测控置</td>
-						<td>JK-GH2013G</td>
-						<td>3</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>7</td>
-						<td>无线远程压力测控置</td>
-						<td>JK-GH2013G</td>
-						<td>3</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>8</td>
-						<td>无线远程压力测控置</td>
-						<td>JK-GH2013G</td>
-						<td>3</td>
-						<td></td>
-					</tr>
+						<td colspan="3">合计</td>
+						<td>{{getData.device_cout}}</td>
 
-					<tr>
-						<td>9</td>
-						<td>无线远程压力测控置</td>
-						<td>JK-GH2013G</td>
-						<td>3</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>10</td>
-						<td>无线远程压力测控置</td>
-						<td>JK-GH2013G</td>
-						<td>3</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td colspan="2">合计</td>
-						<td></td>
-						<td>49</td>
-						<td></td>
 					</tr>
 				</table>
 			</view>
@@ -136,83 +69,18 @@
 						<th style="width:40%">监控子系统</th>
 						<th>检测点类型</th>
 						<th>数量</th>
-						<th>备注</th>
-					</tr>
-					<tr>
-						<td>1</td>
-						<td>火灾自动报警系统</td>
-						<td>火灾探测报警</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>2</td>
-						<td>火灾自动报警系统</td>
-						<td>火灾探测报警</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>3</td>
-						<td>火灾自动报警系统</td>
-						<td>火灾探测报警</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>4</td>
-						<td>火灾自动报警系统</td>
-						<td>火灾探测报警</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>5</td>
-						<td>火灾自动报警系统</td>
-						<td>火灾探测报警</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>6</td>
-						<td>火灾自动报警系统</td>
-						<td>火灾探测报警</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>7</td>
-						<td>火灾自动报警系统</td>
-						<td>火灾探测报警</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>8</td>
-						<td>火灾自动报警系统</td>
-						<td>火灾探测报警</td>
-						<td>1</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>9</td>
-						<td>火灾自动报警系统</td>
-						<td>火灾探测报警</td>
-						<td>1</td>
-						<td></td>
+
 					</tr>
-					<tr>
-						<td>10</td>
-						<td>火灾自动报警系统</td>
-						<td>火灾探测报警</td>
-						<td>1</td>
-						<td></td>
+					<tr v-for="(item,index) in monitor_point_info">
+						<td>{{item.xh}}</td>
+						<td>{{item.monitor_son}}</td>
+						<td>{{item.monitor_type}}</td>
+						<td>{{item.monitor_sum}}</td>
 					</tr>
+
 					<tr>
-						<td colspan="2">合计</td>
-						<td></td>
-						<td>100</td>
-						<td></td>
+						<td colspan="3">合计</td>
+						<td>{{getData.point_count}}</td>
 					</tr>
 				</table>
 			</view>
@@ -226,19 +94,19 @@
 			<view class="info-content">
 				<view class="info-one-info ">
 					<text>统计起始日期：</text>
-					<text>2019年11月01日</text>
+					<text>{{count_time.startData}}</text>
 				</view>
 				<view>
 					<text>统计截至日期：</text>
-					<text>2019年11月20日</text>
+					<text>{{count_time.endData}}</text>
 				</view>
 				<view>
 					<text>统计时段时长：</text>
-					<text>30</text>
+					<text>{{count_time.days}}</text>
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="bg-white margin-bottom-sm">
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
@@ -247,28 +115,99 @@
 			<view class="margin-lr padding-bottom-lg" style="overflow:auto">
 				<table style="border:1px solid #ccc;width:150%;" cellspacing="0" cellpadding="0" align="center">
 					<tr>
-						<th >序号</th>
-						<th >报告分类</th>
+						<th>序号</th>
+						<th>报告分类</th>
 						<th>报告属性</th>
 						<th>报告总数</th>
 						<th>已处理</th>
 						<th>未处理</th>
 						<th>处置率</th>
 					</tr>
-					<tr>
-						<td>1</td>
-						<td>火灾监测</td>
-						<td>报警</td>
-						<td>2724</td>
-						<td>1219</td>
-						<td>0</td>
-						<td>44.75%</td>
-					</tr>
-					
+					<block v-for="(item,index) in count_report">
+						<template v-if="item.alarm_type=='火灾监测'">
+							<tr>
+								<td rowspan="2">{{item.xh}}</td>
+								<td rowspan="2">{{item.alarm_type}}</td>
+								<td>设备离线</td>
+								<td>{{item.offline.hjlxtotal}}</td>
+								<td>{{item.offline.hjlxcltotal}}</td>
+								<td>{{item.offline.hjlxwcltotal}}</td>
+								<td>{{item.offline.hjlxbaifenbi}}%</td>
+							</tr>
+							<tr>
+								<td>报警</td>
+								<td>{{item.alarm.hjtotal}}</td>
+								<td>{{item.alarm.hjcltotal}}</td>
+								<td>{{item.alarm.hjwcltotal}}</td>
+								<td>{{item.alarm.hjbaifenbi}}%</td>
+							</tr>
+						</template>
+
+						<template v-if="item.alarm_type=='电气火灾监测'">
+							<tr>
+								<td rowspan="2">{{item.xh}}</td>
+								<td rowspan="2">{{item.alarm_type}}</td>
+								<td>设备离线</td>
+								<td>{{item.offline.eflxtotal}}</td>
+								<td>{{item.offline.eflxcltotal}}</td>
+								<td>{{item.offline.eflxwcltotal}}</td>
+								<td>{{item.offline.eflxbaifenbi}}%</td>
+							</tr>
+							<tr>
+								<td>报警</td>
+								<td>{{item.alarm.efwcltotal}}</td>
+								<td>{{item.alarm.efcltotal}}</td>
+								<td>{{item.alarm.efwcltotal}}</td>
+								<td>{{item.alarm.efbaifenbi}}%</td>
+							</tr>
+						</template>
+
+						<template v-if="item.alarm_type=='消防水系统监测'">
+							<tr>
+								<td rowspan="2">{{item.xh}}</td>
+								<td rowspan="2">{{item.alarm_type}}</td>
+								<td>设备离线</td>
+								<td>{{item.offline.sjlxtotal}}</td>
+								<td>{{item.offline.sjlxcltotal}}</td>
+								<td>{{item.offline.sjlxwcltotal}}</td>
+								<td>{{item.offline.sjlxbaifenbi}}%</td>
+							</tr>
+							<tr>
+								<td>报警</td>
+								<td>{{item.alarm.sjtotal}}</td>
+								<td>{{item.alarm.sjcltotal}}</td>
+								<td>{{item.alarm.sjwcltotal}}</td>
+								<td>{{item.alarm.sjbaifenbi}}%</td>
+							</tr>
+						</template>
+
+						<template v-if="item.alarm_type=='RTU监测'">
+							<tr>
+								<td rowspan="2">{{item.xh}}</td>
+								<td rowspan="2">{{item.alarm_type}}</td>
+								<td>设备离线</td>
+								<td>{{item.offline.rtulxtotal}}</td>
+								<td>{{item.offline.rtulxcltotal}}</td>
+								<td>{{item.offline.rtulxwcltotal}}</td>
+								<td>{{item.offline.rtulxbaifenbi}}%</td>
+							</tr>
+							<tr>
+								<td>报警</td>
+								<td>{{item.alarm.rtutotal}}</td>
+								<td>{{item.alarm.rtucltotal}}</td>
+								<td>{{item.alarm.rtuwcltotal}}</td>
+								<td>{{item.alarm.rtubaifenbi}}%</td>
+							</tr>
+						</template>
+
+
+					</block>
+
+
 				</table>
 			</view>
 		</view>
-		
+
 
 		<view class="bg-white margin-bottom-sm">
 			<view class="info-tit margin-left-xs">
@@ -279,86 +218,70 @@
 				<view class="chart-tit">
 					各类告警总数饼状图
 				</view>
-				<chart :bindData="staticData"></chart>
+				<chart :bindData="alarm_total" v-if="Object.keys(alarm_total).length!==0" ></chart>
 				<view class="chart-tit">火灾告警处理情况饼图</view>
-				<chart2 :bindData="staticData2"></chart2>
+				<chart2 :bindData="fire_data" v-if="Object.keys(fire_data).length!==0" ></chart2>
 				<br>
 			</view>
 
 			<view class="padding text-df">
-				<view> 统计时段内火灾监控报告数量：2724条。。 
-				</view>
-				<view>报告平均发生：0条/台/天。</view>
-				<view>报告平均发生：90.8条/台/天。</view>
-				<view> 报告数量偏高</view>
-				<view>提示：火灾隐患极高或存在系统故障，需要排查； 离线记录中，报告数量：0条。</view>
-				<view>提示：火灾监测设备通信状态良好，数据接收情况稳定，需要保持。</view>
+				<view v-html="fire_data.data"></view>
 			</view>
-			
+
 			<view class="padding text-center">
 				<view class="chart-tit">水系统告警处理情况饼图</view>
-				<chart3 :bindData="staticData2"></chart3>
-			
-				
-				<br>
+				<chart3 :bindData="water_data" v-if="Object.keys(water_data).length!==0"></chart3>
 			</view>
-			
+
 			<view class="padding text-df">
-				<view> 统计时段内火灾监控报告数量：2724条。。 
-				</view>
-				<view>报告平均发生：0条/台/天。</view>
-				<view>报告平均发生：90.8条/台/天。</view>
-				<view> 报告数量偏高</view>
-				<view>提示：火灾隐患极高或存在系统故障，需要排查； 离线记录中，报告数量：0条。</view>
-				<view>提示：火灾监测设备通信状态良好，数据接收情况稳定，需要保持。</view>
+				<view v-html="water_data.data"></view>
 			</view>
-			
-			
-			
+
+
+
 			<view class="padding text-center">
 				<view class="chart-tit">
 					RTU系统告警处理情况饼图
 				</view>
 				<br>
-				<chart4 :bindData="staticData2"></chart4>
+				<chart4 :bindData="rtu_data" v-if="Object.keys(rtu_data).length!==0"></chart4>
 			</view>
-			<view  class="padding text-df">
-				<view>未安装此设备。</view>
+			<view class="padding text-df">
+				<view v-html="rtu_data.data"></view>
 			</view>
-			
+
 		</view>
-		
-		
+
+
 		<view class="bg-white margin-bottom-sm">
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				存在问题或需要改进事项
 			</view>
 			<view class="padding-lr padding-bottom">
-				1、系统数据分析提示：火灾隐患极高或存在系统 故障，建议尽早进行系统排查；
+				<view v-for="(item,index) in propose" :key="index" >
+					{{index+1}}、{{item.data1}}
+				</view>
+				
 			</view>
 		</view>
-		
+
 		<view class="bg-white margin-bottom-sm">
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				其他事宜
 			</view>
 			<view class="padding-lr padding-bottom other">
-				<view>
-					1、目前数据反映：火灾监测设备通信情况较好， 需要保持；
-				</view>
-				<view>
-					 2、目前数据反映：消防水系统监测运行状态较好， 需要保持；
+				<view v-for="(item,index) in other" :key="index" >
+					{{index}}、{{item.data2}}
 				</view>
-				<view>3、目前数据反映：消防水系统监测设备通信情况 较好，需要保持。</view>
 			</view>
-			
+
 
 		</view>
-		
-		
-		
+
+
+
 
 
 	</view>
@@ -371,25 +294,92 @@
 	import chart4 from './components/chart4.vue';
 	export default {
 		components: {
-			chart,chart2,chart3,chart4
+			chart,
+			chart2,
+			chart3,
+			chart4
 		},
 		data() {
 			return {
 				staticData: {
-					wubao:9,
-					unSolve:6,
-					truely:20
+					wubao: 9,
+					unSolve: 6,
+					truely: 20
 				},
 				staticData2: {
-					wubao:9,
-					unSolve:6,
-					truely:20
-				}
+					wubao: 9,
+					unSolve: 6,
+					truely: 20
+				},
+				
+				getData: {},
+				company_name:'',
+				event_time:'',
+				project_info: {},
+				instal_device_info: {},
+				monitor_point_info: {},
+				count_time: {},
+				count_report: {},
+				alarm_total:{},
+				fire_data:{},
+				water_data:{},
+				rtu_data:{},
+				propose:{},
+				other:{},
 
 
 			}
 		},
+		onLoad: function(option) {
+			// this.companyName=uni.getStorageSync('selectedName')
+
+			this.getDataDetail({
+				'company_code': uni.getStorageSync('selectedCode'),
+				'id': option.id
+			})
+
+		},
 		methods: {
+			
+			
+
+			// 详情数据请求
+			async getDataDetail(params = {}) {
+				const res = await this.$myRequest({
+					url: 'MonthlyReport/getMonthlyReportDetails',
+					data: params,
+					showLoading: true
+				})
+				this.getData = res.data.data;
+				// console.log(this.getData)
+				this.project_info = this.getData.project_info; //基本情况
+
+				this.instal_device_info = this.getData.instal_device_info; //安装设备情况
+				console.log(this.instal_device_info)
+				this.monitor_point_info = this.getData.monitor_point_info; //监控点情况  
+
+				this.count_time = this.getData.count_time; //统计时段
+
+				this.count_report = this.getData.count_report; //统计报表
+				
+				this.alarm_total = this.getData.alarm_total; //各类告警
+				
+				this.fire_data = this.getData.fire_data; //火灾告警		
+						
+				this.water_data = this.getData.water_data; //水系统告警
+				
+				this.rtu_data = this.getData.rtu_data; //水系统告警  
+				
+				this.propose = this.getData.propose; //存在问题
+				
+				this.other = this.getData.other; //其他事宜  
+				
+				this.event_time=res.data.event_time;
+				this.company_name=res.data.company_name;
+
+
+
+			},
 
 
 
@@ -401,11 +391,7 @@
 </script>
 
 <style lang="scss">
-
-page {
+	page {
 		background: #EDEDED;
 	}
-
-
-
 </style>

pages/analyse/monthReport/monthReport.vue

@@ -2,10 +2,10 @@
 
 	<view class="">
 		<view class="cu-list menu-avatar">
-			<view class="cu-item deviceTypeItem" v-for="(item,index) in deviceType" :key="index" @tap="goReportDetail">
+			<view class="cu-item deviceTypeItem" v-for="(item,index) in getData" :key="index" @tap="goReportDetail(item)">
 				<view class="cu-avatar round" style="background-image:url(../../../static/month-report-icon.png)"></view>
 				<view class="content">
-					<view class="title">虹泾总部园2020-04月报</view>
+					<view class="title">{{item.company_name}} {{item.event_time}}</view>
 				</view>
 				<view class="nav-right num">
 					<view>
@@ -25,16 +25,32 @@
 		data() {
 			return {
 				deviceType: json.deviceType,
+				getData:[]
 			};
 		},
 		onLoad: function(option) {
+			
+			this.getDataList({'company_code':uni.getStorageSync('selectedCode')})
 
 		},
 
 		methods: {
-			goReportDetail() {
+			
+			// 列表数据请求
+			async getDataList(params = {}) {
+				const res = await this.$myRequest({
+					url: 'MonthlyReport/getMonthlyReportList',
+					data:params,
+					showLoading: true
+				})
+				this.getData=res.data.data;
+				// console.log(JSON.parse(res))
+				console.log(this.getData[0].company_name)
+			
+			},
+			goReportDetail(item) {
 				uni.navigateTo({
-					url: '/pages/analyse/monthDetail/monthDetail',
+					url: '/pages/analyse/monthDetail/monthDetail?id='+item.id,
 				});
 			}
 

pages/deviceManage/component/searchArea.vue

@@ -11,15 +11,15 @@
 						<option value="">类型2</option>
 					</select>
 				</view>
-				<view class="search-form round bg-white">
-					<input type="text" placeholder="选输入设备点位" confirm-type="search"></input>
-				</view>
 			</view>
 
 			<view class="cu-bar search bg-gray filter-section">
 				<view class="search-form round bg-white" style="margin-bottom:26rpx">
-					<input class="" @focus="InputFocus" v-model="siteName" @blur="InputBlur" :adjust-position="false"
-						type="text" placeholder="选择传输方式" confirm-type="search"></input>
+					<select name="" id="" placeholder="">
+						<option value="">请选择传输方式</option>
+						<option value="">类型1</option>
+						<option value="">类型2</option>
+					</select>
 				</view>
 				<view class="action">
 					<button class="cu-btn bg-blue round">查询</button>

pages/deviceManage/deviceAdd/deviceAdd.vue

@@ -69,14 +69,14 @@
 				</radio-group>
 			</view>
 			
-			<view class="form-item">
+			<!-- <view class="form-item">
 				<view class="title"><text class="necessary">*</text>传输方式:</view>
 				<select name="" id="">
 					<option value="">方式一</option>
 					<option value="">方式一</option>
 					<option value="">方式一</option>
 				</select>
-			</view>
+			</view> -->
 			
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>NB类型:</view>

pages/deviceManage/deviceManage.vue

@@ -2,16 +2,51 @@
 	<view class="deviceRegistWrapper" ref="contentWrapper">
 
 		<!-- 筛选框start -->
-		<search-area></search-area>
+		<view>
+			
+			<view style="height:206rpx"></view>
+			<view class="ding">
+				<view class="cu-bar search bg-gray filter-section" style="with:50%;">
+					<view class="search-form round bg-white">
+						<select name="" id="" placeholder="">
+							<option value="0">请选择设备类型</option>
+							<option value="1">用传</option>
+							<option value="2">水表</option>
+							<option value="3">烟感</option>
+							<option value="4">消防栓</option>
+							<option value="5">液位</option>
+							<option value="6">RTU</option>
+							<option value="7">电气火灾</option>
+							<option value="16">视频监测</option>
+						</select>
+					</view>
+				</view>
+			
+				<view class="cu-bar search bg-gray filter-section">
+					<view class="search-form round bg-white" style="margin-bottom:26rpx">
+						<select name="" id="" placeholder="">
+							<option value="0">请选择传输方式</option>
+							<option value="NB">NB</option>
+							<option value="4G">4G</option>
+							<option value="Lora">Lora</option>
+						</select>
+					</view>
+					<view class="action">
+						<button class="cu-btn bg-blue round">查询</button>
+					</view>
+				</view>
+			</view>
+			
+		</view>
 		<!-- 筛选框end -->
 
 		<!-- 设备注册列表start -->
 		<block class="">
-			<view class="processList deviceRegistList" style="height: calc(100vh - 241px);">
+			<view class="processList deviceRegistList" style="height: calc(100vh - 470rpx);">
 				<checkbox-group @change="changeCheckbox">
 					<view class="cu-list menu-avatar ">
 						<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''"
-							v-for="(item,index) in getData" :key="index" :data-target="'move-box-' + index">
+							v-for="(item,index) in deviceManage" :key="index" :data-target="'move-box-' + index">
 							<view class="cu-form-group margin-top">
 								<checkbox :value="String(item.id)" :checked="checkedArr.includes(String(item.id))"
 									:class="{'checked':checkedArr.includes(String(item.id))}"></checkbox>
@@ -130,19 +165,19 @@
 <script>
 	import json from '../../data/json.js';
 	import validCode from './component/validCode/validCode';
-	import searchArea from './component/searchArea.vue';
+	// import searchArea from './component/searchArea.vue';
 	import exportModal from './component/exportModal.vue';
 
 	export default {
 		components: {
 			validCode,
-			searchArea,
+			// searchArea,
 			exportModal
 		},
 		data() {
 			return {
 				
-				getData:[],
+				deviceManage:[],
 				validCode: '',
 
 				checkbox: [{
@@ -150,7 +185,7 @@
 					checked: false
 				}],
 
-				deviceManage: json.deviceManage,
+				// deviceManage: json.deviceManage,
 				siteListRes: 0,
 
 				type: '0',
@@ -212,10 +247,10 @@
 					data:params,
 					showLoading: true
 				})
-				this.getData=res.data.data;
+				this.deviceManage=res.data.data;
 			
 				// console.log(res.data.data.length)
-				console.log(this.getData);
+				console.log(this.deviceManage);
 				
 			},
 			
@@ -296,6 +331,13 @@
 			},
 
 
+InputFocus(e) {
+				this.InputBottom = e.detail.height
+			},
+			InputBlur(e) {
+				this.InputBottom = 0
+			},
+
 			// 多选复选框改变事件
 			changeCheckbox(e) {
 				this.checkedArr = e.detail.value;