modify

common/common.scss

@@ -11,7 +11,24 @@ radio,checkbox {
 /* 修改placeholder颜色 */
 	.uni-input-placeholder{
 		color:#999
-	}
+	}
+	
+	
+	table{
+		border-collapse: collapse;
+		width:100%;
+		text-align:center
+	}
+	table,tr,td,th{
+		border:1px solid #e2e2e2;
+	}
+	td,th{
+		padding:6rpx;
+		font-size:26rpx;
+	}
+	
+	
+	
 	
 /* 一行显示*/
 .inOneLine{
@@ -261,11 +278,10 @@ radio,checkbox {
 	width: auto!important;
 	display: inline-block
 }
-// .info-content view text:last-child {
-// 	color:#333
-// }
-
-
+
+
+
+//分析页面
 .analyse-wrapper {
 		.top-banner {
 			width: 100%;
@@ -275,10 +291,8 @@ radio,checkbox {
 			
 		}
 		.cu-list.menu-avatar .cu-item{
-		
 			margin:30rpx 0 0;
 			margin-left:0;
-			
 			.cu-avatar{
 				background-color:rgba(0,0,0,0);
 				left:26rpx;
@@ -287,12 +301,16 @@ radio,checkbox {
 				left:130rpx;
 				font-size:32rpx;
 			}
+		}
+	}
+	
+	//消息页面
+	.info-wrapper {
+			.top-banner {
+				background: url(/static/info-bg.png) no-repeat;
+				background-size:cover;
+			}
 		}
-		
-		
-
-	}
-	
 	
 	.submitBottomBtn {
 		position: fixed;
@@ -614,4 +632,94 @@ radio,checkbox {
 			height:40rpx;
 		}
 	}
+	
+	.fireBashWrapper{
+		.cu-avatar{
+			width:120rpx;
+			height:100rpx
+		}
+		.cu-list.menu-avatar > .cu-item .content{
+			left:140rpx;
+			.pro-date{
+				position:absolute;
+				right:20rpx;
+				bottom:0
+			}
+		}
+	}
+	
+	// 消防知识库详情页
+	.fireBashDetailWrapper{
+		font-size:28rpx;
+		.cu-avatar{
+			width:50rpx;
+			height:50rpx
+		}
+		.fireD-content{
+			position:relative
+		}
+		
+		.fireD-content:before{
+			position: absolute;
+			    top: -8px;
+			    left: -15px;
+			    box-sizing: border-box;
+			    width: calc(100% + 30px);
+			    height: 1px;
+			    background:#EDEDED;
+			    content: " ";
+		
+		}
+		.fireD-content view{
+			line-height:1.5;
+			// text-indent:56rpx;
+		}
+		.share{
+			position:fixed;
+			bottom:0;
+			left:0;
+			width:100%;
+			background: #f4f5f7;
+			border: 1px solid #e6e6e6;
+			.share-item{
+				padding:20rpx;
+				
+			}
+			.share-item:nth-child(2){
+				border-left:1px solid #e6e6e6;
+				border-right:1px solid #e6e6e6;
+			}
+			
+		
+		}
+	}
+	.fireD-tit{
+		font-size:32rpx;
+		font-weight:bold
+	}
+	.preAndNext{
+		color:#4074E7;
+		margin:30rpx 0 80rpx;
+	}
+	
+	
+	// 月报详情
+	.reportD-wrapper{
+		
+		.title-wrapper{
+			background:#EFF4FF;
+		}
+		.title{
+			line-height:2
+		}
+		.other view{
+			margin-bottom:10rpx;
+		}
+	}
+	.chart-tit{
+		color:#4074E7;
+		font-size:32rpx;
+	}
+	
+	
 	

pages.json

@@ -604,6 +604,51 @@
             }
             
         }
+        ,{
+            "path" : "pages/info/fireBase/fireBase",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "消防知识库",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/info/pushList/pushList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "消息推送",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/info/fireBashDetail/fireBashDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "火灾逃生十大要诀",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/analyse/monthReport/monthReport",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "虹泾总部园月报",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/analyse/monthDetail/monthDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "月报详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	
 	

pages/analyse/analyse.vue

@@ -4,7 +4,7 @@
 			
 		</view>
 		<view class="cu-list menu-avatar padding-lr">
-			<view class="cu-item shadow">
+			<view class="cu-item shadow" @tap="goMonthReport()">
 				<view class="cu-avatar " style="background-image:url(../../static/yb-icon.png)"></view>
 				<view class="content">
 					<view class="">月报</view>
@@ -38,7 +38,12 @@
 			return {
 			}
 		},
-		methods: {
+		methods: {
+			goMonthReport() {
+				uni.navigateTo({
+					url: '/pages/analyse/monthReport/monthReport',
+				});
+			}
 			
 
 		}
@@ -52,30 +57,4 @@
 
 <style lang="scss">  
 
-	// .analyse-wrapper {
-	// 	.top-banner {
-	// 		width: 100%;
-	// 		height: 273rpx;
-	// 		background: url(../../static/analyse-bg.png) no-repeat;
-	// 		background-size:cover;
-			
-	// 	}
-	// 	.cu-list.menu-avatar .cu-item{
-		
-	// 		margin:30rpx 0 0;
-	// 		margin-left:0;
-			
-	// 		.cu-avatar{
-	// 			background-color:rgba(0,0,0,0);
-	// 			left:26rpx;
-	// 		}
-	// 		.content{
-	// 			left:130rpx;
-	// 			font-size:32rpx;
-	// 		}
-	// 	}
-		
-		
-
-	// }
 </style>

pages/analyse/monthDetail/components/chart.vue

@@ -0,0 +1,207 @@
+<template>
+	<view class="content">
+
+		<view @click="echarts.onClick" :prop="option" :change:prop="echarts.updateEcharts" id="echarts2" class="echarts"></view>
+
+	</view>
+</template>
+
+<script>
+
+	 let title = '报警总数';
+
+	export default {
+		props:{
+			bindData:{
+				type:Object,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				option: {
+					color: ['#006ED6', '#00E9CD', '#FF5354'],
+
+					title: {
+						left: 'center'
+					},
+					tooltip: {
+						trigger: 'item',
+						formatter: "{a} <br/>{b}: {c} ({d}%)"
+					},
+
+					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',
+					// 			}
+					// 		}
+					// 	}
+					// }],
+					legend: { //aa图例
+						orient: 'horizontal',
+						// icon: 'circle',
+						itemWidth: 12,
+						itemHeight: 12,
+						itemGap: 20,
+						 bottom: -6,
+						textStyle: {
+
+							fontSize: 14,
+							rich: {
+								name: {
+									fontSize: 18
+								},
+								value: {
+									fontSize: 14,
+									padding: [0, 20, 0, 5]
+								},
+
+							}
+						},
+					},
+					series: [{
+						name: '访问来源',
+						type: 'pie',
+						radius: ['0%', '60%'],
+						center: ['50%', '45%'],
+						itemStyle: {
+							normal: {
+								// shadowBlur: 20,
+								// shadowColor: '#F9F5F7',
+								// shadowOffsetX: 0,
+								// shadowOffsetY: 0,
+							},
+						},
+
+						data: [{
+								name: "火系统告警",
+								value: this.bindData.wubao
+							},
+							{
+								name: "水系统告警",
+								value: this.bindData.unSolve
+							},
+							{
+								name: "TRU系统告警",
+								value: this.bindData.truely
+							},
+
+						],
+						emphasis: {
+							itemStyle: {
+								shadowBlur: 10,
+								shadowOffsetX: 0,
+								// shadowColor: 'rgba(0, 0, 0, 0.5)'
+							}
+						},
+						labelLine: {
+							normal: {
+								length: 10, //aa折线长度
+								length2: 20, //aa折线长度
+
+							}
+						},
+						label: {
+							normal: {
+								
+								formatter: "{d}%"
+								// formatter: params => {
+								// 	var percent = 0;
+								// 	var total = 0;
+								// 	for (var i = 0; i < echartData.length; i++) {
+								// 		total += echartData[i].value;
+								// 	}
+								// 	console.log(111);
+								// 	console.log(total);
+
+								// 	percent = ((params.value / total) * 100).toFixed(0);
+								// 	return params.name + ': ' + percent + '%';
+
+								// },
+
+							}
+						},
+					}]
+				}
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			changeOption() {
+				const data = this.option.series[0].data
+				// 随机更新示例数据
+				data.forEach((item, index) => {
+					data.splice(index, 1, Math.random() * 40)
+				})
+			},
+			onViewClick(options) {
+				console.log(options)
+			}
+		}
+	}
+</script>
+
+<script module="echarts" lang="renderjs">
+	let myChart
+	export default {
+		mounted() {
+			if (typeof window.echarts === 'function') {
+				this.initEcharts()
+			} else {
+				// 动态引入较大类库避免影响页面展示
+				const script = document.createElement('script')
+				// view 层的页面运行在 www 根目录，其相对路径相对于 www 计算
+				script.src = '/static/echarts.js'
+				script.onload = this.initEcharts.bind(this)
+				document.head.appendChild(script)
+			}
+		},
+		methods: {
+			initEcharts() {
+				myChart = echarts.init(document.getElementById('echarts2'))
+				// 观测更新的数据在 view 层可以直接访问到
+				myChart.setOption(this.option)
+			},
+			updateEcharts(newValue, oldValue, ownerInstance, instance) {
+				// 监听 service 层数据变更
+				myChart.setOption(newValue)
+			},
+			onClick(event, ownerInstance) {
+				// 调用 service 层的方法
+				ownerInstance.callMethod('onViewClick', {
+					test: 'test'
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.echarts {
+		width: 100%;
+		height: 500rpx;
+		margin-bottom: 70rpx;
+	}
+</style>

pages/analyse/monthDetail/components/chart2.vue

@@ -0,0 +1,160 @@
+<template>
+	<view class="content">
+		<view @click="echarts.onClick" :prop="option" :change:prop="echarts.updateEcharts" id="echarts" class="echarts"></view>
+
+	</view>
+</template>
+
+<script>
+
+
+	export default {
+		name: 'chart',
+		props: {
+
+		},
+		data() {
+			return {
+				option: {
+					 series: [{
+					         type: 'gauge',
+							 //半径
+							 radius: '80%',	 
+					         detail: {
+					             color: '#FFC600',
+					             fontSize: 30,
+					             fontWeight: 'normal',
+					             offsetCenter: [0, '70%']  
+					         },
+					         data: [{
+					             value: 30,
+					             name: '任务完成率'
+					         }],
+							  
+							   startAngle: 210,
+							                  //结束角度。
+							                  endAngle: -30,
+							                  center: ['50%', '50%'],  //中心位置
+					         pointer: {
+					 	    	show: true,
+								 length: '70%',
+					 	    },
+					 	    title: {
+					 	        offsetCenter: [0, '30%'],
+					 	        fontSize: 15,
+					 	        color: '#444'
+					 	    },
+					 	    min:0,
+					         max:100,
+					         splitNumber: 10,
+							 //分隔线样式。
+							 splitLine: {
+								 show: false,
+							 },
+					         axisLine: {
+					             show: true,
+					             lineStyle: {
+									  width: 20,
+									  // color: [[1, 'red']]
+					                 // color: [
+					                 //     [1, new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
+					                 //             offset: 0.1,
+					                 //             color: "#E43F3D"
+					                 //         },
+					                 //         {
+					                 //             offset: 0.15,
+					                 //             color: "#E98E2C"
+					                 //         },
+					                 //         {
+					                 //             offset: 0.2,
+					                 //             color: "#DDBD4D"
+					                 //         },
+					                 //         {
+					                 //             offset: 0.8,
+					                 //             color: "#7CBB55"
+					                 //         },
+					                 //         {
+					                 //             offset: 1,
+					                 //             color: "#9CD6CE"
+					                 //         }
+					                 //     ])]
+					                 // ]
+					 
+					             }
+					         },
+					      
+					 
+					     }]}
+
+				
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			changeOption() {
+				const data = this.option.series[0].data
+				// 随机更新示例数据
+				data.forEach((item, index) => {
+					data.splice(index, 1, Math.random() * 40)
+				})
+			},
+			onViewClick(options) {
+				console.log(options)
+			}
+		}
+	}
+</script>
+
+<script module="echarts" lang="renderjs">
+	let myChart
+	export default {
+		mounted() {
+			if (typeof window.echarts === 'function') {
+				this.initEcharts()
+			} else {
+				// 动态引入较大类库避免影响页面展示
+				const script = document.createElement('script')
+				// view 层的页面运行在 www 根目录，其相对路径相对于 www 计算
+				script.src = '/static/echarts.min.js'
+				script.onload = this.initEcharts.bind(this)
+				document.head.appendChild(script)
+			}
+		},
+		methods: {
+			initEcharts() {
+
+
+				myChart = echarts.init(document.getElementById('echarts'))
+				// 观测更新的数据在 view 层可以直接访问到
+				myChart.setOption(this.option)
+			},
+			updateEcharts(newValue, oldValue, ownerInstance, instance) {
+				// 监听 service 层数据变更
+				myChart.setOption(newValue)
+			},
+			onClick(event, ownerInstance) {
+				// 调用 service 层的方法
+				ownerInstance.callMethod('onViewClick', {
+					test: 'test'
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.echarts {
+		width: 100%;
+		height: 400rpx;
+
+	}
+</style>

pages/analyse/monthDetail/monthDetail.vue

@@ -0,0 +1,372 @@
+<template>
+	<view class="reportD-wrapper">
+		<view class="text-center flex flex-wrap justify-center title-wrapper">
+			<view class="basis-xl margin title">凯撒国际会所消防报警系统监测数据 2020-11月报表</view>
+		</view>
+		<view class="basic-info bg-white margin-bottom-sm">
+			<view class="info-tit margin-left-xs">
+				<text class="cuIcon-titles margin-right-xs"></text>
+				项目情况
+			</view>
+			<view class="info-content">
+				<view class="info-one-info ">
+					<text>单位名称：</text>
+					<text>凯撒国际会所</text>
+				</view>
+				<view>
+					<text>进场日期：</text>
+					<text>2019年11月20日</text>
+				</view>
+				<view>
+					<text style="width:auto!important">完工日期：</text>
+					<text>2019年11月20日</text>
+				</view>
+				<view>
+					<text>验收日期：</text>
+					<text>2019年12月11日</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>
+				安装设备情况
+			</view>
+			<view class="padding-lr padding-bottom-lg">
+				<table style="border:1px solid #ccc" cellspacing="0" cellpadding="0" align="center">
+					<tr>
+						<th style="width:13%">序号</th>
+						<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>
+
+					<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>
+
+					<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>
+		</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-lg">
+				<table style="border:1px solid #ccc" cellspacing="0" cellpadding="0" align="center">
+					<tr>
+						<th style="width:13%">序号</th>
+						<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>
+					<tr>
+						<td colspan="2">合计</td>
+						<td></td>
+						<td>100</td>
+						<td></td>
+					</tr>
+				</table>
+
+			</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="info-content">
+				<view class="info-one-info ">
+					<text>统计起始日期：</text>
+					<text>2019年11月01日</text>
+				</view>
+				<view>
+					<text>统计截至日期：</text>
+					<text>2019年11月20日</text>
+				</view>
+				<view>
+					<text>统计时段时长：</text>
+					<text>30</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>
+				项目情况
+			</view>
+			<view class="padding text-center">
+				<view class="chart-tit">
+					各类告警总数饼状图
+				</view>
+				<chart :bindData="staticData"></chart>
+				<view class="chart-tit">火灾告警处理情况饼图</view>
+				<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>
+			
+			<view class="padding text-center">
+			
+				<view class="chart-tit">水系统告警处理情况饼图</view>
+				<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>
+			
+			
+			
+			<view class="padding text-center">
+				<view class="chart-tit">
+					RTU系统告警处理情况饼图
+				</view>
+				<br>
+			</view>
+			<view  class="padding text-df">
+				<view>未安装此设备。</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>
+		</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>
+				<view>3、目前数据反映：消防水系统监测设备通信情况 较好，需要保持。</view>
+			</view>
+			
+
+		</view>
+		
+		
+		
+
+
+	</view>
+</template>
+
+<script>
+	import chart from './components/chart.vue';
+	import chart2 from './components/chart2.vue';
+	export default {
+		components: {
+			chart,chart2
+		},
+		data() {
+			return {
+				staticData: {
+					wubao:9,
+					unSolve:6,
+					truely:20
+				}
+
+
+			}
+		},
+		methods: {
+
+
+
+
+
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+page {
+		background: #EDEDED;
+	}
+
+
+
+</style>

pages/analyse/monthReport/monthReport.vue

@@ -0,0 +1,48 @@
+<template>
+
+	<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-avatar round" style="background-image:url(../../../static/month-report-icon.png)"></view>
+				<view class="content">
+					<view class="title">虹泾总部园2020-04月报</view>
+				</view>
+				<view class="nav-right num">
+					<view>
+						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+					</view>
+				</view>
+			</view>
+
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import json from '../../../data/json.js';
+	export default {
+		data() {
+			return {
+				deviceType: json.deviceType,
+			};
+		},
+		onLoad: function(option) {
+
+		},
+
+		methods: {
+			goReportDetail() {
+				uni.navigateTo({
+					url: '/pages/analyse/monthDetail/monthDetail',
+				});
+			}
+
+		}
+
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/info/fireBase/fireBase.vue

@@ -0,0 +1,122 @@
+<template>
+	<view class="fireBashWrapper">
+		
+		<block v-if="TabCur==0">
+			<view class="" style="margin-top:0">
+				<view class="cu-list menu-avatar ">
+					<view class="cu-item" v-for="(item,index) in unporcessList" :key="index"  @tap="goFireBaseDetail">
+						<view class="cu-avatar" style="background-image:url(../../../static/fire-base1.png);"></view>
+						<view class="content">
+							<view class="pro-title">
+								<view class="cut">{{item.title}}</view>
+							</view>
+							<view class="pro-des  ">
+								<view class="text-cut">
+									{{item.subtit}}
+								</view>
+							</view>
+							<view class="pro-date">{{item.time}}</view>
+						</view>
+						
+					</view>
+				</view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				unporcessList:[{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},
+				{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},
+				{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},
+				{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				},
+				{
+					title:'火灾逃生九大要诀',
+					time:'2020-02-12',
+					subtit:'admin'
+				}],
+				
+				
+				modalName: null,
+				listTouchStart: 0,
+				listTouchDirection: null,
+				CustomBar: this.CustomBar,
+				TabCur: 0,
+				
+				tabNav: ['未处理', '已处理']
+			};
+		},
+		methods: {
+			tabSelect(e) {
+				this.TabCur = e.currentTarget.dataset.id;
+				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
+			},
+			
+			// 页面跳转
+			goFireBaseDetail() {
+				uni.navigateTo({
+					url: '/pages/info/fireBashDetail/fireBashDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goProcessedDetail(){
+				uni.navigateTo({
+					url: '/pages/processedDetail/processedDetail',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+	.processList{
+		position:static;
+	}
+	
+</style>

pages/info/fireBashDetail/fireBashDetail.vue

@@ -0,0 +1,76 @@
+<template>
+	<view class="padding fireBashDetailWrapper">
+		<view class="margin-bottom fireD-tit">火灾逃生十大要诀火灾逃生十大要诀</view>
+		<view class="flex justify-between align-center">
+			<view>
+				<view class="cu-avatar round" style="background-image:url(../../static/fireBase.png)"></view>
+				<text class="margin-left-sm margin-right-sm text-sm">admin</text>
+				<text>2020-01-08</text>
+			</view>
+			<view style="color:#999">阅读：1568</view>
+		</view>
+
+		<view class="fireD-content margin-top padding-top-xs">
+
+			<view class="">
+				
+				<img src="../../../static/fireD-img.png" alt="" style="max-width:100%">
+
+				<view style="text-indent:58rpx">
+					&nbsp;第一决：熟悉环境，暗记出口。当你来到酒店，卡拉OK厅，务必留心疏散通道、安全出口及楼梯方位等，等大火燃起、浓烟密布时，便可以摸清道路，尽快逃离现场。</view>
+				<view style="text-indent:58rpx">第二决：通道出口畅通无阻。楼梯、通道、安全出口等是火灾发生时最重要的逃生支路，应保证畅通无阻，切不可堆放杂物或设闸上锁。且自断后路，必死无疑。
+				</view>
+				<view style="text-indent:58rpx">第三决：保持镇静，快速撤离。突遇火灾，面对浓烟和烈火，千万不要盲目的跟从人流相互拥挤、乱冲乱撞。
+					首先要保持镇静，判明起火地点，多地脑筋，因地制宜， 因时制宜，决定逃生的办法。</view>
+				<view style="text-indent:58rpx">第四决：不入险地、不贪财物、生命是最重要的。不要因为害羞及顾及贵重物品，而把宝贵的逃生时间浪费在
+					穿衣或寻找贵重物品上。据报载：在一次特大火灾中，人们发现有三名遇难者手中抓着存折或首饰。</view>
+				<view style="text-indent:58rpx">
+					第五决：简易防护，不可缺少。逃生时可用毛巾、口罩等蒙住口鼻，将被褥浇湿蒙在身上通过烟火区。烟气较空气轻而飘上部，匍匐前进，贴近地面逃离是较佳的办法。</view>
+				<view style="text-indent:58rpx">第六决：莫乘电梯。发生火灾后，电气设备随时可能发生短路，造成停电。一定不要乘坐电梯。要走楼梯或紧急疏散通道。</view>
+			</view>
+		</view>
+
+		<view class="preAndNext">
+			<view class="flex align-top">
+				<view style="width:120rpx">上一篇：</view>
+				<view style="width:calc(100% - 120rpx)" >火灾逃生十大要诀</view>
+			</view>
+			<view class="flex align-top">
+				<view style="width:120rpx">下一篇：</view>
+				<view style="width:calc(100% - 120rpx)">火灾逃生十大要诀</view>
+			</view>
+		</view>
+
+
+		<view class="share grid col-3 ">
+			<view class="share-item align">
+				<text class="icon iconfont margin-right-xs margin-left-lg">&#xe60c;</text>
+				分享
+			</view>
+			<view class="share-item"><text class="icon iconfont margin-right-xs margin-left-lg">&#xe62a;</text>收藏</view>
+			<view class="share-item"><text class="icon iconfont margin-right-xs margin-left-lg">&#xe600;</text>点赞</view>
+		</view>
+
+
+
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/info/info.vue

@@ -1,213 +1,71 @@
 <template>
-	<view class="processWrapper ">
-		
-		<block v-if="TabCur==0">
-			<view class="processList" style="margin-top:0">
-				<view class="cu-list menu-avatar ">
-					<view class="cu-item" v-for="(item,index) in unporcessList" :key="index"  @tap="goUnprocessDetail">
-						<view class="cu-avatar lg" style="background-image:url(../../static/process-icon.png);"></view>
-						<view class="content">
-							<view class="pro-title">
-								<view class="cut">{{item.title}}</view>
-							</view>
-							<view class="pro-des  ">
-								<view class="text-cut">
-									{{item.subTitle}}
-								</view>
-							</view>
-							<view class="pro-date ">{{item.time}}</view>
-						</view>
-						<view class="action">
-							<view class="unProcess">{{item.status}}</view>
-						</view>
+	<view class="analyse-wrapper info-wrapper" >
+		<view class="top-banner justify-center align-center text-center">
+		</view>
+		<view class="cu-list menu-avatar padding-lr">
+			<view class="cu-item shadow" @tap="goFireBase()">
+				<view class="cu-avatar " style="background-image:url(../../static/fireBase.png)"></view>
+				<view class="content">
+					<view class="">消防知识库</view>
+				</view>
+				<view class="nav-right">
+					<view class="text-grey">
+						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
 					</view>
 				</view>
-			</view>
-		</block>
-		<block v-if="TabCur==1">
-			<view class="processList">
-				<view class="cu-list menu-avatar ">
-					<view class="cu-item" v-for="(item,index) in processedList" :key="index" @tap="goProcessedDetail">
-						<view class="cu-avatar lg" style="background-image:url(../../static/processed-icon.png);"></view>
-						<view class="content">
-							<view class="pro-title">
-								<view class="cut">{{item.title}}</view>
-							</view>
-							<view class="pro-des  ">
-								<view class="text-cut">
-									{{item.subTitle}}
-								</view>
-							</view>
-							<view class="pro-date ">{{item.time}}</view>
-						</view>
-						<view class="action">
-							<view class="processed">{{item.status}}</view>
-						</view>
+			</view>
+			<view class="cu-item  shadow" @tap="goPushList()">
+				<view class="cu-avatar " style="background-image:url(../../static/pushList.png)"></view>
+				<view class="content">
+					<view class="">消息推送</view>
+				</view>
+				<view class="nav-right">
+					<view class="text-grey">
+						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
 					</view>
 				</view>
-			</view>
-		</block>
-
+			</view>
+			
+		</view>
+		
 	</view>
 </template>
 
 <script>
 	export default {
 		data() {
-			return {
-				unporcessList:[{
-					title:'母线停电',
-					subTitle:'动作',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'母线停电2',
-					subTitle:'复归',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'母线停电3',
-					subTitle:'动作',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'母线停电4',
-					subTitle:'复归',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'母线停电5',
-					subTitle:'复归',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'母线停电6',
-					subTitle:'复归',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},
-				{
-					title:'母线停电',
-					subTitle:'复归',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},
-				{
-					title:'母线停电',
-					subTitle:'事件未处理测试',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},
-				{
-					title:'母线停电',
-					subTitle:'事件未处理测试',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				},
-				{
-					title:'母线停电',
-					subTitle:'事件未处理测试',
-					status:'未处理',
-					time:'2020-01-08 15:15:12'
-				}],
-				processedList:[{
-					title:'母线停电',
-					subTitle:'事件已处理测试',
-					status:'已处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'母线停电2',
-					subTitle:'事件已处理测试',
-					status:'已处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'母线停电3',
-					subTitle:'事件已处理测试',
-					status:'已处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'母线停电4',
-					subTitle:'事件已处理测试',
-					status:'已处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'母线停电5',
-					subTitle:'事件已处理测试',
-					status:'已处理',
-					time:'2020-01-08 15:15:12'
-				},{
-					title:'母线停电6',
-					subTitle:'事件已处理测试',
-					status:'已处理',
-					time:'2020-01-08 15:15:12'
-				},
-				{
-					title:'母线停电',
-					subTitle:'事件已处理测试',
-					status:'已处理',
-					time:'2020-01-08 15:15:12'
-				},
-				{
-					title:'母线停电',
-					subTitle:'事件已处理测试',
-					status:'已处理',
-					time:'2020-01-08 15:15:12'
-				},
-				{
-					title:'母线停电',
-					subTitle:'事件已处理测试',
-					status:'已处理',
-					time:'2020-01-08 15:15:12'
-				},
-				{
-					title:'母线停电',
-					subTitle:'事件已处理测试',
-					status:'已处理',
-					time:'2020-01-08 15:15:12'
-				}],
-
-				
-				modalName: null,
-				listTouchStart: 0,
-				listTouchDirection: null,
-				CustomBar: this.CustomBar,
-				TabCur: 0,
-				
-				tabNav: ['未处理', '已处理']
-			};
+			return {
+			}
 		},
 		methods: {
-			tabSelect(e) {
-				this.TabCur = e.currentTarget.dataset.id;
-				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
+			
+			goFireBase() {
+				uni.navigateTo({
+					url: '/pages/info/fireBase/fireBase',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			goPushList() {
+				uni.navigateTo({
+					url: '/pages/info/pushList/pushList',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
 			},
-			
-			// 页面跳转
-			goUnprocessDetail() {
-				uni.navigateTo({
-					url: '/pages/unprocessDetail/unprocessDetail',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			goProcessedDetail(){
-				uni.navigateTo({
-					url: '/pages/processedDetail/processedDetail',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-				
-			}
+			
+
 		}
 	}
-</script>
-
-<style lang="scss">
-
-	.processList{
-		position:static;
+</script>
+<style>
+	.shadow {
+		box-shadow: 1px 1px 4px rgb(26 26 26 / 10%);
 	}
-	
+</style>
+
+<style lang="scss">  
+
 </style>

pages/info/pushList/pushList.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/setting/building/building.vue

@@ -82,9 +82,7 @@
 						<td> 消防电梯数量</td>
 						<td>2</td>
 					</tr>
-		
 				</table>
-				
 			</view>
 		</view>
 
@@ -134,17 +132,7 @@
 </script>
 
 <style lang="scss">
-	table{
-		border-collapse: collapse;
-		width:100%;
-		text-align:center
-	}
-	table,tr,td{
-		border:1px solid #e2e2e2;
-	}
-	td{
-		padding:6rpx
-	}
+	
 	
 
 	

pages/weiBao/plan/components/chart.vue

@@ -1,13 +1,12 @@
 <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>
-
-
 	export default {
 		name: 'chart',
 		props: {
@@ -16,77 +15,52 @@
 		data() {
 			return {
 				option: {
-					 series: [{
-					         type: 'gauge',
-							 //半径
-							 radius: '80%',	 
-					         detail: {
-					             color: '#FFC600',
-					             fontSize: 30,
-					             fontWeight: 'normal',
-					             offsetCenter: [0, '70%']  
-					         },
-					         data: [{
-					             value: 30,
-					             name: '任务完成率'
-					         }],
-							  
-							   startAngle: 210,
-							                  //结束角度。
-							                  endAngle: -30,
-							                  center: ['50%', '50%'],  //中心位置
-					         pointer: {
-					 	    	show: true,
-								 length: '70%',
-					 	    },
-					 	    title: {
-					 	        offsetCenter: [0, '30%'],
-					 	        fontSize: 15,
-					 	        color: '#444'
-					 	    },
-					 	    min:0,
-					         max:100,
-					         splitNumber: 10,
-							 //分隔线样式。
-							 splitLine: {
-								 show: false,
-							 },
-					         axisLine: {
-					             show: true,
-					             lineStyle: {
-									  width: 20,
-									  // color: [[1, 'red']]
-					                 // color: [
-					                 //     [1, new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-					                 //             offset: 0.1,
-					                 //             color: "#E43F3D"
-					                 //         },
-					                 //         {
-					                 //             offset: 0.15,
-					                 //             color: "#E98E2C"
-					                 //         },
-					                 //         {
-					                 //             offset: 0.2,
-					                 //             color: "#DDBD4D"
-					                 //         },
-					                 //         {
-					                 //             offset: 0.8,
-					                 //             color: "#7CBB55"
-					                 //         },
-					                 //         {
-					                 //             offset: 1,
-					                 //             color: "#9CD6CE"
-					                 //         }
-					                 //     ])]
-					                 // ]
-					 
-					             }
-					         },
-					      
-					 
-					     }]}
+					tooltip: {
+						formatter: "{a} <br/>{b} : {c}%"
+					},
+					toolbox: {
+
+						feature: {
+							restore: {},
+							saveAsImage: {}
+						}
+					},
+					series: [{
+						name: '业务指标',
+						type: 'gauge',
+						detail: {
+							formatter: '{value}%'
+						},
+						data: [{
+							value: 50,
+							name: '完成率'
+						}],
+						axisLine: {
+							show: true,
+							lineStyle: {
+								color: [
+									[1, new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
+											offset: 0.1,
+											color: "#FFC600"
+										},
+										{
+											offset: 0.6,
+											color: "#30D27C"
+										},
+										{
+											offset: 1,
+											color: "#0B95FF"
+										}
+									])]
+								]
+
+							}
+						}
+
+					}]
+				}
+
 
-				
 			}
 		},
 		onLoad() {
@@ -123,8 +97,16 @@
 			}
 		},
 		methods: {
-			initEcharts() {
+			//串联引入，保证文件加载顺序,在onload 方法内引入下一个js ,在最后一个onload方法内进行图表初始化
+			// init() {
+			// 	// 动态引入较大类库避免影响页面展示
+			// 	const script = document.createElement('script')
+			// 	script.src = 'static/china.js'
+			// 	script.onload = this.initEcharts.bind(this)
+			// 	document.head.appendChild(script)
+			// },
 
+			initEcharts() {
 
 				myChart = echarts.init(document.getElementById('echarts'))
 				// 观测更新的数据在 view 层可以直接访问到

pages/weiBao/plan/components/chart2.vue

@@ -0,0 +1,174 @@
+<template>
+	<view class="content">
+		<view @click="echarts.onClick" :prop="option" :change:prop="echarts.updateEcharts" id="echarts" class="echarts">
+		</view>
+
+	</view>
+</template>
+<!-- <script src="/static/echarts.min.js"></script> -->
+<script>
+	// var abcolor = new echarts.graphic.LinearGradient(
+	// 	0, 0, 0, 1,
+	// 	[{
+	// 			offset: 0,
+	// 			color: '#2378f7'
+	// 		},
+	// 		{
+	// 			offset: 0.7,
+	// 			color: '#2378f7'
+	// 		},
+	// 		{
+	// 			offset: 1,
+	// 			color: '#83bff6'
+	// 		}
+	// 	]
+	// )
+</script>
+
+
+<script>
+	
+	var abcolor = new echarts.graphic.LinearGradient(
+		0, 0, 0, 1,
+		[{
+				offset: 0,
+				color: '#2378f7'
+			},
+			{
+				offset: 0.7,
+				color: '#2378f7'
+			},
+			{
+				offset: 1,
+				color: '#83bff6'
+			}
+		]
+	)
+	export default {
+		name: 'chart',
+		props: {
+
+		},
+		data() {
+			return {
+				option: {
+					series: [{
+						type: 'gauge',
+						//半径
+						radius: '80%',
+						detail: {
+							color: '#FFC600',
+							fontSize: 30,
+							fontWeight: 'normal',
+							offsetCenter: [0, '70%']
+						},
+						data: [{
+							value: 30,
+							name: '任务完成率'
+						}],
+
+						startAngle: 210,
+						//结束角度。
+						endAngle: -30,
+						center: ['50%', '50%'], //中心位置
+						pointer: {
+							show: true,
+							length: '70%',
+						},
+						title: {
+							offsetCenter: [0, '30%'],
+							fontSize: 15,
+							color: '#444'
+						},
+						min: 0,
+						max: 100,
+						splitNumber: 10,
+						//分隔线样式。
+						splitLine: {
+							show: false,
+						},
+						axisLine: {
+							show: true,
+							lineStyle: {
+								width: 20,
+								color: [
+									[1, abcolor]
+								]
+
+							}
+						},
+
+
+					}]
+				}
+
+
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			changeOption() {
+				const data = this.option.series[0].data
+				// 随机更新示例数据
+				data.forEach((item, index) => {
+					data.splice(index, 1, Math.random() * 40)
+				})
+			},
+			onViewClick(options) {
+				console.log(options)
+			}
+		}
+	}
+</script>
+
+<script module="echarts" lang="renderjs">
+	let myChart
+	export default {
+		mounted() {
+			if (typeof window.echarts === 'function') {
+				this.initEcharts()
+			} else {
+				// 动态引入较大类库避免影响页面展示
+				const script = document.createElement('script')
+				// view 层的页面运行在 www 根目录，其相对路径相对于 www 计算
+				script.src = '/static/echarts.min.js'
+				script.onload = this.initEcharts.bind(this)
+				document.head.appendChild(script)
+			}
+		},
+		methods: {
+			initEcharts() {
+				myChart = echarts.init(document.getElementById('echarts'))
+				// 观测更新的数据在 view 层可以直接访问到
+				myChart.setOption(this.option)
+			},
+			updateEcharts(newValue, oldValue, ownerInstance, instance) {
+				// 监听 service 层数据变更
+				myChart.setOption(newValue)
+			},
+			onClick(event, ownerInstance) {
+				// 调用 service 层的方法
+				ownerInstance.callMethod('onViewClick', {
+					test: 'test'
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.echarts {
+		width: 100%;
+		height: 400rpx;
+
+	}
+</style>

pages/weiBao/plan/plan.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="margin bg-white plan-sec text-center">
 			<view class="plan-tit padding-top-lg">任务名称：ui测试</view>
-			<chart></chart>
+			<chart2></chart2>
 		</view>
 
 		<view class="margin bg-white plan-sec">
@@ -33,10 +33,11 @@
 
 <script>
 	import chart from './components/chart.vue';
+	import chart2 from './components/chart2.vue';
 	import json from '../../../data/json.js';
 	export default {
 		components: {
-			chart
+			chart,chart2
 		},
 		data() {
 			return {

static/iconfont/iconfont.css

@@ -1,12 +1,25 @@
-@font-face {
-  font-family: 'iconfont';  /* project id 2394829 */
+/* @font-face {
+  font-family: 'iconfont'; 
   src: url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.eot');
   src: url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.eot?#iefix') format('embedded-opentype'),
   url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.woff2') format('woff2'),
   url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.woff') format('woff'),
   url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.ttf') format('truetype'),
   url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.svg#iconfont') format('svg');
+} */
+
+
+
+
+@font-face {
+  font-family: 'iconfont';  /* Project id 2394829 */
+  src: url('https://at.alicdn.com/t/font_2394829_n6v5f56a8bs.woff2?t=1622785113718') format('woff2'),
+       url('https://at.alicdn.com/t/font_2394829_n6v5f56a8bs.woff?t=1622785113718') format('woff'),
+       url('https://at.alicdn.com/t/font_2394829_n6v5f56a8bs.ttf?t=1622785113718') format('truetype');
 }
+
+
+
 .iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;