修复app上雷达图bug

manifest.json

@@ -1,154 +1,157 @@
 {
-    "name" : "伍继app",
-    "appid" : "__UNI__945DA73",
-    "description" : "伍继app升级",
-    "versionName" : "2.0",
-    "versionCode" : 2,
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {
-            "VideoPlayer" : {},
-            "Maps" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "ad" : {},
-                "maps" : {
-                    "baidu" : {
-                        "appkey_ios" : "",
-                        "appkey_android" : ""
-                    }
-                }
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            },
-            "splashscreen" : {
-                "androidStyle" : "default",
-                "android" : {
-                    "hdpi" : "static/startUp.png"
-                }
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "h5" : {
-        "publicPath" : "./",
-        "title" : "智慧消防",
-        "router" : {
-            "mode" : "hash",
-            "base" : ""
-        },
-        "devServer" : {
-            "https" : true,
-            "proxy" : {
-                "/web" : {
-                    "target" : "https://wx.ewoogi.com/wx",
-                    "changeOrigin" : true,
-                    "secure" : false,
-                    "pathRewrite" : {
-                        "^/web" : "/"
-                    }
-                }
-            }
-        },
-        "domain" : "https://qhome.usky.cn/",
-        "sdkConfigs" : {
-            "maps" : {
-                "qqmap" : {
-                    "key" : ""
-                }
-            }
-        },
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
-            }
-        }
-    }
+	"name": "伍继app",
+	"appid": "__UNI__945DA73",
+	"description": "伍继app升级",
+	"versionName": "2.0",
+	"versionCode": 2,
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"kernel": {
+			"ios": "WKWebview" //或者 "WKWebview"  
+		},
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"VideoPlayer": {},
+			"Maps": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"ad": {},
+				"maps": {
+					"baidu": {
+						"appkey_ios": "",
+						"appkey_android": ""
+					}
+				}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			},
+			"splashscreen": {
+				"androidStyle": "default",
+				"android": {
+					"hdpi": "static/startUp.png"
+				}
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"h5": {
+		"publicPath": "./",
+		"title": "智慧消防",
+		"router": {
+			"mode": "hash",
+			"base": ""
+		},
+		"devServer": {
+			"https": true,
+			"proxy": {
+				"/web": {
+					"target": "https://wx.ewoogi.com/wx",
+					"changeOrigin": true,
+					"secure": false,
+					"pathRewrite": {
+						"^/web": "/"
+					}
+				}
+			}
+		},
+		"domain": "https://qhome.usky.cn/",
+		"sdkConfigs": {
+			"maps": {
+				"qqmap": {
+					"key": ""
+				}
+			}
+		},
+		"optimization": {
+			"treeShaking": {
+				"enable": true
+			}
+		}
+	}
 }

pages/index/components/chart/chart.vue

@@ -1,104 +1,50 @@
 <template>
 	<view class="content">
-		<view @click="echarts.onClick"   :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>
+	var dataname = ['消防水系统', '报警主机', '电气火灾', '其他', '监控视频']
+	var color = ['#3C8BF0', '#06CDF8', '#0ECB70', '#6744EF', '#FFD803'];
 	export default {
 		name: 'chart',
 		props: {
 			fbindData: {
 				type: Object,
 				default: null
+			},
+			findicator:{
+				type: Array,
+				default: null
+			},
+			fdatavalue:{
+				type: Array,
+				default: null
 			}
 		},
-		
-		 computed: {
-		    bindData() {
-		      return this.fbindData;
-		    },
-			
-			
-		  },
-		data() {
 
-			return {
-				aa:0
-
-			}
-		},
-		onLoad() {
+		computed: {
+			bindData() {
+				return this.fbindData;
+			},
 
 		},
-		methods: {
-			onViewClick(options) {
-				console.log(options)
-			}
-		}
-	}
-</script>
+		data() {
 
-<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() {
-				console.log('子组件bindData.fire_water_count')
-				console.log(this.bindData.fire_water_count)
-				var dataname = ['消防水系统', '报警主机', '电气火灾', '其他', '监控视频']
-				var datavaule = [this.bindData.fire_water_count, this.bindData.alarm_host_count, this.bindData.electrical_fire_count, this.bindData.other_count, this.bindData.video_monitoring_count]
-				var aa = [this.bindData.fire_water_count, this.bindData.alarm_host_count, this.bindData.electrical_fire_count, this.bindData.other_count, this.bindData.video_monitoring_count]
-				aa.sort(function (a, b) {
-				  return a-b;
-				}); 
-				aa=aa.pop();
-				var datamax = [aa, aa, aa, aa, aa];
-				var color = ['#3C8BF0', '#06CDF8', '#0ECB70', '#6744EF', '#FFD803'];
-				
-				var indicator = []
-				
-				for (var i = 0; i < dataname.length; i++) {
-					indicator.push({
-						name: dataname[i],
-						max: datamax[i],
-						color: color[i]
-					})
-				}
-				
-				function contains(arrays, obj) {
-					var i = arrays.length;
-					while (i--) {
-						if (arrays[i] === obj) {
-							return i;
-						}
-					}
-					return false;
-				}
+			return {
+				option: {
 
-				myChart = echarts.init(document.getElementById('echarts'))
-				// 观测更新的数据在 view 层可以直接访问到
-				myChart.setOption({
 					tooltip: {
-						formatter: function() {
+						formatter: () => {
 							var html = '';
-							for (var i = 0; i < datavaule.length; i++) {
-								html += dataname[i] + ' : ' + datavaule[i] + '\n'
-							}
+							[this.bindData.fire_water_count, this.bindData.alarm_host_count, this.bindData
+								.electrical_fire_count, this.bindData.other_count, this.bindData
+								.video_monitoring_count
+							].map((val, ind) => {
+								html += dataname[ind] + ' : ' + val + '\n'
+							})
 							return html
 						}
 					},
@@ -132,9 +78,23 @@
 						},
 
 						name: {
-							formatter: function(value) {
+							formatter: (value) => {
+
+								function contains(arrays, obj) {
+									var i = arrays.length;
+									while (i--) {
+										if (arrays[i] === obj) {
+											return i;
+										}
+									}
+									return false;
+								}
 								var i = contains(dataname, value);
-								var percent = datavaule[i];
+								var datavalue = [this.bindData.fire_water_count, this.bindData
+									.alarm_host_count, this.bindData.electrical_fire_count, this.bindData
+									.other_count, this.bindData.video_monitoring_count
+								]
+								var percent = datavalue[i];
 
 								return '{a|' + value + '}\n  ' + '{b|' + percent + '}'
 							},
@@ -158,7 +118,7 @@
 								},
 							},
 						},
-						indicator: indicator
+						indicator: this.findicator
 					},
 
 					series: [{
@@ -181,9 +141,45 @@
 								width: 1
 							}
 						},
-						data: [datavaule]
+						data: [this.fdatavalue]
+
+
 					}]
-				})
+				}
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			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 层数据变更

pages/index/components/chart2/chart2.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="content">
+
 		<view @click="echarts.onClick" :prop="option" :change:prop="echarts.updateEcharts" id="echarts2"
 			class="echarts"></view>
 

pages/index/index.vue

@@ -29,7 +29,7 @@
 			</view>
 			<view style="height:570rpx">
 				<view v-if="Inv == 0">
-					<chart :fbindData="staticData" v-if="staticData!= '' && hackReset && JSON.stringify(staticData) != '{}'"></chart>
+					<chart :fbindData="staticData" :findicator="indicator" :fdatavalue="datavalue" v-if="staticData!= '' && hackReset && JSON.stringify(staticData) != '{}'"></chart>
 				</view>
 				<view v-if="Inv == 1">
 					<chart2  v-if="staticData!= ''" :bindData="staticData"></chart2>
@@ -99,7 +99,9 @@
 
 		data() {
 			return {
-				staticData: '',
+				staticData: '',
+				indicator:[],
+				datavalue:[],
 				alarmCount: json.staticData.data[0].alarmCount,
 				cuIconList: json.cuIconList,
 				Inv: 0,
@@ -358,7 +360,36 @@
 				})
 				// console.log('首页请求staticData')
 				// console.log(res.data.data[0])
-				this.staticData = res.data.data[0];
+				this.staticData = res.data.data[0];
+				
+				var data = res.data.data[0]
+				
+				var datavalue = [data.fire_water_count, data.alarm_host_count, data
+					.electrical_fire_count, data.other_count, data.video_monitoring_count
+				]
+				var dataname = ['消防水系统', '报警主机', '电气火灾', '其他', '监控视频']
+				var color = ['#3C8BF0', '#06CDF8', '#0ECB70', '#6744EF', '#FFD803'];
+				
+				var aa = [data.fire_water_count, data.alarm_host_count, data
+					.electrical_fire_count, data.other_count, data.video_monitoring_count
+				]
+				aa.sort(function(a, b) {
+					return a - b;
+				});
+				aa = aa.pop();
+				var datamax = [aa, aa, aa, aa, aa];
+				
+				this.datavalue = datavalue
+				
+				dataname.map((val, ind) => {
+					this.indicator.push({
+						name: val,
+						max: datamax[ind],
+						color: color[ind]
+					})
+				})
+				
+				
 				console.log('父组件staticData.fire_water_count')
 				console.log(this.staticData.fire_water_count)
 			},