+
- {{ op.name }}
-
+ {{ op.name }}
+
@@ -66,7 +67,7 @@
-
+
@@ -75,602 +76,755 @@
diff --git a/src/views/energy/analysis/contrastAnalysis/components/barChart.vue b/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
index 075996b6..c612503c 100644
--- a/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
+++ b/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
@@ -1,148 +1,149 @@
-
+
\ No newline at end of file
diff --git a/src/views/energy/analysis/contrastAnalysis/components/lineChart.vue b/src/views/energy/analysis/contrastAnalysis/components/lineChart.vue
deleted file mode 100644
index b1cc088e..00000000
--- a/src/views/energy/analysis/contrastAnalysis/components/lineChart.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
index f957f7b3..67a4a76d 100644
--- a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
+++ b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
@@ -1,509 +1,596 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
- {{ item.code }}
-
-
-
-
- 查询
-
- 重置
-
-
-
- {{ isExpand ? '收起' : '展开' }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+ {{ item.code }}
+
+
+
+
+
+
+ 查询
+
+
+ 重置
+
+
+
+ 导出
+
+
+
+
+ {{ isExpand ? '收起' : '展开' }}
+
+
+
\ No newline at end of file
diff --git a/src/views/energy/analysis/contrastAnalysis/index.vue b/src/views/energy/analysis/contrastAnalysis/index.vue
index f7efef08..836cde62 100644
--- a/src/views/energy/analysis/contrastAnalysis/index.vue
+++ b/src/views/energy/analysis/contrastAnalysis/index.vue
@@ -1,96 +1,129 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/energy/analysis/qoqAnalysis/components/searchArea.vue b/src/views/energy/analysis/qoqAnalysis/components/searchArea.vue
index 0db3d844..314fc447 100644
--- a/src/views/energy/analysis/qoqAnalysis/components/searchArea.vue
+++ b/src/views/energy/analysis/qoqAnalysis/components/searchArea.vue
@@ -1,232 +1,253 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
- 导出
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+ 导出
+
+
+
\ No newline at end of file
diff --git a/src/views/energy/analysis/qoqAnalysis/index.vue b/src/views/energy/analysis/qoqAnalysis/index.vue
index 6c2ac964..be7ef906 100644
--- a/src/views/energy/analysis/qoqAnalysis/index.vue
+++ b/src/views/energy/analysis/qoqAnalysis/index.vue
@@ -1,132 +1,140 @@
-
+
\ No newline at end of file
diff --git a/src/views/energy/analysis/trendAnalysis/components/lineChart.vue b/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
index e564a745..750dd157 100644
--- a/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
+++ b/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
@@ -1,103 +1,102 @@
-
+
\ No newline at end of file
diff --git a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue b/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
index 303f72fd..3aacb4ee 100644
--- a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
+++ b/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
@@ -1,468 +1,580 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
- 查询
-
- 重置
-
-
-
- {{ isExpand ? '收起' : '展开' }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+ 查询
+
+
+ 重置
+
+
+
+ 导出
+
+
+
+
+ {{ isExpand ? '收起' : '展开' }}
+
+
+
\ No newline at end of file
diff --git a/src/views/energy/analysis/trendAnalysis/index.vue b/src/views/energy/analysis/trendAnalysis/index.vue
index 20b5402c..e48b8760 100644
--- a/src/views/energy/analysis/trendAnalysis/index.vue
+++ b/src/views/energy/analysis/trendAnalysis/index.vue
@@ -1,94 +1,113 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/energy/analysis/yoyAnalysis/components/searchArea.vue b/src/views/energy/analysis/yoyAnalysis/components/searchArea.vue
index 77712e35..bce4a396 100644
--- a/src/views/energy/analysis/yoyAnalysis/components/searchArea.vue
+++ b/src/views/energy/analysis/yoyAnalysis/components/searchArea.vue
@@ -1,205 +1,227 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
- 导出
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+ 导出
+
+
+
\ No newline at end of file
diff --git a/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue b/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
index 1ccd2a15..6989733a 100644
--- a/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
+++ b/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
@@ -1,139 +1,155 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+ name: 'EnergyPlcConnectAdd',
+ props: {
+ objList: {
+ type: Array,
+ default: () => [],
+ },
+ },
+ data() {
+ return {
+ form: {
+ id: '',
+ plcId: '',
+ bindObjectId: '',
+ bindObjectType: '',
+ },
+ objIds: [], // 回显数组
+ plcList: [],
+ isEdit: false, //是否是编辑
+ rules: {
+ plcId: [
+ { required: true, message: '关联表名不能为空', trigger: 'change' },
+ ],
+ bindObjectId: [
+ { required: true, message: '对象不能为空', trigger: 'change' },
+ ],
+ },
+ };
+ },
+ methods: {
+ init(id) {
+ getEnergyPlcAll().then((res) => {
+ this.plcList = res.data || [];
+ });
+ if (id) {
+ this.isEdit = true;
+ this.form.id = id;
+ getEnergyPlcConnect(id).then((res) => {
+ if (res.code === 0) {
+ this.form = res.data;
+ this.objIds = this.changeDetSelect(
+ this.form.bindObjectId,
+ this.objList
+ );
+ }
+ });
+ } else {
+ this.isEdit = false;
+ this.form.id = '';
+ }
+ },
+ // 递归处理分类回显问题
+ changeDetSelect(key, treeData) {
+ let arr = []; // 递归时操作的数组
+ let returnArr = []; // 存放结果的数组
+ let depth = 0; // 定义全局层级
+ // 定义递归函数
+ function childrenEach(childrendData, depthN) {
+ for (var j = 0; j < childrendData.length; j++) {
+ depth = depthN;
+ arr[depthN] = childrendData[j].id;
+ if (childrendData[j].id == key) {
+ returnArr = arr.slice(0, depthN + 1);
+ break;
+ } else {
+ if (childrendData[j].children) {
+ depth++;
+ childrenEach(childrendData[j].children, depth);
+ }
+ }
+ }
+ return returnArr;
+ }
+ return childrenEach(treeData, depth);
+ },
+ selectObj(val) {
+ this.form.bindObjectId = val[val.length - 1];
+ this.form.bindObjectType = val.length - 1;
+ },
+ submitForm() {
+ this.$refs['form'].validate((valid) => {
+ if (valid) {
+ if (this.isEdit) {
+ // 编辑
+ updateEnergyPlcConnect({ ...this.form }).then((res) => {
+ if (res.code === 0) {
+ this.$modal.msgSuccess('操作成功');
+ this.$emit('successSubmit');
+ }
+ });
+ } else {
+ createEnergyPlcConnect({ ...this.form }).then((res) => {
+ if (res.code === 0) {
+ this.$modal.msgSuccess('操作成功');
+ this.$emit('successSubmit');
+ }
+ });
+ }
+ } else {
+ return false;
+ }
+ });
+ },
+ formClear() {
+ this.form.id = '';
+ this.form.plcId = '';
+ this.form.bindObjectId = '';
+ this.form.bindObjectType = '';
+ this.objIds = [];
+ this.isEdit = false;
+ },
+ },
+};
+
\ No newline at end of file
diff --git a/src/views/energy/base/energyPlcConnect/index.vue b/src/views/energy/base/energyPlcConnect/index.vue
index c189d06c..5b2b9db0 100644
--- a/src/views/energy/base/energyPlcConnect/index.vue
+++ b/src/views/energy/base/energyPlcConnect/index.vue
@@ -1,236 +1,270 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/energy/base/energyType/components/energyTypeAdd.vue b/src/views/energy/base/energyType/components/energyTypeAdd.vue
index 01ddcee0..9577e853 100644
--- a/src/views/energy/base/energyType/components/energyTypeAdd.vue
+++ b/src/views/energy/base/energyType/components/energyTypeAdd.vue
@@ -1,329 +1,422 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/energy/base/energyType/index.vue b/src/views/energy/base/energyType/index.vue
index 5b387ebc..9197ecb6 100644
--- a/src/views/energy/base/energyType/index.vue
+++ b/src/views/energy/base/energyType/index.vue
@@ -1,224 +1,191 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
index 0650b380..8ad6b1af 100644
--- a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
+++ b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
@@ -1,282 +1,360 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/energy/monitoring/energyLimit/index.vue b/src/views/energy/monitoring/energyLimit/index.vue
index d72aede2..851607ea 100644
--- a/src/views/energy/monitoring/energyLimit/index.vue
+++ b/src/views/energy/monitoring/energyLimit/index.vue
@@ -1,269 +1,278 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/energy/monitoring/energyReport/index.vue b/src/views/energy/monitoring/energyReport/index.vue
index 48456b85..acb50c9a 100644
--- a/src/views/energy/monitoring/energyReport/index.vue
+++ b/src/views/energy/monitoring/energyReport/index.vue
@@ -1,185 +1,196 @@
-
+
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
index 6ffe2832..5d09dc15 100644
--- a/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
@@ -4,7 +4,8 @@
-
+
@@ -33,10 +34,10 @@ import {
import basicPage from '../../mixins/basic-page';
import moment from 'moment';
import addOrUpdate from './dialogForm.vue';
-
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default {
name: 'QualityInspectionBoxBtn',
- mixins: [basicPage],
+ mixins: [basicPage, tableHeightMixin],
components: { addOrUpdate },
data() {
return {
@@ -114,7 +115,7 @@ export default {
// 查询参数
listQuery: {
pageNo: 1,
- pageSize: 10,
+ pageSize: 20,
inspectionDetContent: null,
},
addOrUpdateVisible: false,
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
index ac0fb483..b4eb6d7a 100644
--- a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
@@ -4,7 +4,8 @@
-
+
@@ -34,10 +35,11 @@ import basicPage from './basic-page';
import moment from 'moment';
import addOrUpdate from './dialogForm.vue';
import ProcessBomList from './ProcessBomList.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import row from './row.vue';
export default {
name: 'QualityInspectionBoxBtn',
- mixins: [basicPage],
+ mixins: [basicPage, tableHeightMixin],
components: { addOrUpdate, ProcessBomList },
data() {
return {
@@ -123,7 +125,7 @@ export default {
// 查询参数
listQuery: {
pageNo: 1,
- pageSize: 10,
+ pageSize: 20,
userName: null,
nickName:null
},
diff --git a/src/views/quality/base/qualityHotMaterial/index.vue b/src/views/quality/base/qualityHotMaterial/index.vue
index a55a8577..f23baab7 100644
--- a/src/views/quality/base/qualityHotMaterial/index.vue
+++ b/src/views/quality/base/qualityHotMaterial/index.vue
@@ -1,7 +1,7 @@
-
@@ -29,6 +29,7 @@ import {
deleteQualityHotMaterial,
getHotMaterialAllList
} from '@/api/base/qualityHotMaterial';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
// import { getList, } from "@/api/base/qualityScrapType";
const tableProps = [
{
@@ -74,7 +75,7 @@ const tableProps = [
];
export default {
- mixins: [basicPage],
+ mixins: [basicPage, tableHeightMixin],
data() {
return {
urlOptions: {
@@ -207,7 +208,7 @@ export default {
switch (val.btnName) {
case 'search':
this.listQuery.pageNo = 1;
- this.listQuery.pageSize = 10;
+ this.listQuery.pageSize = 20;
this.listQuery.materialId = val.materialId ? val.materialId : undefined;
this.listQuery.checkTime = val.checkTime ? val.checkTime : undefined;
this.getDataList();
@@ -215,7 +216,7 @@ export default {
case 'reset':
this.$refs.searchBarForm.resetForm();
this.listQuery = {
- pageSize: 10,
+ pageSize: 20,
pageNo: 1,
total: 1,
};
diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue
index fc302587..5be62028 100644
--- a/src/views/quality/base/qualityInspectionDet/index.vue
+++ b/src/views/quality/base/qualityInspectionDet/index.vue
@@ -4,7 +4,7 @@
-
@@ -59,14 +59,14 @@ import {
getQualityInspectionDetPage,
exportQualityInspectionDetExcel,
} from '@/api/base/qualityInspectionDet';
-
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin';
export default {
name: 'QualityInspectionDet',
- mixins: [basicPageMixin],
+ mixins: [basicPageMixin, tableHeightMixin],
data() {
return {
typeList: [], // 检测类型列表
@@ -153,7 +153,7 @@ export default {
// 查询参数
queryParams: {
pageNo: 1,
- pageSize: 10,
+ pageSize: 20,
content: null,
createTime: [],
},
diff --git a/src/views/quality/base/qualityInspectionType/index.vue b/src/views/quality/base/qualityInspectionType/index.vue
index 095abc49..7c091954 100644
--- a/src/views/quality/base/qualityInspectionType/index.vue
+++ b/src/views/quality/base/qualityInspectionType/index.vue
@@ -4,8 +4,8 @@
-
+
@@ -61,10 +61,10 @@ import {
exportQualityInspectionTypeExcel,
} from '@/api/base/qualityInspectionType';
import basicPageMixin from '@/mixins/lb/basicPageMixin';
-
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
export default {
name: 'QualityInspectionType',
- mixins: [basicPageMixin],
+ mixins: [basicPageMixin, tableHeightMixin],
data() {
return {
tableBtn: [
diff --git a/src/views/quality/monitoring/materielDateFrom/index.vue b/src/views/quality/monitoring/materielDateFrom/index.vue
index cc52218d..68da6ea3 100644
--- a/src/views/quality/monitoring/materielDateFrom/index.vue
+++ b/src/views/quality/monitoring/materielDateFrom/index.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-01 14:55:51
* @LastEditors: zhp
- * @LastEditTime: 2024-03-25 16:07:07
+ * @LastEditTime: 2024-03-29 14:08:18
* @Description:
-->
@@ -24,12 +24,12 @@
// import unitDict from './unitDict';
// import basicPage from '../mixins/basic-page';
import { parseTime } from '../mixins/code-filter';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
import {
getMaterialUseLogPage,
getWorkOrderList,
exportEnergyPlcExcel
} from '@/api/quality/materialTraceability';
-
const tableProps = [
{
prop: 'materialName',
@@ -73,6 +73,7 @@ const tableProps = [
];
export default {
+ mixins: [tableHeightMixin],
// mixins: [basicPage],
data() {
return {
@@ -82,7 +83,7 @@ export default {
// // exportURL: exportPackingExcel,
// },
tableProps,
- tableH: this.tableHeight(260),
+ // tableH: this.tableHeight(260),
tableBtn: [
this.$auth.hasPermi(`base:packaging-print-log:update`)
? {
@@ -174,9 +175,9 @@ export default {
// AddOrUpdate,
},
created() {
- window.addEventListener('resize', () => {
- this.tableH = this.tableHeight(260)
- })
+ // window.addEventListener('resize', () => {
+ // this.tableH = this.tableHeight(260)
+ // })
this.getList()
this.getDict()
},
diff --git a/src/views/quality/monitoring/originalGlassRetrace/index.vue b/src/views/quality/monitoring/originalGlassRetrace/index.vue
index 3d1280ad..ec74b1a1 100644
--- a/src/views/quality/monitoring/originalGlassRetrace/index.vue
+++ b/src/views/quality/monitoring/originalGlassRetrace/index.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-01 14:55:51
* @LastEditors: zhp
- * @LastEditTime: 2024-03-21 15:17:05
+ * @LastEditTime: 2024-03-29 14:08:30
* @Description:
-->
@@ -25,6 +25,8 @@
// import basicPage from '../mixins/basic-page';
import { publicFormatter } from '@/utils/dict';
import { parseTime } from '../mixins/code-filter';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
import {
getOriginalGlassRetrace,
getWorkOrderList,
@@ -85,6 +87,7 @@ const tableProps = [
export default {
// mixins: [basicPage],
+ mixins: [tableHeightMixin],
data() {
return {
// urlOptions: {
@@ -119,7 +122,7 @@ export default {
startTime: undefined,
endTime:undefined,
},
- tableH: this.tableHeight(260),
+ // tableH: this.tableHeight(260),
formConfig: [
{
type: 'select',
@@ -184,9 +187,9 @@ export default {
// AddOrUpdate,
},
created() {
- window.addEventListener('resize', () => {
- this.tableH = this.tableHeight(260)
- })
+ // window.addEventListener('resize', () => {
+ // this.tableH = this.tableHeight(260)
+ // })
this.getList()
this.getDict()
},
diff --git a/src/views/quality/monitoring/processTraceability/index.vue b/src/views/quality/monitoring/processTraceability/index.vue
index 743b9a60..fd8a725c 100644
--- a/src/views/quality/monitoring/processTraceability/index.vue
+++ b/src/views/quality/monitoring/processTraceability/index.vue
@@ -2,13 +2,14 @@
* @Author: zwq
* @Date: 2023-08-01 14:55:51
* @LastEditors: zhp
- * @LastEditTime: 2024-03-20 09:25:40
+ * @LastEditTime: 2024-03-29 15:32:33
* @Description:
-->
-
+
@@ -30,6 +31,7 @@ import {
// exportEnergyPlcExcel
} from '@/api/quality/processTraceability';
import { publicFormatter } from '@/utils/dict';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
const tableProps = [
{
prop: 'name',
@@ -78,7 +80,7 @@ const tableProps = [
];
export default {
- // mixins: [basicPage],
+ mixins: [tableHeightMixin],
data() {
return {
// urlOptions: {
diff --git a/src/views/quality/monitoring/processTraceabilityDetail/components/SmallTitle.vue b/src/views/quality/monitoring/processTraceabilityDetail/components/SmallTitle.vue
index 5d34b55b..c9ef2e2d 100644
--- a/src/views/quality/monitoring/processTraceabilityDetail/components/SmallTitle.vue
+++ b/src/views/quality/monitoring/processTraceabilityDetail/components/SmallTitle.vue
@@ -1,14 +1,7 @@
-
diff --git a/src/views/quality/monitoring/processTraceabilityDetail/index.vue b/src/views/quality/monitoring/processTraceabilityDetail/index.vue
index 3d87a88f..bc2bd909 100644
--- a/src/views/quality/monitoring/processTraceabilityDetail/index.vue
+++ b/src/views/quality/monitoring/processTraceabilityDetail/index.vue
@@ -1,17 +1,10 @@
-
-
diff --git a/src/views/specialEquipment/check/Record.vue b/src/views/specialEquipment/check/Record.vue
index e77685ff..45c72e5c 100644
--- a/src/views/specialEquipment/check/Record.vue
+++ b/src/views/specialEquipment/check/Record.vue
@@ -91,8 +91,18 @@ export default {
// : undefined,
].filter((v) => v),
tableProps: [
- { prop: 'name', label: '巡检单名称', showOverflowtooltip: true },
- { prop: 'department', label: '部门', showOverflowtooltip: true },
+ {
+ prop: 'name',
+ label: '巡检单名称',
+ showOverflowtooltip: true,
+ filter: (v) => v ?? '---',
+ },
+ {
+ prop: 'department',
+ label: '部门',
+ showOverflowtooltip: true,
+ filter: (v) => v ?? '---',
+ },
{
prop: 'actualCheckTime',
label: '巡检时间',
@@ -100,33 +110,12 @@ export default {
filter: parseTime,
showOverflowtooltip: true,
},
- { prop: 'groupClass', label: '班次', showOverflowtooltip: true },
- // {
- // prop: '_detail',
- // label: '巡检内容',
- // subcomponent: {
- // name: 'ViewDetail',
- // props: ['injectData'],
- // data() {
- // return {};
- // },
- // methods: {
- // handleClick() {
- // this.$emit('emitData', {
- // action: this.injectData.label,
- // value: this.injectData,
- // });
- // },
- // },
- // render: function (h) {
- // return (
- //
- // 详情
- //
- // );
- // },
- // },
- // },
+ {
+ prop: 'groupClass',
+ label: '班次',
+ showOverflowtooltip: true,
+ filter: (v) => v ?? '---',
+ },
{ prop: 'remark', label: '备注' },
],
searchBarFormConfig: [
@@ -161,9 +150,7 @@ export default {
type: 'separate',
},
{
- type: this.$auth.hasPermi('se:check-record:export')
- ? 'button'
- : '',
+ type: this.$auth.hasPermi('se:check-record:export') ? 'button' : '',
btnName: '导出',
name: 'export',
plain: true,
diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue
index 639d9798..4c2c2ba1 100644
--- a/src/views/specialEquipment/maintain/Record.vue
+++ b/src/views/specialEquipment/maintain/Record.vue
@@ -80,8 +80,9 @@ import {
import RecordDetail from './Record--detail.vue';
import { TableBtn } from '@/components/tableInnerComponents';
-const timeFilter = (val) =>
- val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---';
+const timeFilter = (val) => {
+ return val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---';
+};
export default {
name: 'SpecialEquipmentMaintainRecord',
+ height: 88 + 'px',
+ lineHeight: 88 + 'px',
+ fontSize: 31 + 'px',
+ }">
+