'ym'

src/assets/js/chartTemplates - 副本.js

@@ -1106,8 +1106,8 @@ var reqApis = function(){
 						baseInfo:{
 							"sensorname":{name:"设备名称"},
 							"sensorid":{name:"设备ID"},
-							"dispA":{name:"a轴变化量(mm)"},
-							"dispB":{name:"b轴变化量(mm)"},
+							"dispA":{name:"x轴变化量(mm)"},
+							"dispB":{name:"y轴变化量(mm)"},
 							"cjvalue":{name:"沉降"},
 							"state":{name:"是否报警", type:'select'},
 							"time":{name:"监测时间", form:0, type:"tableFormat", tableFormat:function(val){

src/assets/js/chartTemplates.js

@@ -477,6 +477,7 @@ var Highchart = function(){
 				lineWidth:3,
 			};
 			var alarmData = discernValidAlarmValue(data.alarm, data.lists, series, warningLine, option);
+      console.log(alarmData,"ala")
 
 			var option = {
 				chart: {

src/assets/js/httpApi.js

@@ -355,6 +355,7 @@ var reqApis = function(){
 								that.pageApi.reqchart(query).then((res) => {
 									var body = res.body || [];
 									chartOpts.cache = Highchart.template.rich.call(that, chartEl, body, chartOpts);
+
 								})
 							}else if(tag.classList.contains('switch')){
 								chartOpts.cache.update({chart:{type:tag.dataset.type}})
@@ -513,7 +514,8 @@ var reqApis = function(){
 							"sensorid":{name:"设备ID"},
 							"lenth":{name:"长度(m)"},
 							"safeheight":{name:"坡比"},
-							"angle":{name:"高程(m)"},
+							"angle":{name:"滩顶高程(m)"},
+              "state":{name:"是否报警", type:'select',},
 							"time":{name:"监测时间", form:0, type:"tableFormat", tableFormat:function(val){
 								return Tools.Dates.format.call(new Date(val), 'yyyy-MM-dd HH:mm:ss')
 							}},
@@ -532,6 +534,11 @@ var reqApis = function(){
 									return res.body || [];
 								});
 							},
+              state:function(){
+              	return reqApi.getDictDeviceStatus({}).then(function(res){
+              		return res.body || []
+              	});
+              },
 						},
 					},
 					config:{
@@ -923,8 +930,8 @@ var reqApis = function(){
 						baseInfo:{
 							"sensorname":{name:"设备名称"},
 							"sensorid":{name:"设备ID"},
-							"rainfall":{name:"监测值"},
-							"danwei":{name:"单位"},
+							"rainfall":{name:"监测值(mm)"},
+							// "danwei":{name:"单位"},
 							"state":{name:"是否报警", type:'select',},
 							"time":{name:"监测时间", form:0, type:"tableFormat", tableFormat:function(val){
 								return Tools.Dates.format.call(new Date(val), 'yyyy-MM-dd HH:mm:ss')
@@ -1106,9 +1113,8 @@ var reqApis = function(){
 						baseInfo:{
 							"sensorname":{name:"设备名称"},
 							"sensorid":{name:"设备ID"},
-							"dispA":{name:"a轴变化量(mm)"},
-							"dispB":{name:"b轴变化量(mm)"},
-							"cjvalue":{name:"沉降"},
+							"dispA":{name:"x轴变化量(mm)"},
+							"dispB":{name:"y轴变化量(mm)"},
 							"state":{name:"是否报警", type:'select'},
 							"time":{name:"监测时间", form:0, type:"tableFormat", tableFormat:function(val){
 								return Tools.Dates.format.call(new Date(val), 'yyyy-MM-dd HH:mm:ss')
@@ -1688,7 +1694,7 @@ var reqApis = function(){
 				},
 			},
 			valueInput:{		// 监测值录入
-				name:'监测值录入',
+				name:'人工监测与软件监测对比表',
 				Dict:{
 					baseInfo:{
 						"point_id":{name:"监测点", must:true, type:'select', key:'jcdname', val:'id', 'change': function(val){
@@ -1715,9 +1721,9 @@ var reqApis = function(){
 						"precision":{name:"精度", type:'text', style:'display:flex;width:100%;',},
 						"value":{name:"人工监测值", must:true},
 						"time":{name:"添加时间", must:true, type:'datetime', format:'yyyy-MM-dd HH:mm:ss'},
-            "sjvalue":{name:"数据监测值", type:'text', style:'display:flex;width:100%;',},
-            "sjtime":{name:"数据监测时间", type:'text', style:'display:flex;width:100%;',},
-            "difference":{name:"数据监测差异", type:'text', style:'display:flex;width:100%;',},
+            "sjvalue":{name:"系统监测值", type:'text', style:'display:flex;width:100%;',},
+            "sjtime":{name:"系统监测时间", type:'text', style:'display:flex;width:100%;',},
+            "difference":{name:"系统比对差异", type:'text', style:'display:flex;width:100%;',},
 					},
 					selectList:{
 						point_id:function(){
@@ -2071,6 +2077,9 @@ var reqApis = function(){
 						"jchours":{name:"解除时长", table:0,},
 						"reason":{name:"报警原因"},
 						"jcreason":{name:"解除报警原因"},
+            "createtime":{name:"开始报警时间", form:0, type:"tableFormat", tableFormat:function(val){
+            	return Tools.Dates.format.call(new Date(val), 'yyyy-MM-dd HH:mm:ss')
+            }},
 						"time":{name:"报警时间", form:0, type:"tableFormat", tableFormat:function(val){
 							return Tools.Dates.format.call(new Date(val), 'yyyy-MM-dd HH:mm:ss')
 						}},