.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-10-27 16:17:13
+ # @LastEditTime: 2023-11-03 11:16:12
  # @LastEditors: DY
  # @Description:
 ###
@@ -12,14 +12,14 @@ ENV = 'development'
 VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
-
+# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
 VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.56:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.188:48080'
-
+# VUE_APP_BASE_API = 'http://192.168.2.159:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/base/coreCustomer.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2023-10-21 11:50:46
+ * @LastEditTime: 2023-11-02 20:25:36
+ * @LastEditors: DY
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// 创建客户
+export function createCustomer(data) {
+  return request({
+    url: '/base/core-customer/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新客户
+export function updateCustomer(data) {
+  return request({
+    url: '/base/core-customer/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户
+export function deleteCustomer(id) {
+  return request({
+    url: '/base/core-customer/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得客户
+export function getCustomer(id) {
+  return request({
+    url: '/base/core-customer/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得客户code
+export function getCode() {
+  return request({
+    url: '/base/core-customer/getCode',
+    method: 'get'
+  })
+}
+
+// 获得客户分页
+export function getCustomerPage(query) {
+  return request({
+    url: '/base/core-customer/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得所有列表
+export function getCustomerList(query) {
+  return request({
+    url: '/base/core-customer/listAll',
+    method: 'get',
+    params: query
+  })
+}

src/api/base/coreDepartment.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2023-10-21 11:50:46
+ * @LastEditTime: 2023-10-30 14:37:28
+ * @LastEditors: DY
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// 创建部门
+export function createCoreDepartment(data) {
+  return request({
+    url: '/base/core-department/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新部门
+export function updateCoreDepartment(data) {
+  return request({
+    url: '/base/core-department/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除部门
+export function deleteCoreDepartment(id) {
+  return request({
+    url: '/base/core-department/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得部门
+export function getCoreDepartment(id) {
+  return request({
+    url: '/base/core-department/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得部门code
+export function getCode() {
+  return request({
+    url: '/base/core-department/getCode',
+    method: 'get'
+  })
+}
+
+// 获得部门分页
+export function getCoreDepartmentPage(query) {
+  return request({
+    url: '/base/core-department/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得所有列表
+export function getCoreDepartmentList(query) {
+  return request({
+    url: '/base/core-department/listAll',
+    method: 'get',
+    params: query
+  })
+}

src/api/base/coreMajor.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2023-10-21 11:50:46
+ * @LastEditTime: 2023-10-31 15:11:25
+ * @LastEditors: DY
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// 创建专业
+export function createCoreMajor(data) {
+  return request({
+    url: '/base/core-major/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新专业
+export function updateCoreMajor(data) {
+  return request({
+    url: '/base/core-major/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除专业
+export function deleteCoreMajor(id) {
+  return request({
+    url: '/base/core-major/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得专业
+export function getCoreMajor(id) {
+  return request({
+    url: '/base/core-major/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得专业code
+export function getCode() {
+  return request({
+    url: '/base/core-major/getCode',
+    method: 'get'
+  })
+}
+
+// 获得专业分页
+export function getCoreMajorPage(query) {
+  return request({
+    url: '/base/core-major/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得所有列表
+export function getCoreMajorList(query) {
+  return request({
+    url: '/base/core-major/listAll',
+    method: 'get',
+    params: query
+  })
+}

src/api/base/coreSupplier.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2023-10-21 11:50:46
+ * @LastEditTime: 2023-11-03 10:39:44
+ * @LastEditors: DY
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// 创建供应商
+export function createCoreSupplier(data) {
+  return request({
+    url: '/base/core-supplier/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新供应商
+export function updateCoreSupplier(data) {
+  return request({
+    url: '/base/core-supplier/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除供应商
+export function deleteCoreSupplier(id) {
+  return request({
+    url: '/base/core-supplier/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得供应商
+export function getCoreSupplier(id) {
+  return request({
+    url: '/base/core-supplier/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得供应商code
+export function getCode() {
+  return request({
+    url: '/base/core-supplier/getCode',
+    method: 'get'
+  })
+}
+
+// 获得供应商分页
+export function getCoreSupplierPage(query) {
+  return request({
+    url: '/base/core-supplier/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得所有列表
+export function getCoreSupplierList(query) {
+  return request({
+    url: '/base/core-supplier/listAll',
+    method: 'get',
+    params: query
+  })
+}

src/api/base/coreWorker.js

@@ -0,0 +1,103 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2023-10-21 11:50:46
+ * @LastEditTime: 2023-11-02 19:49:52
+ * @LastEditors: DY
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// 创建员工
+export function createCoreWorker(data) {
+  return request({
+    url: '/base/core-worker/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新员工
+export function updateCoreWorker(data) {
+  return request({
+    url: '/base/core-worker/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除员工
+export function deleteCoreWorker(id) {
+  return request({
+    url: '/base/core-worker/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得员工
+export function getCoreWorker(id) {
+  return request({
+    url: '/base/core-worker/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得员工code
+export function getCode() {
+  return request({
+    url: '/base/core-worker/getCode',
+    method: 'get'
+  })
+}
+
+// 获得员工分页
+export function getCoreWorkerPage(query) {
+  return request({
+    url: '/base/core-worker/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得所有列表
+export function getCoreWorkerList(query) {
+  return request({
+    url: '/base/core-worker/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建员工--专业
+export function createWoBindMa(data) {
+  return request({
+    url: '/base/core-worker-bind-major/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新员工--专业
+export function updateWoBindMa(data) {
+  return request({
+    url: '/base/core-worker-bind-major/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除员工--专业
+export function deleteWoBindMa(id) {
+  return request({
+    url: '/base/core-worker-bind-major/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得员工--专业分页
+export function getWoBindMaPage(query) {
+  return request({
+    url: '/base/core-worker-bind-major/page',
+    method: 'get',
+    params: query
+  })
+}

src/components/DialogForm/index.vue

@@ -21,11 +21,13 @@
 						v-model="form[col.prop]"
 						@change="$emit('update', form)"
 						:placeholder="`请输入${col.label}`"
+						:disabled="disabled"
 						v-bind="col.bind" />
 					<el-input
 						v-if="col.textarea"
 						type="textarea"
 						v-model="form[col.prop]"
+						:disabled="disabled"
 						@change="$emit('update', form)"
 						:placeholder="`请输入${col.label}`"
 						v-bind="col.bind" />
@@ -33,6 +35,7 @@
 						v-if="col.select"
 						v-model="form[col.prop]"
 						:placeholder="`请选择${col.label}`"
+						:disabled="disabled"
 						@change="$emit('update', form)"
 						v-bind="col.bind">
 						<el-option
@@ -45,18 +48,23 @@
 						v-if="col.datetime"
 						v-model="form[col.prop]"
 						type="datetime"
+						:disabled="disabled"
 						:placeholder="`请选择${col.label}`"
 						value-format="timestamp"
+						@change="$emit('update', form)"
 						v-bind="col.bind"></el-date-picker>
 					<el-switch
 						v-if="col.switch"
 						v-model="form[col.prop]"
+						:disabled="disabled"
 						active-color="#0b58ff"
 						inactive-color="#e1e1e1"
+						@change="$emit('update', form)"
 						v-bind="col.bind"></el-switch>
 					<component
 						v-if="col.subcomponent"
 						:key="col.key"
+						:disabled="disabled"
 						:is="col.subcomponent"
 						:inlineStyle="col.style"></component>
 
@@ -79,6 +87,7 @@
 							:headers="uploadHeaders"
 							:show-file-list="false"
 							icon="el-icon-upload2"
+							:disabled="disabled"
 							:before-upload="beforeUpload"
 							:on-success="handleUploadSuccess"
 							v-bind="col.bind">
@@ -98,7 +107,7 @@
 							v-for="file in form[col.prop] || []"
 							:file="file"
 							:key="file.fileUrl"
-							@delete="handleDeleteFile(file)" />
+							@delete="!disabled && handleDeleteFile(file)" />
 					</div>
 				</el-form-item>
 			</el-col>
@@ -277,7 +286,6 @@ export default {
 					} else if (opt.url) {
 						// 如果有 depends，则暂时先不获取，注册一个watcher
 						if (opt.depends) {
-							console.log('[handleOptions] setting watch');
 							this.$watch(
 								() => this.form[opt.depends],
 								(id) => {
@@ -300,7 +308,7 @@ export default {
 									});
 								},
 								{
-									immediate: true,
+									immediate: false,
 								}
 							);
 							return;

src/mixins/lb/basicPageMixin.js

@@ -32,9 +32,28 @@ export default {
 			updateUrl: '',
 			addUrl: '',
 			pageUrl: '',
+			infoUrl: '',
+			basePath: '',
 			form: {}
 		};
 	},
+	computed: {
+		addPath() {
+			return this.basePath + '/create'
+		},
+		updatePath() {
+			return this.basePath + '/update'
+		},
+		deletePath() {
+			return this.basePath + '/delete'
+		},
+		infoPath() {
+			return this.basePath + '/get'
+		},
+		pagePath() {
+			return this.basePath + '/page'
+		}
+	},
 	methods: {
 		// utils
 		http(url, method, payload) {
@@ -46,16 +65,19 @@ export default {
 			})
 		},
 		put(payload) {
-			return this.http(this.updateUrl, 'put', payload);
+			return this.http(this.updateUrl == '' ? this.updatePath : this.updateUrl, 'put', payload);
 		},
 		post(payload) {
-			return this.http(this.addUrl, 'post', payload);
+			return this.http(this.addUrl == '' ? this.addPath : this.addUrl, 'post', payload);
 		},
 		recv(payload) {
-			return this.http(this.pageUrl, 'get', payload);
+			return this.http(this.pageUrl == '' ? this.pagePath : this.pageUrl, 'get', payload);
 		},
 		info(payload) {
-			return this.http(this.infoUrl, 'get', payload);
+			return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload);
+		},
+		del(payload) {
+			return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload);
 		},
 
 

src/utils/dict.js

@@ -99,7 +99,11 @@ export const DICT_TYPE = {
   ORDER_STATUS: 'order_status',
   ORDER_ORIGIN: 'order_Origin',
   ORDER_PRIORITY: 'order_priority',
-  PACK_SPEC: 'pack_spec'
+  PACK_SPEC: 'pack_spec',
+  
+  // ============== EQUIPMENT - 设备模块 =============
+  MAINTAIN_TYPE: 'maintain_type',
+  FAULT_LEVEL: 'fault-level',
 }
 
 /**

src/views/base/coreCustomer/add-or-updata.vue

@@ -0,0 +1,103 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-03 10:53:43
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="客户编号" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入客户编号" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="客户名称" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入客户名称" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="联系人" prop="contact">
+					<el-input v-model="dataForm.contact" clearable placeholder="请输入联系人" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="联系电话" prop="telephone">
+					<el-input
+						v-model="dataForm.telephone"
+						maxlength="11"
+						placeholder="请输入联系电话" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-form-item label="地址" prop="address">
+			<el-input
+				v-model="dataForm.address"
+				placeholder="请输入地址" />
+		</el-form-item>
+		<el-form-item label="备注" prop="remark">
+			<el-input
+				v-model="dataForm.remark"
+				placeholder="请输入备注" />
+		</el-form-item>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCustomer, updateCustomer, getCustomer, getCode } from "@/api/base/coreCustomer";
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCustomer,
+				updateURL: updateCustomer,
+				infoURL: getCustomer
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        telephone: undefined,
+				contact: undefined,
+				address: undefined,
+        remark: undefined
+			},
+			dataRule: {
+        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }],
+				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
+				telephone: [
+					{ required: false, trigger: "blur", message: "手机号不能为空" },
+          {
+            validator: function (rule, value, callback) {
+              if (value) {
+								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
+									callback(new Error("手机号格式错误"));
+								}
+							} else {
+                callback();
+              }
+            }, trigger: "blur"
+          }
+        ]
+      }
+		};
+	},
+	mounted() {},
+	methods: {}
+};
+</script>

src/views/base/coreCustomer/index.vue

@@ -0,0 +1,176 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCustomerPage,
+	deleteCustomer
+} from '@/api/base/coreCustomer';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
+	{
+		prop: 'name',
+		label: '客户名称'
+	},
+	{
+		prop: 'code',
+		label: '客户编码'
+	},
+	{
+		prop: 'contact',
+		label: '联系人'
+	},
+	{
+		prop: 'telephone',
+		label: '联系电话'
+	},
+	{
+		prop: 'address',
+		label: '地址'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCustomerPage,
+				deleteURL: deleteCustomer
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-customer:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-customer:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '名称',
+					placeholder: '专业',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-customer:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    // getDataList() {
+    //   this.dataListLoading = true;
+    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+    //     this.tableData = response.data.list;
+    //     this.listQuery.total = response.data.total;
+    //     this.dataListLoading = false;
+    //   });
+    // },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreDepartment/add-or-updata.vue

@@ -0,0 +1,107 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-02 14:16:30
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="部门名称" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入部门名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="部门编码" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入部门编码" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="上级部门" prop="parentId">
+					<treeselect v-model="dataForm.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" placeholder="选择上级部门"/>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="dataForm.remark"
+						placeholder="请输入备注" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCoreDepartment, updateCoreDepartment, getCoreDepartment, getCode, getCoreDepartmentList } from "@/api/base/coreDepartment";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+	mixins: [basicAdd],
+	components: { Treeselect },
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCoreDepartment,
+				updateURL: updateCoreDepartment,
+				infoURL: getCoreDepartment,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        parentId: undefined,
+        remark: undefined,
+			},
+			departmentlList: [],
+			menuOptions: [],
+			dataRule: {
+        code: [{ required: true, message: "部门编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 部门列表
+			this.menuOptions = []
+			const res = await getCoreDepartmentList();
+			this.departmentlList = res.data.map(item => {
+				item.parentId = item.parentId ? item.parentId : 0
+				return item
+			});
+			const menu = { id: 0, name: '总部门', children: [] };
+			menu.children = this.handleTree(this.departmentlList, "id")
+			this.menuOptions.push(menu)
+			console.log('你好', this.menuOptions)
+		},
+		/** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    }
+	},
+};
+</script>

src/views/base/coreDepartment/index.vue

@@ -0,0 +1,168 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCoreDepartmentPage,
+	deleteCoreDepartment
+} from '@/api/base/coreDepartment';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
+	{
+		prop: 'name',
+		label: '部门名称'
+	},
+	{
+		prop: 'code',
+		label: '部门编码'
+	},
+	{
+		prop: 'parentName',
+		label: '上级部门'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCoreDepartmentPage,
+				deleteURL: deleteCoreDepartment
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-department:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-department:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '部门名',
+					placeholder: '部门名',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-department:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    // getDataList() {
+    //   this.dataListLoading = true;
+    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+    //     this.tableData = response.data.list;
+    //     this.listQuery.total = response.data.total;
+    //     this.dataListLoading = false;
+    //   });
+    // },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreEquipment/components/AssetsUpload.vue

@@ -82,7 +82,7 @@
 
 <script>
 import { getAccessToken } from '@/utils/auth';
-import defaultBg from '../../../../../assets/images/default-file-icon.png';
+import defaultBg from '../../../../assets/images/default-file-icon.png';
 
 function checkSize(file, message) {
 	const isLt2M = file.size / 1024 / 1024 < 2;
@@ -139,56 +139,7 @@ export default {
 			headers: { Authorization: 'Bearer ' + getAccessToken() }, // 设置上传的请求头部
 			fileList: [],
 			uploadUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload',
-			files: [
+			files: [],
-				// 服务器返回的结构
-				// {
-				// 	fileName: 'sf.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://hbimg.b0.upaiyun.com/cc7475787bd08ed926b68eaf53fa1f2c5473259115e3c-gJdObd_fw658',
-				// },
-				// {
-				// 	fileName: 'sddf.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl: 'https://img0.sc115.com/wm/xqx/pic1/1501xofo4ssolji.jpg',
-				// },
-				// {
-				// 	fileName: 'jjj.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://www.mms591.com/www.mms591.com-photo/2013081823/1-130QR34544.jpg',
-				// },
-				// {
-				// 	fileName: 'asdfasdf.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://hbimg.b0.upaiyun.com/8f6bced5f2e38d3a021b2c48d5a98dfb6317e3e12c6a0-QmhJ5v_fw658',
-				// },
-				// {
-				// 	fileName: 'asdkj.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://www.mms591.com/www.mms591.com-photo/2013013021/1-130130212034.jpg',
-				// },
-				// {
-				// 	fileName: 'lkasjdf.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://www.mms591.com/www.mms591.com-photo/2013072122/1-130H1223057.jpg',
-				// },
-				// {
-				// 	fileName: 'asdf.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://img.1ppt.com/uploads/allimg/1212/1-1212101ZH5A2.jpg',
-				// },
-				// {
-				// 	fileName: 'afdffff.docs',
-				// 	fileType: 'asset',
-				// 	fileUrl:
-				// 		'https://www.mms591.com/www.mms591.com-photo/2013051721/1-13051H11945.jpg',
-				// },
-			],
 			updateTimer: null,
 		};
 	},
@@ -414,7 +365,7 @@ export default {
 }
 
 .default-icon {
-	background: url(../../../../../assets/images/default-file-icon.png) no-repeat;
+	background: url(../../../../assets/images/default-file-icon.png) no-repeat;
 	background-position: center;
 	background-size: 64px;
 }

src/views/base/coreEquipment/components/EquipmentInfoForm.vue

@@ -6,150 +6,105 @@
 -->
 
 <template>
-	<el-form
+	<el-form class="equipment-info-form" ref="form" :model="form" label-width="200px" label-position="top"
-		class="equipment-info-form"
-		ref="form"
-		:model="form"
-		label-width="200px"
-		label-position="top"
 		v-loading="formLoading">
 		<el-row :gutter="20">
 			<el-col :span="8">
-				<el-form-item
+				<el-form-item label="设备名称" prop="name" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					label="设备名称"
+					<el-input v-model="form.name" :disabled="disabled" placeholder="请输入设备名称"></el-input>
-					prop="name"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-input
-						v-model="form.name"
-						:disabled="disabled"
-						placeholder="请输入设备名称"></el-input>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="设备编码" prop="code" :rules="[]">
-					<el-input
+					<el-input v-model="form.code" :disabled="disabled" placeholder="请输入设备编码"></el-input>
-						v-model="form.code"
-						:disabled="disabled"
-						placeholder="请输入设备编码"></el-input>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="英文名称" prop="enName" :rules="[]">
-					<el-input
+					<el-input v-model="form.enName" :disabled="disabled" placeholder="请输入英文名称"></el-input>
-						v-model="form.enName"
-						:disabled="disabled"
-						placeholder="请输入英文名称"></el-input>
 				</el-form-item>
 			</el-col>
 		</el-row>
 		<el-row :gutter="20">
 			<el-col :span="8">
 				<el-form-item label="缩写" prop="abbr" :rules="[]">
-					<el-input
+					<el-input v-model="form.abbr" :disabled="disabled" placeholder="请输入名称缩写"></el-input>
-						v-model="form.abbr"
-						:disabled="disabled"
-						placeholder="请输入名称缩写"></el-input>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
-				<el-form-item label="设备类型" prop="equipmentTypeId" :rules="[]">
+				<el-form-item label="设备类型" prop="equipmentTypeId"
-					<el-select
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-						v-model="form.equipmentTypeId"
+					<el-select v-model="form.equipmentTypeId" :disabled="disabled" filterable placeholder="请选择设备类型">
-						:disabled="disabled"
+						<el-option v-for="eqType in eqTypeList" :key="eqType.id" :label="eqType.name"
-						filterable
-						placeholder="请选择设备类型">
-						<el-option
-							v-for="eqType in eqTypeList"
-							:key="eqType.id"
-							:label="eqType.name"
 							:value="eqType.id"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
+
 			<el-col :span="8">
-				<el-form-item label="备注" prop="remark" :rules="[]">
+				<el-form-item label="预计生产时间(min/天)" prop="workTime" :rules="[
-					<el-input
+					{ required: true, message: '不能为空', trigger: 'blur' },
-						v-model="form.remark"
+					{
-						:disabled="disabled"
+						type: 'number',
-						placeholder="请输入备注"></el-input>
+						message: '请输入正确的数字值',
+						trigger: 'blur',
+						transform: (val) => Number(val),
+					},
+				]">
+					<el-input v-model="form.workTime" :disabled="disabled" placeholder="请输入预计生产时间"></el-input>
 				</el-form-item>
 			</el-col>
+
 		</el-row>
 		<el-row :gutter="20">
 			<el-col :span="8">
 				<el-form-item label="生产日期" prop="productionTime" :rules="[]">
-					<el-date-picker
+					<el-date-picker v-model="form.enterTime" :disabled="disabled" type="datetime" placeholder="请选择生产日期"
-						v-model="form.enterTime"
-						:disabled="disabled"
-						type="datetime"
-						placeholder="请选择生产日期"
 						value-format="timestamp"></el-date-picker>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="进场日期" prop="enterTime" :rules="[]">
-					<el-date-picker
+					<el-date-picker v-model="form.enterTime" :disabled="disabled" type="datetime" placeholder="请选择进场日期"
-						v-model="form.enterTime"
-						:disabled="disabled"
-						type="datetime"
-						placeholder="请选择进场日期"
 						value-format="timestamp"></el-date-picker>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
-				<el-form-item
+				<el-form-item label="设备TT值" prop="tvalue" :rules="[
-					label="设备TT值"
+					{ required: true, message: '不能为空', trigger: 'blur' },
-					prop="tvalue"
+					{
-					:rules="[
+						type: 'number',
-						{ required: true, message: '不能为空', trigger: 'blur' },
+						message: '请输入正确的数字值',
-						{
+						trigger: 'blur',
-							type: 'number',
+						transform: (val) => Number(val),
-							message: '请输入正确的数字值',
+					},
-							trigger: 'blur',
+				]">
-							transform: (val) => Number(val),
+					<el-input v-model="form.tvalue" :disabled="disabled" placeholder="请输入设备TT值"></el-input>
-						},
-					]">
-					<el-input
-						v-model="form.tvalue"
-						:disabled="disabled"
-						placeholder="请输入设备TT值"></el-input>
 				</el-form-item>
 			</el-col>
 		</el-row>
 		<el-row :gutter="20">
 			<el-col :span="8">
-				<el-form-item
+				<el-form-item label="产品加工时间(s)" prop="processingTime" :rules="[
-					label="产品加工时间(s)"
+					{ required: true, message: '不能为空', trigger: 'blur' },
-					prop="processingTime"
+					{
-					:rules="[
+						type: 'number',
-						{ required: true, message: '不能为空', trigger: 'blur' },
+						message: '请输入正确的数字值',
-						{
+						trigger: 'blur',
-							type: 'number',
+						transform: (val) => Number(val),
-							message: '请输入正确的数字值',
+					},
-							trigger: 'blur',
+				]">
-							transform: (val) => Number(val),
+					<el-input v-model="form.processingTime" :disabled="disabled" placeholder="请输入产品加工时间"></el-input>
-						},
-					]">
-					<el-input
-						v-model="form.processingTime"
-						:disabled="disabled"
-						placeholder="请输入产品加工时间"></el-input>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="制造商" prop="manufacturer" :rules="[]">
-					<el-input
+					<el-input v-model="form.manufacturer" :disabled="disabled" placeholder="请输入制造商"></el-input>
-						v-model="form.manufacturer"
-						:disabled="disabled"
-						placeholder="请输入制造商"></el-input>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="设备规格" prop="spec" :rules="[]">
-					<el-input
+					<el-input v-model="form.spec" :disabled="disabled" placeholder="请输入设备规格"></el-input>
-						v-model="form.spec"
-						:disabled="disabled"
-						placeholder="请输入设备规格"></el-input>
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -157,14 +112,19 @@
 			<!-- 功能描述  -->
 			<el-col>
 				<el-form-item label="功能描述" prop="description" :rules="[]">
-					<el-input
+					<el-input type="textarea" :disabled="disabled" v-model="form.description"
-						type="textarea"
-						:disabled="disabled"
-						v-model="form.description"
 						placeholder="请填写功能描述"></el-input>
 				</el-form-item>
 			</el-col>
 		</el-row>
+		<el-row :gutter="20">
+			<!-- 功能描述  -->
+			<el-col>
+				<el-form-item label="备注" prop="remark" :rules="[]">
+					<el-input v-model="form.remark" :disabled="disabled" placeholder="请输入备注"></el-input>
+				</el-form-item>
+			</el-col>
+		</el-row>
 		<el-row :gutter="20">
 			<!-- 上传资料  -->
 			<el-col>
@@ -177,10 +137,7 @@
 			<!-- 上传图片  -->
 			<el-col>
 				<el-form-item label="上传图片" prop="pics" :rules="[]">
-					<AssetsUpload
+					<AssetsUpload :is-pic-mode="true" v-model="form.pics" :disabled="disabled" />
-						:is-pic-mode="true"
-						v-model="form.pics"
-						:disabled="disabled" />
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -229,6 +186,7 @@ export default {
 				equipmentTypeId: '',
 				remark: '',
 				productionTime: '',
+				workTime: '',
 				enterTime: '',
 				tvalue: '',
 				processingTime: '',
@@ -305,16 +263,9 @@ export default {
 			return response.data;
 		},
 		// 上传成功的特殊处理
-		beforeUpload() {},
+		beforeUpload() { },
 		// 上传前的验证规则可通过 bind 属性传入
 		handleUploadSuccess(response, file, fileList) {
-			console.log(
-				'[dialogForm:handleUploadSuccess]',
-				response,
-				file,
-				fileList,
-				this.form
-			);
 			// 保存原始文件名
 			if ('fileNames' in this.form) this.form.fileNames.push(file.name);
 			// 保存完整地址

src/views/base/coreEquipment/index.vue

@@ -1,61 +1,29 @@
 <template>
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
-		<SearchBar
+		<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
 
 		<!-- 列表 -->
-		<base-table
+		<base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
 			@emitFun="handleEmitFun">
-			<method-btn
+			<method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
 
 		<!-- 分页组件 -->
-		<pagination
+		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
 			@pagination="getList" />
 
 		<!-- 对话框(添加) -->
-		<base-dialog
+		<base-dialog :dialogTitle="title" :dialogVisible="open" @close="cancel" @cancel="cancel" width="60%"
-			:dialogTitle="title"
-			:dialogVisible="open"
-			@close="cancel"
-			@cancel="cancel"
-			width="60%"
 			@confirm="submitForm">
-			<DialogForm
+			<DialogForm v-if="open" key="index-dialog-form" ref="form" label-position="top" size="small" :dataForm="form"
-				v-if="open"
-				key="index-dialog-form"
-				ref="form"
-				label-position="top"
-				size="small"
-				:dataForm="form"
 				:rows="computedRows" />
 		</base-dialog>
 
 		<!-- 设备 详情 - 编辑 -->
-		<EquipmentDrawer
+		<EquipmentDrawer v-if="editVisible" ref="drawer" :mode="editMode" @update-mode="editMode = $event"
-			v-if="editVisible"
+			:data-id="form.id" :sections="[
-			ref="drawer"
-			:mode="editMode"
-			@update-mode="editMode = $event"
-			:data-id="form.id"
-			:sections="[
 				{
 					name: '基本信息',
 					key: 'base',
@@ -69,36 +37,33 @@
 					name: '属性列表',
 					key: 'attrs',
 					props: drawerListProps,
-					url: '/base/equipment-attr/page',
+					url: '/base/core-equipment-attr/page',
-					urlCreate: '/base/equipment-attr/create',
+					urlCreate: '/base/core-equipment-attr/create',
-					urlUpdate: '/base/equipment-attr/update',
+					urlUpdate: '/base/core-equipment-attr/update',
-					urlDelete: '/base/equipment-attr/delete',
+					urlDelete: '/base/core-equipment-attr/delete',
-					urlDetail: '/base/equipment-attr/get',
+					urlDetail: '/base/core-equipment-attr/get',
 					queryParams: {
 						equipmentId: form.id,
 						pageNo: 1,
 						pageSize: 10,
 					},
 					tableBtn: [
-						this.$auth.hasPermi('base:equipment-attr:update')
+						this.$auth.hasPermi('base:core-equipment-attr:update')
 							? {
-									type: 'edit',
+								type: 'edit',
-									btnName: '修改',
+								btnName: '修改',
-							  }
+							}
 							: undefined,
-						this.$auth.hasPermi('base:equipment-attr:delete')
+						this.$auth.hasPermi('base:core-equipment-attr:delete')
 							? {
-									type: 'delete',
+								type: 'delete',
-									btnName: '删除',
+								btnName: '删除',
-							  }
+							}
 							: undefined,
 					].filter((v) => v),
 					allowAdd: true,
 				},
-			]"
+			]" @refreshDataList="getList" @cancel="cancelEdit" @destroy="cancelEdit" />
-			@refreshDataList="getList"
-			@cancel="cancelEdit"
-			@destroy="cancelEdit" />
 	</div>
 </template>
 
@@ -129,23 +94,23 @@ export default {
 		return {
 			searchBarKeys: ['name', 'code'],
 			tableBtn: [
-				this.$auth.hasPermi(`base:equipment:update`)
+				this.$auth.hasPermi(`base:core-equipment:update`)
 					? {
-							type: 'detail',
+						type: 'detail',
-							btnName: '详情',
+						btnName: '详情',
-					  }
+					}
 					: undefined,
-				this.$auth.hasPermi('base:equipment:update')
+				this.$auth.hasPermi('base:core-equipment:update')
 					? {
-							type: 'edit',
+						type: 'edit',
-							btnName: '修改',
+						btnName: '修改',
-					  }
+					}
 					: undefined,
-				this.$auth.hasPermi('base:equipment:delete')
+				this.$auth.hasPermi('base:core-equipment:delete')
 					? {
-							type: 'delete',
+						type: 'delete',
-							btnName: '删除',
+						btnName: '删除',
-					  }
+					}
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
@@ -211,14 +176,14 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:equipment:export') ? 'button' : '',
+					type: this.$auth.hasPermi('base:core-equipment:export') ? 'button' : '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:equipment:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:core-equipment:create') ? 'button' : '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,
@@ -268,17 +233,31 @@ export default {
 						label: '设备类型',
 						prop: 'equipmentTypeId',
 						url: '/base/core-equipment-type/page?pageNo=1&pageSize=100',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},
 					},
+					{
+						input: true,
+						label: '预计生产时间(min/天)',
+						prop: 'workTime',
+						rules: [
+							{ required: true, message: '不能为空', trigger: 'blur' },
+							{
+								type: 'number',
+								message: '请输入正确的数字值',
+								trigger: 'blur',
+								transform: (val) => Number(val),
+							},
+						],
+					},
 					// {
 					// 	select: true,
 					// 	label: '设备分组',
 					// 	prop: 'groupId',
-					// 	url: '/base/equipment-group/page?pageNo=1&pageSize=100',
+					// 	url: '/base/core-equipment-group/page?pageNo=1&pageSize=100',
 					// },
-					{ input: true, label: '备注', prop: 'remark' },
 				],
 				[
 					{
@@ -309,7 +288,7 @@ export default {
 				[
 					{
 						input: true,
-						label: '产品加工时间（s）',
+						label: '产品加工时间(s)',
 						prop: 'processingTime',
 						rules: [
 							{ required: true, message: '不能为空', trigger: 'blur' },
@@ -330,7 +309,7 @@ export default {
 					},
 					{
 						input: true,
-						label: '设备规格',
+						label: '规格描述',
 						prop: 'spec',
 					},
 				],
@@ -342,6 +321,9 @@ export default {
 						prop: 'description',
 					},
 				],
+				[
+					{ input: true, label: '备注', prop: 'remark' }
+				]
 				// [
 				// 	{
 				// 		assetUpload: true,
@@ -453,36 +435,36 @@ export default {
 		computedRows() {
 			return this.showUploadComponents
 				? [
-						...this.rows,
+					...this.rows,
-						[
+					[
-							{
+						{
-								assetUpload: true,
+							assetUpload: true,
-								key: 'eq-assets', // 用于区分不同的上传组件
+							key: 'eq-assets', // 用于区分不同的上传组件
-								label: '上传资料',
+							label: '上传资料',
-								fieldName: 'assets',
+							fieldName: 'assets',
-								subcomponent: AssetsUpload,
+							subcomponent: AssetsUpload,
-								prop: 'uploadedAssets',
+							prop: 'uploadedAssets',
-								default: [],
+							default: [],
-								bind: {
+							bind: {
-									'is-pic-mode': false,
+								'is-pic-mode': false,
-								},
 							},
-						],
+						},
-						[
+					],
-							{
+					[
-								assetUpload: true,
+						{
-								key: 'eq-pics', // 用于区分不同的上传组件
+							assetUpload: true,
-								label: '上传图片',
+							key: 'eq-pics', // 用于区分不同的上传组件
-								fieldName: 'images',
+							label: '上传图片',
-								subcomponent: AssetsUpload,
+							fieldName: 'images',
-								// prop: '',
+							subcomponent: AssetsUpload,
-								// default: [],
+							// prop: '',
-								bind: {
+							// default: [],
-									'is-pic-mode': true,
+							bind: {
-								},
+								'is-pic-mode': true,
 							},
-						],
+						},
-				  ]
+					],
+				]
 				: this.rows;
 		},
 	},
@@ -580,7 +562,7 @@ export default {
 					this.getList();
 					this.$modal.msgSuccess('删除成功');
 				})
-				.catch(() => {});
+				.catch(() => { });
 		},
 		/** 导出按钮操作 */
 		handleExport() {
@@ -598,7 +580,7 @@ export default {
 					this.$download.excel(response, '设备.xls');
 					this.exportLoading = false;
 				})
-				.catch(() => {});
+				.catch(() => { });
 		},
 		// 查看详情
 		viewDetail(id) {

src/views/base/coreEquipmentLineBind/index.vue

@@ -0,0 +1,360 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:has-files="false"
+				:rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+
+// import { getAccessToken } from '@/utils/auth';
+
+export default {
+	name: 'EquipmentLineBind',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			basePath: '/base/core-equipment-bind-section',
+			searchBarKeys: ['equipmentName', 'productionLineId'],
+			tableBtn: [
+				this.$auth.hasPermi('base:core-equipment-bind-section:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:core-equipment-bind-section:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{ prop: 'productionLineName', label: '产线名称' },
+				{ prop: 'workshopSectionName', label: '工段名称' },
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'sort', label: '工段中排序' },
+				{
+					prop: 'lineDataType',
+					label: '产线统计类型',
+					filter: (val) =>
+						val != null ? ['无类型', '进片数量统计', '出片数量统计'][val] : '',
+				},
+				{
+					prop: 'sectionDataType',
+					label: '工段统计类型',
+					filter: (val) =>
+						val != null ? ['无类型', '进片数量统计', '出片数量统计'][val] : '',
+				},
+				// { prop: 'remark', label: '备注' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					placeholder: '请选择产线',
+					param: 'productionLineId',
+					selectOptions: [],
+					filterable: true,
+				},
+				{
+					type: 'input',
+					label: '设备名',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-equipment-bind-section:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('base:quality-inspection-type:export')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						select: true,
+						label: '产线',
+						prop: 'productionLineId',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						url: '/base/core-production-line/listAll',
+						bind: { clearable: true, filterable: true },
+						// watch: 'workshopSectionId'
+					},
+					{
+						select: true,
+						label: '工段',
+						prop: 'workshopSectionId',
+						depends: 'productionLineId',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: { clearable: true, filterable: true },
+						url: '/base/core-workshop-section/listByParentId',
+					},
+				],
+				[
+					{
+						select: true,
+						label: '设备',
+						prop: 'equipmentId',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: { clearable: true, filterable: true },
+						url: '/base/core-equipment/listAll',
+					},
+					{
+						input: true,
+						label: '工段排序',
+						prop: 'sort',
+					},
+				],
+				[
+					{
+						select: true,
+						options: [
+							{ label: '无类型', value: 0 },
+							{ label: '进片数量统计', value: 1 },
+							{ label: '出片数量统计', value: 2 },
+						],
+						label: '产线统计类型',
+						prop: 'lineDataType',
+					},
+					{
+						select: true,
+						options: [
+							{ label: '无类型', value: 0 },
+							{ label: '进片数量统计', value: 1 },
+							{ label: '出片数量统计', value: 2 },
+						],
+						label: '工段统计类型',
+						prop: 'sectionDataType',
+					},
+				],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				equipmentName: null,
+				productionLineId: null,
+			},
+			// 表单参数
+			form: {},
+		};
+	},
+	created() {
+		this.initSearchOptions();
+		this.getList();
+	},
+	methods: {
+		/** 初始化查询条件 */
+		async initSearchOptions() {
+			this.http('/base/core-production-line/listAll', 'get').then(
+				({ code, data }) => {
+					if (code == 0) {
+						this.searchBarFormConfig[0].selectOptions = data.map((item) => {
+							return {
+								name: item.name,
+								id: item.id,
+							};
+						});
+					}
+				}
+			);
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(this.queryParams).then(({ code, data }) => {
+				// if (code == 0) {
+				this.list = data.list;
+				this.total = data.total;
+				this.loading = false;
+				// }
+			});
+			// .catch(err => {
+			// 	this.list = [];
+			// 	this.total = 0;
+			// 	this.loading = false;
+			// })
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: undefined,
+				productionLineId: undefined,
+				// 工段
+				workshopSectionId: undefined,
+				// 设备
+				equipmentId: undefined,
+				// 工段排序
+				sort: undefined,
+				// 产线统计类型
+				lineDataType: undefined,
+				// 工段统计类型
+				sectionDataType: 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;
+			this.info({ id }).then(({ code, data }) => {
+				this.form = data;
+				this.open = true;
+				this.title = '修改设备工段绑定';
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return;
+				}
+				// 修改的提交
+				if (this.form.id != null) {
+					this.put(this.form).then(({ code, data }) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				this.post(this.form).then(({ code, data }) => {
+					this.$modal.msgSuccess('修改成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除绑定"' + row.name + '"?')
+				.then(function () {
+					return deleteEquipmentType(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 exportEquipmentTypeExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '设备工段绑定.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/base/coreEquipmentType/index.vue

@@ -70,13 +70,13 @@ export default {
 		return {
 			searchBarKeys: ['name'],
 			tableBtn: [
-				this.$auth.hasPermi('base:equipment-type:update')
+				this.$auth.hasPermi('base:core-equipment-type:update')
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:equipment-type:delete')
+				this.$auth.hasPermi('base:core-equipment-type:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -112,7 +112,7 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:equipment-type:create')
+					type: this.$auth.hasPermi('base:core-equipment-type:create')
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -237,25 +237,6 @@ export default {
 			const id = row.id;
 			getEquipmentType(id).then((response) => {
 				this.form = response.data;
-				// this.form = {
-				// 	code: 'SBLX20230925184444000041',
-				// 	name: '测试131',
-				// 	remark: '测试可删除',
-				// 	id: '1706258479729336322',
-				// 	files: [
-				// 		{ fileName: '1.png', fileUrl: '', fileType: 2 },
-				// 		{ fileName: '1.asdfaslkjfkasdf.png', fileUrl: '', fileType: 2 },
-				// 		{ fileName: '2.txt', fileUrl: '', fileType: 2 },
-				// 		{ fileName: '1.rar', fileUrl: '', fileType: 2 },
-				// 		{ fileName: '1.kkk', fileUrl: '', fileType: 2 },
-				// 		{ fileName: 'test.file', fileUrl: '', fileType: 2 },
-				// 		{ fileName: '222', fileUrl: '', fileType: 2 },
-				// 		{ fileName: 'g', fileUrl: '', fileType: 2 },
-				// 	],
-				// 	createTime: 1695638697000,
-				// 	parentId: '1701869972319584257',
-				// };
-				// debugger;
 				this.open = true;
 				this.title = '修改设备类型';
 			});

src/views/base/coreMajor/add-or-updata.vue

@@ -0,0 +1,77 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-02 14:24:12
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="专业编号" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入专业编号" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="专业名称" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入专业名称" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="缩写" prop="abbreviation">
+					<el-input v-model="dataForm.abbreviation" clearable placeholder="请输入缩写" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="dataForm.remark"
+						placeholder="请输入备注" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCoreMajor, updateCoreMajor, getCoreMajor, getCode } from "@/api/base/coreMajor";
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCoreMajor,
+				updateURL: updateCoreMajor,
+				infoURL: getCoreMajor,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        abbreviation: undefined,
+        remark: undefined,
+			},
+			departmentlList: [],
+			menuOptions: [],
+			dataRule: {
+        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }]
+      }
+		};
+	},
+	mounted() {},
+	methods: {}
+};
+</script>

src/views/base/coreMajor/index.vue

@@ -0,0 +1,168 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCoreMajorPage,
+	deleteCoreMajor
+} from '@/api/base/coreMajor';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
+	{
+		prop: 'code',
+		label: '专业编码'
+	},
+	{
+		prop: 'name',
+		label: '专业名称'
+	},
+	{
+		prop: 'abbreviation',
+		label: '缩写'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCoreMajorPage,
+				deleteURL: deleteCoreMajor
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-major:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-major:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '名称',
+					placeholder: '专业',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-major:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    // getDataList() {
+    //   this.dataListLoading = true;
+    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+    //     this.tableData = response.data.list;
+    //     this.listQuery.total = response.data.total;
+    //     this.dataListLoading = false;
+    //   });
+    // },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreSupplier/add-or-updata.vue

@@ -0,0 +1,103 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-03 11:00:47
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="100px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="供应商编号" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入供应商编号" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="供应商名称" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入供应商名称" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="联系人" prop="contact">
+					<el-input v-model="dataForm.contact" clearable placeholder="请输入联系人" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="联系电话" prop="telephone">
+					<el-input
+						v-model="dataForm.telephone"
+						maxlength="11"
+						placeholder="请输入联系电话" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-form-item label="地址" prop="address">
+			<el-input
+				v-model="dataForm.address"
+				placeholder="请输入地址" />
+		</el-form-item>
+		<el-form-item label="备注" prop="remark">
+			<el-input
+				v-model="dataForm.remark"
+				placeholder="请输入备注" />
+		</el-form-item>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCoreSupplier, updateCoreSupplier, getCoreSupplier, getCode } from "@/api/base/coreSupplier";
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCoreSupplier,
+				updateURL: updateCoreSupplier,
+				infoURL: getCoreSupplier
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        telephone: undefined,
+				contact: undefined,
+				address: undefined,
+        remark: undefined
+			},
+			dataRule: {
+        code: [{ required: true, message: "专业编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "专业名称不能为空", trigger: "blur" }],
+				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
+				telephone: [
+					{ required: false, trigger: "blur", message: "手机号不能为空" },
+          {
+            validator: function (rule, value, callback) {
+							if (value) {
+								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
+									callback(new Error("手机号格式错误"));
+								}
+							} else {
+                callback();
+              }
+            }, trigger: "blur"
+          }
+        ]
+      }
+		};
+	},
+	mounted() {},
+	methods: {}
+};
+</script>

src/views/base/coreSupplier/index.vue

@@ -0,0 +1,176 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCoreSupplierPage,
+	deleteCoreSupplier
+} from '@/api/base/coreSupplier';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '添加时间',
+		filter: parseTime
+	},
+	{
+		prop: 'code',
+		label: '供应商编码'
+	},
+	{
+		prop: 'name',
+		label: '供应商名称'
+	},
+	{
+		prop: 'contact',
+		label: '联系人'
+	},
+	{
+		prop: 'telephone',
+		label: '联系电话'
+	},
+	{
+		prop: 'address',
+		label: '地址'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCoreSupplierPage,
+				deleteURL: deleteCoreSupplier
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-supplier:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-supplier:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '关键字',
+					placeholder: '供应商名称',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-supplier:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    // getDataList() {
+    //   this.dataListLoading = true;
+    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+    //     this.tableData = response.data.list;
+    //     this.listQuery.total = response.data.total;
+    //     this.dataListLoading = false;
+    //   });
+    // },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/coreWorker/add-or-updata.vue

@@ -0,0 +1,339 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-03 11:01:24
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="员工姓名" prop="name">
+					<el-input v-model="dataForm.name" clearable placeholder="请输入员工姓名" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="员工照片" prop="fileUrl">
+					<imageUpload v-model="dataForm.fileUrl" :limit="1"/>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="员工号" prop="code">
+					<el-input v-model="dataForm.code" clearable placeholder="请输入员工号" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="性别" prop="sex">
+					<el-select
+						v-model="dataForm.sex"
+						filterable
+						placeholder="请选择性别">
+						<el-option
+							v-for="dict in sexList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="电话" prop="telephone">
+					<el-input v-model="dataForm.telephone" maxlength="11" clearable placeholder="请输入电话" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="部门" prop="departmentId">
+					<treeselect v-model="dataForm.departmentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" placeholder="选择部门"/>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="职位" prop="position">
+					<el-input v-model="dataForm.position" clearable placeholder="请输入职位" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="专业" prop="majorIdList">
+					<el-select
+						v-model="majorIdList"
+						filterable
+						multiple
+						placeholder="请选择专业">
+						<el-option
+							v-for="dict in majorList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="入职时间" prop="entryTime">
+					<el-date-picker
+						v-model="dataForm.entryTime"
+						type="date"
+						format='yyyy-MM-dd'
+         		value-format='timestamp'
+						placeholder="选择入职时间" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="状态" prop="status">
+					<el-radio-group v-model="dataForm.status" @input="setOut">
+						<el-radio :label="1">在职</el-radio>
+						<el-radio :label="2">离职</el-radio>
+					</el-radio-group>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="离职时间" prop="outTime">
+					<el-date-picker
+						v-model="dataForm.outTime"
+						type="date"
+						:disabled="isOut"
+						format='yyyy-MM-dd'
+         		value-format='timestamp'
+						placeholder="选择离职时间" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="教育程度" prop="education">
+					<el-select
+						v-model="dataForm.education"
+						filterable
+						placeholder="请选择教育程度">
+						<el-option
+							v-for="dict in educationList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="劳务成本(元/班次)" prop="workCost">
+					<el-input type="number" v-model.number="dataForm.workCost" clearable placeholder="请输入劳务成本" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-form-item label="备注" prop="remark">
+			<el-input
+				v-model="dataForm.remark"
+				placeholder="请输入备注" />
+		</el-form-item>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { createCoreWorker, updateCoreWorker, getCoreWorker, getCode, createWoBindMa, getWoBindMaPage, deleteWoBindMa } from "@/api/base/coreWorker";
+import { getCoreDepartmentList } from "@/api/base/coreDepartment";
+import { getCoreMajorList } from "@/api/base/coreMajor";
+import ImageUpload from '@/components/ImageUpload';
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+	mixins: [basicAdd],
+	components: {
+    ImageUpload,
+		Treeselect
+  },
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCoreWorker,
+				updateURL: updateCoreWorker,
+				infoURL: getCoreWorker,
+			},
+			sexList: [
+				{ id: 0, name: '男' },
+				{ id: 1, name: '女' }
+			],
+			educationList: [
+				{ id: '1', name: '初中' },
+				{ id: '2', name: '高中' },
+				{ id: '3', name: '中专' },
+				{ id: '5', name: '大专' },
+				{ id: '6', name: '大学本科' },
+				{ id: '7', name: '研究生及以上' }
+			],
+			departmentList: [],
+			majorList: [],
+			isOut: true,
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+				fileUrl: undefined,
+				sex: 0,
+				telephone: undefined,
+				departmentId: undefined,
+				position: undefined,
+				entryTime: new Date().getTime(),
+				status: 1,
+				outTime: undefined,
+				education: undefined,
+				workCost: undefined,
+        remark: undefined,
+			},
+			majorIdList: undefined,
+			departmentlList: [],
+			menuOptions: [],
+			bindIds: [],
+			workerId: '',
+			dataRule: {
+        code: [{ required: true, message: "员工编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "员工姓名不能为空", trigger: "blur" }],
+				telephone: [
+					{ required: false, trigger: "blur", message: "手机号不能为空" },
+          {
+            validator: function (rule, value, callback) {
+              if (value) {
+								if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
+									callback(new Error("手机号格式错误"));
+								}
+							} else {
+                callback();
+              }
+            }, trigger: "blur"
+          }
+        ],
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 部门列表
+			this.menuOptions = []
+			const res = await getCoreDepartmentList();
+			this.departmentlList = res.data.map(item => {
+				item.parentId = item.parentId ? item.parentId : 0
+				return item
+			});
+			// const menu = { id: 0, name: '总部门', children: [] };
+			// menu.children = this.handleTree(this.departmentlList, "id")
+			this.menuOptions = this.handleTree(this.departmentlList, "id")
+			// 专业列表
+			const majorRes = await getCoreMajorList();
+			this.majorList = majorRes.data;
+		},
+		setOut(val) {
+			if (val === 1) {
+				this.isOut = true
+			} else {
+				this.isOut = false
+			}
+		},
+		// 表单提交
+    dataFormSubmit() {
+			console.log('111', this.dataForm)
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+
+				// 把员工--专业关系全删
+				this.bindIds.forEach(id => {
+					deleteWoBindMa(id).then(res => {})
+				});
+
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+					this.majorIdList.forEach(majorId => {
+						createWoBindMa({
+							workerId: this.dataForm.id,
+							majorId: majorId
+						}).then(res => {})
+					});
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+					// response.data = id
+					this.workerId = response.data
+					this.majorIdList.forEach(majorId => {
+						createWoBindMa({
+							workerId: this.workerId,
+							majorId: majorId
+						}).then(res => {})
+					});
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
+		init(id) {
+      this.dataForm.id = id || "";
+      this.visible = true;
+      if (this.urlOptions.getOption) {
+        this.getArr()
+      }
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data;
+          });
+					// 获取员工--专业
+					getWoBindMaPage({
+						pageSize: 99,
+						pageNo: 1,
+						workerId: id
+					}).then(res => {
+						this.majorIdList = res.data.list.map(item => {
+							return item.majorId
+						})
+						this.bindIds = res.data.list.map(item => {
+							return item.id
+						})
+					})
+        } else {
+          if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+      });
+    },
+		/** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    }
+	}
+};
+</script>

src/views/base/coreWorker/index.vue

@@ -0,0 +1,204 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			v-loading="dataListLoading"
+			:table-props="tableProps"
+			:page="listQuery.pageNo"
+			:limit="listQuery.pageSize"
+			:table-data="tableData">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="50%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import basicPage from '../../core/mixins/basic-page';
+import { parseTime } from '../../core/mixins/code-filter';
+import {
+	getCoreWorkerPage,
+	deleteCoreWorker
+} from '@/api/base/coreWorker';
+import moment from 'moment';
+
+const tableProps = [
+	{
+		prop: 'createTime',
+		label: '创建时间',
+		filter: parseTime
+	},
+	{
+		prop: 'name',
+		label: '姓名'
+	},
+	{
+		prop: 'code',
+		label: '员工号'
+	},
+	{
+		prop: 'sex',
+		label: '性别',
+		filter: (val) => ['男', '女'][val]
+	},
+	{
+		prop: 'entryTime',
+		label: '入职时间',
+		filter: (val) => val ? moment(val).format('yyyy-MM-DD') : '',
+	},
+	{
+		prop: 'telephone',
+		label: '联系电话'
+	},
+	{
+		prop: 'status',
+		label: '状态',
+		filter: (val) => ['', '在职', '离职'][val]
+	},
+	{
+		prop: 'departmentName',
+		label: '部门'
+	},
+	{
+		prop: 'majorName',
+		label: '专业'
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	},
+];
+
+export default {
+	mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCoreWorkerPage,
+				deleteURL: deleteCoreWorker
+			},
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi(`base:core-worker:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-worker:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v)=>v),
+			tableData: [],
+			formConfig: [
+				{
+					type: 'input',
+					label: '员工姓名',
+					placeholder: '员工姓名',
+					param: 'name',
+				},
+				{
+					type: 'select',
+					label: '状态',
+					placeholder: '请选择状态',
+					param: 'status',
+					selectOptions: [
+						{ id: 1, name: '在职' },
+						{ id: 2, name: '离职' }
+					],
+					filterable: true
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:core-worker:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				},
+			],
+		};
+	},
+	components: {
+		AddOrUpdate,
+	},
+	created() {},
+	methods: {
+		// 获取数据列表
+    // getDataList() {
+    //   this.dataListLoading = true;
+    //   this.urlOptions.getDataListURL(this.listQuery).then(response => {
+    //     this.tableData = response.data.list;
+    //     this.listQuery.total = response.data.total;
+    //     this.dataListLoading = false;
+    //   });
+    // },
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					this.listQuery.pageNo = 1;
+					this.listQuery.pageSize = 10;
+					this.listQuery.name = val.name ? val.name : undefined;
+					this.listQuery.status = val.status ? val.status : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/base/equipmentAttr/index.vue

@@ -1,214 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-attr:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-attr:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="设备id" align="center" prop="equipmentId" />
-      <el-table-column label="属性名称" align="center" prop="name" />
-      <el-table-column label="属性值" align="center" prop="value" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <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-attr:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-attr: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="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备id" />
-        </el-form-item>
-        <el-form-item label="属性名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入属性名称" />
-        </el-form-item>
-        <el-form-item label="属性值" prop="value">
-          <el-input v-model="form.value" 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 { createEquipmentAttr, updateEquipmentAttr, deleteEquipmentAttr, getEquipmentAttr, getEquipmentAttrPage, exportEquipmentAttrExcel } from "@/api/base/equipmentAttr";
-
-export default {
-  name: "EquipmentAttr",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 设备属性列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        equipmentId: [{ required: true, message: "设备id不能为空", trigger: "blur" }],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentAttrPage(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,
-        equipmentId: undefined,
-        name: undefined,
-        value: 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;
-      getEquipmentAttr(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) {
-          updateEquipmentAttr(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentAttr(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 deleteEquipmentAttr(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 exportEquipmentAttrExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '设备属性.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>

src/views/base/equipmentFile/index.vue

@@ -1,225 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备ID" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-file:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-file:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="设备ID" align="center" prop="equipmentId" />
-      <el-table-column label="文件类型 1.图片 2.设备资料" align="center" prop="fileType">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.EQU_FILE_TYPE" :value="scope.row.fileType" />
-        </template>
-      </el-table-column>
-      <el-table-column label="原始文件名" align="center" prop="fileName" />
-      <el-table-column label="文件url" align="center" prop="fileUrl" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <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-file:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-file: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="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备ID" />
-        </el-form-item>
-        <el-form-item label="文件类型 1.图片 2.设备资料" prop="fileType">
-          <el-select v-model="form.fileType" placeholder="请选择文件类型 1.图片 2.设备资料">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQU_FILE_TYPE)"
-                       :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="原始文件名" prop="fileName">
-          <el-input v-model="form.fileName" placeholder="请输入原始文件名" />
-        </el-form-item>
-        <el-form-item label="文件url" prop="fileUrl">
-          <el-input v-model="form.fileUrl" placeholder="请输入文件url" />
-        </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 { createEquipmentFile, updateEquipmentFile, deleteEquipmentFile, getEquipmentFile, getEquipmentFilePage, exportEquipmentFileExcel } from "@/api/base/equipmentFile";
-
-export default {
-  name: "EquipmentFile",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 设备文件对应列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentFilePage(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,
-        equipmentId: undefined,
-        fileType: undefined,
-        fileName: undefined,
-        fileUrl: 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;
-      getEquipmentFile(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) {
-          updateEquipmentFile(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentFile(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 deleteEquipmentFile(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 exportEquipmentFileExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '设备文件对应.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>

src/views/base/equipmentQuantityLog/index.vue

@@ -1,277 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentName">
-        <el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="进入设备的数量" prop="inQuantity">
-        <el-input v-model="queryParams.inQuantity" placeholder="请输入进入设备的数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="离开设备的数量，若plc只记录一个生产数量，也写入该字段" prop="outQuantity">
-        <el-input v-model="queryParams.outQuantity" placeholder="请输入离开设备的数量，若plc只记录一个生产数量，也写入该字段" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="正常生产量" prop="okQuantity">
-        <el-input v-model="queryParams.okQuantity" placeholder="请输入正常生产量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="设备上报的报废数量" prop="nokQuantity">
-        <el-input v-model="queryParams.nokQuantity" placeholder="请输入设备上报的报废数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="生产数量的记录时间" prop="recordTime">
-        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="版本号" prop="version">
-        <el-input v-model="queryParams.version" placeholder="请输入版本号" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-quantity-log:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-quantity-log:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="设备id" align="center" prop="equipmentId" />
-      <el-table-column label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column label="进入设备的数量" align="center" prop="inQuantity" />
-      <el-table-column label="离开设备的数量，若plc只记录一个生产数量，也写入该字段" align="center" prop="outQuantity" />
-      <el-table-column label="正常生产量" align="center" prop="okQuantity" />
-      <el-table-column label="设备上报的报废数量" align="center" prop="nokQuantity" />
-      <el-table-column label="生产数量的记录时间" align="center" prop="recordTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recordTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <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-quantity-log:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-quantity-log: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="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备id" />
-        </el-form-item>
-        <el-form-item label="设备名称" prop="equipmentName">
-          <el-input v-model="form.equipmentName" placeholder="请输入设备名称" />
-        </el-form-item>
-        <el-form-item label="进入设备的数量" prop="inQuantity">
-          <el-input v-model="form.inQuantity" placeholder="请输入进入设备的数量" />
-        </el-form-item>
-        <el-form-item label="离开设备的数量，若plc只记录一个生产数量，也写入该字段" prop="outQuantity">
-          <el-input v-model="form.outQuantity" placeholder="请输入离开设备的数量，若plc只记录一个生产数量，也写入该字段" />
-        </el-form-item>
-        <el-form-item label="正常生产量" prop="okQuantity">
-          <el-input v-model="form.okQuantity" placeholder="请输入正常生产量" />
-        </el-form-item>
-        <el-form-item label="设备上报的报废数量" prop="nokQuantity">
-          <el-input v-model="form.nokQuantity" placeholder="请输入设备上报的报废数量" />
-        </el-form-item>
-        <el-form-item label="生产数量的记录时间" prop="recordTime">
-          <el-date-picker clearable v-model="form.recordTime" type="date" value-format="timestamp" placeholder="选择生产数量的记录时间" />
-        </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" 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 { createEquipmentQuantityLog, updateEquipmentQuantityLog, deleteEquipmentQuantityLog, getEquipmentQuantityLog, getEquipmentQuantityLogPage, exportEquipmentQuantityLogExcel } from "@/api/base/equipmentQuantityLog";
-
-export default {
-  name: "EquipmentQuantityLog",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 后端用 设备生产数量统计表（按一定时间段写入）列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentId: null,
-        equipmentName: null,
-        inQuantity: null,
-        outQuantity: null,
-        okQuantity: null,
-        nokQuantity: null,
-        recordTime: [],
-        version: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        equipmentName: [{ required: true, message: "设备名称不能为空", trigger: "blur" }],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentQuantityLogPage(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,
-        equipmentId: undefined,
-        equipmentName: undefined,
-        inQuantity: undefined,
-        outQuantity: undefined,
-        okQuantity: undefined,
-        nokQuantity: undefined,
-        recordTime: undefined,
-        version: 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;
-      getEquipmentQuantityLog(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) {
-          updateEquipmentQuantityLog(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentQuantityLog(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 deleteEquipmentQuantityLog(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 exportEquipmentQuantityLogExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '后端用 设备生产数量统计表（按一定时间段写入）.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>

src/views/base/equipmentQuantityRealtime/index.vue

@@ -1,276 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentName">
-        <el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="进入设备的基板数量" prop="inQuantity">
-        <el-input v-model="queryParams.inQuantity" placeholder="请输入进入设备的基板数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="离开设备的基板数量，若plc只记录一个生产数量，也写入该字段" prop="outQuantity">
-        <el-input v-model="queryParams.outQuantity" placeholder="请输入离开设备的基板数量，若plc只记录一个生产数量，也写入该字段" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="正常生产量" prop="okQuantity">
-        <el-input v-model="queryParams.okQuantity" placeholder="请输入正常生产量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="设备上报的报废数量" prop="nokQuantity">
-        <el-input v-model="queryParams.nokQuantity" placeholder="请输入设备上报的报废数量" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="记录时间" prop="recordTime">
-        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="版本号" prop="version">
-        <el-input v-model="queryParams.version" placeholder="请输入版本号" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-quantity-realtime:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-quantity-realtime:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="设备id" align="center" prop="equipmentId" />
-      <el-table-column label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column label="进入设备的基板数量" align="center" prop="inQuantity" />
-      <el-table-column label="离开设备的基板数量，若plc只记录一个生产数量，也写入该字段" align="center" prop="outQuantity" />
-      <el-table-column label="正常生产量" align="center" prop="okQuantity" />
-      <el-table-column label="设备上报的报废数量" align="center" prop="nokQuantity" />
-      <el-table-column label="记录时间" align="center" prop="recordTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recordTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <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-quantity-realtime:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-quantity-realtime: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="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备id" />
-        </el-form-item>
-        <el-form-item label="设备名称" prop="equipmentName">
-          <el-input v-model="form.equipmentName" placeholder="请输入设备名称" />
-        </el-form-item>
-        <el-form-item label="进入设备的基板数量" prop="inQuantity">
-          <el-input v-model="form.inQuantity" placeholder="请输入进入设备的基板数量" />
-        </el-form-item>
-        <el-form-item label="离开设备的基板数量，若plc只记录一个生产数量，也写入该字段" prop="outQuantity">
-          <el-input v-model="form.outQuantity" placeholder="请输入离开设备的基板数量，若plc只记录一个生产数量，也写入该字段" />
-        </el-form-item>
-        <el-form-item label="正常生产量" prop="okQuantity">
-          <el-input v-model="form.okQuantity" placeholder="请输入正常生产量" />
-        </el-form-item>
-        <el-form-item label="设备上报的报废数量" prop="nokQuantity">
-          <el-input v-model="form.nokQuantity" placeholder="请输入设备上报的报废数量" />
-        </el-form-item>
-        <el-form-item label="记录时间" prop="recordTime">
-          <el-date-picker clearable v-model="form.recordTime" type="date" value-format="timestamp" placeholder="选择记录时间" />
-        </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" 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 { createEquipmentQuantityRealtime, updateEquipmentQuantityRealtime, deleteEquipmentQuantityRealtime, getEquipmentQuantityRealtime, getEquipmentQuantityRealtimePage, exportEquipmentQuantityRealtimeExcel } from "@/api/base/equipmentQuantityRealtime";
-
-export default {
-  name: "EquipmentQuantityRealtime",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 后端用 设备生产数量实时列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentId: null,
-        equipmentName: null,
-        inQuantity: null,
-        outQuantity: null,
-        okQuantity: null,
-        nokQuantity: null,
-        recordTime: [],
-        version: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentQuantityRealtimePage(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,
-        equipmentId: undefined,
-        equipmentName: undefined,
-        inQuantity: undefined,
-        outQuantity: undefined,
-        okQuantity: undefined,
-        nokQuantity: undefined,
-        recordTime: undefined,
-        version: 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;
-      getEquipmentQuantityRealtime(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) {
-          updateEquipmentQuantityRealtime(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentQuantityRealtime(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 deleteEquipmentQuantityRealtime(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 exportEquipmentQuantityRealtimeExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '后端用 设备生产数量实时.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>

src/views/base/equipmentStatusLog/index.vue

@@ -1,289 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentName">
-        <el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="plc id" prop="plcId">
-        <el-input v-model="queryParams.plcId" placeholder="请输入plc id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="plc" prop="plc">
-        <el-input v-model="queryParams.plc" placeholder="请输入plc" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="状态，0正常 1计划停机 2故障" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态，0正常 1计划停机 2故障" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="记录时间" prop="recordTime">
-        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="持续时间（分钟），状态变动时记录并更新" prop="duration">
-        <el-input v-model="queryParams.duration" placeholder="请输入持续时间（分钟），状态变动时记录并更新" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="版本号" prop="version">
-        <el-input v-model="queryParams.version" placeholder="请输入版本号" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-status-log:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-status-log:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="设备id" align="center" prop="equipmentId" />
-      <el-table-column label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column label="plc id" align="center" prop="plcId" />
-      <el-table-column label="plc" align="center" prop="plc" />
-      <el-table-column label="状态，0正常 1计划停机 2故障" align="center" prop="status" />
-      <el-table-column label="记录时间" align="center" prop="recordTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recordTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="持续时间（分钟），状态变动时记录并更新" align="center" prop="duration" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <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-status-log:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-status-log: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="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备id" />
-        </el-form-item>
-        <el-form-item label="设备名称" prop="equipmentName">
-          <el-input v-model="form.equipmentName" placeholder="请输入设备名称" />
-        </el-form-item>
-        <el-form-item label="plc id" prop="plcId">
-          <el-input v-model="form.plcId" placeholder="请输入plc id" />
-        </el-form-item>
-        <el-form-item label="plc" prop="plc">
-          <el-input v-model="form.plc" placeholder="请输入plc" />
-        </el-form-item>
-        <el-form-item label="状态，0正常 1计划停机 2故障" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="记录时间" prop="recordTime">
-          <el-date-picker clearable v-model="form.recordTime" type="date" value-format="timestamp" placeholder="选择记录时间" />
-        </el-form-item>
-        <el-form-item label="持续时间（分钟），状态变动时记录并更新" prop="duration">
-          <el-input v-model="form.duration" placeholder="请输入持续时间（分钟），状态变动时记录并更新" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" 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 { createEquipmentStatusLog, updateEquipmentStatusLog, deleteEquipmentStatusLog, getEquipmentStatusLog, getEquipmentStatusLogPage, exportEquipmentStatusLogExcel } from "@/api/base/equipmentStatusLog";
-
-export default {
-  name: "EquipmentStatusLog",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 后端用 设备工作状态列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentId: null,
-        equipmentName: null,
-        plcId: null,
-        plc: null,
-        status: null,
-        recordTime: [],
-        duration: null,
-        remark: null,
-        version: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentStatusLogPage(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,
-        equipmentId: undefined,
-        equipmentName: undefined,
-        plcId: undefined,
-        plc: undefined,
-        status: undefined,
-        recordTime: undefined,
-        duration: undefined,
-        remark: undefined,
-        version: 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;
-      getEquipmentStatusLog(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) {
-          updateEquipmentStatusLog(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentStatusLog(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 deleteEquipmentStatusLog(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 exportEquipmentStatusLogExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '后端用 设备工作状态.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>

src/views/base/equipmentStatusRealtime/index.vue

@@ -1,296 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备id" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备id" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentName">
-        <el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="状态，0正常 1计划停机 2故障" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态，0正常 1计划停机 2故障" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否运行中" prop="run">
-        <el-select v-model="queryParams.run" placeholder="请选择是否运行中" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否发生运行错误" prop="error">
-        <el-select v-model="queryParams.error" placeholder="请选择是否发生运行错误" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="记录时间" prop="recordTime">
-        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item label="版本号" prop="version">
-        <el-input v-model="queryParams.version" placeholder="请输入版本号" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-status-realtime:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-status-realtime:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="设备id" align="center" prop="equipmentId" />
-      <el-table-column label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column label="状态，0正常 1计划停机 2故障" align="center" prop="status" />
-      <el-table-column label="是否运行中" align="center" prop="run" />
-      <el-table-column label="是否发生运行错误" align="center" prop="error" />
-      <el-table-column label="描述" align="center" prop="description" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="记录时间" align="center" prop="recordTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.recordTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <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-status-realtime:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-status-realtime: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="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备id" />
-        </el-form-item>
-        <el-form-item label="设备名称" prop="equipmentName">
-          <el-input v-model="form.equipmentName" placeholder="请输入设备名称" />
-        </el-form-item>
-        <el-form-item label="状态，0正常 1计划停机 2故障" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="是否运行中" prop="run">
-          <el-radio-group v-model="form.run">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="是否发生运行错误" prop="error">
-          <el-radio-group v-model="form.error">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </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-item label="记录时间" prop="recordTime">
-          <el-date-picker clearable v-model="form.recordTime" type="date" value-format="timestamp" placeholder="选择记录时间" />
-        </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" 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 { createEquipmentStatusRealtime, updateEquipmentStatusRealtime, deleteEquipmentStatusRealtime, getEquipmentStatusRealtime, getEquipmentStatusRealtimePage, exportEquipmentStatusRealtimeExcel } from "@/api/base/equipmentStatusRealtime";
-import Editor from '@/components/Editor';
-
-export default {
-  name: "EquipmentStatusRealtime",
-  components: {
-    Editor
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 后端用 设备状态实时列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentId: null,
-        equipmentName: null,
-        status: null,
-        run: null,
-        error: null,
-        description: null,
-        remark: null,
-        recordTime: [],
-        version: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentStatusRealtimePage(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,
-        equipmentId: undefined,
-        equipmentName: undefined,
-        status: undefined,
-        run: undefined,
-        error: undefined,
-        description: undefined,
-        remark: undefined,
-        recordTime: undefined,
-        version: 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;
-      getEquipmentStatusRealtime(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) {
-          updateEquipmentStatusRealtime(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentStatusRealtime(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 deleteEquipmentStatusRealtime(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 exportEquipmentStatusRealtimeExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '后端用 设备状态实时.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>

src/views/base/equipmentTypeFile/index.vue

@@ -1,229 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备类型ID" prop="equipmentTypeId">
-        <el-input v-model="queryParams.equipmentTypeId" placeholder="请输入设备类型ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="原始名称" prop="fileName">
-        <el-input v-model="queryParams.fileName" placeholder="请输入原始名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="下载地址" prop="fileUrl">
-        <el-input v-model="queryParams.fileUrl" placeholder="请输入下载地址" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:equipment-type-file:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:equipment-type-file:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="设备类型ID" align="center" prop="equipmentTypeId" />
-      <el-table-column label="原始名称" align="center" prop="fileName" />
-      <el-table-column label="下载地址" align="center" prop="fileUrl" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <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-type-file:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-type-file: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="equipmentTypeId">
-          <el-input v-model="form.equipmentTypeId" placeholder="请输入设备类型ID" />
-        </el-form-item>
-        <el-form-item label="原始名称" prop="fileName">
-          <el-input v-model="form.fileName" placeholder="请输入原始名称" />
-        </el-form-item>
-        <el-form-item label="下载地址" prop="fileUrl">
-          <el-input v-model="form.fileUrl" 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 { createEquipmentTypeFile, updateEquipmentTypeFile, deleteEquipmentTypeFile, getEquipmentTypeFile, getEquipmentTypeFilePage, exportEquipmentTypeFileExcel } from "@/api/base/equipmentTypeFile";
-
-export default {
-  name: "EquipmentTypeFile",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 设备类型文件关联列表
-      list: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-        equipmentTypeId: null,
-        fileName: null,
-        fileUrl: null,
-        createTime: [],
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        equipmentTypeId: [{ required: true, message: "设备类型ID不能为空", trigger: "blur" }],
-        fileName: [{ required: true, message: "原始名称不能为空", trigger: "blur" }],
-        fileUrl: [{ required: true, message: "下载地址不能为空", trigger: "blur" }],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true;
-      // 执行查询
-      getEquipmentTypeFilePage(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,
-        equipmentTypeId: undefined,
-        fileName: undefined,
-        fileUrl: 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;
-      getEquipmentTypeFile(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) {
-          updateEquipmentTypeFile(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createEquipmentTypeFile(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 deleteEquipmentTypeFile(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 exportEquipmentTypeFileExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '设备类型文件关联.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>

src/views/base/packagingPrintLog/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-10-17 16:50:19
- * @LastEditTime: 2023-10-18 15:31:12
+ * @LastEditTime: 2023-10-30 10:47:13
  * @LastEditors: zhp
  * @Description:
 -->
@@ -30,17 +30,15 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="所属工单" prop="workOrderId">
-                <el-select v-model="dataForm.workOrderId" style="width: 100%;" placeholder="请选择所属工单">
+                <el-select v-model="dataForm.workOrderId" style="width: 100%;" placeholder="请选择所属工单" clearable>
-                  <el-option v-for="dict in workOrderList" clearable :key="dict.id" :label="dict.name"
+                  <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
-                    :value="dict.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="客户" prop="customerId">
-                <el-select v-model="dataForm.customerId" style="width: 100%;" placeholder="请选择客户">
+                <el-select v-model="dataForm.customerId" style="width: 100%;" placeholder="请选择客户" clearable>
-                  <el-option v-for="dict in customerList" clearable :key="dict.id" :label="dict.name"
+                  <el-option v-for="dict in customerList" :key="dict.id" :label="dict.name" :value="dict.id" />
-                    :value="dict.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -48,9 +46,8 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="标签模板" prop="modelId">
-                <el-select v-model="dataForm.modelId" style="width: 100%;" placeholder="请选择标签模板">
+                <el-select v-model="dataForm.modelId" style="width: 100%;" placeholder="请选择标签模板" clearable>
-                  <el-option v-for="dict in modelList" clearable :key="dict.id"
+                  <el-option v-for="dict in modelList" :key="dict.id" :label="dict.name" :value="dict.id" />
-                    :label="dict.name" :value="dict.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -196,10 +193,10 @@ export default {
 				total: 0,
 			},
 			dataRule: {
-				code: [
+        content: [
 					{
 						required: true,
-						message: '产品编码不能为空',
+						message: '内容不能为空',
 						trigger: 'blur',
 					},
 					// {
@@ -209,11 +206,11 @@ export default {
 					// 	transfom: 'val => Number(val)',
 					// },
 				],
-				name: [
+        workOrderId: [
 					{
 						required: true,
-						message: '产品名称不能为空',
+						message: '所属工单不能为空',
-						trigger: 'blur',
+						trigger: 'change',
 					},
 				],
 				typeDictValue: [

src/views/base/packagingPrintLog/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-10-20 15:05:09
+ * @LastEditTime: 2023-10-30 10:44:48
  * @Description:
 -->
 <template>
@@ -183,47 +183,48 @@ export default {
         this.dataListLoading = false;
       });
     },
-    handlePrint(id){
+    handlePrint(id) {
-      getPackingModel(id).then(res => {
+      if (id) {
-        var obj = {
+        getPackingModel(id).then(res => {
-          code: '11111222',
+          var obj = {
-          test: '11111',
+            code: '11111222',
-          test2: '3333333',
+            test: '11111',
-          test1: '222222',
+            test2: '3333333',
-        }
+            test1: '222222',
-        console.log(res);
+          }
-        // getPackingListInfo({
+          console.log(res);
-        //   size: 20,
+          // getPackingListInfo({
-        //   current: 1,
+          //   size: 20,
-        //   boxNo: printModel.boxNo
+          //   current: 1,
-        // }).then(result => {
+          //   boxNo: printModel.boxNo
-        //   this.substrateList = result.data.records
+          // }).then(result => {
-        //   var obj = {
+          //   this.substrateList = result.data.records
-        //     // time: this.getNewDate(),
+          //   var obj = {
-        //     boxNo: this.currentData.boxNo,
+          //     // time: this.getNewDate(),
-        //     orderNum: this.currentData.orderNum,
+          //     boxNo: this.currentData.boxNo,
-        //     powerLevel: this.currentData.powerLevel,
+          //     orderNum: this.currentData.orderNum,
-        //     sapMaterial: this.currentData.sapMaterial,
+          //     powerLevel: this.currentData.powerLevel,
-        //     img: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAHVklEQVR4nO2dT2wUVRzHv2/2T5eSAlvFilwgQUH+eLACaUxEiJLAxdh44MDZi2ChUIrSFtoCgbbSP4GDdwgeEA8kRTAI0iIGBL1ITLxgLAlCsCKBYndnx7zd35pl2+7On/de387OJ9l00515/z7z/szMmzfs7869mD0yCjw2gZAB4VhAiln4/dUaRGdU18aOnzw9dn24ioGJj0soFsJr1z2yNm+qN2/fvRFL8XyMYqTmFfxZ+TwMc1xKDsL/f2Ms8xGeLwuIRpCKx99MHf/i4uPrw5GQ9jIAfsCMXfw2HkuOX03Wb1qLh4+uIGFJjzecPoS5iEhUTg1hDMaM2GuRk6cGMTQUCYmPQQq86CMAkkPDkQirGAzXf7Du34ejN9IHmETCRjQGPL6D+4NnYDEJDQmXbaY6on/dm2Vm/jHdZe0Almm6Ll+YNQbzasX7765BNHI1o0sOYRghwExg7MG9dDQSiqsdwHuZmlFKMjLwQ3QcFtjlSxHTenLO3Lp7vfU09AOS41Ka+HC6CjIDIaqmguvIPgBtIgOcDhjVlMTQtarKOScumR/teCdpxoeNZGJCapjFt7Rcywrb2MYtnQBatCpZTzCkYCF+5suKRXf+6EvOmv0GSzwrhB/QpmGkBYZSpqvIZAlp8ZeMLFwKUH3z2gqWyd/+3F/5b1yRQQMCN8gQspeaKt+SAItSCxCiPjIjhDEkjRAMxmCZSbgZkYke537qdxl57KM8C0OkkD0ADohMXIlwgPIuBFFC9uS3p2XGflFSRAgpdxlZeBl84jUQr0ImjDTKGWZZBwE0eCkCL0J20UgjgGCwEDHNPjB86PbiilshfGRxOBCRD0tLCSWTnzMLO9yE4EbIzjIdTdmGpc8/rB4qK0c4FcKbqe7pyWZJ0k1lZhsnQnZq3EzV00dHDjupKXaFNGtcM7YA+Io+WzRIz2R0UxkWxY6QJgCHlCbfPlzAsZytj2ks5RCVZUGKCdkOoEt+Wl3RkCcjyzGv5wIS6aIynZJCQni7d0TTjPFaMFDg9wGNa8qRQn3KVEI+1rjPmKpm5KNzTemmMp7AZEK2AehXmz7bbC1SM/IZoH10pJ/K+hnyhXBrvZpmoBHAURf7HaV9daQ3v6Zk7hhWVr4AYDOAzzRNeKPHAyW7r459Yj/deUynMcyqqpY9/fXW+RTwkiF/ms5pADcd7nMbwAkBcfMM3wOwwOF+rys46TxCt+T72d2NG0YSg2fnC58ANDkbAZyVH41QNgAYVBTXNiMxeLYG6qawvagmGqGoTHOfwcAe6T8TvWwYlTC7OsALgRDNCIRoRiBEMwIhmhEI0YxAiGYEQjRDtZCY9iUyEaVpVi3kvuL4RKA0zSqF8Ad5TimMTxSnKO1KUCWEZ6hDVaYk0KFKigohbSUuI0uHiieKZQtp89kM+U7ZUmQKafHp4wpSH/eWJaTT5zPkD8g62GQI8cXqDTZok/HEsWgh+3Of2y4D2kU/0idKyEOaJdgqKLxSotXlfLFJESXkicKZGTrys6g0iRIyD8AvAFYLCq+UWC1yACOyD+Hrf1wAUCcwTN2pozzXiEqn6E59JoBvANQKDldHaimvM0WmTcawlydw2Oc1pY7yKFQGJJ4YxqiTXyEp/OlkBeVNyn0SmZdO5gC47rOOfjXlaY6sCGRfXKwA8LVP+pRaykuFzEhUXH7nR9P3AFYqiEsWKykP0mpGFlU3qKI0IlmlKD6RrKK0R1VEpvIW7uwSHXnVUdqVoHqSwz+K4xOB0jQH87I0IxCiGYEQzQiEaEYgRDMCIZoRCNGMQIhmBEI0gwuJK0xScKZemHiY1mzqUxThYgBLHO7zQOAzGnMBPOdwn8WC4rbDNjaSWVajQaEUp9wBsB7ALY/hLAVwHsB89VmwRXrhuGwf0q/xIl/z6f6105qVyxIKQ1cZjdlV/HI79V6N1yjk/dxlAMtc7LuM9lXZVzqhIXdxtvxR1kCxZUynkbl0o2ihgyQspH3mapqn7flrSE427O3TuKbwGZI/AlhuY9vltO08Belyw6T99lTnIQN2VmGeJqppskGhpfoW0DbVmuahaarVVQudGPZo3tH/RCOnfJbSbzp34D1T/VjsTL3X6esWFMJngJwDsCgnykX0P+mzQ1yyq9jqqtnzkGI0a7wgPz9pfJm+/6ZxB77bzus+7L7pkwdkarr8OBdwJee7jjQVaqZysVtDsuwK3j3lmGYnb5hwerW3S+PRl440OX3dh5vL7z0iXzXqY/bYbaZycXs/5KDdV/iUKc1URo7xcoOqq0yfui1Gq5e3EoUava1qzS/aJQGs8xKIj2jx+gCoVyGcoUBKGs8yIEgIAiliZEDwJAehL3ovIYS+2F9UDckyRH/fFhmoxuwTvdaJaCGc7+gyi9+br1YZSzTJEAIaffHrZG/JCFwDpK16JEsI5yK9uMdvzVe7zAUxZQrhXKKBwxqZkSikQ8aiZbnIFgKS4oea0i5bBhQJgQ+kKJEBhUJAUkqxo+cduJqVrQH8B6xBgBhvJFNDAAAAAElFTkSuQmCC',
+          //     sapMaterial: this.currentData.sapMaterial,
-        //     // lineBody: this.currentData.lineBody == 1 ? 'F ' : 'S',
+          //     img: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAHVklEQVR4nO2dT2wUVRzHv2/2T5eSAlvFilwgQUH+eLACaUxEiJLAxdh44MDZi2ChUIrSFtoCgbbSP4GDdwgeEA8kRTAI0iIGBL1ITLxgLAlCsCKBYndnx7zd35pl2+7On/de387OJ9l00515/z7z/szMmzfs7869mD0yCjw2gZAB4VhAiln4/dUaRGdU18aOnzw9dn24ioGJj0soFsJr1z2yNm+qN2/fvRFL8XyMYqTmFfxZ+TwMc1xKDsL/f2Ms8xGeLwuIRpCKx99MHf/i4uPrw5GQ9jIAfsCMXfw2HkuOX03Wb1qLh4+uIGFJjzecPoS5iEhUTg1hDMaM2GuRk6cGMTQUCYmPQQq86CMAkkPDkQirGAzXf7Du34ejN9IHmETCRjQGPL6D+4NnYDEJDQmXbaY6on/dm2Vm/jHdZe0Almm6Ll+YNQbzasX7765BNHI1o0sOYRghwExg7MG9dDQSiqsdwHuZmlFKMjLwQ3QcFtjlSxHTenLO3Lp7vfU09AOS41Ka+HC6CjIDIaqmguvIPgBtIgOcDhjVlMTQtarKOScumR/teCdpxoeNZGJCapjFt7Rcywrb2MYtnQBatCpZTzCkYCF+5suKRXf+6EvOmv0GSzwrhB/QpmGkBYZSpqvIZAlp8ZeMLFwKUH3z2gqWyd/+3F/5b1yRQQMCN8gQspeaKt+SAItSCxCiPjIjhDEkjRAMxmCZSbgZkYke537qdxl57KM8C0OkkD0ADohMXIlwgPIuBFFC9uS3p2XGflFSRAgpdxlZeBl84jUQr0ImjDTKGWZZBwE0eCkCL0J20UgjgGCwEDHNPjB86PbiilshfGRxOBCRD0tLCSWTnzMLO9yE4EbIzjIdTdmGpc8/rB4qK0c4FcKbqe7pyWZJ0k1lZhsnQnZq3EzV00dHDjupKXaFNGtcM7YA+Io+WzRIz2R0UxkWxY6QJgCHlCbfPlzAsZytj2ks5RCVZUGKCdkOoEt+Wl3RkCcjyzGv5wIS6aIynZJCQni7d0TTjPFaMFDg9wGNa8qRQn3KVEI+1rjPmKpm5KNzTemmMp7AZEK2AehXmz7bbC1SM/IZoH10pJ/K+hnyhXBrvZpmoBHAURf7HaV9daQ3v6Zk7hhWVr4AYDOAzzRNeKPHAyW7r459Yj/deUynMcyqqpY9/fXW+RTwkiF/ms5pADcd7nMbwAkBcfMM3wOwwOF+rys46TxCt+T72d2NG0YSg2fnC58ANDkbAZyVH41QNgAYVBTXNiMxeLYG6qawvagmGqGoTHOfwcAe6T8TvWwYlTC7OsALgRDNCIRoRiBEMwIhmhEI0YxAiGYEQjRDtZCY9iUyEaVpVi3kvuL4RKA0zSqF8Ad5TimMTxSnKO1KUCWEZ6hDVaYk0KFKigohbSUuI0uHiieKZQtp89kM+U7ZUmQKafHp4wpSH/eWJaTT5zPkD8g62GQI8cXqDTZok/HEsWgh+3Of2y4D2kU/0idKyEOaJdgqKLxSotXlfLFJESXkicKZGTrys6g0iRIyD8AvAFYLCq+UWC1yACOyD+Hrf1wAUCcwTN2pozzXiEqn6E59JoBvANQKDldHaimvM0WmTcawlydw2Oc1pY7yKFQGJJ4YxqiTXyEp/OlkBeVNyn0SmZdO5gC47rOOfjXlaY6sCGRfXKwA8LVP+pRaykuFzEhUXH7nR9P3AFYqiEsWKykP0mpGFlU3qKI0IlmlKD6RrKK0R1VEpvIW7uwSHXnVUdqVoHqSwz+K4xOB0jQH87I0IxCiGYEQzQiEaEYgRDMCIZoRCNGMQIhmBEI0gwuJK0xScKZemHiY1mzqUxThYgBLHO7zQOAzGnMBPOdwn8WC4rbDNjaSWVajQaEUp9wBsB7ALY/hLAVwHsB89VmwRXrhuGwf0q/xIl/z6f6105qVyxIKQ1cZjdlV/HI79V6N1yjk/dxlAMtc7LuM9lXZVzqhIXdxtvxR1kCxZUynkbl0o2ihgyQspH3mapqn7flrSE427O3TuKbwGZI/AlhuY9vltO08Belyw6T99lTnIQN2VmGeJqppskGhpfoW0DbVmuahaarVVQudGPZo3tH/RCOnfJbSbzp34D1T/VjsTL3X6esWFMJngJwDsCgnykX0P+mzQ1yyq9jqqtnzkGI0a7wgPz9pfJm+/6ZxB77bzus+7L7pkwdkarr8OBdwJee7jjQVaqZysVtDsuwK3j3lmGYnb5hwerW3S+PRl440OX3dh5vL7z0iXzXqY/bYbaZycXs/5KDdV/iUKc1URo7xcoOqq0yfui1Gq5e3EoUava1qzS/aJQGs8xKIj2jx+gCoVyGcoUBKGs8yIEgIAiliZEDwJAehL3ovIYS+2F9UDckyRH/fFhmoxuwTvdaJaCGc7+gyi9+br1YZSzTJEAIaffHrZG/JCFwDpK16JEsI5yK9uMdvzVe7zAUxZQrhXKKBwxqZkSikQ8aiZbnIFgKS4oea0i5bBhQJgQ+kKJEBhUJAUkqxo+cduJqVrQH8B6xBgBhvJFNDAAAAAElFTkSuQmCC',
-        //     createTime: moment(this.currentData.createTime).format('YYYY-MM-DD HH:mm:ss')
+          //     // lineBody: this.currentData.lineBody == 1 ? 'F ' : 'S',
-        //     // modul1: '20210320000012',
+          //     createTime: moment(this.currentData.createTime).format('YYYY-MM-DD HH:mm:ss')
-        //     // modul2: '20210320000012',
+          //     // modul1: '20210320000012',
-        //     // modul3: '20210320000012'
+          //     // modul2: '20210320000012',
-        //   }
+          //     // modul3: '20210320000012'
-        //   for (var i = 0; i < this.substrateList.length; i++) {
+          //   }
-        //     var model = 'model' + Number(i + 1)
+          //   for (var i = 0; i < this.substrateList.length; i++) {
-        //     var pmpp = 'PMPP' + Number(i + 1)
+          //     var model = 'model' + Number(i + 1)
-        //     var m = 'm' + Number(i + 1)
+          //     var pmpp = 'PMPP' + Number(i + 1)
+          //     var m = 'm' + Number(i + 1)
 
-        //     console.log(model)
+          //     console.log(model)
-        //     // console.log(this.list[i].woSubstrateId)
+          //     // console.log(this.list[i].woSubstrateId)
-        //     // console.log(this.list[i].woSubstrateId)
+          //     // console.log(this.list[i].woSubstrateId)
-        //     obj['' + model + ''] = this.substrateList[i].woSubstrateId
+          //     obj['' + model + ''] = this.substrateList[i].woSubstrateId
-        //     obj['' + pmpp + ''] = this.substrateList[i].pmpp
+          //     obj['' + pmpp + ''] = this.substrateList[i].pmpp
-        //     obj['' + m + ''] = i + 1
+          //     obj['' + m + ''] = i + 1
-        //   }
+          //   }
-        //   console.log(obj)
+          //   console.log(obj)
           // this.printPreview('预览', res.data)
           const hiprintTemplate = this.$print(undefined, JSON.parse(res.data.content), obj, {}, {
             // styleHandler: () => {
@@ -232,18 +233,23 @@ export default {
             // }
           })
 
-        hiprintTemplate.on('printSuccess', function () {
+          hiprintTemplate.on('printSuccess', function () {
-          console.log(1111);
+            console.log(1111);
-          // that.$notification.success({
+            // that.$notification.success({
-          //   // key: key,
+            //   // key: key,
-          //   placement: 'topRight',
+            //   placement: 'topRight',
-          //   message: key + ' 打印成功',
+            //   message: key + ' 打印成功',
-          //   description: 'Api单独直接打印回调',
+            //   description: 'Api单独直接打印回调',
-          // });
+            // });
-        });
+          });
           console.log(hiprintTemplate)
         })
-    // })
+      } else {
+        this.$message({
+          message: '请选择打印标签模板',
+          type: 'warning'
+        });
+      }
     },
     closeCallback(vue) {
       console.log('关闭了打印工具')

src/views/base/packagingPrintModel/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-10-17 16:50:19
- * @LastEditTime: 2023-10-20 14:13:39
+ * @LastEditTime: 2023-10-30 10:41:07
  * @LastEditors: zhp
  * @Description:
 -->
@@ -23,8 +23,8 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="标签类型" prop="typeId">
-                <el-select v-model="dataForm.typeId" style="width: 100%;" placeholder="请选择打印方式">
+                <el-select v-model="dataForm.typeId" style="width: 100%;" placeholder="请选择打印方式" clearable>
-                  <el-option v-for="dict in typeList" clearable :key="dict.id" :label="dict.name" :value="dict.id" />
+                  <el-option v-for="dict in typeList" :key="dict.id" :label="dict.name" :value="dict.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -32,9 +32,8 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="打印方式" prop="printModel">
-                <el-select v-model="dataForm.printModel" style="width: 100%;" placeholder="请选择打印方式">
+                <el-select v-model="dataForm.printModel" style="width: 100%;" placeholder="请选择打印方式" clearable>
-                  <el-option v-for="dict in printModelList" clearable :key="dict.id" :label="dict.name"
+                  <el-option v-for="dict in printModelList" :key="dict.id" :label="dict.name" :value="dict.id" />
-                    :value="dict.id" />
                 </el-select>
               </el-form-item>
             </el-col>

src/views/base/packagingPrintModel/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-10-20 14:21:33
+ * @LastEditTime: 2023-10-30 10:45:23
  * @Description:
 -->
 <template>
@@ -191,7 +191,7 @@ export default {
       // this.content = JSON.stringify(data)
       this.obj.content = JSON.stringify(data)
       updatePackingModel(this.obj).then((response) => {
-        this.$modal.msgSuccess('修改成功');
+        // this.$modal.msgSuccess('修改成功');
         // this.visible = false;
         // this.$emit('refreshDataList');
       });

src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue

@@ -21,7 +21,7 @@
 						:disabled="disabled"
 						v-model="dataForm.code"
 						@change="$emit('update', dataForm)"
-						placeholder="请输入工段排序" />
+						placeholder="请输入报警编码" />
 				</el-form-item>
 				<!-- 				
 				<el-form-item

src/views/equipment/base/config/AlarmGroup/index.vue

@@ -58,7 +58,7 @@
 					queryParams: { id: alarmForm.id },
 				},
 				{
-					name: '属性列表',
+					name: '报警明细',
 					key: 'attrs',
 					props: drawerListProps,
 					url: '/base/equipment-group-alarm/page',
@@ -72,13 +72,13 @@
 						pageSize: 10,
 					},
 					tableBtn: [
-						this.$auth.hasPermi('base:equipment-group:update')
+						this.$auth.hasPermi('equipment:alarm-group:update')
 							? {
 									type: 'edit',
 									btnName: '修改',
 							  }
 							: undefined,
-						this.$auth.hasPermi('base:equipment-group:delete')
+						this.$auth.hasPermi('equipment:alarm-group:delete')
 							? {
 									type: 'delete',
 									btnName: '删除',
@@ -119,19 +119,19 @@ export default {
 			editMode: '',
 			searchBarKeys: ['name', 'code'],
 			tableBtn: [
-				this.$auth.hasPermi('base:equipment-group:update')
+				this.$auth.hasPermi('equipment:alarm-group:update')
 					? {
 							type: 'detail',
 							btnName: '查看报警',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:equipment-group:update')
+				this.$auth.hasPermi('equipment:alarm-group:update')
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:equipment-group:delete')
+				this.$auth.hasPermi('equipment:alarm-group:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -193,8 +193,8 @@ export default {
 						label: '设备分组编码',
 						prop: 'code',
 						// url: '/base/core-equipment/getCode',
-					}
+					},
-				]
+				],
 			],
 			drawerListProps: [
 				{
@@ -250,7 +250,7 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:equipment-group:create')
+					type: this.$auth.hasPermi('equipment:alarm-group:create')
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -259,7 +259,7 @@ export default {
 					color: 'success',
 				},
 				// {
-				// 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
+				// 	type: this.$auth.hasPermi('equipment:alarm-group:export') ? 'button' : '',
 				// 	btnName: '导出',
 				// 	name: 'export',
 				// 	color: 'warning',
@@ -375,7 +375,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = '添加设备分组（用于同类型不同厂家的设备区分）';
+			this.title = '添加设备分组';
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -384,7 +384,7 @@ export default {
 			getEquipmentGroup(id).then((response) => {
 				this.form = response.data;
 				this.open = true;
-				this.title = '修改设备分组（用于同类型不同厂家的设备区分）';
+				this.title = '修改设备分组';
 			});
 		},
 		/** 提交按钮 */
@@ -445,18 +445,13 @@ export default {
 			params.pageNo = undefined;
 			params.pageSize = undefined;
 			this.$modal
-				.confirm(
+				.confirm('是否确认导出所有设备分组数据项?')
-					'是否确认导出所有设备分组（用于同类型不同厂家的设备区分）数据项?'
-				)
 				.then(() => {
 					this.exportLoading = true;
 					return exportEquipmentGroupExcel(params);
 				})
 				.then((response) => {
-					this.$download.excel(
+					this.$download.excel(response, '设备分组.xls');
-						response,
-						'设备分组（用于同类型不同厂家的设备区分）.xls'
-					);
 					this.exportLoading = false;
 				})
 				.catch(() => {});

src/views/equipment/base/config/BindGroup/index.vue

@@ -118,19 +118,19 @@ export default {
 		return {
 			searchBarKeys: ['groupId', 'equipmentName'],
 			tableBtn: [
-				this.$auth.hasPermi('base:equipment-bind-group:update')
+				this.$auth.hasPermi('equipment:bind-group:update')
 					? {
 							type: 'detail',
 							btnName: '查看报警',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:equipment-bind-group:update')
+				this.$auth.hasPermi('equipment:bind-group:update')
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:equipment-bind-group:delete')
+				this.$auth.hasPermi('equipment:bind-group:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -199,7 +199,7 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:equipment-bind-group:create')
+					type: this.$auth.hasPermi('equipment:bind-group:create')
 						? 'button'
 						: '',
 					btnName: '新增',

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

@@ -0,0 +1,522 @@
+<!-- 
+    filename: CollectionConfig.vue
+    author: liubin
+    date: 2023-10-30 10:09:03
+    description: 
+-->
+
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="700px"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
+		</base-dialog>
+
+		<!-- 抽屉 详情 -->
+		<BasicDrawer
+			v-if="editVisible"
+			ref="drawer"
+			:default-mode="editMode"
+			:info-data="alarmForm"
+			:sections="[
+				{
+					name: '基本信息',
+					key: 'base',
+					rows: drawerBaseInfoRows,
+				},
+				{
+					name: '属性列表',
+					key: 'attrs',
+					props: drawerListProps,
+					url: '/base/equipment-plc-param/page',
+					urlCreate: '/base/equipment-plc-param/create',
+					urlUpdate: '/base/equipment-plc-param/update',
+					urlDelete: '/base/equipment-plc-param/delete',
+					urlDetail: '/base/equipment-plc-param/get',
+					queryParams: {
+						connectId: alarmForm.id,
+						pageNo: 1,
+						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: '删除',
+							  }
+							: undefined,
+					].filter((v) => v),
+					allowAdd: true,
+				},
+			]"
+			@refreshDataList="getList"
+			@cancel="editVisible = false"
+			@destroy="editVisible = false" />
+	</div>
+</template>
+
+<script>
+import {
+	createEquipmentPlcConnect,
+	updateEquipmentPlcConnect,
+	deleteEquipmentPlcConnect,
+	getEquipmentPlcConnect,
+	getEquipmentPlcConnectPage,
+	exportEquipmentPlcConnectExcel,
+} from '@/api/base/equipmentPlcConnect';
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+// import './http';
+import BasicDrawer from './components/BasicDrawer.vue';
+import { publicFormatter } from '@/utils/dict';
+
+export default {
+	name: 'EquipmentPlcConnect',
+	mixins: [basicPageMixin],
+	components: { BasicDrawer },
+	data() {
+		return {
+			searchBarKeys: ['equipmentId', 'plcId'],
+			// tableBtn: [
+			// ].filter((v) => v),
+			tableBtn: [
+				{
+					type: 'detail',
+					btnName: '参数绑定',
+				},
+				this.$auth.hasPermi('equipment:collection-config:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:collection-config:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{ 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: '查看绑定',
+				// 	subcomponent: {
+				// 		props: ['injectData'],
+				// 		render: function (h) {
+				// 			const _this = this;
+				// 			return h(
+				// 				'el-button',
+				// 				{
+				// 					props: { type: 'text' },
+				// 					on: {
+				// 						click: function () {
+				// 							console.log('inejctdata', _this.injectData);
+				// 							_this.$emit('emitData', {
+				// 								action: _this.injectData._action,
+				// 								payload: _this.injectData,
+				// 							});
+				// 						},
+				// 					},
+				// 				},
+				// 				'查看绑定'
+				// 			);
+				// 		},
+				// 	},
+				// },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '设备名',
+					placeholder: '请选择设备',
+					param: 'equipmentId',
+					selectOptions: [],
+				},
+				{
+					type: 'select',
+					label: '编码',
+					placeholder: '请选择编码',
+					param: 'plcId',
+					selectOptions: [],
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:collection-config:create')
+						? 'button'
+						: '',
+					// type: 'button',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('equipment:collection-config:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						select: true,
+						label: '关联表名',
+						prop: 'plcId',
+						labelKey: `plcTableName`,
+						url: '/base/equipment-plc/listAll',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: {
+							filterable: true,
+						},
+					},
+				],
+				[
+					{
+						select: true,
+						label: '设备',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=99',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: {
+							filterable: true,
+						},
+					},
+				],
+			],
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				plcId: null,
+				equipmentId: null,
+			},
+			// 表单参数
+			form: {},
+			// 查看绑定配置
+			editVisible: false,
+			editMode: '',
+			drawerBaseInfoRows: [
+				[
+					{
+						input: true,
+						label: '设备名',
+						prop: 'equipmentName',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						// bind: {
+						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
+						// }
+					},
+					{
+						input: true,
+						label: '关联表名',
+						prop: 'plcTableName',
+						// url: '/base/core-equipment/getCode',
+					},
+				],
+			],
+			drawerListProps: [
+				{ prop: 'plcParamName', label: '参数列名' },
+				{ prop: 'name', label: '参数名称' },
+				{
+					prop: 'unit',
+					label: '单位',
+					filter: publicFormatter('unit_dict'),
+				},
+				{
+					prop: 'equipment_param_type',
+					label: '设备参数类型',
+					filter: (val) =>
+						val != null
+							? ['', '一般参数', '工艺参数', '报警参数', ''][val]
+							: '-',
+				},
+				{
+					prop: 'production_param_type',
+					label: '生产参数类型',
+					filter: (val) =>
+						val != null
+							? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
+							: '-',
+				},
+				{
+					prop: 'collection',
+					label: '是否采集',
+					filter: (val) => (val != null ? ['否', '是'][val] : '-'),
+				},
+				{ prop: 'minValue', label: '最小值' },
+				{ prop: 'maxValue', label: '最大值' },
+				{ prop: 'defaultValue', label: '标准值' },
+				{ prop: 'description', label: '描述' },
+				{ prop: 'remark', label: '备注' },
+			],
+			alarmForm: {
+				id: undefined,
+				equipmentName: undefined,
+				plcTableName: undefined,
+			},
+		};
+	},
+	created() {
+		this.getList();
+		this.initSearchOptions();
+	},
+	methods: {
+		async getEquipmentOptions() {
+			const res = await this.$axios({
+				url: '/base/core-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) {
+				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();
+				});
+			});
+		},
+
+		// 查看报警
+		handleDetail(row) {
+			// debugger;
+			const {
+				id,
+				bindingParameters,
+				equipmentCode,
+				equipmentId,
+				equipmentName,
+				plcCode,
+				plcId,
+				plcName,
+				plcTableName,
+				productionLine,
+				workshopSection,
+			} = row;
+			// 打开抽屉
+			this.editMode = 'detail';
+			this.alarmForm.id = id;
+			this.alarmForm.plcTableName = plcTableName; // 关联表名
+			this.alarmForm.equipmentName = equipmentName;
+			this.editVisible = true;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
+			});
+		},
+
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否删除该配置?')
+				.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/equipment/base/config/DataCollection/TableConfig.vue

@@ -0,0 +1,385 @@
+<!-- 
+    filename: TableConfig.vue
+    author: liubin
+    date: 2023-10-30 10:09:03
+    description: 
+-->
+
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			ref="pageTable"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="700px"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import {
+	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 {};
+	},
+	computed: {
+		active() {
+			return +this.injectData[this.injectData.prop] == 1 ? true : false;
+		},
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'el-switch',
+			{
+				props: {
+					value: this.active,
+				},
+				on: {
+					change: (newVal) => {
+						this.$emit('emitData', {
+							action: 'update-collect',
+							payload: {
+								...this.injectData,
+								collection: newVal ? 1 : 0,
+							},
+						});
+					},
+				},
+			},
+			null
+		);
+	},
+};
+
+export default {
+	name: 'EquipmentPlc',
+	mixins: [basicPageMixin],
+	components: {},
+	data() {
+		return {
+			tableKey: Math.random(),
+			searchBarKeys: ['name', 'plcTableName'],
+			tableBtn: [
+				this.$auth.hasPermi('equipment:realtime-table-config:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:realtime-table-config:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				// {
+				// 	prop: 'createTime',
+				// 	label: '添加时间',
+				// 	fixed: true,
+				// 	width: 180,
+				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				// },
+				{ prop: 'code', label: '编码' },
+				{ prop: 'plcTableName', label: '关联表名' },
+				{ prop: 'name', label: '标识名称' },
+				{ prop: 'enName', label: '英文名称' },
+				{
+					prop: 'collection',
+					label: '是否采集',
+					subcomponent: switchBtn,
+				},
+				{ prop: 'description', label: '描述' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '表名',
+					placeholder: '请输入表名',
+					param: 'plcTableName',
+				},
+				{
+					type: 'input',
+					label: '标识',
+					placeholder: '请输入标识',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					// type: this.$auth.hasPermi('equipment:realtime-table-config:create')
+					// 	? 'button'
+					// 	: '',
+					type: 'button',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('equipment:realtime-table-config:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '关联表名',
+						prop: 'plcTableName',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						// bind: {
+						// 	disabled: true, // some condition, like detail mode...
+						// }
+					},
+					{
+						input: true,
+						label: '编码',
+						prop: 'code',
+						url: '/base/equipment-group/getCode',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '标识',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						// bind: {
+						// 	disabled: true, // some condition, like detail mode...
+						// }
+					},
+					{
+						input: true,
+						label: '英文名',
+						prop: 'enName',
+					},
+				],
+				[
+					{
+						switch: true,
+						label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
+						prop: 'collection',
+						bind: {
+                            'active-value': 1,
+							'inactive-value': 0,
+                            value: 1,
+						},
+					},
+				],
+				[
+					{
+						textarea: true,
+						label: '描述',
+						prop: 'description',
+						bind: {
+							placeholder: '请输入备注',
+						},
+					},
+				],
+			],
+			// 是否显示弹出
+			open: false,
+			// 查询参数
+			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;
+				// this.tableKey = Math.random(); // method 1
+			});
+		},
+		/** 取消按钮 */
+		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/equipment/base/config/DataCollection/components/BasicDrawer.vue

@@ -0,0 +1,557 @@
+<!-- 
+    filename: EquipmentDrawer.vue
+    author: liubin
+    date: 2023-08-22 14:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section v-for="(section, index) in sections" :key="section.key">
+					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
+
+					<div class="form-part" v-if="section.key == 'base'">
+						<el-skeleton v-if="!showForm" animated />
+						<BaseInfoForm
+							key="drawer-dialog-form"
+							v-if="showForm"
+							ref="form"
+							:disabled="mode.includes('detail')"
+							v-model="form"
+							:rows="formRows" />
+					</div>
+
+					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
+						<base-table
+							v-loading="attrListLoading"
+							:table-props="section.props"
+							:page="attrQuery?.params.pageNo || 1"
+							:limit="attrQuery?.params.pageSize || 10"
+							:table-data="list"
+							:add-button-show="mode.includes('detail') ? null : '添加属性'"
+							@emitButtonClick="handleAddAttr"
+							@emitFun="handleEmitFun">
+							<method-btn
+								v-if="section.tableBtn"
+								slot="handleBtn"
+								label="操作"
+								:method-list="tableBtn"
+								@clickBtn="handleTableBtnClick" />
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="total > 0"
+							:total="total"
+							:page.sync="attrQuery.params.pageNo"
+							:limit.sync="attrQuery.params.pageSize"
+							@pagination="getAttrList" />
+					</div>
+				</section>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="handleCancel">确定</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			v-if="sections[1].allowAdd"
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="45%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				:disabled="mode.includes('detail')"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import BaseInfoForm from '@/components/DialogForm';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm: BaseInfoForm, BaseInfoForm },
+	props: ['sections', 'defaultMode', 'infoData'],
+	data() {
+		return {
+			mode: '',
+			visible: false,
+			showForm: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				name: '',
+				plcParamName: '',
+				unit: '',
+				collection: 1,
+				minValue: '',
+				maxValue: '',
+				defaultValue: '',
+				description: '',
+				remark: '',
+				alarmContent: '',
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						input: true,
+						label: '参数列名',
+						prop: 'plcParamName',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '参数名称',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '单位',
+						prop: 'unit',
+						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						switch: true,
+						label: '是否采集',
+						prop: 'collection',
+						bind: {
+							'active-value': 1,
+							'inactive-value': 0,
+						},
+					},
+				],
+				[
+					{
+						select: true,
+						label: '设备参数类型',
+						prop: 'equipment_param_type',
+						options: [
+                            { label: '一般参数', value: 1 },
+                            { label: '工艺参数', value: 2 },
+                            { label: '报警参数', value: 3 },
+                        ],
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+                        select: true,
+						label: '生产参数类型',
+                        prop: 'production_param_type',
+						options: [
+                            { label: '进片数量', value: 1 },
+                            { label: '出片数量', value: 2 },
+                            { label: '破损数量', value: 3 },
+                            { label: '无类型', value: 4 },
+
+                        ],
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '最小值',
+						prop: 'minValue',
+						rules: [
+							{
+								type: 'number',
+								message: '请输入正确的数字',
+								trigger: 'change',
+								transform: (val) => Number(val),
+							},
+						],
+					},
+					{
+						input: true,
+						label: '最大值',
+						prop: 'maxValue',
+						rules: [
+							{
+								required: false,
+							},
+							{
+								type: 'number',
+								message: '请输入正确的数字',
+								trigger: 'change',
+								transform: (val) => Number(val),
+							},
+						],
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '标准值',
+						prop: 'defaultValue',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '描述',
+						prop: 'description',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '备注',
+						prop: 'remark',
+						// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+			}, // 属性列表的请求
+			infoQuery: null, // 基本信息的请求
+			attrFormSubmitting: false,
+			attrListLoading: false,
+		};
+	},
+	computed: {
+		formRows() {
+			return this.sections[0].rows.map((row) => {
+				return row.map((col) => {
+					return {
+						...col,
+						bind: {
+							// 详情 模式下，禁用各种输入
+							// disabled: this.mode == 'detail',
+							disabled: true,
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		this.mode = this.defaultMode || 'detail';
+		for (const section of this.sections) {
+			// 请求具体信息
+			if ('url' in section) {
+				const query = {
+					url: section.url,
+					method: section.method || 'get',
+					params: section.queryParams || null,
+					data: section.data || null,
+				};
+				// debugger;
+				this.$axios(query).then(({ data }) => {
+					if (section.key == 'base') {
+						this.form = data;
+						this.showForm = true;
+						this.infoQuery = query;
+					} else if (section.key == 'attrs') {
+						this.attrQuery = query;
+						this.list = data.list;
+						this.total = data.total;
+					}
+				});
+			} else if (section.key == 'base') {
+				this.form = this.infoData;
+				this.showForm = true;
+			}
+		}
+	},
+	methods: {
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init() {
+			this.visible = true;
+		},
+
+		async getAttrList() {
+			this.attrListLoading = true;
+			const res = await this.$axios(this.attrQuery);
+			if (res.code == 0) {
+				this.list = res.data.list;
+				this.total = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs['form'][0].validate(async (valid) => {
+				if (valid) {
+					const isEdit = this.mode == 'edit';
+					await this.$axios({
+						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		// 开启编辑
+		toggleEdit() {
+			this.mode = 'edit';
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			this.attrForm = {
+				id: null,
+				name: '',
+				plcParamName: '',
+				unit: '',
+				collection: 1,
+				minValue: '',
+				maxValue: '',
+				defaultValue: '',
+				description: '',
+				remark: '',
+				alarmContent: '',
+			};
+			this.attrTitle = '添加设备绑定信息';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: this.sections[1].urlDetail,
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备绑定信息';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该分组报警?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: this.sections[1].urlDelete,
+						method: 'delete',
+						params: { id: attrId },
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		async submitAttrForm() {
+			this.$refs['attrForm'].validate((valid) => {
+				if (!valid) {
+					return;
+				}
+			});
+			const isEdit = this.attrForm.id != null;
+			this.attrFormSubmitting = true;
+			const res = await this.$axios({
+				url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
+				method: isEdit ? 'put' : 'post',
+				data: {
+					...this.attrForm,
+					connectId: this.infoData.id,
+				},
+			});
+
+			if (res.code == 0) {
+				this.closeAttrForm();
+				this.$message({
+					message: `${isEdit ? '更新' : '创建'}成功`,
+					type: 'success',
+					duration: 1500,
+					onClose: () => {
+						this.getAttrList();
+					},
+				});
+			}
+			this.attrFormSubmitting = false;
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(`确定删除该报警?`, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning',
+				})
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/equipment/base/config/deprecated/dialogForm.vue

@@ -0,0 +1,187 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-09-11 15:55:13
+    description: DialogForm for equipmentBindSection only
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="dataForm"
+		label-width="100px"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="报警编码"
+					prop="code"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.code"
+						@change="$emit('update', dataForm)"
+						placeholder="请输入工段排序" />
+				</el-form-item>
+				<!-- 				
+						<el-form-item
+						label="报警编码"
+						prop="code"
+						:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+						<el-select
+						v-model="dataForm.code"
+						placeholder="请选择产线"
+						@change="handleProductlineChange">
+						<el-option
+						v-for="opt in productionLineList"
+						:key="opt.value"
+						:label="opt.label"
+						:value="opt.value" />
+					</el-select>
+				</el-form-item> -->
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="报警类型"
+					prop="type"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						v-model="dataForm.type"
+						:disabled="disabled"
+						placeholder="请选择报警类型"
+						@change="$emit('update', dataForm)">
+						<el-option
+							v-for="opt in [
+								{ label: '布尔型', value: 2 },
+								{ label: '字符型', value: 1 },
+							]"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="报警级别"
+					prop="grade"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						:disabled="disabled"
+						v-model="dataForm.grade"
+						placeholder="请选择报警级别"
+						@change="$emit('update', dataForm)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					v-if="+dataForm.type == 1"
+					label="设备报警编码"
+					prop="alarmCode">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.alarmCode"
+						@change="$emit('update', dataForm)"
+						placeholder="请输入设备报警编码" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="参数列名"
+					prop="plcParamName"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.plcParamName"
+						placeholder="请输入参数列名"
+						@change="$emit('update', dataForm)"></el-input>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item
+					label="报警内容"
+					prop="alarmContent"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-input
+						:disabled="disabled"
+						v-model="dataForm.alarmContent"
+						placeholder="请输入报警内容"
+						@change="$emit('update', dataForm)"></el-input>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: {},
+	props: {
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	data() {
+		return {
+			formLoading: true,
+		};
+	},
+	mounted() {
+		this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
+			this.formLoading = false;
+			this.$emit('update', {
+				...this.dataForm,
+				code,
+			});
+		});
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		async handleProductlineChange(id) {
+			await this.getWorksectionList(id);
+			this.dataForm.workshopSectionId = null;
+			this.$emit('update', this.dataForm);
+		},
+		async getCode(url) {
+			const response = await this.$axios(url);
+			return response.data;
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>

src/views/equipment/base/config/deprecated/index.vue

@@ -0,0 +1,361 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="736px"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import {
+	createEquipmentGroupAlarm,
+	updateEquipmentGroupAlarm,
+	deleteEquipmentGroupAlarm,
+	getEquipmentGroupAlarm,
+	getEquipmentGroupAlarmPage,
+	exportEquipmentGroupAlarmExcel,
+} from '@/api/base/equipmentGroupAlarm';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import moment from 'moment';
+import { publicFormatter } from '@/utils/dict';
+import DialogForm from './dialogForm.vue';
+
+export default {
+	name: 'EquipmentGroupAlarm',
+	components: { DialogForm },
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: [''],
+			tableBtn: [
+				this.$auth.hasPermi('base:equipment-group-alarm:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:equipment-group-alarm:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{  width: 240, prop: 'code', label: '报警编码' },
+				{
+					prop: 'type',
+					label: '报警类型',
+					filter: (val) =>
+						val != null ? ['-', '字符型', '布尔型', '-'][val] : '-',
+				},
+				{
+					prop: 'grade',
+					label: '报警级别',
+					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
+				},
+				{ prop: 'alarmCode', label: '设备报警编码' },
+				{ prop: 'plcParamName', label: '参数列名' },
+				{ prop: 'alarmContent', label: '报警内容' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备分组编码',
+					width: '220',
+					placeholder: '/',
+					param: 'equipmentGroupCode',
+					defaultSelect: null,
+					disabled: true,
+				},
+				{
+					type: 'input',
+					label: '设备分组名称',
+					placeholder: '/',
+					param: 'equipmentGroupName',
+					defaultSelect: null,
+					disabled: true,
+				},
+				{
+					type: this.$auth.hasPermi('base:equipment-group-alarm:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '报警编码', // 自动生成
+						prop: 'code',
+						url: '/base/equipment-group-alarm/getCode',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						select: true,
+						label: '报警类型', // 固定选项
+						prop: 'type',
+						options: [
+							{ label: '布尔型', value: 2 },
+							{ label: '字符型', value: 1 },
+						],
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '报警级别', // 字典
+						prop: 'grade',
+						options: this.getDictDatas(this.DICT_TYPE.EQU_ALARM_LEVEL),
+					},
+					{
+						input: true,
+						label: '设备报警编码', // 对应到设备实际的报警编码
+						prop: 'alarmCode',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '参数列名', // 在实时数据库的列名
+						prop: 'plcParamName',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '报警内容',
+						prop: 'alarmContent',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				equipmentGroupId: null,
+			},
+			// 表单参数
+			form: {
+				id: null,
+				equipmentGroupId: null,
+				code: null,
+				type: null,
+				grade: null,
+				alarmCode: null,
+				alarmContent: null,
+				plcParamName: null,
+			},
+			// // 表单校验
+			// rules: {
+			//   equipmentGroupId: [{ required: true, message: "设备分组ID，关联base_equipment_group不能为空", trigger: "blur" }],
+			//   type: [{ required: true, message: "报警类型:1.字符型，2.布尔型不能为空", trigger: "change" }],
+			//   alarmContent: [{ required: true, message: "报警内容 该条报警具体的解释不能为空", trigger: "blur" }],
+			//   plcParamName: [{ required: true, message: "关联编码，对应到plc_param_name的编码，用于链接数采不能为空", trigger: "blur" }],
+			// }
+		};
+	},
+	// watch: {
+	//   $route(value) {
+	//     console.log('new route info', value)
+	//   }
+	// },
+	// created() {
+	// 	this.getList();
+	// },
+	activated() {
+		// 设置顶部搜索栏信息
+		const { equipmentGroupName, equipmentGroupCode, equipmentGroupId } =
+			this.$route.params;
+		this.setSearchBarFormValue('equipmentGroupName', equipmentGroupName);
+		this.setSearchBarFormValue('equipmentGroupCode', equipmentGroupCode);
+		this.queryParams.equipmentGroupId = equipmentGroupId;
+		// if (!equipmentGroupId) this.getList(); // 拦截
+		this.getList();
+	},
+	deactivated() {
+		this.setSearchBarFormValue('equipmentGroupName', null);
+		this.setSearchBarFormValue('equipmentGroupCode', null);
+		this.queryParams.equipmentGroupId = null;
+	},
+	methods: {
+		/** 设置 searchBarForm 的默认值 - 用得比较少 */
+		setSearchBarFormValue(param, value) {
+			this.searchBarFormConfig.forEach((config) => {
+				if (config.param == param) {
+					config.defaultSelect = value;
+				}
+			});
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			getEquipmentGroupAlarmPage(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: null,
+				equipmentGroupId: null,
+				code: null,
+				type: null,
+				grade: null,
+				alarmCode: null,
+				alarmContent: null,
+				plcParamName: null,
+			};
+			this.resetForm('form');
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			if (this.queryParams.equipmentGroupId == null)
+				return this.$message.error('没有检测到设备分组信息');
+			this.reset();
+			this.open = true;
+			this.title = '添加设备分组报警明细';
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const id = row.id;
+			getEquipmentGroupAlarm(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) {
+					updateEquipmentGroupAlarm({
+						...this.form,
+						equipmentGroupId: this.queryParams.equipmentGroupId,
+					}).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				createEquipmentGroupAlarm({
+					...this.form,
+					equipmentGroupId: this.queryParams.equipmentGroupId,
+				}).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除该报警?')
+				.then(function () {
+					return deleteEquipmentGroupAlarm(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 exportEquipmentGroupAlarmExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '设备分组报警明细.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/inspection/Content/index.vue

@@ -0,0 +1,307 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:disabled="mode == 'detail'"
+				:has-files="false"
+				:rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import { publicFormatter } from '@/utils/dict';
+
+const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+export default {
+	name: 'EquipmentCheck',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['content'],
+			tableBtn: [
+				// this.$auth.hasPermi('equipment:check:update')
+				// 	? {
+				// 			type: 'detail',
+				// 			btnName: '详情',
+				// 	  }
+				// 	: undefined,
+				this.$auth.hasPermi('equipment:check:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:check:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{ prop: 'program', label: '巡检项目' },
+				{ prop: 'content', label: '巡检内容' },
+				{ prop: 'code', label: '巡检内容编码' },
+				{ prop: 'remark', label: '备注' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '巡检内容',
+					placeholder: '请输入巡检内容',
+					param: 'content',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:check:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('equipment:check:export')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '巡检内容编号',
+						prop: 'code',
+						url: '/base/equipment-check/getCode',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '巡检项目',
+						prop: 'program',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '巡检内容',
+						prop: 'content',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '备注',
+						prop: 'remark',
+					},
+				],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				content: null,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-check',
+			mode: null,
+		};
+	},
+	created() {
+		// this.initSearchBar();
+		this.getList();
+	},
+	methods: {
+		// initSearchBar() {
+		// 	this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+		// 		this.$set(
+		// 			this.searchBarFormConfig[0],
+		// 			'selectOptions',
+		// 			data.map((item) => ({
+		// 				name: item.name,
+		// 				id: item.id,
+		// 			}))
+		// 		);
+		// 	});
+		// },
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.mode = null;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: null,
+				name: null,
+				content: null,
+				program: null,
+				remark: null,
+			};
+			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;
+			this.info({ 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) {
+					this.put(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				this.post(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除记录"' + row.name + '"?')
+				.then(function () {
+					return this.delete({ id });
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		handleDetail({ id }) {
+			this.reset();
+			this.mode = 'detail';
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改巡检内容';
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有巡检内容?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentTypeExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '巡检内容.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/inspection/Record/index.vue

@@ -0,0 +1,371 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:disabled="mode == 'detail'"
+				:has-files="true"
+				:rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+
+const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+export default {
+	name: 'EquipmentRepair',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['equipmentId', 'createTime'],
+			tableBtn: [
+				this.$auth.hasPermi('equipment:check-record:update')
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:check-record:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:check-record:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{ prop: 'repairOrderNumber', label: '配置名称' },
+				{ prop: 'maintenanceDuration', label: '设备名称' },
+				{ prop: 'lineName', label: '数据来源' },
+				{ prop: 'sectionName', label: '计划巡检时间' },
+				{ prop: 'equipmentName', label: '实际巡检时间' },
+				{ prop: 'maintenanceDetail', label: '完成状态' },
+				{ prop: 'repairman', label: '巡检人' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '设备',
+					placeholder: '请选择设备',
+					param: 'equipmentId',
+				},
+				// 开始结束时间 
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange', // datetimerange
+					format: 'yyyy-MM-dd',
+					valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'startTime',
+					// width: 350,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:check-record:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:check-record:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+				},
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '维修单号',
+						prop: 'repairOrderNumber',
+					},
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/listAll',
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						// TODO: 和班组联动
+						select: true,
+						label: '维修工',
+						prop: 'repairman',
+						// url: '/base/core-equipment/listAll',
+						bind: {
+							filterable: true,
+							clearable: true,
+							multiple: true,
+						},
+						options: [{ label: 'test', value: 'test' }],
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '联系方式',
+						prop: 'repairmanPhone',
+					},
+				],
+				[
+					{
+						datetime: true,
+						label: '故障发生时间',
+						prop: 'faultTime',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: {
+							format: 'yyyy-MM-dd HH:mm:ss',
+							'value-format': 'timestamp',
+							// 'value-format': 'yyyy-MM-dd HH:mm:ss',
+							clearable: true,
+						},
+					},
+					{
+						select: true,
+						label: '故障级别',
+						prop: 'faultLevel', // 数据字典
+						options: this.getDictDatas(this.DICT_TYPE.FAULT_LEVEL),
+					},
+				],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				maintenanceStatus: null,
+				createTime: null,
+				equipmentId: null,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-repair-log',
+			mode: null,
+		};
+	},
+	created() {
+		this.initSearchBar();
+		this.getList();
+	},
+	methods: {
+		initSearchBar() {
+			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+				this.$set(
+					this.searchBarFormConfig[0],
+					'selectOptions',
+					data.map((item) => ({
+						name: item.name,
+						id: item.id,
+					}))
+				);
+			});
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.mode = null;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: null,
+				repairOrderNumber: null,
+				equipmentId: null,
+				repairman: null,
+				repairmanPhone: null,
+				faultTime: null,
+				faultLevel: null,
+				maintenanceStartTime: null,
+				maintenanceFinishTime: null,
+				faultType: null,
+				repairMode: null,
+				maintenanceStatus: null,
+				faultDetail: null,
+				maintenanceDetail: null,
+				remark: null,
+				files: [
+					// {
+					// 	fileName: '',
+					// 	fileType: '',
+					// 	fileUrl: '',
+					// },
+				],
+			};
+			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;
+			this.info({ 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) {
+					this.put(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				this.post(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除记录"' + row.name + '"?')
+				.then(function () {
+					return this.delete({ id });
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		handleDetail({ id }) {
+			this.reset();
+			this.mode = 'detail';
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改维修记录';
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有维修记录?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentTypeExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '维修记录.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/inspection/Settings/index.vue

@@ -0,0 +1,317 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:disabled="mode == 'detail'"
+				:has-files="false"
+				:rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+// import { publicFormatter } from '@/utils/dict';
+// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+export default {
+	name: 'EquipmentCheckSetting',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['equipmentId', 'name'],
+			tableBtn: [
+				// this.$auth.hasPermi('equipment:check-setting:update')
+				// 	? {
+				// 			type: 'detail',
+				// 			btnName: '详情',
+				// 	  }
+				// 	: undefined,
+				this.$auth.hasPermi('equipment:check-setting:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:check-setting:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{ prop: 'name', label: '配置名' },
+				{ prop: 'code', label: '编码' },
+				{ prop: 'lineName', label: '产线' },
+				{ prop: 'sectionName', label: '工段' },
+				{ prop: 'equipmentName', label: '设备' },
+				{ prop: 'responsible', label: '负责人' },
+				{ prop: 'equipmentCode', label: '描述' },
+				{ prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问
+				{ prop: 'remark', label: '备注' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '配置名称',
+					placeholder: '请输入配置名称',
+					param: 'name',
+				},
+				{
+					type: 'select',
+					label: '设备名称',
+					placeholder: '请选择设备',
+					param: 'equipmentId',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:check-setting:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('equipment:check-setting:export')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '配置名称',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '配置编码',
+						prop: 'code',
+						url: '/base/equipment-check-config/getCode',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/listAll',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '设备编码', // TODO: 和设备名称联动估计
+						prop: 'equipmentCode',
+					},
+				],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				equipmentId: null,
+				name: null,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-check-config',
+			mode: null,
+		};
+	},
+	created() {
+		this.initSearchBar();
+		this.getList();
+	},
+	methods: {
+		initSearchBar() {
+			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+				this.$set(
+					this.searchBarFormConfig[1],
+					'selectOptions',
+					data.map((item) => ({
+						name: item.name,
+						id: item.id,
+					}))
+				);
+			});
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.mode = null;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: null,
+				name: null,
+				content: null,
+				program: null,
+				remark: null,
+			};
+			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;
+			this.info({ 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) {
+					this.put(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				this.post(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除记录"' + row.name + '"?')
+				.then(function () {
+					return this.delete({ id });
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		handleDetail({ id }) {
+			this.reset();
+			this.mode = 'detail';
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改巡检设置';
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有巡检设置?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentTypeExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '巡检设置.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/maintain/Monitor/index.vue

@@ -0,0 +1,336 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<!-- <method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" /> -->
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:has-files="false"
+				:rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import { publicFormatter } from '@/utils/dict';
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+
+const remainBox = {
+	name: 'RemainBox',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	computed: {
+		value() {
+			return this.injectData[this.injectData.prop] || null;
+		},
+		color() {
+			if (this.value) {
+				const v = +this.value;
+				return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green';
+			}
+			return 'unset';
+		},
+	},
+	render: function (h) {
+		return (
+			<div
+				style={`background: ${
+					this.color
+				}; position:absolute; inset: 0; padding: 0 10px; display: flex; align-items: center; color: ${
+					this.color == 'red' ? '#fff' : 'unset'
+				}`}>
+				{this.injectData[this.injectData.prop] || ''}
+			</div>
+		);
+	},
+};
+
+const btn = {
+	name: 'tableBtn',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleClick() {
+			this.$emit('emitData', { action: this.injectData.label, value: null });
+		},
+	},
+	render: function (h) {
+		return (
+			<el-button type="text" onClick={this.handleClick}>
+				{this.injectData.label}
+			</el-button>
+		);
+	},
+};
+
+export default {
+	name: 'PlanConfig',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['planId', 'equipmentId'],
+			tableProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{ prop: 'name', label: '保养计划' },
+				{ prop: 'lineName', label: '产线' },
+				{ prop: 'sectionName', label: '工段' },
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'equipmentCode', label: '设备编码' },
+				{ prop: 'maintainDuration', label: '保养频率' },
+				{
+					prop: 'maintainType',
+					label: '保养类型',
+					filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
+				},
+				{
+					prop: 'lastMaintainTime',
+					label: '上次保养时间',
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{ prop: 'nextMaintainTime', label: '计划下次保养时间' },
+				{
+					prop: 'remainDays',
+					label: '距离保养时间(天)',
+					subcomponent: remainBox,
+				},
+				{ prop: 'opt1', label: '设备保养', subcomponent: btn },
+				{ prop: 'opt2', label: '保养记录', subcomponent: btn },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '保养计划',
+					placeholder: '请选择保养计划',
+					param: 'planId',
+					filterable: true,
+				},
+				{
+					type: 'select',
+					label: '设备名',
+					placeholder: '请选择设备',
+					param: 'equipmentId',
+					filterable: true,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:quality-inspection-type:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+				},
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				equipmentName: null,
+				createTime: null,
+			},
+			// 表单参数
+			form: {},
+		};
+	},
+	created() {
+		this.initSearchBar();
+		this.getList();
+	},
+	methods: {
+		initSearchBar() {
+			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+				this.$set(
+					this.searchBarFormConfig[1],
+					'selectOptions',
+					data.map((item) => ({
+						name: item.name,
+						id: item.id,
+					}))
+				);
+			});
+			this.http('/base/equipment-maintain-plan/page', 'get', {
+				pageNo: 1,
+				pageSize: 100,
+			}).then(({ data }) => {
+				this.$set(
+					this.searchBarFormConfig[0],
+					'selectOptions',
+					(data?.list || []).map((item) => ({
+						name: item.name,
+						id: item.id,
+					}))
+				);
+			});
+		},
+		handleEmitFun({action, value}) {
+ 			switch (action) {
+				// 查看详情
+				case '设备保养':
+					alert('设备保养');
+					break;
+				case '保养记录':
+					alert('保养记录');
+					break;
+			}
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.http(
+				'/base/equipment-maintain-plan/monitor',
+				'get',
+				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 = {
+				code: null,
+				name: null,
+				equipmentId: null,
+				enabled: null,
+				maintenancePeriod: null,
+				maintainDuration: null,
+				maintainType: null,
+				remark: null,
+				enabled: 1,
+			};
+			this.resetForm('form');
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = '添加保养计划';
+		},
+		handleDetail(id) {
+			alert('跳转到 保养记录');
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const id = row.id;
+			this.info({ 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) {
+					this.put(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				this.post(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除设备类型"' + row.name + '"?')
+				.then(function () {
+					return this.del(id);
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/maintain/PlanConfig/index.vue

@@ -0,0 +1,343 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:has-files="false"
+				:rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+
+export default {
+	name: 'PlanConfig',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		const t = new Date();
+		const [y, m, d] = [t.getFullYear(), t.getMonth(), t.getDate()];
+		return {
+			searchBarKeys: ['equipmentName', 'createTime'],
+			tableBtn: [
+				{
+					type: 'detail',
+					btnName: '保养记录',
+				},
+				this.$auth.hasPermi('equipment:plan-config:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:plan-config:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{ prop: 'name', label: '计划名称' },
+				{ prop: 'code', label: '计划编号' },
+				{ prop: 'enabled', label: '启用状态' },
+				{ prop: 'lineName', label: '产线' },
+				{ prop: 'sectionName', label: '工段' },
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'maintainDuration', label: '计划保养用时(h)' },
+				{ prop: 'maintenancePeriod', label: '保养频率(天/次)' },
+				{ prop: 'maintainType', label: '保养类型' },
+				{ prop: 'remark', label: '备注' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备名',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				// 时间段
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange', // datetimerange
+					format: 'yyyy-MM-dd',
+					// valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'createTime',
+					// defaultSelect: [
+					// 	new Date(y, m, d)
+					// 		.toLocaleString()
+					// 		.split('/')
+					// 		.map((item, index) => {
+					// 			if (index == 1 || index == 2) return item.padStart(2, '0');
+					// 			return item;
+					// 		})
+					// 		.join('-'),
+					// 	new Date(y, m, d, 23, 59, 59)
+					// 		.toLocaleString()
+					// 		.split('/')
+					// 		.map((item, index) => {
+					// 			if (index == 1 || index == 2) return item.padStart(2, '0');
+					// 			return item;
+					// 		})
+					// 		.join('-'),
+					// ],
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:plan-config:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('base:quality-inspection-type:export')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '计划名称',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '计划编号',
+						prop: 'code',
+						url: '/base/equipment-maintain-plan/getCode',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/listAll',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						select: true,
+						label: '保养类型',
+						prop: 'maintainType',
+						options: this.getDictDatas(this.DICT_TYPE.MAINTAIN_TYPE),
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养时长(h)',
+						prop: 'maintainDuration',
+						rules: [
+							{
+								type: 'number',
+								trigger: 'blur',
+								message: '请输入正确的数字',
+								transform: (val) => Number(val),
+							},
+						],
+					},
+					{
+						input: true,
+						label: '保养频率(天/次)',
+						prop: 'maintenancePeriod',
+						rules: [
+							{
+								type: 'number',
+								trigger: 'blur',
+								message: '请输入正确的数字',
+								transform: (val) => Number(val),
+							},
+						],
+					},
+				],
+				[{ input: true, label: '备注', prop: 'remark' }],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				equipmentName: null,
+				createTime: null,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-maintain-plan',
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(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 = {
+				code: null,
+				name: null,
+				equipmentId: null,
+				enabled: null,
+				maintenancePeriod: null,
+				maintainDuration: null,
+				maintainType: null,
+				remark: null,
+                enabled: 1
+			};
+			this.resetForm('form');
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = '添加保养计划';
+		},
+        handleDetail(id){
+            alert('跳转到 保养记录')
+        },
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const id = row.id;
+			this.info({ 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) {
+					this.put(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				this.post(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除设备类型"' + row.name + '"?')
+				.then(function () {
+					return this.del(id);
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/maintain/Record/index.vue

@@ -0,0 +1,452 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="60%"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+                :disabled="mode == 'detail'"
+				:has-files="true"
+				:rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+
+const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+export default {
+	name: 'EquipmentMaintainRecord',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: [
+				'maintainPlanId',
+				'maintainPlanId',
+				'startTime',
+				'relatePlan',
+				'equipmentId',
+			],
+			tableBtn: [
+				this.$auth.hasPermi('equipment:maintain-record:update')
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:maintain-record:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:maintain-record:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: timeFilter,
+				},
+				{ prop: 'maintainOrderNumber', label: '设备保养单号' },
+				{ prop: 'startTime', label: '开始时间', filter: timeFilter },
+				{ prop: 'endTime', label: '结束时间', filter: timeFilter },
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'maintainWorker', label: '保养人员' },
+				{
+					prop: 'relatePlan',
+					label: '是否计划保养',
+					filter: (v) => (v != null ? ['', '是', '否'][v] : ''),
+				},
+				{ prop: 'planName', label: '保养计划名称' },
+				{ prop: 'maintainDuration', label: '计划保养用时(h)' },
+				{ prop: 'timeUsed', label: '实际保养用时(h)' },
+				{ prop: 'remark', label: '备注' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '设备',
+					placeholder: '请选择设备',
+					param: 'equipmentId',
+				},
+				{
+					type: 'select',
+					label: '保养计划',
+					placeholder: '请选择保养计划',
+					param: 'maintainPlanId',
+				},
+				// 开始结束时间
+				{
+					type: 'datePicker',
+					label: '时间段',
+					dateType: 'daterange', // datetimerange
+					format: 'yyyy-MM-dd',
+					valueFormat: 'timestamp',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'startTime',
+					// width: 350,
+				},
+				{
+					type: 'select',
+					label: '是否计划保养',
+					selectOptions: [
+						{ name: '是', id: 1 },
+						{ name: '否', id: 2 },
+					],
+					param: 'relatePlan',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:maintain-record:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:maintain-record:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+				},
+			],
+			rows: [
+				[
+					{
+						select: true,
+						label: '保养设备',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/listAll',
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						// TODO: 和班组联动
+						select: true,
+						label: '保养人员',
+						prop: 'maintainWorker',
+						// url: '/base/core-equipment/listAll',
+						bind: {
+							filterable: true,
+							clearable: true,
+							multiple: true,
+						},
+						selectOptions: [{ name: 'test', id: 'test' }],
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '保养单号',
+						prop: 'maintainOrderNumber',
+					},
+				],
+				[
+					{
+						switch: true,
+						label: '是否计划保养',
+						prop: 'relatePlan',
+					},
+					{},
+					{
+						// TODO: 和计划联动
+						select: true,
+						label: '所属计划',
+						prop: 'maintainPlanId',
+						url: '',
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
+					},
+				],
+				[
+					{
+						datetime: true,
+						label: '开始时间',
+						prop: 'startTime',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: {
+							format: 'yyyy-MM-dd HH:mm:ss',
+							'value-format': 'timestamp',
+							// 'value-format': 'yyyy-MM-dd HH:mm:ss',
+							clearable: true,
+						},
+					},
+					{
+						datetime: true,
+						label: '结束时间',
+						prop: 'endTime',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: {
+							format: 'yyyy-MM-dd HH:mm:ss',
+							'value-format': 'timestamp',
+							// 'value-format': 'yyyy-MM-dd HH:mm:ss',
+							clearable: true,
+						},
+					},
+					{
+						input: true,
+						label: '保养用时',
+						prop: 'timeUsed',
+					},
+				],
+
+				[
+					{
+						upload: true,
+						label: '上传资料',
+						prop: 'files',
+					},
+				],
+				// TODO: 富文本
+				[{ input: true, label: '保养描述', prop: 'maintenanceDes' }],
+				[{ input: true, label: '备注', prop: 'remark' }],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				maintainPlanId: null,
+				maintainPlanId: null,
+				startTime: null,
+				relatePlan: null,
+				equipmentId: null,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-maintain-log',
+            mode: null
+		};
+	},
+	created() {
+		this.initSearchBar();
+		this.getList();
+	},
+	methods: {
+		initSearchBar() {
+			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+				this.$set(
+					this.searchBarFormConfig[0],
+					'selectOptions',
+					data.map((item) => ({
+						name: item.name,
+						id: item.id,
+					}))
+				);
+			});
+			this.http('/base/equipment-maintain-plan/page', 'get', {
+				pageNo: 1,
+				pageSize: 100,
+			}).then(({ data }) => {
+				this.$set(
+					this.searchBarFormConfig[1],
+					'selectOptions',
+					(data?.list || []).map((item) => ({
+						name: item.name,
+						id: item.id,
+					}))
+				);
+			});
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+            this.mode = null;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: null,
+				relatePlan: null,
+				maintainPlanId: null,
+				equipmentId: null,
+				maintainWorker: null,
+				maintainOrderNumber: null,
+				startTime: null,
+				endTime: null,
+				timeUsed: null,
+				remark: null,
+				maintenanceDes: null,
+				files: [
+					// {
+					// 	fileName: '',
+					// 	fileType: '',
+					// 	fileUrl: '',
+					// },
+				],
+			};
+			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;
+			this.info({ 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) {
+					this.put(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				this.post(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除记录"' + row.name + '"?')
+				.then(function () {
+					return this.delete({ id });
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		handleDetail({ id }) {
+			this.reset();
+            this.mode = 'detail'
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改保养记录';
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有保养记录?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentTypeExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '保养记录.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/repair/CustomDialogForm.vue

@@ -0,0 +1,216 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-10-31 15:55:13
+    description: 
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="dataForm"
+		label-width="100px"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="8">
+				<el-form-item label="维修单号" prop="code">
+					<span>{{ dataForm.code }}</span>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="设备名称" prop="code">
+					<span>{{ dataForm.code }}</span>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="维修工" prop="code">
+					<span>{{ dataForm.code }}</span>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="8">
+				<el-form-item label="故障发生时间" prop="code">
+					<span>{{ dataForm.code }}</span>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="故障级别" prop="code">
+					<span>{{ dataForm.code }}</span>
+				</el-form-item>
+			</el-col>
+			<el-col :span="8">
+				<el-form-item label="联系方式" prop="code">
+					<span>{{ dataForm.code }}</span>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="8">
+				<el-form-item
+					label="维修开始时间"
+					prop="alarmCode"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-date-picker
+						v-model="dataForm.startTIme"
+						type="datetime"
+						:disabled="disabled"
+						:placeholder="请选择维修开始时间"
+						value-format="timestamp"
+						@change="$emit('update', form)"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="8">
+				<el-form-item
+					label="维修结束时间"
+					prop="alarmCode"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-date-picker
+						v-model="dataForm.startTIme"
+						type="datetime"
+						:disabled="disabled"
+						:placeholder="请选择维修开始时间"
+						value-format="timestamp"
+						@change="$emit('update', form)"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="8">
+				<el-form-item
+					label="维修方式"
+					prop="grade"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<el-select
+						:disabled="disabled"
+						v-model="dataForm.grade"
+						placeholder="请选择报警级别"
+						@change="$emit('update', dataForm)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="8">
+				<el-form-item label="故障类型" prop="alarmCode">
+					<el-select
+						:disabled="disabled"
+						v-model="dataForm.grade"
+						placeholder="请选择报警级别"
+						@change="$emit('update', dataForm)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.EQU_ALARM_LEVEL)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+
+		<el-row :gutter="20">
+			<el-col>
+				<el-form-item
+					label="故障明细"
+					prop="dsfsdfasd"
+					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+					<!-- // 富文本 -->
+				</el-form-item>
+			</el-col>
+		</el-row>
+
+		<el-row :gutter="20">
+			<el-col>
+				<el-form-item label="维修记录" prop="dsfsdfasd">
+					<!-- // 富文本 -->
+				</el-form-item>
+			</el-col>
+		</el-row>
+
+		<el-row :gutter="20">
+			<el-col>
+				<el-form-item label="维修附件" prop="dsfsdfasd">
+					<el-upload></el-upload>
+				</el-form-item>
+			</el-col>
+		</el-row>
+
+		<el-row :gutter="20">
+			<el-col>
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="dataForm.remark"
+						@change="$emit('update', form)"
+						:placeholder="`请输入备注`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: {},
+	props: {
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	data() {
+		return {
+			formLoading: true,
+		};
+	},
+	mounted() {
+		this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
+			this.formLoading = false;
+			this.$emit('update', {
+				...this.dataForm,
+				code,
+			});
+		});
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		async handleTypeChange(id) {
+			// debugger;
+			this.dataForm.alarmCode = '';
+			this.$emit('update', this.dataForm);
+		},
+		async getCode(url) {
+			const response = await this.$axios(url);
+			return response.data;
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>

src/views/equipment/base/repair/index.vue

@@ -0,0 +1,383 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:disabled="mode == 'detail'"
+				:has-files="true"
+				:rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+
+const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+export default {
+	name: 'EquipmentRepair',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['maintenanceStatus', 'createTime', 'equipmentId'],
+			tableBtn: [
+				this.$auth.hasPermi('equipment:repair:update')
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:repair:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:repair:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: timeFilter,
+				},
+				{ prop: 'repairOrderNumber', label: '设备维修单号' },
+				{ prop: 'maintenanceStartTime', label: '开始时间', filter: timeFilter },
+				{
+					prop: 'maintenanceFinishTime',
+					label: '结束时间',
+					filter: timeFilter,
+				},
+				{
+					prop: 'maintenanceStatus',
+					label: '维修状态',
+					filter: (v) => (v != null ? ['未完成', '完成'][v] : ''),
+				},
+				{ prop: 'maintenanceDuration', label: '维修时长(h)' },
+				{ prop: 'lineName', label: '产线' },
+				{ prop: 'sectionName', label: '工段' },
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'maintenanceDetail', label: '维修明细' },
+				{ prop: 'repairman', label: '维修工' },
+				{ prop: 'repairmanPhone', label: '联系方式' },
+				{ prop: 'remark', label: '备注' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '设备',
+					placeholder: '请选择设备',
+					param: 'equipmentId',
+				},
+				{
+					type: 'select',
+					label: '状态',
+					placeholder: '请选择状态',
+					param: 'maintenanceStatus',
+					selectOptions: [
+						{ name: '未完成', id: '0' },
+						{ name: '完成', id: '1' },
+					],
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:repair:create') ? 'button' : '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:repair:export') ? 'button' : '',
+					btnName: '导出',
+					name: 'export',
+					color: 'warning',
+				},
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '维修单号',
+						prop: 'repairOrderNumber',
+					},
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/listAll',
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						// TODO: 和班组联动
+						select: true,
+						label: '维修工',
+						prop: 'repairman',
+						// url: '/base/core-equipment/listAll',
+						bind: {
+							filterable: true,
+							clearable: true,
+							multiple: true,
+						},
+						options: [{ label: 'test', value: 'test' }],
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '联系方式',
+						prop: 'repairmanPhone',
+					},
+				],
+				[
+					{
+						datetime: true,
+						label: '故障发生时间',
+						prop: 'faultTime',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						bind: {
+							format: 'yyyy-MM-dd HH:mm:ss',
+							'value-format': 'timestamp',
+							// 'value-format': 'yyyy-MM-dd HH:mm:ss',
+							clearable: true,
+						},
+					},
+					{
+						select: true,
+						label: '故障级别',
+						prop: 'faultLevel', // 数据字典
+						options: this.getDictDatas(this.DICT_TYPE.FAULT_LEVEL),
+					},
+				],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				maintenanceStatus: null,
+				createTime: null,
+				equipmentId: null,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-repair-log',
+			mode: null,
+		};
+	},
+	created() {
+		this.initSearchBar();
+		this.getList();
+	},
+	methods: {
+		initSearchBar() {
+			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+				this.$set(
+					this.searchBarFormConfig[0],
+					'selectOptions',
+					data.map((item) => ({
+						name: item.name,
+						id: item.id,
+					}))
+				);
+			});
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.mode = null;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: null,
+				repairOrderNumber: null,
+				equipmentId: null,
+				repairman: null,
+				repairmanPhone: null,
+				faultTime: null,
+				faultLevel: null,
+				maintenanceStartTime: null,
+				maintenanceFinishTime: null,
+				faultType: null,
+				repairMode: null,
+				maintenanceStatus: null,
+				faultDetail: null,
+				maintenanceDetail: null,
+				remark: null,
+				files: [
+					// {
+					// 	fileName: '',
+					// 	fileType: '',
+					// 	fileUrl: '',
+					// },
+				],
+			};
+			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;
+			this.info({ 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) {
+					this.put(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				this.post(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除记录"' + row.name + '"?')
+				.then(function () {
+					return this.delete({ id });
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		handleDetail({ id }) {
+			this.reset();
+			this.mode = 'detail';
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改维修记录';
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有维修记录?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentTypeExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '维修记录.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/spareParts/Config/index.vue

@@ -0,0 +1,331 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="35%"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:disabled="mode == 'detail'"
+				:has-files="false"
+				:rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import { publicFormatter } from '@/utils/dict';
+
+const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+export default {
+	name: 'EquipmentSparePartsConfig',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['name', 'equipmentId', 'equipmentIdList'],
+			tableBtn: [
+				// this.$auth.hasPermi('equipment:spare-parts-config:update')
+				// 	? {
+				// 			type: 'detail',
+				// 			btnName: '详情',
+				// 	  }
+				// 	: undefined,
+				this.$auth.hasPermi('equipment:spare-parts-config:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:spare-parts-config:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{ prop: 'name', label: '配置名' },
+				{ prop: 'lineName', label: '产线' },
+				{ prop: 'sectionName', label: '工段' },
+				{ prop: 'equipmentName', label: '设备名' },
+				{ prop: 'equipmentCode', label: '设备编码' },
+				{ prop: 'responsible', label: '负责人' },
+				// { prop: 'unit', label: '单位', filter: publicFormatter('unit_dict') },
+				{ prop: 'description', label: '描述' },
+				{ prop: 'sparePartNumber', label: '备品备件数量' },
+				// { prop: 'remark', label: '备注' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '配置名称',
+					placeholder: '请输入配置名称',
+					param: 'name',
+				},
+				{
+					type: 'select',
+					label: '设备名称',
+					placeholder: '请输选择设备称',
+					param: 'equipmentId',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:spare-parts-config:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('equipment:spare-parts-config:export')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '配置名称',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/listAll',
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true, // TODO: or INPUT instead of SELECT
+						label: '负责人',
+						prop: 'responsible',
+						url: '/base/core-equipment/listAll', // TODO: 班组
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
+					},
+				],
+				[
+					{
+						input: true,
+						label: '描述',
+						prop: 'description', // TODO: 富文本
+					},
+				],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				name: null,
+				equipmentId: null,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-spare-part-config',
+			mode: null,
+		};
+	},
+	created() {
+		this.initSearchBar();
+		this.getList();
+	},
+	methods: {
+		initSearchBar() {
+			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+				this.$set(
+					this.searchBarFormConfig[1],
+					'selectOptions',
+					data.map((item) => ({
+						name: item.name,
+						id: item.id,
+					}))
+				);
+			});
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.mode = null;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: null,
+				name: null,
+				equipmentId: null,
+				description: null,
+				responsible: null
+			};
+			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;
+			this.info({ 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) {
+					this.put(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				this.post(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除记录"' + row.name + '"?')
+				.then(function () {
+					return this.delete({ id });
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		handleDetail({ id }) {
+			this.reset();
+			this.mode = 'detail';
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改备品备件配置';
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有备品备件配置?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentTypeExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '备品备件配置.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/spareParts/List/index.vue

@@ -0,0 +1,369 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:disabled="mode == 'detail'"
+				:has-files="false"
+				:rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import { publicFormatter } from '@/utils/dict';
+
+const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+export default {
+	name: 'EquipmentSparePartsList',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['name'],
+			tableBtn: [
+				// this.$auth.hasPermi('equipment:spare-parts:update')
+				// 	? {
+				// 			type: 'detail',
+				// 			btnName: '详情',
+				// 	  }
+				// 	: undefined,
+				this.$auth.hasPermi('equipment:spare-parts:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:spare-parts:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{ prop: 'code', label: '备件编码' },
+				{ prop: 'name', label: '备件名称' },
+				{ prop: 'model', label: '备件型号' },
+				{ prop: 'unit', label: '单位', filter: publicFormatter('unit_dict') },
+				{ prop: 'life', label: '使用寿命' },
+				{ prop: 'specifications', label: '规格' },
+				{ prop: 'remark', label: '备注' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '关键字',
+					placeholder: '请输入备件名称',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:spare-parts:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('equipment:spare-parts:export')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '备件名称',
+						prop: 'name',
+					},
+					{
+						input: true,
+						label: '备件型号',
+						prop: 'model',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '规格',
+						prop: 'specifications',
+					},
+					{
+						select: true,
+						label: '供应商',
+						prop: 'supplierId',
+						url: '/base/core-supplier/listAll', // TODO: 课上关系
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '物料类型',
+						prop: 'type',
+						url: '/base/core-equipment/listAll', // TODO: 物料
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '使用寿命',
+						prop: 'life',
+						rules: [
+							{
+								type: 'number',
+								message: '请输入正确的数字类型',
+								trigger: 'blur',
+								transform: (v) => Number(v),
+							},
+						],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '单位',
+						prop: 'unit', // 数据字典
+						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
+					},
+					{
+						input: true,
+						label: '备注',
+						prop: 'remark',
+					},
+				],
+				// [
+				// {
+				// 	datetime: true,
+				// 	label: '故障发生时间',
+				// 	prop: 'faultTime',
+				// 	rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+				// 	bind: {
+				// 		format: 'yyyy-MM-dd HH:mm:ss',
+				// 		'value-format': 'timestamp',
+				// 		// 'value-format': 'yyyy-MM-dd HH:mm:ss',
+				// 		clearable: true,
+				// 	},
+				// },
+
+				// ],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				name: null,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-spare-part',
+			mode: null,
+		};
+	},
+	created() {
+		// this.initSearchBar();
+		this.getList();
+	},
+	methods: {
+		// initSearchBar() {
+		// 	this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+		// 		this.$set(
+		// 			this.searchBarFormConfig[0],
+		// 			'selectOptions',
+		// 			data.map((item) => ({
+		// 				name: item.name,
+		// 				id: item.id,
+		// 			}))
+		// 		);
+		// 	});
+		// },
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.mode = null;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: null,
+				code: null,
+				name: null,
+				model: null,
+				specifications: null,
+				life: null,
+				type: null,
+				supplierId: null,
+				unit: null,
+				remark: null,
+			};
+			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;
+			this.info({ 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) {
+					this.put(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				this.post(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除记录"' + row.name + '"?')
+				.then(function () {
+					return this.delete({ id });
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		handleDetail({ id }) {
+			this.reset();
+			this.mode = 'detail';
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改备品备件';
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有备品备件?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentTypeExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '备品备件.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/spareParts/Monitor/index.vue

@@ -0,0 +1,385 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="35%"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:disabled="mode == 'detail'"
+				:has-files="false"
+				:rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+// import { publicFormatter } from '@/utils/dict';
+// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+// TODO: 该组件缺乏对应的后端接口
+
+const remainBox = {
+	name: 'RemainBox',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	computed: {
+		value() {
+			return this.injectData[this.injectData.prop] || null;
+		},
+		color() {
+			if (this.value) {
+				const v = +this.value;
+				return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green';
+			}
+			return 'unset';
+		},
+	},
+	render: function (h) {
+		return (
+			<div
+				style={`background: ${
+					this.color
+				}; position:absolute; inset: 0; padding: 0 10px; display: flex; align-items: center; color: ${
+					this.color == 'red' ? '#fff' : 'unset'
+				}`}>
+				{this.injectData[this.injectData.prop] || ''}
+			</div>
+		);
+	},
+};
+
+const btn = {
+	name: 'tableBtn',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleClick() {
+			this.$emit('emitData', { action: this.injectData.label, value: null });
+		},
+	},
+	render: function (h) {
+		return (
+			<el-button type="text" onClick={this.handleClick}>
+				{this.injectData.label}
+			</el-button>
+		);
+	},
+};
+
+
+
+export default {
+	name: 'EquipmentSparePartsMonitor',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['name', 'equipmentId', 'equipmentIdList'],
+			tableBtn: [
+				// this.$auth.hasPermi('equipment:spare-parts-config:update')
+				// 	? {
+				// 			type: 'detail',
+				// 			btnName: '详情',
+				// 	  }
+				// 	: undefined,
+				this.$auth.hasPermi('equipment:spare-parts-config:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:spare-parts-config:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{ prop: 'name', label: '配置名' },
+				{ prop: 'lineName', label: '产线' },
+				{ prop: 'sectionName', label: '工段' },
+				{ prop: 'equipmentName', label: '设备' },
+				{ prop: 'responsible', label: '负责人' },
+				{ prop: 'equipmentCode', label: '是否超期', subcomonent: remainBox },
+				{ prop: 'opt1', label: '备件更换' },
+				{ prop: 'opt2', label: '更新记录' },  // TODO: 是否换成按钮， 群里问
+				// { prop: 'remark', label: '备注' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '产线',
+					placeholder: '请选择产线',
+					param: 'name',
+				},
+				{
+					type: 'select',
+					label: '设备',
+					placeholder: '请选择设备',
+					param: 'equipmentId',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				// {
+				// 	type: 'separate',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('equipment:spare-parts-config:create')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '新增',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'success',
+				// },
+				// {
+				// 	type: this.$auth.hasPermi('equipment:spare-parts-config:export')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '配置名称',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/listAll',
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true, // TODO: or INPUT instead of SELECT
+						label: '负责人',
+						prop: 'responsible',
+						url: '/base/core-equipment/listAll', // TODO: 班组
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
+					},
+				],
+				[
+					{
+						input: true,
+						label: '描述',
+						prop: 'description', // TODO: 富文本
+					},
+				],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				name: null,
+				equipmentId: null,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-spare-part-config',
+			mode: null,
+		};
+	},
+	created() {
+		this.initSearchBar();
+		this.getList();
+	},
+	methods: {
+		initSearchBar() {
+			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+				this.$set(
+					this.searchBarFormConfig[1],
+					'selectOptions',
+					data.map((item) => ({
+						name: item.name,
+						id: item.id,
+					}))
+				);
+			});
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.mode = null;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: null,
+				name: null,
+				equipmentId: null,
+				description: null,
+				responsible: null
+			};
+			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;
+			this.info({ 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) {
+					this.put(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				this.post(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除记录"' + row.name + '"?')
+				.then(function () {
+					return this.delete({ id });
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+		handleDetail({ id }) {
+			this.reset();
+			this.mode = 'detail';
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改备品备件配置';
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有备品备件配置?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportEquipmentTypeExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '备品备件配置.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/extend/processFlowView/components/ProcessDetail.vue

@@ -227,8 +227,12 @@ export default {
 									cancelButtonText: '取消',
 									type: 'warning'
 								}
-							).then(() => {
+							).then(async () => {
-								view.cell.remove()
+								const id = node.attrs.detId.text;
+								const status = await this.handleDelete(id);
+								if (status) {
+									view.cell.remove();
+								}
 							}).catch(err => {
 								return;
 							})
@@ -326,8 +330,9 @@ export default {
 
 		async handleDelete(id) {
 			const { code, data } = await this.delete({ id });
+			debugger;
 			if (code == 0) {
-				this.$msgSuccess('成功删除一个工序!');
+				this.$modal.msgSuccess('成功删除一个工序!');
 				return true;
 			}
 			return false;
@@ -419,7 +424,7 @@ export default {
 					};
 				}
 			).catch(err => {
-				this.$msgError(err)
+				this.$modal.msgError(err)
 			});
 		},
 
@@ -435,8 +440,11 @@ export default {
 		info(payload) {
 			return this.http(this.infoUrl, 'get', payload);
 		},
-		delete(payload) {
+		delete({ id }) {
-			return this.http(this.deleteUrl, 'delete', payload);
+			return this.$axios({
+				url: this.deleteUrl + `?id=${id}`,
+				method: 'delete',
+			});
 		},
 		http(url, method, payload) {
 			return this.$axios({

src/views/system/menu/index.vue

@@ -80,7 +80,7 @@
             <el-form-item v-if="form.type !== 3" label="菜单图标">
               <el-popover placement="bottom-start" width="460" trigger="click" @show="$refs['iconSelect'].reset()">
                 <IconSelect ref="iconSelect" @selected="selected" />
-                <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
+                <el-input slot="reference" clearable v-model="form.icon" placeholder="点击选择图标">
                   <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon"
                             style="height: 32px;width: 16px;"/>
                   <i v-else slot="prefix" class="el-icon-search el-input__icon" />