Merge branch 'mw2' of http://61.161.152.110:10101/r/electronic-map into mw2

src/views/Decision/Decision3Db.vue

@@ -153,7 +153,7 @@
 				value2: [],
 				value4: "",
 				fzyData: [],
-				list: [],
+				list: [{value: [{text: "",value: 0,}]}],
 				listName: [],
 				TypeClass:0,
 				ajaxArr:['daydjhxdbtop','monthdjhxdbtop','yeardjhxdbtop'],
@@ -241,6 +241,13 @@
 						let thisItem = [];
 						jfpl = data.pop(); //静风频率
 						fzy = data.pop(); //风资源
+						if(fzy['1'] == null){
+							that.BASE.showMsg({
+								msg:'此风机无数据',
+								type:'success'
+							});
+							return false;
+						}
 						data.forEach((ele, index) => {
 							for (let key in ele) {
 								if (key !== "name") {

src/views/Decision/Decision4.vue

@@ -59,6 +59,7 @@
 						},
 						{
 							name: "值际",
+							width:"200px",
 							field: "dutyname",
 							is_num: false,
 							is_light: false,
@@ -97,7 +98,7 @@
 							name: "限电损失",
 							field: "rationingloss",
 							is_num: false,
-							is_light: true,
+							is_light: false,
 						},
 						{
 							name: "受累损失",