src/views/databoard/deepProcessing/EqAlarm.vue

@@ -32,11 +32,11 @@ export default {
 		return {
 			timestr: '',
 			config: {
-				header: ['序号', '设备名称', '产线名', '设备状态'],
+				header: ['序号', '设备名称', '设备编码', '设备状态', '是否故障'],
 				headerBGC: 'rgba(32, 55, 96, 0.8)',
 				oddRowBGC: 'rgba(32, 55, 96, 0.8)',
 				evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-				columnWidth: [60, 280, 120],
+				columnWidth: [60, 150, 190],
 				align: ['center'],
 				data: [],
 				// data: [
@@ -64,7 +64,7 @@ export default {
 				let outArr = this.sjgEquipment.map((item, index) => [
 					index + 1,
 					`<span title=${item.name || ''}>${item.name || ''}</span>`,
-					`<span title=${item.lineName || ''}>${item.lineName || ''}</span>`,
+					`<span title=${item.code || ''}>${item.code || ''}</span>`,
 					`<span><div style="${
 						item.status == '运行'
 							? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 '
@@ -72,11 +72,11 @@ export default {
 							? 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '
 							: 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:13px 10px 0 0 '
 					}"></div>  ${item.status || ''}</span>`,
-					// `<span"><div style="${
+					`<span"><div style="${
-					// 	item.error == false
+						item.error == false
-					// 		? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 '
+							? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 '
-					// 		: 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '
+							: 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '
-					// }"></div>  ${item.error == true ? '是' : '否' || ''}</span>`,
+					}"></div>  ${item.error == true ? '是' : '否' || ''}</span>`,
 				]);
 				this.config.data = outArr;
 				this.$refs['eqScrollBoard'].updateRows(outArr);

src/views/databoard/kiln/GasHandle.vue

@@ -80,7 +80,7 @@
 					</span>
 				</ShadowRect>
 
-				<!-- <ShadowRect>
+				<ShadowRect>
 					<span
 						style="
 							font-size: 20px;
@@ -99,7 +99,7 @@
 								: ''
 						}}mg/m³
 					</span>
-				</ShadowRect> -->
+				</ShadowRect>
 			</div>
 			<KilnLine :horizontal="true" />
 			<div
@@ -130,9 +130,8 @@
 						align-items: center;
 						justify-content: space-between;
 					">
-					<!-- :options="['氧气含量', '二氧化硫', '氮氧化物', '颗粒物']" -->
 					<SelectorBtnGroup
-						:options="['氧气含量', '二氧化硫', '氮氧化物']"
+						:options="['氧气含量', '二氧化硫', '氮氧化物', '颗粒物']"
 						@emitFun="toggleType"
 						:active="chartType" />
 					<SelectorBtnGroup