更新

src/views/monitoring/equipmentAlarmLog/index.vue

@@ -91,19 +91,19 @@ export default {
 				{ prop: 'productionLine', label: '产线' },
 				{ prop: 'workshopSection', label: '工段' },
 				{ prop: 'equipment', label: '设备名称' },
-				{
-					width: 90,
-					prop: 'alarmGrade',
-					label: '报警级别',
-					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
-				},
+				// {
+				// 	width: 90,
+				// 	prop: 'alarmGrade',
+				// 	label: '报警级别',
+				// 	filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
+				// },
 				{
 					prop: 'createTime',
 					label: '报警时间',
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'alarmContent', label: '报警内容' },
+				// { prop: 'alarmContent', label: '报警内容' },
 				// {
 				// 	_action: 'equipment-group-show-alert',
 				// 	label: '报警',
@@ -167,7 +167,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
         factoryId: undefined,
 				createTime: [],
 			},

src/views/monitoring/equipmentFullParams/index.vue

@@ -126,10 +126,10 @@ export default {
 	},
 	mounted() {
 		if (this.id) this.$set(this.queryParams, 'equipmentId', this.id);
-		if (this.code)
-			this.$set(this.searchBarFormConfig[0], 'defaultSelect', this.code);
 		if (this.name)
-			this.$set(this.searchBarFormConfig[1], 'defaultSelect', this.name);
+			this.$set(this.searchBarFormConfig[0], 'defaultSelect', this.name);
+		if (this.code)
+			this.$set(this.searchBarFormConfig[1], 'defaultSelect', this.code);
 		const end = new Date();
 		const start = new Date() - 1800 * 1000;
 		this.queryParams.recordTime = [parseTime(start), parseTime(end)];

src/views/monitoring/equipmentVisualize/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-02-10 09:15:55
  * @LastEditors: zwq
- * @LastEditTime: 2025-02-19 09:41:10
+ * @LastEditTime: 2025-02-25 15:48:59
  * @Description:
 -->
 <template>
@@ -63,6 +63,7 @@ export default {
 					selectOptions: [],
 					param: 'lineId',
 					multiple: true,
+          width: 410
 				},
 				{
 					type: 'button',