bugfix zentao 1

src/views/base/equipmentPlcConnect/index.vue

@@ -61,7 +61,7 @@ export default {
 	components: {},
 	data() {
 		return {
-			searchBarKeys: ['name', 'plcTableName'],
+			searchBarKeys: ['equipmentId', 'plcId'],
 			// tableBtn: [
 			// 	this.$auth.hasPermi('base:equipment-plc:update')
 			// 		? {
@@ -98,18 +98,17 @@ export default {
 				// 	width: 180,
 				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				// },
-				{ prop: 'productionLine', label: '产线', align: 'center' },
-				{ prop: 'workshopSection', label: '工段', align: 'center' },
-				{ prop: 'equipmentName', label: '设备名', align: 'center' },
-				{ prop: 'equipmentCode', label: '设备编码', align: 'center' },
-				{ prop: 'plcCode', label: '关联表编码', align: 'center' },
-				{ prop: 'plcTableName', label: '关联表名', align: 'center' },
-				{ prop: 'plcName', label: '标识名称', align: 'center' },
-				{ prop: 'bindingParameters', label: '绑定参数数量', align: 'center' },
+				{ prop: 'productionLine', label: '产线' },
+				{ prop: 'workshopSection', label: '工段' },
+				{ prop: 'equipmentName', label: '设备名' },
+				{ prop: 'equipmentCode', label: '设备编码' },
+				{ prop: 'plcCode', label: '关联表编码' },
+				{ prop: 'plcTableName', label: '关联表名' },
+				{ prop: 'plcName', label: '标识名称' },
+				{ prop: 'bindingParameters', label: '绑定参数数量' },
 				{
 					_action: 'params-bind',
 					label: '查看绑定',
-					align: 'center',
 					subcomponent: {
 						props: ['injectData'],
 						render: function (h) {
@@ -136,16 +135,18 @@ export default {
 			],
 			searchBarFormConfig: [
 				{
-					type: 'input',
+					type: 'select',
 					label: '设备名',
-					placeholder: '请输入设备名',
+					placeholder: '请选择设备',
 					param: 'equipmentId',
+					selectOptions: [],
 				},
 				{
-					type: 'input',
-					label: '编码',
-					placeholder: '请输入编码',
+					type: 'select',
+					label: 'PLC编码',
+					placeholder: '请选择编码',
 					param: 'plcId',
+					selectOptions: [],
 				},
 				{
 					type: 'button',
@@ -207,8 +208,44 @@ export default {
 	},
 	created() {
 		this.getList();
+		this.initSearchOptions();
 	},
 	methods: {
+		async getEquipmentOptions() {
+			const res = await this.$axios({
+				url: '/base/equipment/listAll',
+				method: 'get',
+			});
+			return res.data;
+		},
+
+		async getPlcOptions() {
+			const res = await this.$axios({
+				url: '/base/equipment-plc/listAll',
+				method: 'get',
+			});
+			return res.data;
+		},
+
+		/** 初始化查询条件 */
+		async initSearchOptions() {
+			Promise.all([this.getEquipmentOptions(), this.getPlcOptions()]).then(
+				([eqList, plcList]) => {
+					this.searchBarFormConfig[0].selectOptions = eqList.map((item) => {
+						return {
+							name: item.name,
+							id: item.id,
+						};
+					});
+					this.searchBarFormConfig[1].selectOptions = plcList.map((item) => {
+						return {
+							name: item.name,
+							id: item.id,
+						};
+					});
+				}
+			);
+		},
 		/** 覆盖 handleEmitFun 的默认实现 */
 		handleEmitFun({ action, payload }) {
 			switch (action) {