diff --git a/src/views/base/components/dialogForm.vue b/src/components/DialogForm/index.vue
similarity index 100%
rename from src/views/base/components/dialogForm.vue
rename to src/components/DialogForm/index.vue
diff --git a/src/views/quality/mixin/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js
similarity index 97%
rename from src/views/quality/mixin/basicPageMixin.js
rename to src/mixins/lb/basicPageMixin.js
index 670b909a..af4dbeda 100644
--- a/src/views/quality/mixin/basicPageMixin.js
+++ b/src/mixins/lb/basicPageMixin.js
@@ -1,4 +1,4 @@
-import DialogForm from '../components/dialogForm.vue';
+import DialogForm from '@/components/DialogForm/index.vue';
export default {
components: { DialogForm },
diff --git a/src/views/base/equipmentGroup/index.vue b/src/views/base/equipmentGroup/index.vue
index c1c43efc..7c75e8f0 100644
--- a/src/views/base/equipmentGroup/index.vue
+++ b/src/views/base/equipmentGroup/index.vue
@@ -53,7 +53,7 @@ import {
exportEquipmentGroupExcel,
} from '@/api/base/equipmentGroup';
import moment from 'moment';
-import basicPageMixin from '../mixin/basicPageMixin';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
import { getAccessToken } from '@/utils/auth';
export default {
diff --git a/src/views/base/mixin/basicPageMixin.js b/src/views/base/mixin/basicPageMixin.js
deleted file mode 100644
index 547a168b..00000000
--- a/src/views/base/mixin/basicPageMixin.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import DialogForm from '../components/dialogForm.vue';
-
-export default {
- components: { DialogForm },
- data() {
- return {
- // 遮罩层
- loading: true,
- // 导出遮罩层
- exportLoading: false,
- // 显示搜索条件
- showSearch: true,
- // 总条数
- total: 0,
- // 质量检测信息基础列表
- list: [],
- // 弹出层标题
- title: '',
- // 是否显示弹出层
- open: false,
- // 列表数据
- tableData: [],
- // 弹窗的表单
- // form: {}, // 占位
- // 搜索框需要的 keys
- // searchBarKeys: [], // 占位
- // tableProps: [], // 占位
- // tableBtn: [], // 占位
- // searchBarFormConfig: [], // 占位
- // // 弹窗表单配置
- // dialogFormConfig: [], // 占位
- };
- },
- mounted() {},
- methods: {
- // 过滤后端传回的详情数据
- filterData(data, keys) {
- const obj = {};
- keys.forEach((key) => {
- if (/time/i.test(key)) {
- obj[key] = new Date(data[key]);
- } else {
- obj[key] = data[key];
- }
- });
- return obj;
- },
- // 处理搜索条件
- handleSearchBarBtnClick() {},
- // 处理表格按钮
- handleTableBtnClick({ data, type }) {
- switch (type) {
- case 'edit':
- this.handleUpdate(data);
- break;
- case 'delete':
- this.handleDelete(data);
- break;
- }
- },
- // 处理搜索栏按钮
- handleSearchBarBtnClick(btn) {
- // const keys = ['name', 'createTime']; // timeVal // 已被 searchBarKeys 替代
- switch (btn.btnName) {
- case 'search':
- this.searchBarKeys.forEach((key) => {
- if (key == 'timeVal') {
- this.queryParams['startTime'] = btn.timeVal[0];
- this.queryParams['endTime'] = btn.timeVal[1];
- return;
- }
- this.queryParams[key] = btn[key] || null;
- });
- this.handleQuery();
- break;
- case 'add':
- this.handleAdd();
- break;
- case 'export':
- this.handleExport();
- break;
- case 'reset':
- this.$refs['search-bar'].resetForm();
- this.resetQuery();
- break;
- }
- },
- handleEmitFun({ action, value }) {
- console.log('[Emit Fun]', action, value);
- switch (action) {
- // 查看详情
- case 'show-detail':
- this.$modal.msgSuccess('查看详情')
- break;
- }
- },
- // 获取列表数据
- getList() {},
- /** 搜索按钮操作 */
- handleQuery() {
- this.queryParams.pageNo = 1;
- this.getList();
- },
- /** 重置按钮操作 */
- resetQuery() {
- this.resetForm('queryForm');
- this.handleQuery();
- },
- /** 取消按钮 */
- cancel() {
- this.open = false;
- this.reset();
- },
- },
-};
diff --git a/src/views/base/equipment/index.vue b/src/views/core/base/equipment/index.vue
similarity index 99%
rename from src/views/base/equipment/index.vue
rename to src/views/core/base/equipment/index.vue
index bc8b84cd..6b31fe78 100644
--- a/src/views/base/equipment/index.vue
+++ b/src/views/core/base/equipment/index.vue
@@ -122,7 +122,7 @@
-
-
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/index.vue b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
index 2ff114c1..19e691f4 100644
--- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
@@ -55,7 +55,7 @@ import {
import Editor from '@/components/Editor';
import moment from 'moment';
-import basicPageMixin from '../../mixin/basicPageMixin';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
export default {
name: 'QualityInspectionRecord',
components: {
diff --git a/src/views/quality/monitoring/qualityStatistics/components/summaryTable.vue b/src/views/quality/monitoring/qualityStatistics/components/summaryTable.vue
index 9bdc7c24..4edc8489 100644
--- a/src/views/quality/monitoring/qualityStatistics/components/summaryTable.vue
+++ b/src/views/quality/monitoring/qualityStatistics/components/summaryTable.vue
@@ -13,14 +13,6 @@
:page="queryParams.pageNo"
:limit="queryParams.pageSize"
:table-data="list">
-
-