wgl 4 years ago
parent
commit
00bf191ff8

+ 7 - 9
src/projects/business/views/Master/Company/RegisterInfo.vue

@@ -154,15 +154,13 @@
 					var btnArray = ['否', '是'];
 					mui.confirm('是否' + _this.subForm.content + '所勾选的注册申请?', '提示', btnArray, function(e) {
 						if (e.index == 1) {
-							if (e.index == 1) {
-								_this.set_register_examine_form(_this.subForm);
-								_this.$router.push({
-									name: 'MasterCompanyRegisterSelectDevice',
-									query: {
-										hasSceneId4: _this.hasSceneId4 ? '1' : '0'
-									}
-								})
-							}
+							_this.set_register_examine_form(_this.subForm);
+							_this.$router.push({
+								name: 'MasterCompanyRegisterSelectDevice',
+								query: {
+									hasSceneId4: _this.hasSceneId4 ? '1' : '0'
+								}
+							})
 						}
 					})
 				}

+ 1 - 1
src/projects/pension/views/Master/Health/ChartMap.vue

@@ -86,7 +86,7 @@
 			//设置echart数据
 			setEcharts() {
 				var mapList = [];
-				var list = this.chartsList[this.typeList[0]];
+				var list = this.chartsList[this.typeList[0]] ? this.chartsList[this.typeList[0]] : [];
 				for (var j = 0; j < list.length; j++) {
 					mapList.push({
 						longtitude: list[j]['value'].split(',')[0],