package.json

@@ -58,7 +58,6 @@
     "js-beautify": "1.13.0",
     "jsencrypt": "3.3.1",
     "min-dash": "3.5.2",
-    "mockjs": "^1.1.0",
     "moment": "^2.29.4",
     "nprogress": "0.2.0",
     "qrcode.vue": "^1.7.0",

src/components/DialogForm/index.vue

@@ -63,12 +63,6 @@
 							{{ col.uploadTips || '只能上传jpg/png文件，大小不超过2MB' }}
 						</div>
 					</el-upload>
-					<el-switch
-						v-if="col.switch"
-						v-model="form[col.prop]"
-						active-color="#0b58ff"
-						inactive-color="#e1e1e1"
-						v-bind="col.bind"></el-switch>
 					<component
 						v-if="col.subcomponent"
 						:key="col.key"
@@ -235,7 +229,7 @@ export default {
 										}))
 									);
 								} else if (opt.input) {
-									console.log('setting code: ', response.data);
+									console.log('setting code: ', response.data)
 									// 处理输入框数据
 									this.form[opt.prop] = response.data;
 								}

src/views/base/equipmentPlc/index.vue

@@ -1,373 +1,233 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
 
-		<!-- 列表 -->
+    <!-- 搜索工作栏 -->
-		<base-table
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			:table-props="tableProps"
+      <el-form-item label="实时关联表实际名称" prop="plcTableName">
-			:page="queryParams.pageNo"
+        <el-input v-model="queryParams.plcTableName" placeholder="请输入实时关联表实际名称" clearable @keyup.enter.native="handleQuery"/>
-			:limit="queryParams.pageSize"
+      </el-form-item>
-			:table-data="list"
+      <el-form-item label="标识名称" prop="name">
-			@emitFun="handleEmitFun">
+        <el-input v-model="queryParams.name" placeholder="请输入标识名称" clearable @keyup.enter.native="handleQuery"/>
-			<method-btn
+      </el-form-item>
-				v-if="tableBtn.length"
+      <el-form-item>
-				slot="handleBtn"
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-				label="操作"
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-				:method-list="tableBtn"
+      </el-form-item>
-				@clickBtn="handleTableBtnClick" />
+    </el-form>
-		</base-table>
 
-		<!-- 分页组件 -->
+    <!-- 操作工具栏 -->
-		<pagination
+    <el-row :gutter="10" class="mb8">
-			v-show="total > 0"
+      <el-col :span="1.5">
-			:total="total"
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-			:page.sync="queryParams.pageNo"
+                   v-hasPermi="['base:equipment-plc:create']">新增</el-button>
-			:limit.sync="queryParams.pageSize"
+      </el-col>
-			@pagination="getList" />
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['base:equipment-plc:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-		<!-- 对话框(添加 / 修改) -->
+    <!-- 列表 -->
-		<base-dialog
+    <el-table v-loading="loading" :data="list">
-			:dialogTitle="title"
+      <el-table-column label="id" align="center" prop="id" />
-			:dialogVisible="open"
+      <el-table-column label="实时关联表实际名称" align="center" prop="plcTableName" />
-			width="700px"
+      <el-table-column label="关联表编码" align="center" prop="code" />
-			@close="cancel"
+      <el-table-column label="标识名称" align="center" prop="name" />
-			@cancel="cancel"
+      <el-table-column label="英文标识名称" align="center" prop="enName" />
-			@confirm="submitForm">
+      <el-table-column label="描述" align="center" prop="description" />
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+      <el-table-column label="是否采集 0 代表不采集, 1 代表采集" align="center" prop="collection" />
-		</base-dialog>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-	</div>
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['base:equipment-plc:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['base:equipment-plc:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="实时关联表实际名称" prop="plcTableName">
+          <el-input v-model="form.plcTableName" placeholder="请输入实时关联表实际名称" />
+        </el-form-item>
+        <el-form-item label="关联表编码" prop="code">
+          <el-input v-model="form.code" placeholder="请输入关联表编码" />
+        </el-form-item>
+        <el-form-item label="标识名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入标识名称" />
+        </el-form-item>
+        <el-form-item label="英文标识名称" prop="enName">
+          <el-input v-model="form.enName" placeholder="请输入英文标识名称" />
+        </el-form-item>
+        <el-form-item label="描述" prop="description">
+          <el-input v-model="form.description" placeholder="请输入描述" />
+        </el-form-item>
+        <el-form-item label="是否采集 0 代表不采集, 1 代表采集" prop="collection">
+          <el-input v-model="form.collection" placeholder="请输入是否采集 0 代表不采集, 1 代表采集" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import {
+import { createEquipmentPlc, updateEquipmentPlc, deleteEquipmentPlc, getEquipmentPlc, getEquipmentPlcPage, exportEquipmentPlcExcel } from "@/api/base/equipmentPlc";
-	createEquipmentPlc,
-	updateEquipmentPlc,
-	deleteEquipmentPlc,
-	getEquipmentPlc,
-	getEquipmentPlcPage,
-	exportEquipmentPlcExcel,
-} from '@/api/base/equipmentPlc';
-import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-
-const switchBtn = {
-	name: 'SwitchBtn',
-	props: ['injectData'],
-	data() {
-		return {
-			active: +this.injectData[this.injectData.prop] == 1 ? true : false,
-		};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'el-switch',
-			{
-				props: {
-					value: this.active,
-				},
-				on: {
-					change: (newVal) => {
-						this.active = !this.active;
-						console.log('changed emit', newVal);
-						this.$emit('emitData', {
-							action: 'update-collect',
-							payload: {
-								...this.injectData,
-								collection: newVal ? 1 : 0,
-							},
-						});
-					},
-				},
-			},
-			null
-		);
-	},
-};
 
 export default {
-	name: 'EquipmentPlc',
+  name: "EquipmentPlc",
-	mixins: [basicPageMixin],
+  components: {
-	components: {},
+  },
-	data() {
+  data() {
-		return {
+    return {
-			searchBarKeys: ['name', 'plcTableName'],
+      // 遮罩层
-			tableBtn: [
+      loading: true,
-				this.$auth.hasPermi('base:equipment-plc:update')
+      // 导出遮罩层
-					? {
+      exportLoading: false,
-							type: 'edit',
+      // 显示搜索条件
-							btnName: '修改',
+      showSearch: true,
-					  }
+      // 总条数
-					: undefined,
+      total: 0,
-				this.$auth.hasPermi('base:equipment-plc:delete')
+      // 实时数据采集配置列表
-					? {
+      list: [],
-							type: 'delete',
+      // 弹出层标题
-							btnName: '删除',
+      title: "",
-					  }
+      // 是否显示弹出层
-					: undefined,
+      open: false,
-			].filter((v) => v),
+      // 查询参数
-			tableProps: [
+      queryParams: {
-				// {
+        pageNo: 1,
-				// 	prop: 'createTime',
+        pageSize: 10,
-				// 	label: '添加时间',
+        plcTableName: null,
-				// 	fixed: true,
+        name: null,
-				// 	width: 180,
+      },
-				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+      // 表单参数
-				// },
+      form: {},
-				{ prop: 'code', label: '编码', align: 'center' },
+      // 表单校验
-				{ prop: 'plcTableName', label: '关联表名', align: 'center' },
+      rules: {
-				{ prop: 'name', label: '标识名称', align: 'center' },
+        plcTableName: [{ required: true, message: "实时关联表实际名称不能为空", trigger: "blur" }],
-				{ prop: 'enName', label: '英文名称', align: 'center' },
+      }
-				{
+    };
-					prop: 'collection',
+  },
-					label: '是否采集',
+  created() {
-					align: 'center',
+    this.getList();
-					subcomponent: switchBtn,
+  },
-				},
+  methods: {
-				{ prop: 'description', label: '描述', align: 'center' },
+    /** 查询列表 */
-			],
+    getList() {
-			searchBarFormConfig: [
+      this.loading = true;
-				{
+      // 执行查询
-					type: 'input',
+      getEquipmentPlcPage(this.queryParams).then(response => {
-					label: '表名',
+        this.list = response.data.list;
-					placeholder: '请输入表名',
+        this.total = response.data.total;
-					param: 'plcTableName',
+        this.loading = false;
-				},
+      });
-				{
+    },
-					type: 'input',
+    /** 取消按钮 */
-					label: '标识',
+    cancel() {
-					placeholder: '请输入标识',
+      this.open = false;
-					param: 'name',
+      this.reset();
-				},
+    },
-				{
+    /** 表单重置 */
-					type: 'button',
+    reset() {
-					btnName: '查询',
+      this.form = {
-					name: 'search',
+        id: undefined,
-					color: 'primary',
+        plcTableName: undefined,
-				},
+        code: undefined,
-				{
+        name: undefined,
-					type: 'separate',
+        enName: undefined,
-				},
+        description: undefined,
-				{
+        collection: undefined,
-					// type: this.$auth.hasPermi('base:equipment-plc:create')
+      };
-					// 	? 'button'
+      this.resetForm("form");
-					// 	: '',
+    },
-					type: 'button',
+    /** 搜索按钮操作 */
-					btnName: '新增',
+    handleQuery() {
-					name: 'add',
+      this.queryParams.pageNo = 1;
-					plain: true,
+      this.getList();
-					color: 'success',
+    },
-				},
+    /** 重置按钮操作 */
-				// {
+    resetQuery() {
-				// 	type: this.$auth.hasPermi('base:equipment-plc:export') ? 'button' : '',
+      this.resetForm("queryForm");
-				// 	btnName: '导出',
+      this.handleQuery();
-				// 	name: 'export',
+    },
-				// 	color: 'warning',
+    /** 新增按钮操作 */
-				// },
+    handleAdd() {
-			],
+      this.reset();
-			rows: [
+      this.open = true;
-				[
+      this.title = "添加实时数据采集配置";
-					{
+    },
-						input: true,
+    /** 修改按钮操作 */
-						label: '关联表名',
+    handleUpdate(row) {
-						prop: 'plcTableName',
+      this.reset();
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+      const id = row.id;
-						// bind: {
+      getEquipmentPlc(id).then(response => {
-						// 	disabled: true, // some condition, like detail mode...
+        this.form = response.data;
-						// }
+        this.open = true;
-					},
+        this.title = "修改实时数据采集配置";
-					{
+      });
-						input: true,
+    },
-						label: '编码',
+    /** 提交按钮 */
-						prop: 'code',
+    submitForm() {
-						url: '/base/equipment-group/getCode',
+      this.$refs["form"].validate(valid => {
-					},
+        if (!valid) {
-				],
+          return;
-				[
+        }
-					{
+        // 修改的提交
-						input: true,
+        if (this.form.id != null) {
-						label: '标识',
+          updateEquipmentPlc(this.form).then(response => {
-						prop: 'name',
+            this.$modal.msgSuccess("修改成功");
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+            this.open = false;
-						// bind: {
+            this.getList();
-						// 	disabled: true, // some condition, like detail mode...
+          });
-						// }
+          return;
-					},
+        }
-					{
+        // 添加的提交
-						input: true,
+        createEquipmentPlc(this.form).then(response => {
-						label: '英文名',
+          this.$modal.msgSuccess("新增成功");
-						prop: 'enName',
+          this.open = false;
-					},
+          this.getList();
-				],
+        });
-				[
+      });
-					{
+    },
-						switch: true,
+    /** 删除按钮操作 */
-						label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
+    handleDelete(row) {
-						prop: 'collection',
+      const id = row.id;
-						bind: {
+      this.$modal.confirm('是否确认删除实时数据采集配置编号为"' + id + '"的数据项?').then(function() {
-							'active-value': 1,
+          return deleteEquipmentPlc(id);
-							'inactive-value': 0,
+        }).then(() => {
-						},
+          this.getList();
-					},
+          this.$modal.msgSuccess("删除成功");
-				],
+        }).catch(() => {});
-				[
+    },
-					{
+    /** 导出按钮操作 */
-						textarea: true,
+    handleExport() {
-						label: '描述',
+      // 处理查询参数
-						prop: 'description',
+      let params = {...this.queryParams};
-						bind: {
+      params.pageNo = undefined;
-							placeholder: '请输入备注',
+      params.pageSize = undefined;
-						},
+      this.$modal.confirm('是否确认导出所有实时数据采集配置数据项?').then(() => {
-					},
+          this.exportLoading = true;
-				],
+          return exportEquipmentPlcExcel(params);
-			],
+        }).then(response => {
-			// 是否显示弹出
+          this.$download.excel(response, '实时数据采集配置.xls');
-			open: false,
+          this.exportLoading = false;
-			// 查询参数
+        }).catch(() => {});
-			queryParams: {
+    }
-				pageNo: 1,
+  }
-				pageSize: 10,
-				plcTableName: null,
-				name: null,
-			},
-			// 表单参数
-			form: {},
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** 覆盖 handleEmitFun 的默认实现 */
-		handleEmitFun({ action, payload }) {
-			switch (action) {
-				case 'update-collect':
-          this.reset();
-					const tempForm = {};
-					Object.keys(this.form).forEach((key) => {
-						tempForm[key] = payload[key];
-					});
-					updateEquipmentPlc(tempForm).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					break;
-			}
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentPlcPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				plcTableName: undefined,
-				code: undefined,
-				name: undefined,
-				enName: undefined,
-				description: undefined,
-				collection: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加实时数据采集配置';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentPlc(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改实时数据采集配置';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentPlc(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentPlc(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除实时数据采集配置编号为"' + id + '"的数据项?')
-				.then(function () {
-					return deleteEquipmentPlc(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有实时数据采集配置数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentPlcExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '实时数据采集配置.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
 };
 </script>

src/views/base/equipmentPlcConnect/http.js

@@ -1,78 +0,0 @@
-import Mock from 'mockjs';
-
-const baseURL = 'http://192.168.1.49:48080/admin-api';
-
-Mock.setup({
-	timeout: 200,
-});
-
-// @database
-const list = Mock.mock({
-	'data|1-10': [
-		{
-			'id|+1': 1,
-			productionLine: (options) => {
-				// console.log('otpsion', options.context.currentContext);
-				return `EQ${options.context.currentContext.id}`;
-			},
-			workshopSection: ({ context: { currentContext } }) =>
-				`EQ${currentContext.id}_WS${Mock.Random.integer(1, 10)}`,
-			equipmentName: ({ context: { currentContext } }) =>
-				`设备${currentContext.id}`,
-			equipmentCode: ({ context: { currentContext } }) =>
-				`${currentContext.equipmentName}_Code`,
-			plcCode: ({ context: { currentContext } }) =>
-				`PLC_TABLE_CODE_${currentContext.id}`,
-			plcTableName: ({ context: { currentContext } }) =>
-				`PLC_TABLE_${currentContext.id}`,
-			plcName: ({ context: { currentContext } }) => `PLC_${currentContext.id}`,
-			'bindingParameters|1-10': 1,
-		},
-	],
-});
-
-// @page
-Mock.mock(
-	RegExp(baseURL + '/base/equipment-plc-connect/page' + '.*'),
-	'get',
-	(options) => {
-		console.log('[Mock url]', options.url, list);
-		return {
-			code: 0,
-			data: {
-				list: list.data,
-				total: list.data.length,
-			},
-		};
-	}
-);
-
-// @create
-Mock.mock(baseURL + '/base/equipment-plc-connect/create', 'post', (options) => {
-	console.log('options', options);
-	const { url, type, body } = options;
-	const newItem = JSON.parse(body);
-	list.data.push(newItem);
-	return {
-		code: 0,
-		data: null,
-		msg: 'success',
-	};
-});
-
-// @update
-Mock.mock(
-	baseURL + '/admin-api/base/equipment-plc-connect/update',
-	'put',
-	(options) => {
-		const { url, type, body } = options;
-		const { id } = JSON.parse(body);
-		const newItem = list.data.find((item) => item.id == id);
-		newItem = { ...newItem, ...JSON.parse(body) };
-		return {
-			code: 0,
-			msg: 'success',
-			data: null,
-		};
-	}
-);

src/views/base/equipmentPlcConnect/index.vue

@@ -1,349 +1,209 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
 
-		<!-- 列表 -->
+    <!-- 搜索工作栏 -->
-		<base-table
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			:table-props="tableProps"
+      <el-form-item label="plc表iD" prop="plcId">
-			:page="queryParams.pageNo"
+        <el-input v-model="queryParams.plcId" placeholder="请输入plc表iD" clearable @keyup.enter.native="handleQuery"/>
-			:limit="queryParams.pageSize"
+      </el-form-item>
-			:table-data="list"
+      <el-form-item label="设备表id" prop="equipmentId">
-			@emitFun="handleEmitFun">
+        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备表id" clearable @keyup.enter.native="handleQuery"/>
-			<method-btn
+      </el-form-item>
-				v-if="tableBtn.length"
+      <el-form-item>
-				slot="handleBtn"
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-				label="操作"
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-				:method-list="tableBtn"
+      </el-form-item>
-				@clickBtn="handleTableBtnClick" />
+    </el-form>
-		</base-table>
 
-		<!-- 分页组件 -->
+    <!-- 操作工具栏 -->
-		<pagination
+    <el-row :gutter="10" class="mb8">
-			v-show="total > 0"
+      <el-col :span="1.5">
-			:total="total"
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-			:page.sync="queryParams.pageNo"
+                   v-hasPermi="['base:equipment-plc-connect:create']">新增</el-button>
-			:limit.sync="queryParams.pageSize"
+      </el-col>
-			@pagination="getList" />
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['base:equipment-plc-connect:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-		<!-- 对话框(添加 / 修改) -->
+    <!-- 列表 -->
-		<base-dialog
+    <el-table v-loading="loading" :data="list">
-			:dialogTitle="title"
+      <el-table-column label="id" align="center" prop="id" />
-			:dialogVisible="open"
+      <el-table-column label="plc表iD" align="center" prop="plcId" />
-			width="700px"
+      <el-table-column label="设备表id" align="center" prop="equipmentId" />
-			@close="cancel"
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-			@cancel="cancel"
+        <template v-slot="scope">
-			@confirm="submitForm">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+                     v-hasPermi="['base:equipment-plc-connect:update']">修改</el-button>
-		</base-dialog>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-	</div>
+                     v-hasPermi="['base:equipment-plc-connect:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="plc表iD" prop="plcId">
+          <el-input v-model="form.plcId" placeholder="请输入plc表iD" />
+        </el-form-item>
+        <el-form-item label="设备表id" prop="equipmentId">
+          <el-input v-model="form.equipmentId" placeholder="请输入设备表id" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import {
+import { createEquipmentPlcConnect, updateEquipmentPlcConnect, deleteEquipmentPlcConnect, getEquipmentPlcConnect, getEquipmentPlcConnectPage, exportEquipmentPlcConnectExcel } from "@/api/base/equipmentPlcConnect";
-	createEquipmentPlcConnect,
-	updateEquipmentPlcConnect,
-	deleteEquipmentPlcConnect,
-	getEquipmentPlcConnect,
-	getEquipmentPlcConnectPage,
-	exportEquipmentPlcConnectExcel,
-} from '@/api/base/equipmentPlcConnect';
-import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-// import './http';
 
 export default {
-	name: 'EquipmentPlcConnect',
+  name: "EquipmentPlcConnect",
-	mixins: [basicPageMixin],
+  components: {
-	components: {},
+  },
-	data() {
+  data() {
-		return {
+    return {
-			searchBarKeys: ['name', 'plcTableName'],
+      // 遮罩层
-			// tableBtn: [
+      loading: true,
-			// 	this.$auth.hasPermi('base:equipment-plc:update')
+      // 导出遮罩层
-			// 		? {
+      exportLoading: false,
-			// 				type: 'edit',
+      // 显示搜索条件
-			// 				btnName: '修改',
+      showSearch: true,
-			// 		  }
+      // 总条数
-			// 		: undefined,
+      total: 0,
-			// 	this.$auth.hasPermi('base:equipment-plc:delete')
+      // 设备与实时采集关系表（一对多）列表
-			// 		? {
+      list: [],
-			// 				type: 'delete',
+      // 弹出层标题
-			// 				btnName: '删除',
+      title: "",
-			// 		  }
+      // 是否显示弹出层
-			// 		: undefined,
+      open: false,
-			// ].filter((v) => v),
+      // 查询参数
-			tableBtn: [
+      queryParams: {
-				{
+        pageNo: 1,
-					type: 'edit',
+        pageSize: 10,
-					btnName: '修改',
+        plcId: null,
-				},
+        equipmentId: null,
-				// {
+      },
-				// 	type: 'params-bind',
+      // 表单参数
-				// 	btnName: '参数绑定',
+      form: {},
-				// },
+      // 表单校验
-				{
+      rules: {
-					type: 'delete',
+        plcId: [{ required: true, message: "plc表iD不能为空", trigger: "blur" }],
-					btnName: '删除',
+        equipmentId: [{ required: true, message: "设备表id不能为空", trigger: "blur" }],
-				},
+      }
-			],
+    };
-			tableProps: [
+  },
-				// {
+  created() {
-				// 	prop: 'createTime',
+    this.getList();
-				// 	label: '添加时间',
+  },
-				// 	fixed: true,
+  methods: {
-				// 	width: 180,
+    /** 查询列表 */
-				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+    getList() {
-				// },
+      this.loading = true;
-				{ prop: 'productionLine', label: '产线', align: 'center' },
+      // 执行查询
-				{ prop: 'workshopSection', label: '工段', align: 'center' },
+      getEquipmentPlcConnectPage(this.queryParams).then(response => {
-				{ prop: 'equipmentName', label: '设备名', align: 'center' },
+        this.list = response.data.list;
-				{ prop: 'equipmentCode', label: '设备编码', align: 'center' },
+        this.total = response.data.total;
-				{ prop: 'plcCode', label: '关联表编码', align: 'center' },
+        this.loading = false;
-				{ prop: 'plcTableName', label: '关联表名', align: 'center' },
+      });
-				{ prop: 'plcName', label: '标识名称', align: 'center' },
+    },
-				{ prop: 'bindingParameters', label: '绑定参数数量', align: 'center' },
+    /** 取消按钮 */
-				{
+    cancel() {
-					_action: 'params-bind',
+      this.open = false;
-					label: '查看绑定',
+      this.reset();
-					align: 'center',
+    },
-					subcomponent: {
+    /** 表单重置 */
-						props: ['injectData'],
+    reset() {
-						render: function (h) {
+      this.form = {
-							const _this = this;
+        id: undefined,
-							return h(
+        plcId: undefined,
-								'el-button',
+        equipmentId: undefined,
-								{
+      };
-									props: { type: 'text' },
+      this.resetForm("form");
-									on: {
+    },
-										click: function () {
+    /** 搜索按钮操作 */
-											console.log('inejctdata', _this.injectData);
+    handleQuery() {
-											_this.$emit('emitData', {
+      this.queryParams.pageNo = 1;
-												action: _this.injectData._action,
+      this.getList();
-												payload: _this.injectData,
+    },
-											});
+    /** 重置按钮操作 */
-										},
+    resetQuery() {
-									},
+      this.resetForm("queryForm");
-								},
+      this.handleQuery();
-								'查看绑定'
+    },
-							);
+    /** 新增按钮操作 */
-						},
+    handleAdd() {
-					},
+      this.reset();
-				},
+      this.open = true;
-			],
+      this.title = "添加设备与实时采集关系表（一对多）";
-			searchBarFormConfig: [
+    },
-				{
+    /** 修改按钮操作 */
-					type: 'input',
+    handleUpdate(row) {
-					label: '设备名',
+      this.reset();
-					placeholder: '请输入设备名',
+      const id = row.id;
-					param: 'equipmentId',
+      getEquipmentPlcConnect(id).then(response => {
-				},
+        this.form = response.data;
-				{
+        this.open = true;
-					type: 'input',
+        this.title = "修改设备与实时采集关系表（一对多）";
-					label: '编码',
+      });
-					placeholder: '请输入编码',
+    },
-					param: 'plcId',
+    /** 提交按钮 */
-				},
+    submitForm() {
-				{
+      this.$refs["form"].validate(valid => {
-					type: 'button',
+        if (!valid) {
-					btnName: '查询',
+          return;
-					name: 'search',
+        }
-					color: 'primary',
+        // 修改的提交
-				},
+        if (this.form.id != null) {
-				{
+          updateEquipmentPlcConnect(this.form).then(response => {
-					type: 'separate',
+            this.$modal.msgSuccess("修改成功");
-				},
+            this.open = false;
-				{
+            this.getList();
-					// type: this.$auth.hasPermi('base:equipment-plc:create')
+          });
-					// 	? 'button'
+          return;
-					// 	: '',
+        }
-					type: 'button',
+        // 添加的提交
-					btnName: '新增',
+        createEquipmentPlcConnect(this.form).then(response => {
-					name: 'add',
+          this.$modal.msgSuccess("新增成功");
-					plain: true,
+          this.open = false;
-					color: 'success',
+          this.getList();
-				},
+        });
-				// {
+      });
-				// 	type: this.$auth.hasPermi('base:equipment-plc:export') ? 'button' : '',
+    },
-				// 	btnName: '导出',
+    /** 删除按钮操作 */
-				// 	name: 'export',
+    handleDelete(row) {
-				// 	color: 'warning',
+      const id = row.id;
-				// },
+      this.$modal.confirm('是否确认删除设备与实时采集关系表（一对多）编号为"' + id + '"的数据项?').then(function() {
-			],
+          return deleteEquipmentPlcConnect(id);
-			rows: [
+        }).then(() => {
-				[
+          this.getList();
-					{
+          this.$modal.msgSuccess("删除成功");
-						select: true,
+        }).catch(() => {});
-						label: '关联表名',
+    },
-						prop: 'plcId',
+    /** 导出按钮操作 */
-						url: '/base/equipment-plc/listAll',
+    handleExport() {
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+      // 处理查询参数
-					},
+      let params = {...this.queryParams};
-				],
+      params.pageNo = undefined;
-				[
+      params.pageSize = undefined;
-					{
+      this.$modal.confirm('是否确认导出所有设备与实时采集关系表（一对多）数据项?').then(() => {
-						select: true,
+          this.exportLoading = true;
-						label: '设备',
+          return exportEquipmentPlcConnectExcel(params);
-						prop: 'equipmentId',
+        }).then(response => {
-						url: '/base/equipment/page?pageNo=1&pageSize=99',
+          this.$download.excel(response, '设备与实时采集关系表（一对多）.xls');
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+          this.exportLoading = false;
-					},
+        }).catch(() => {});
-				],
+    }
-			],
+  }
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				plcId: null,
-				equipmentId: null,
-			},
-			// 表单参数
-			form: {},
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** 覆盖 handleEmitFun 的默认实现 */
-		handleEmitFun({ action, payload }) {
-			switch (action) {
-				case 'params-bind':
-					this.reset();
-					const {
-						id,
-						equipmentName,
-						equipmentId,
-						plcId,
-						plcName,
-						plcTableName,
-					} = payload;
-					// console.log('Cha看绑定参数弹窗', id, equipmentName, plcTableName);
-					this.$router.push({
-						name: 'EquipmentPlcParam',
-						params: {
-							id,
-							equipmentName,
-							plcTableName,
-						},
-					});
-					break;
-			}
-		},
-
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentPlcConnectPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				plcId: undefined,
-				equipmentId: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备与实时采集关系表（一对多）';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentPlcConnect(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备与实时采集关系表（一对多）';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentPlcConnect(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentPlcConnect(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm(
-					'是否确认删除设备与实时采集关系表（一对多）编号为"' +
-						id +
-						'"的数据项?'
-				)
-				.then(function () {
-					return deleteEquipmentPlcConnect(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备与实时采集关系表（一对多）数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentPlcConnectExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备与实时采集关系表（一对多）.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
 };
 </script>

src/views/base/equipmentPlcParam/index.vue

@@ -1,450 +1,255 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
 
-		<!-- 列表 -->
+    <!-- 搜索工作栏 -->
-		<base-table
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			:table-props="tableProps"
+      <el-form-item label="实时数采表id" prop="connectId">
-			:page="queryParams.pageNo"
+        <el-input v-model="queryParams.connectId" placeholder="请输入实时数采表id" clearable @keyup.enter.native="handleQuery"/>
-			:limit="queryParams.pageSize"
+      </el-form-item>
-			:table-data="list"
+      <el-form-item>
-			@emitFun="handleEmitFun">
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-			<method-btn
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-				v-if="tableBtn.length"
+      </el-form-item>
-				slot="handleBtn"
+    </el-form>
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
 
-		<!-- 分页组件 -->
+    <!-- 操作工具栏 -->
-		<pagination
+    <el-row :gutter="10" class="mb8">
-			v-show="total > 0"
+      <el-col :span="1.5">
-			:total="total"
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-			:page.sync="queryParams.pageNo"
+                   v-hasPermi="['base:equipment-plc-param:create']">新增</el-button>
-			:limit.sync="queryParams.pageSize"
+      </el-col>
-			@pagination="getList" />
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['base:equipment-plc-param:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-		<!-- 对话框(添加 / 修改) -->
+    <!-- 列表 -->
-		<base-dialog
+    <el-table v-loading="loading" :data="list">
-			:dialogTitle="title"
+      <el-table-column label="ID" align="center" prop="id" />
-			:dialogVisible="open"
+      <el-table-column label="实时数采表id" align="center" prop="connectId" />
-			width="700px"
+      <el-table-column label="plc实际的列名（参数列名）" align="center" prop="plcParamName" />
-			@close="cancel"
+      <el-table-column label="参数名称" align="center" prop="name" />
-			@cancel="cancel"
+      <el-table-column label="单位 关联数据字典表label_value" align="center" prop="unit">
-			@confirm="submitForm">
+        <template v-slot="scope">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+          <dict-tag :type="DICT_TYPE.UNIT_DICT" :value="scope.row.unit" />
-		</base-dialog>
+        </template>
-	</div>
+      </el-table-column>
+      <el-table-column label="最小值 数值型可用" align="center" prop="minValue" />
+      <el-table-column label="最大值 数值型可用" align="center" prop="maxValue" />
+      <el-table-column label="参数设定标准值" align="center" prop="defaultValue" />
+      <el-table-column label="0 代表不采集, 1 代表采集" align="center" prop="collection" />
+      <el-table-column label="描述" align="center" prop="description" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['base:equipment-plc-param:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['base:equipment-plc-param:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="实时数采表id" prop="connectId">
+          <el-input v-model="form.connectId" placeholder="请输入实时数采表id" />
+        </el-form-item>
+        <el-form-item label="plc实际的列名（参数列名）" prop="plcParamName">
+          <el-input v-model="form.plcParamName" placeholder="请输入plc实际的列名（参数列名）" />
+        </el-form-item>
+        <el-form-item label="参数名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入参数名称" />
+        </el-form-item>
+        <el-form-item label="单位 关联数据字典表label_value" prop="unit">
+          <el-select v-model="form.unit" placeholder="请选择单位 关联数据字典表label_value">
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.UNIT_DICT)"
+                       :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="最小值 数值型可用" prop="minValue">
+          <el-input v-model="form.minValue" placeholder="请输入最小值 数值型可用" />
+        </el-form-item>
+        <el-form-item label="最大值 数值型可用" prop="maxValue">
+          <el-input v-model="form.maxValue" placeholder="请输入最大值 数值型可用" />
+        </el-form-item>
+        <el-form-item label="参数设定标准值" prop="defaultValue">
+          <el-input v-model="form.defaultValue" placeholder="请输入参数设定标准值" />
+        </el-form-item>
+        <el-form-item label="0 代表不采集, 1 代表采集" prop="collection">
+          <el-input v-model="form.collection" placeholder="请输入0 代表不采集, 1 代表采集" />
+        </el-form-item>
+        <el-form-item label="描述">
+          <editor v-model="form.description" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import {
+import { createEquipmentPlcParam, updateEquipmentPlcParam, deleteEquipmentPlcParam, getEquipmentPlcParam, getEquipmentPlcParamPage, exportEquipmentPlcParamExcel } from "@/api/base/equipmentPlcParam";
-	createEquipmentPlcParam,
+import Editor from '@/components/Editor';
-	updateEquipmentPlcParam,
-	deleteEquipmentPlcParam,
-	getEquipmentPlcParam,
-	getEquipmentPlcParamPage,
-	exportEquipmentPlcParamExcel,
-} from '@/api/base/equipmentPlcParam';
-import moment from 'moment';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import { publicFormatter } from '@/utils/dict';
 
 export default {
-	name: 'EquipmentPlcParam',
+  name: "EquipmentPlcParam",
-	mixins: [basicPageMixin],
+  components: {
-	data() {
+    Editor
-		return {
+  },
-			tableProps: [
+  data() {
-				// {
+    return {
-				// 	prop: 'createTime',
+      // 遮罩层
-				// 	label: '添加时间',
+      loading: true,
-				// 	fixed: true,
+      // 导出遮罩层
-				// 	width: 180,
+      exportLoading: false,
-				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+      // 显示搜索条件
-				// },
+      showSearch: true,
-				{ prop: 'plcParamName', label: '参数列名', align: 'center' },
+      // 总条数
-				{ prop: 'name', label: '参数名称', align: 'center' },
+      total: 0,
-				{
+      // 设备数采详情列表
-					prop: 'unit',
+      list: [],
-					label: '单位',
+      // 弹出层标题
-					align: 'center',
+      title: "",
-					filter: publicFormatter('unit_dict'),
+      // 是否显示弹出层
-				},
+      open: false,
-				{
+      // 查询参数
-					prop: 'collection',
+      queryParams: {
-					label: '是否采集',
+        pageNo: 1,
-					align: 'center',
+        pageSize: 10,
-					filter: (val) => (val != null ? ['否', '是'][val] : '-'),
+        connectId: null,
-				},
+      },
-				{ prop: 'minValue', label: '最小值', align: 'center' },
+      // 表单参数
-				{ prop: 'maxValue', label: '最大值', align: 'center' },
+      form: {},
-				{ prop: 'defaultValue', label: '标准值', align: 'center' },
+      // 表单校验
-				{ prop: 'description', label: '描述', align: 'center' },
+      rules: {
-				{ prop: 'remark', label: '备注', align: 'center' },
+        connectId: [{ required: true, message: "实时数采表id不能为空", trigger: "blur" }],
-				// {
+        plcParamName: [{ required: true, message: "plc实际的列名（参数列名）不能为空", trigger: "blur" }],
-				// 	_action: 'params-bind',
+        name: [{ required: true, message: "参数名称不能为空", trigger: "blur" }],
-				// 	label: '查看绑定',
+      }
-				// 	align: 'center',
+    };
-				// 	subcomponent: {
+  },
-				// 		props: ['injectData'],
+  created() {
-				// 		render: function (h) {
+    this.getList();
-				// 			const _this = this;
+  },
-				// 			return h(
+  methods: {
-				// 				'el-button',
+    /** 查询列表 */
-				// 				{
+    getList() {
-				// 					props: { type: 'text' },
+      this.loading = true;
-				// 					on: {
+      // 执行查询
-				// 						click: function () {
+      getEquipmentPlcParamPage(this.queryParams).then(response => {
-				// 							console.log('inejctdata', _this.injectData);
+        this.list = response.data.list;
-				// 							_this.$emit('emitData', {
+        this.total = response.data.total;
-				// 								action: _this.injectData._action,
+        this.loading = false;
-				// 								payload: _this.injectData,
+      });
-				// 							});
+    },
-				// 						},
+    /** 取消按钮 */
-				// 					},
+    cancel() {
-				// 				},
+      this.open = false;
-				// 				'查看绑定'
+      this.reset();
-				// 			);
+    },
-				// 		},
+    /** 表单重置 */
-				// 	},
+    reset() {
-				// },
+      this.form = {
-			],
+        id: undefined,
-			rows: [
+        connectId: undefined,
-				[
+        plcParamName: undefined,
-					{
+        name: undefined,
-						input: true,
+        unit: undefined,
-						label: '参数列名',
+        minValue: undefined,
-						prop: 'plcParamName',
+        maxValue: undefined,
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+        defaultValue: undefined,
-					},
+        collection: undefined,
-					{
+        description: undefined,
-						input: true,
+        remark: undefined,
-						label: '参数名称',
+      };
-						prop: 'name',
+      this.resetForm("form");
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+    },
-					},
+    /** 搜索按钮操作 */
-				],
+    handleQuery() {
-				[
+      this.queryParams.pageNo = 1;
-					{
+      this.getList();
-						select: true,
+    },
-						label: '单位',
+    /** 重置按钮操作 */
-						prop: 'unit',
+    resetQuery() {
-						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
+      this.resetForm("queryForm");
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+      this.handleQuery();
-					},
+    },
-					{
+    /** 新增按钮操作 */
-						switch: true,
+    handleAdd() {
-						label: '是否采集',
+      this.reset();
-						prop: 'collection',
+      this.open = true;
-						bind: {
+      this.title = "添加设备数采详情";
-							'active-value': 1,
+    },
-							'inactive-value': 0,
+    /** 修改按钮操作 */
-						},
+    handleUpdate(row) {
-					},
+      this.reset();
-				],
+      const id = row.id;
-				[
+      getEquipmentPlcParam(id).then(response => {
-					{
+        this.form = response.data;
-						input: true,
+        this.open = true;
-						label: '最小值',
+        this.title = "修改设备数采详情";
-						prop: 'minValue',
+      });
-						rules: [
+    },
-							{
+    /** 提交按钮 */
-								type: 'number',
+    submitForm() {
-								message: '请输入正确的数字',
+      this.$refs["form"].validate(valid => {
-								trigger: 'blur',
+        if (!valid) {
-								transform: (val) => Number(val),
+          return;
-							},
+        }
-						],
+        // 修改的提交
-					},
+        if (this.form.id != null) {
-					{
+          updateEquipmentPlcParam(this.form).then(response => {
-						input: true,
+            this.$modal.msgSuccess("修改成功");
-						label: '最大值',
+            this.open = false;
-						prop: 'maxValue',
+            this.getList();
-						rules: [
+          });
-							{
+          return;
-								type: 'number',
+        }
-								message: '请输入正确的数字',
+        // 添加的提交
-								trigger: 'blur',
+        createEquipmentPlcParam(this.form).then(response => {
-								transform: (val) => Number(val),
+          this.$modal.msgSuccess("新增成功");
-							},
+          this.open = false;
-						],
+          this.getList();
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+        });
-					},
+      });
-				],
+    },
-				[
+    /** 删除按钮操作 */
-					{
+    handleDelete(row) {
-						input: true,
+      const id = row.id;
-						label: '标准值',
+      this.$modal.confirm('是否确认删除设备数采详情编号为"' + id + '"的数据项?').then(function() {
-						prop: 'defaultValue',
+          return deleteEquipmentPlcParam(id);
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+        }).then(() => {
-					},
+          this.getList();
-					{
+          this.$modal.msgSuccess("删除成功");
-						input: true,
+        }).catch(() => {});
-						label: '描述',
+    },
-						prop: 'description',
+    /** 导出按钮操作 */
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+    handleExport() {
-					},
+      // 处理查询参数
-				],
+      let params = {...this.queryParams};
-				[
+      params.pageNo = undefined;
-					{
+      params.pageSize = undefined;
-						input: true,
+      this.$modal.confirm('是否确认导出所有设备数采详情数据项?').then(() => {
-						label: '备注',
+          this.exportLoading = true;
-						prop: 'remark',
+          return exportEquipmentPlcParamExcel(params);
-						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+        }).then(response => {
-					},
+          this.$download.excel(response, '设备数采详情.xls');
-				],
+          this.exportLoading = false;
-			],
+        }).catch(() => {});
-			open: false,
+    }
-			// 查询参数
+  }
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				connectId: null,
-			},
-			// 表单参数
-			form: {},
-			connectId: null,
-			equipmentName: '',
-			plcTableName: '',
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '设备名',
-					disabled: true,
-					param: 'equipmentName',
-					defaultSelect: '',
-				},
-				{
-					type: 'input',
-					label: '关联表名',
-					disabled: true,
-					param: 'plcName',
-					defaultSelect: '',
-				},
-				{
-					type:
-						this.$auth.hasPermi('base:equipment-plc-param:create') &&
-						!this.isDetailPage
-							? 'button'
-							: '',
-					btnName: '新增',
-					name: 'add',
-					plain: true,
-					color: 'success',
-				},
-			],
-		};
-	},
-	computed: {
-		isDetailPage() {
-			return this.$route.params.detail === true;
-		},
-		tableBtn() {
-			return [
-				this.$auth.hasPermi('base:equipment-plc-param:update') &&
-				!this.isDetailPage
-					? {
-							type: 'edit',
-							btnName: '修改',
-					  }
-					: undefined,
-				this.$auth.hasPermi('base:equipment-plc-param:delete') &&
-				!this.isDetailPage
-					? {
-							type: 'delete',
-							btnName: '删除',
-					  }
-					: undefined,
-			].filter((v) => v);
-		},
-		// searchBarFormConfig() {
-		// 	console.log(
-		// 		'ers',
-		// 		JSON.stringify({ eid: this.equipmentName, plc: this.plcTableName })
-		// 	);
-		// 	return [
-		// 		{
-		// 			type: 'input',
-		// 			label: '设备名',
-		// 			disabled: true,
-		// 			param: 'equipmentName',
-		// 			defaultSelect: this.equipmentName,
-		// 		},
-		// 		{
-		// 			type: 'input',
-		// 			label: '关联表名',
-		// 			disabled: true,
-		// 			param: 'plcName',
-		// 			defaultSelect: this.plcTableName,
-		// 		},
-		// 		{
-		// 			type:
-		// 				this.$auth.hasPermi('base:equipment-plc-param:create') &&
-		// 				!this.isDetailPage
-		// 					? 'button'
-		// 					: '',
-		// 			btnName: '新增',
-		// 			name: 'add',
-		// 			plain: true,
-		// 			color: 'success',
-		// 		},
-		// 	];
-		// },
-	},
-	activated() {
-		console.log('activated,,,');
-		// 设置顶部搜索栏信息
-		const { equipmentName, id: connectId, plcTableName } = this.$route.params;
-		// this.equipmentName = equipmentName;
-		// this.plcTableName = plcTableName;
-		this.setSearchBarFormValue('equipmentName', equipmentName);
-		this.setSearchBarFormValue('plcName', plcTableName);
-		this.queryParams.connectId = connectId;
-		// if (!equipmentGroupId) this.getList(); // 拦截
-		this.getList();
-	},
-	deactivated() {
-		console.log('deactivated,,,');
-		this.setSearchBarFormValue('equipmentName', '');
-		this.setSearchBarFormValue('plcName', '');
-		// this.equipmentName = null;
-		// this.plcTableName = null;
-		this.queryParams.connectId = null;
-	},
-	methods: {
-		/** 设置 searchBarForm 的默认值 - 用得比较少 */
-		setSearchBarFormValue(param, value) {
-			this.searchBarFormConfig.forEach((config) => {
-				if (config.param == param) {
-					config.defaultSelect = value;
-				}
-			});
-		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-			// 执行查询
-			getEquipmentPlcParamPage(this.queryParams).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: undefined,
-				connectId: undefined,
-				plcParamName: undefined,
-				name: undefined,
-				unit: undefined,
-				minValue: undefined,
-				maxValue: undefined,
-				defaultValue: undefined,
-				collection: undefined,
-				description: undefined,
-				remark: undefined,
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加设备数采详情';
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			getEquipmentPlcParam(id).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改设备数采详情';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					updateEquipmentPlcParam({
-						...this.form,
-						connectId: this.queryParams.connectId,
-					}).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				createEquipmentPlcParam({
-					...this.form,
-					connectId: this.queryParams.connectId,
-				}).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除设备数采详情编号为"' + id + '"的数据项?')
-				.then(function () {
-					return deleteEquipmentPlcParam(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有设备数采详情数据项?')
-				.then(() => {
-					this.exportLoading = true;
-					return exportEquipmentPlcParamExcel(params);
-				})
-				.then((response) => {
-					this.$download.excel(response, '设备数采详情.xls');
-					this.exportLoading = false;
-				})
-				.catch(() => {});
-		},
-	},
 };
 </script>

yarn.lock

@@ -3059,11 +3059,6 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@*:
-  version "11.0.0"
-  resolved "https://registry.npmmirror.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67"
-  integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==
-
 commander@2.17.x:
   version "2.17.1"
   resolved "https://registry.npmmirror.com/commander/-/commander-2.17.1.tgz"
@@ -6831,13 +6826,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-mockjs@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmmirror.com/mockjs/-/mockjs-1.1.0.tgz#e6a0c378e91906dbaff20911cc0273b3c7d75b06"
-  integrity sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==
-  dependencies:
-    commander "*"
-
 moddle-xml@^9.0.6:
   version "9.0.6"
   resolved "https://registry.npmmirror.com/moddle-xml/-/moddle-xml-9.0.6.tgz"