'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

@@ -8,13 +8,13 @@ HTreemap(Highcharts);			// treemap 类型
 Highcharts3D(Highcharts);		// 3D 类型
 
 var Highchart = function(){
-	
+
 	/**
 	  * 图表数据格式化
 	  * @param: {Array} list
 	  * @param: {Object} opts [standOut(突出最大值)]
 	  *	@example1: qf.UI.showFloatMenu({top:y,left:x, eventOutClose:}, html);
-	  * @return: 
+	  * @return:
 	  * @author: Kimber
 	  * @updatetime: 2021/12/25
 	  * @createtime: 2021/12/25
@@ -35,14 +35,14 @@ var Highchart = function(){
 		};
 		return {seriesData:sdata, sum:sum};
 	};
-	
+
 
 	/**
 	  * series数据格式化
 	  * @param: {Array} list
 	  * @param: {Object} opts [standOut(突出最大值)]
 	  *	@example1: qf.UI.showFloatMenu({top:y,left:x, eventOutClose:}, html);
-	  * @return: 
+	  * @return:
 	  * @author: Kimber
 	  * @updatetime: 2022/12/28
 	  * @createtime: 2022/12/28
@@ -78,14 +78,14 @@ var Highchart = function(){
 		return {series:series, categories:categories, maxVal:maxVal}
 	};
 
-	
+
 	/**
 	  * 递归继承, 新对象在先, 原对象在后, 节省运行效率
 	  * @param: {Object} inherit	// 继承者
 	  * @param: {Object} give		// 传承者
 	  * @param: {Function} call		// 方法回调, 于在在特殊情况自定义
 	  *	@example1: var options = reversExtends(option, opts);
-	  * @return: 
+	  * @return:
 	  * @author: Kimber
 	  * @updatetime: 2022/1/12
 	  * @createtime: 2022/1/12
@@ -110,7 +110,7 @@ var Highchart = function(){
 	  * @param: {Number} level
 	  * @param: {Object} value
 	  *	@example1: series = discernValidAlarmValue(data.alarm, data.lists, series);
-	  * @return: 
+	  * @return:
 	  * @author: Kimber
 	  * @updatetime: 2022/4/18(周一)
 	  * @createtime: 2022/4/18(周一)
@@ -122,16 +122,16 @@ var Highchart = function(){
 
 			// discern
 			var levelDist = [
-				{color:'red', name:'红色报警线'}, 
-				{color:'orange', name:'橙色报警线'}, 
-				{color:'yellow', name:'黄色报警线'}, 
+				{color:'red', name:'红色报警线'},
+				{color:'orange', name:'橙色报警线'},
+				{color:'yellow', name:'黄色报警线'},
 				{color:'blue', name:'蓝色报警线'}],
 				alarmLine = {}, setAlarmSerie = function(value, name, color){
 					// 修改蓝色色值
 					(color === 'blue') && (color = '#3BAFFB');
 					var sx = list[0].date, ex = list[xLength-1].date;
-					var serie = {name:name, type:'spline', data:[{x:sx, y:value}, {x:ex, y:value}], 
-						color:color, 
+					var serie = {name:name, type:'spline', data:[{x:sx, y:value}, {x:ex, y:value}],
+						color:color,
 						enableMouseTracking:false,
 						legend:false,
 						showInLegend:false,
@@ -180,7 +180,7 @@ var Highchart = function(){
 				alarm.value = value[alarm.color];
 				alarmLine[alarm.color] = alarm;
 			}; */
-			
+
 			// 多条报警线
 			for(var item of levelDist){
 				item.value = value[item.color];
@@ -204,12 +204,12 @@ var Highchart = function(){
 			var value = alarms.value;
 			// discern
 			var levelDist = [
-				{color:'red', name:'红色报警线'}, 
-				{color:'orange', name:'橙色报警线'}, 
-				{color:'yellow', name:'黄色报警线'}, 
+				{color:'red', name:'红色报警线'},
+				{color:'orange', name:'橙色报警线'},
+				{color:'yellow', name:'黄色报警线'},
 				{color:'blue', name:'蓝色报警线'}],
 				alarmLine = {}, setAlarmSerie = function(value, name, color){
-					var serie = {name:name, type:'spline', data:[{x:0, y:value}, {x:xLength, y:value}],				color:color, 
+					var serie = {name:name, type:'spline', data:[{x:0, y:value}, {x:xLength, y:value}],				color:color,
 						//enableMouseTracking:false,
 						legend:false,
 						showInLegend:false,
@@ -292,15 +292,15 @@ var Highchart = function(){
 					y:centerY
 				}); */
 			});
-		}, 
-		
+		},
+
 		/**
 		  * 浮动菜单容器
-		  * @param: {Dom} el 
+		  * @param: {Dom} el
 		  * @param: {Object} data
 		  * @param: {Object} opts	{chartConfig:{}, callback:Function}
 		  *	@example1:
-		  * @return: 
+		  * @return:
 		  * @author: Kimber
 		  * @updatetime: 2022/1/11
 		  * @createtime: 2022/1/11
@@ -309,10 +309,10 @@ var Highchart = function(){
 			var list = data.list;
 			data.chartType = data.range === 'month' ? 'line' : 'column';
 			var chartConfig = opts.chartConfig || {};
-			
+
 			var chartData, categories = [], series = [], maxVal = null;
 			if(opts.isSeriesData){
-				
+
 			}else{
 				chartData = seriesDataFormat(data, {});
 				categories = chartData.categories;
@@ -396,7 +396,7 @@ var Highchart = function(){
 					layout: 'horizontal',				// 水平布局:“horizontal”, 垂直布局:“vertical”
 					floating: false,					// 图列是否浮动
 					align: 'right',
-					
+
 					// 图例容器
 					//width:'100%',		// number	|| String
 					padding:2,			// 内边距
@@ -452,7 +452,7 @@ var Highchart = function(){
 			}else{
 				options = reversExtends(option, chartConfig, opts.callback);
 			};
-			
+
 			return new Highcharts.chart(el, options);
 		},
 
@@ -461,7 +461,7 @@ var Highchart = function(){
 			var chartConfig = opts.chartConfig || {};
 			var chartData, categories = [], series = [], maxVal = null, unit = data.danwei;
 			if(opts.isSeriesData){
-				
+
 			}else{
 				chartData = seriesDataFormat(data, {datekey:'date'});
 				categories = chartData.categories;
@@ -469,7 +469,7 @@ var Highchart = function(){
 			};
 
 			var warningLine = this.form.config.warningLine;
-			
+
 			// add alarm line
 			var option = {
 				valEnabled: true,
@@ -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: {
@@ -503,7 +504,7 @@ var Highchart = function(){
 					lineWidth:0,
 					//lineColor:'#ff0000',
 					gridLineColor:'#aaa',
-					
+
 					dateTimeLabelFormats: {
 						millisecond: '%H:%M:%S.%L',
 						second: '%H:%M:%S',
@@ -560,7 +561,7 @@ var Highchart = function(){
 					layout: 'horizontal',				// 水平布局:“horizontal”, 垂直布局:“vertical”
 					floating: false,					// 图列是否浮动
 					align: 'right',
-					
+
 					// 图例容器
 					//width:'100%',		// number	|| String
 					padding:2,			// 内边距

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,13 +514,14 @@ 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')
 							}},
 							"jcvalue":{name:"人工监测值", table:0, form:0,},
 							"jctime":{name:"人工监测时间", table:0, form:0,},
-                            "difference":{name:"人工与在线监测数值差异", table:0, form:0,},
+              "difference":{name:"人工与在线监测数值差异", table:0, form:0,},
 						},
 						selectList:{
 							sensorid:function(){
@@ -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')
 						}},