quanxiang-lichunliang

src/assets/js/chartTemplates.js

@@ -116,9 +116,12 @@ var Highchart = function(){
 	  * @createtime: 2022/4/18(周一)
 	  */
 	var discernValidAlarmValue = function(alarms, list, series, direction, opts){
+		console.log(alarms, list, series, direction, opts)
 		var xLength = (list || []).length, maxAlarm = 0, opts = opts || {};
-		if(alarms && xLength){
+		if(alarms && xLength&&series[0].name!='x方向偏移'&&series[0].name!='y方向偏移'){
+
 			var value = alarms.value;
+			console.log(alarms.value,series[0].name,'alarms.value')
 
 			// discern
 			var levelDist = [
@@ -181,18 +184,22 @@ var Highchart = function(){
 			}; */
 			
 			// 多条报警线
-			for(var item of levelDist){
-				item.value = value[item.color];
-				alarmLine[item.color] = item;
-			};
-
+			
+			console.log(series[0].name,'///////////')
 			// add
-			for(var key in alarmLine){
-				var line = alarmLine[key];
-				line.value > maxAlarm && (maxAlarm = line.value);
-				setAlarmSerie(line.value, line.name, line.color);
-				direction && setAlarmSerie(0-line.value, line.name, line.color);
-			};
+			if(series[0].name!='x方向偏移'||series[0].name!='y方向偏移'){
+				for(var item of levelDist){
+					item.value = value[item.color];
+					alarmLine[item.color] = item;
+				};
+				for(var key in alarmLine){
+					var line = alarmLine[key];
+					line.value > maxAlarm && (maxAlarm = line.value);
+					setAlarmSerie(line.value, line.name, line.color);
+					direction && setAlarmSerie(0-line.value, line.name, line.color);
+				};
+			}
+			
 		};
 		return {series, maxAlarm};
 	};

src/views/personInspection/ledger/index.vue

 <template>
   <div class="common-page qyzz page-t1">
-   
-    
     <div class="head-container">
       <!--表单组件-->
       <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
@@ -67,11 +65,11 @@
                 <el-input v-model="form.sbcs" />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
+            <el-col :span="12">
               <el-form-item label="型号规格" prop="type">
                 <el-input v-model="form.type" />
               </el-form-item>
-            </el-col> -->
+            </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -119,7 +117,7 @@
               <el-table ref="table" v-loading="loading" :data="dataList" size="small" style="width: 100%;" border @selection-change="handleSelectionChange">
                   <el-table-column type="selection" width="55" align="center"/>
                   <el-table-column label="设备名称" align="center" prop="sensorname" />
-                  <!-- <el-table-column label="型号规格" align="center" prop="type" /> -->
+                  <el-table-column label="型号规格" align="center" prop="type" />
                   <el-table-column label="设备参数" align="center" prop="sbcs" />
                   <el-table-column label="设备编号" align="center" prop="sensorno" />
                   <el-table-column label="安装日期" align="center" prop="installdate" />
@@ -209,7 +207,7 @@ export default {
       this.form = {
         id:undefined,
         sensorname:undefined,
-        // type:undefined,
+        type:undefined,
         sbcs:undefined,
         sensorno:undefined,
         installdate:undefined,