src/components/DialogForm/index.vue

@@ -347,8 +347,6 @@ export default {
 									console.log('setting code: ', response.data);
 									// 处理输入框数据
 									this.form[opt.prop] = response.data;
-									// 更新下外部的 dataForm，防止code字段有数据也报空的bug
-									this.$emit('update', this.form)
 								}
 							});
 						}

src/views/equipment/base/config/DataCollection/CollectionConfig.vue

@@ -61,7 +61,7 @@
 					rows: drawerBaseInfoRows,
 				},
 				{
-					name: '采集参数',
+					name: '属性列表',
 					key: 'attrs',
 					props: drawerListProps,
 					url: '/base/equipment-plc-param/page',
@@ -75,26 +75,18 @@
 						pageSize: 10,
 					},
 					tableBtn: [
-						{
+						this.$auth.hasPermi('equipment:collection-config-param:update')
+							? {
 									type: 'edit',
 									btnName: '修改',
-						},
+							  }
-						{
+							: undefined,
+						this.$auth.hasPermi('equipment:collection-config-param:delete')
+							? {
 									type: 'delete',
 									btnName: '删除',
-						},
+							  }
-						// this.$auth.hasPermi('equipment:collection-config-param:update')
+							: undefined,
-						// 	? {
-						// 			type: 'edit',
-						// 			btnName: '修改',
-						// 	  }
-						// 	: undefined,
-						// this.$auth.hasPermi('equipment:collection-config-param:delete')
-						// 	? {
-						// 			type: 'delete',
-						// 			btnName: '删除',
-						// 	  }
-						// 	: undefined,
 					].filter((v) => v),
 					allowAdd: true,
 				},
@@ -114,6 +106,7 @@ import {
 	getEquipmentPlcConnectPage,
 	exportEquipmentPlcConnectExcel,
 } from '@/api/base/equipmentPlcConnect';
+import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 // import './http';
 import BasicDrawer from './components/BasicDrawer.vue';
@@ -189,15 +182,13 @@ export default {
 					placeholder: '请选择设备',
 					param: 'equipmentId',
 					selectOptions: [],
-					filterable: true
 				},
 				{
 					type: 'select',
-					label: '关联表编码',
+					label: '编码',
-					placeholder: '请选择关联表编码',
+					placeholder: '请选择编码',
 					param: 'plcId',
 					selectOptions: [],
-					filterable: true
 				},
 				{
 					type: 'button',
@@ -233,9 +224,7 @@ export default {
 						prop: 'plcId',
 						labelKey: `plcTableName`,
 						url: '/base/equipment-plc/listAll',
-						rules: [
+						rules: [{ required: true, message: '关联表名不能为空', trigger: 'blur' }],
-							{ required: true, message: '关联表名不能为空', trigger: 'blur' },
-						],
 						bind: {
 							filterable: true,
 						},
@@ -247,9 +236,7 @@ export default {
 						label: '设备',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/page?pageNo=1&pageSize=99',
-						rules: [
+						rules: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
-							{ required: true, message: '设备不能为空', trigger: 'blur' },
-						],
 						bind: {
 							filterable: true,
 						},
@@ -275,9 +262,7 @@ export default {
 						input: true,
 						label: '设备名',
 						prop: 'equipmentName',
-						rules: [
+						rules: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
-							{ required: true, message: '设备名不能为空', trigger: 'blur' },
-						],
 						// bind: {
 						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
 						// }
@@ -311,8 +296,7 @@ export default {
 					label: '生产参数类型',
 					filter: (val) =>
 						val != null
-							// ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
+							? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
-							? ['', '进口计数', '出口计数', '损耗计数', '无类型', ''][val]
 							: '-',
 				},
 				{

src/views/equipment/base/config/DataCollection/TableConfig.vue

@@ -59,6 +59,7 @@ import {
 	getEquipmentPlcPage,
 	exportEquipmentPlcExcel,
 } from '@/api/base/equipmentPlc';
+import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 
 const switchBtn = {
@@ -351,7 +352,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除该配置?')
+				.confirm('是否确认删除实时数据采集配置编号为"' + id + '"的数据项?')
 				.then(function () {
 					return deleteEquipmentPlc(id);
 				})

src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue

@@ -194,17 +194,13 @@ export default {
 						input: true,
 						label: '参数列名',
 						prop: 'plcParamName',
-						rules: [
+						rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
-							{ required: true, message: '参数列名不能为空', trigger: 'blur' },
-						],
 					},
 					{
 						input: true,
 						label: '参数名称',
 						prop: 'name',
-						rules: [
+						rules: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
-							{ required: true, message: '参数名称不能为空', trigger: 'blur' },
-						],
 					},
 				],
 				[
@@ -234,35 +230,19 @@ export default {
 							{ label: '工艺参数', value: 2 },
 							{ label: '报警参数', value: 3 },
 						],
-						rules: [
+						rules: [{ required: true, message: '设备参数类型不能为空', trigger: 'blur' }],
-							{
-								required: true,
-								message: '设备参数类型不能为空',
-								trigger: 'blur',
-							},
-						],
 					},
 					{
 						select: true,
 						label: '生产参数类型',
 						prop: 'production_param_type',
 						options: [
-							// { label: '进片数量', value: 1 },
+							{ label: '进片数量', value: 1 },
-							// { label: '出片数量', value: 2 },
+							{ label: '出片数量', value: 2 },
-							// { label: '破损数量', value: 3 },
+							{ label: '破损数量', value: 3 },
-							// { label: '无类型', value: 4 },
-							{ label: '进口计数', value: 1 },
-							{ label: '出口计数', value: 2 },
-							{ label: '损耗计数', value: 3 },
 							{ label: '无类型', value: 4 },
 						],
-						rules: [
+						rules: [{ required: true, message: '生产参数类型不能为空', trigger: 'blur' }],
-							{
-								required: true,
-								message: '生产参数类型不能为空',
-								trigger: 'blur',
-							},
-						],
 					},
 				],
 				[
@@ -325,7 +305,6 @@ export default {
 			infoQuery: null, // 基本信息的请求
 			attrFormSubmitting: false,
 			attrListLoading: false,
-			shouldRefreshPageView: false,
 		};
 	},
 	computed: {
@@ -344,12 +323,10 @@ export default {
 			});
 		},
 		tableBtn() {
-			return this.sections[1].tableBtn;
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
-			// return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
 		},
 	},
 	mounted() {
-		this.shouldRefreshPageView = false;
 		this.mode = this.defaultMode || 'detail';
 		for (const section of this.sections) {
 			// 请求具体信息
@@ -426,9 +403,6 @@ export default {
 		},
 
 		handleCancel() {
-			if (this.shouldRefreshPageView) {
-				this.$emit('refreshDataList');
-			}
 			this.visible = false;
 		},
 
@@ -452,7 +426,7 @@ export default {
 				remark: '',
 				alarmContent: '',
 			};
-			this.attrTitle = '添加参数绑定信息';
+			this.attrTitle = '添加设备绑定信息';
 			this.attrFormVisible = true;
 		},
 
@@ -465,14 +439,14 @@ export default {
 			});
 			if (res.code == 0) {
 				this.attrForm = res.data;
-				this.attrTitle = '编辑参数绑定信息';
+				this.attrTitle = '编辑设备绑定信息';
 				this.attrFormVisible = true;
 			}
 		},
 
 		// 删除属性
 		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该参数?', '提示', {
+			this.$confirm('确定删除该分组报警?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
@@ -484,7 +458,6 @@ export default {
 						params: { id: attrId },
 					});
 					if (res.code == 0) {
-						this.shouldRefreshPageView = true;
 						this.$message({
 							message: '删除成功',
 							type: 'success',
@@ -499,12 +472,12 @@ export default {
 		},
 
 		// 提交属性表
-		submitAttrForm() {
+		async submitAttrForm() {
-			this.$refs['attrForm'].validate(async (valid) => {
+			this.$refs['attrForm'].validate((valid) => {
 				if (!valid) {
 					return;
 				}
-
+			});
 			const isEdit = this.attrForm.id != null;
 			this.attrFormSubmitting = true;
 			const res = await this.$axios({
@@ -524,12 +497,10 @@ export default {
 					duration: 1500,
 					onClose: () => {
 						this.getAttrList();
-							this.shouldRefreshPageView = true;
 					},
 				});
 			}
 			this.attrFormSubmitting = false;
-			});
 		},
 
 		closeAttrForm() {
@@ -538,7 +509,7 @@ export default {
 
 		handleClick(raw) {
 			if (raw.type === 'delete') {
-				this.$confirm(`确定删除该参数?`, '提示', {
+				this.$confirm(`确定删除该报警?`, '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning',

src/views/equipment/timing-diagram/output/index.vue

@@ -482,7 +482,7 @@ export default {
 
 		async submitForm() {
 			const { code, data } = await this.$axios({
-				url: '/monitoring/equipment-monitor/quantity-series',
+				url: '/analysis/equipment-analysis/quantity',
 				method: 'get',
 				params: this.queryParams,
 			});

src/views/equipment/timing-diagram/status/index.vue

@@ -6,29 +6,19 @@
 -->
 
 <template>
-	<div
+	<div class="status-timegraph-container" style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
-		class="status-timegraph-container"
+		<el-row class="" style="
-		style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
-		<el-row
-			class=""
-			style="
 				margin-bottom: 12px;
 				background: #fff;
 				padding: 16px 16px 0;
 				border-radius: 8px;
 			">
 			<div class="blue-title">生产节拍时序图</div>
-			<SearchBar
+			<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" :remove-blue="true"
-				:formConfigs="searchBarFormConfig"
+				@select-changed="handleSearchBarSelectChange" @headBtnClick="handleSearchBarBtnClick" />
-				ref="search-bar"
-				:remove-blue="true"
-				@select-changed="handleSearchBarSelectChange"
-				@headBtnClick="handleSearchBarBtnClick" />
 		</el-row>
 
-		<el-row
+		<el-row class="" style="
-			class=""
-			style="
 				height: 1px;
 				flex: 1;
 				margin-bottom: 12px;
@@ -57,36 +47,17 @@
 					</div>
 				</el-col>
 			</el-row>
-			<div
+			<div class="main-area" style="flex: 1; display: flex; flex-direction: column">
-				class="main-area"
+				<div class="graphs" v-show="graphList.length" id="status-chart" style="height: 1px; flex: 1"></div>
-				style="flex: 1; display: flex; flex-direction: column">
-				<div
-					class="graphs"
-					v-show="graphList.length"
-					id="status-chart"
-					style="height: 1px; flex: 1"></div>
 				<h2 v-if="!graphList || graphList.length == 0" class="no-data-bg"></h2>
 			</div>
 		</el-row>
 
 		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
+		<base-dialog dialogTitle="添加设备" :dialogVisible="open" width="500px" @close="open = false" @cancel="open = false"
-			dialogTitle="添加设备"
-			:dialogVisible="open"
-			width="500px"
-			@close="open = false"
-			@cancel="open = false"
 			@confirm="submitForm">
-			<el-select
+			<el-select v-if="open" style="width: 100%" v-model="queryParams.equipmentId" placeholder="请选择一个设备">
-				v-if="open"
+				<el-option v-for="eq in eqList" :key="eq.id" :value="eq.id" :label="eq.name"></el-option>
-				style="width: 100%"
-				v-model="queryParams.equipmentId"
-				placeholder="请选择一个设备">
-				<el-option
-					v-for="eq in eqList"
-					:key="eq.id"
-					:value="eq.id"
-					:label="eq.name"></el-option>
 			</el-select>
 		</base-dialog>
 	</div>
@@ -158,7 +129,7 @@ export default {
 			open: false,
 			eqList: [],
 			startTime: null,
-			gantt: null,
+			gantt: null
 			// demo: [
 			// 	[
 			// 		{
@@ -188,7 +159,7 @@ export default {
 		this.initEquipment();
 		// this.getList();
 	},
-	mounted() {},
+	mounted() { },
 	watch: {
 		graphList: {
 			handler(val) {
@@ -200,6 +171,7 @@ export default {
 							return;
 						}
 						this.gantt.update(val);
+
 					});
 				}
 				return;
@@ -243,9 +215,7 @@ export default {
 				params: this.queryParams,
 			});
 			if (code == 0) {
-				this.existingEquipments = Object.values(data).map(
+				this.existingEquipments = Object.values(data).map((eq) => eq[0].equipmentId);
-					(eq) => eq[0].equipmentId
-				);
 				this.graphList = this.objectToArray(data);
 			}
 		},
@@ -332,7 +302,7 @@ export default {
 						return;
 					}
 
-					this.startTime = new Date(payload.recordTime);
+					this.startTime = new Date(payload.recordTime)
 					this.queryParams.lineId = payload.lineId || null;
 					this.queryParams.sectionId = payload.sectionId || null;
 					this.queryParams.equipmentId = payload.equipmentId || null;
@@ -367,7 +337,7 @@ export default {
 				return;
 			}
 			const { code, data } = await this.$axios({
-				url: '/monitoring/equipment-monitor/status-series',
+				url: '/analysis/equipment-analysis/status',
 				method: 'get',
 				params: this.queryParams,
 			});
@@ -474,7 +444,7 @@ export default {
 }
 
 .running {
-	background-color: #288aff;
+	background-color: #288AFF;
 	// background-color: #84f04e;
 }
 
@@ -485,7 +455,7 @@ export default {
 
 .fault {
 	// background-color: #ea5b5b;
-	background-color: #fc9c91;
+	background-color: #FC9C91;
 }
 
 .full {
@@ -499,7 +469,7 @@ export default {
 }
 
 .stop {
-	background-color: #ffdc94;
+	background-color: #FFDC94;
 }
 
 .legend-row {
@@ -508,7 +478,7 @@ export default {
 	display: flex;
 	justify-content: flex-end;
 
-	> .legend:not(:last-child) {
+	>.legend:not(:last-child) {
 		margin-right: 12px;
 	}
 
@@ -551,7 +521,7 @@ export default {
 	background: #ccc;
 }
 
-.echarts__status-chart > div {
+.echarts__status-chart>div {
 	height: 100% !important;
 	width: 100% !important;
 }