Compare commits

..

3 Commits

Author SHA1 Message Date
lb
2cf0e718f7 update 完成质量-最近24小时记录 2023-08-18 14:41:52 +08:00
lb
54ce9639ab add 动态表结构处理相关工具 2023-08-18 14:06:44 +08:00
lb
5cc3fb758e update 设备分组 2023-08-17 09:37:39 +08:00
5 changed files with 505 additions and 334 deletions

63
src/utils/dynamicProps.js Normal file
View File

@ -0,0 +1,63 @@
/**
* 用于动态表结构的 tableProps 生成
* @param {*} nameData
* @returns
*/
export function handleNameData(nameData) {
const props = step1(nameData.filter((item) => item.tree == 1));
step2(
props,
nameData.filter((item) => item.tree == 2)
);
// console.log('level 1', JSON.stringify(props, null, 2));
return props;
}
function step1(tree1) {
return Array.from(new Set(tree1.map((item) => item.name)))
.sort()
.map((item) => ({
prop: item,
label: item,
align: 'center',
children: [],
}));
}
function step2(firstTierProps, tree2) {
tree2.map((nd) => {
const parent = firstTierProps.find(
({ prop }) => nd.parentId.indexOf(prop) > -1
);
if (notRepeat(parent.children, nd.name)) {
parent.children.push({
label: nd.name,
prop: `${parent.prop}-${nd.name}`,
align: 'center',
});
}
});
}
function notRepeat(propArray, name) {
return propArray.every((item) => item.label !== name);
}
/**
* 用于调整服务器返回的动态数据
* @param {*} dynamicData
* @returns
*/
export function handleDynamicData(dynamicData) {
return dynamicData.map((dd) => {
const initData = {
inspectionContent: dd.inspectionDetContent,
};
dd.data.forEach((column) => {
column.children.forEach((ch) => {
initData[`${column.dynamicName}-${ch.dynamicName}`] = ch.dynamicValue;
});
});
return initData;
});
}

View File

@ -370,13 +370,13 @@ export default {
}, },
], ],
[{ input: true, label: '备注', prop: 'remark' }], [{ input: true, label: '备注', prop: 'remark' }],
[ [
{ {
diy: true, diy: true,
label: '设备图片', label: '设备图片',
prop: 'fileUrls', prop: 'fileUrls',
}, },
], ],
], ],
// //
open: false, open: false,

View File

@ -1,217 +1,323 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 -->
<SearchBar
:formConfigs="searchBarFormConfig"
ref="search-bar"
@headBtnClick="handleSearchBarBtnClick" />
<!-- 搜索工作栏 --> <!-- 列表 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <base-table
<el-form-item label="分组编码" prop="code"> :table-props="tableProps"
<el-input v-model="queryParams.code" placeholder="请输入分组编码" clearable @keyup.enter.native="handleQuery"/> :page="queryParams.pageNo"
</el-form-item> :limit="queryParams.pageSize"
<el-form-item label="分组名字" prop="name"> :table-data="list"
<el-input v-model="queryParams.name" placeholder="请输入分组名字" clearable @keyup.enter.native="handleQuery"/> @emitFun="handleEmitFun">
</el-form-item> <method-btn
<el-form-item> v-if="tableBtn.length"
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> slot="handleBtn"
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> label="操作"
</el-form-item> :method-list="tableBtn"
</el-form> @clickBtn="handleTableBtnClick" />
</base-table>
<!-- 操作工具栏 --> <!-- 分页组件 -->
<el-row :gutter="10" class="mb8"> <pagination
<el-col :span="1.5"> v-show="total > 0"
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" :total="total"
v-hasPermi="['base:equipment-group:create']">新增</el-button> :page.sync="queryParams.pageNo"
</el-col> :limit.sync="queryParams.pageSize"
<el-col :span="1.5"> @pagination="getList" />
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['base:equipment-group:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 --> <!-- 对话框(添加 / 修改) -->
<el-table v-loading="loading" :data="list"> <base-dialog
<el-table-column label="ID" align="center" prop="id" /> :dialogTitle="title"
<el-table-column label="分组编码" align="center" prop="code" /> :dialogVisible="open"
<el-table-column label="分组名字" align="center" prop="name" /> width="500px"
<el-table-column label="备注" align="center" prop="remark" /> @close="cancel"
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> @cancel="cancel"
<template v-slot="scope"> @confirm="submitForm">
<span>{{ parseTime(scope.row.createTime) }}</span> <DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
</template> </base-dialog>
</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-group:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['base:equipment-group: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"/>
<!-- 对话框(添加 / 修改) --> </div>
<el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="分组编码" prop="code">
<el-input v-model="form.code" placeholder="请输入分组编码" />
</el-form-item>
<el-form-item label="分组名字" prop="name">
<el-input v-model="form.name" placeholder="请输入分组名字" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template> </template>
<script> <script>
import { createEquipmentGroup, updateEquipmentGroup, deleteEquipmentGroup, getEquipmentGroup, getEquipmentGroupPage, exportEquipmentGroupExcel } from "@/api/base/equipmentGroup"; import {
createEquipmentGroup,
updateEquipmentGroup,
deleteEquipmentGroup,
getEquipmentGroup,
getEquipmentGroupPage,
exportEquipmentGroupExcel,
} from '@/api/base/equipmentGroup';
import moment from 'moment';
import basicPageMixin from '../mixin/basicPageMixin';
import { getAccessToken } from '@/utils/auth';
export default { export default {
name: "EquipmentGroup", name: 'EquipmentGroup',
components: { mixins: [basicPageMixin],
}, components: {},
data() { data() {
return { return {
// searchBarKeys: ['name', 'code'],
loading: true, tableBtn: [
// this.$auth.hasPermi('base:equipment-group:update')
exportLoading: false, ? {
// type: 'edit',
showSearch: true, btnName: '修改',
// }
total: 0, : undefined,
// this.$auth.hasPermi('base:equipment-group:delete')
list: [], ? {
// type: 'delete',
title: "", btnName: '删除',
// }
open: false, : undefined,
// ].filter((v) => v),
queryParams: { tableProps: [
pageNo: 1, {
pageSize: 10, prop: 'createTime',
code: null, label: '添加时间',
name: null, fixed: true,
}, width: 180,
// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
form: {}, },
// { prop: 'name', label: '设备分组名称', align: 'center' },
rules: { { prop: 'code', label: '检测分组编码', align: 'center' },
} { prop: 'remark', label: '备注', align: 'center' },
}; {
}, action: 'show-alert',
created() { label: '报警',
this.getList(); align: 'center',
}, subcomponent: {
methods: { props: ['injectData'],
/** 查询列表 */ render: function (h) {
getList() { const _this = this;
this.loading = true; return h(
// 'el-button',
getEquipmentGroupPage(this.queryParams).then(response => { {
this.list = response.data.list; props: { type: 'text', size: 'mini' },
this.total = response.data.total; on: {
this.loading = false; click: function () {
}); console.log('inejctdata', _this.injectData);
}, _this.$emit('emitData', {
/** 取消按钮 */ action: _this.injectData.action,
cancel() { value: _this.injectData.id,
this.open = false; });
this.reset(); },
}, },
/** 表单重置 */ },
reset() { '查看报警'
this.form = { );
id: undefined, },
code: undefined, },
name: undefined, },
remark: undefined, ],
}; searchBarFormConfig: [
this.resetForm("form"); {
}, type: 'input',
/** 搜索按钮操作 */ label: '分组名称',
handleQuery() { placeholder: '请输入设备分组名称',
this.queryParams.pageNo = 1; param: 'name',
this.getList(); },
}, {
/** 重置按钮操作 */ type: 'input',
resetQuery() { label: '分组编码',
this.resetForm("queryForm"); placeholder: '请输入设备分组编码',
this.handleQuery(); param: 'codes',
}, },
/** 新增按钮操作 */ {
handleAdd() { type: 'button',
this.reset(); btnName: '查询',
this.open = true; name: 'search',
this.title = "添加设备分组(用于同类型不同厂家的设备区分)"; color: 'primary',
}, },
/** 修改按钮操作 */ {
handleUpdate(row) { type: 'separate',
this.reset(); },
const id = row.id; {
getEquipmentGroup(id).then(response => { type: this.$auth.hasPermi('base:equipment-group:create')
this.form = response.data; ? 'button'
this.open = true; : '',
this.title = "修改设备分组(用于同类型不同厂家的设备区分)"; btnName: '新增',
}); name: 'add',
}, plain: true,
/** 提交按钮 */ color: 'success',
submitForm() { },
this.$refs["form"].validate(valid => { // {
if (!valid) { // type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
return; // btnName: '',
} // name: 'export',
// // color: 'warning',
if (this.form.id != null) { // },
updateEquipmentGroup(this.form).then(response => { ],
this.$modal.msgSuccess("修改成功"); rows: [
this.open = false; [
this.getList(); {
}); input: true,
return; label: '分组名称',
} prop: 'name',
// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
createEquipmentGroup(this.form).then(response => { // bind: {
this.$modal.msgSuccess("新增成功"); // disabled: true, // some condition, like detail mode...
this.open = false; // }
this.getList(); },
}); ],
}); [
}, {
/** 删除按钮操作 */ input: true,
handleDelete(row) { label: '分组编码',
const id = row.id; prop: 'code',
this.$modal.confirm('是否确认删除设备分组(用于同类型不同厂家的设备区分)编号为"' + id + '"的数据项?').then(function() { url: '/base/equipment-group/getCode',
return deleteEquipmentGroup(id); },
}).then(() => { ],
this.getList(); [
this.$modal.msgSuccess("删除成功"); {
}).catch(() => {}); input: true,
}, label: '备注',
/** 导出按钮操作 */ prop: 'remark',
handleExport() { // rules: [{ required: true, message: '', trigger: 'blur' }],
// bind: {
let params = {...this.queryParams}; placeholder: '请输入备注',
params.pageNo = undefined; },
params.pageSize = undefined; },
this.$modal.confirm('是否确认导出所有设备分组(用于同类型不同厂家的设备区分)数据项?').then(() => { ],
this.exportLoading = true; ],
return exportEquipmentGroupExcel(params); //
}).then(response => { open: false,
this.$download.excel(response, '设备分组(用于同类型不同厂家的设备区分).xls'); //
this.exportLoading = false; queryParams: {
}).catch(() => {}); pageNo: 1,
} pageSize: 10,
} code: null,
name: null,
},
//
form: {},
};
},
created() {
this.getList();
},
methods: {
/** 查询列表 */
getList() {
this.loading = true;
//
getEquipmentGroupPage(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,
code: undefined,
name: undefined,
remark: undefined,
};
this.resetForm('form');
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm');
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = '添加设备分组(用于同类型不同厂家的设备区分)';
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getEquipmentGroup(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) {
updateEquipmentGroup(this.form).then((response) => {
this.$modal.msgSuccess('修改成功');
this.open = false;
this.getList();
});
return;
}
//
createEquipmentGroup(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 deleteEquipmentGroup(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 exportEquipmentGroupExcel(params);
})
.then((response) => {
this.$download.excel(
response,
'设备分组(用于同类型不同厂家的设备区分).xls'
);
this.exportLoading = false;
})
.catch(() => {});
},
},
}; };
</script> </script>

View File

@ -10,8 +10,11 @@
<SearchBar <SearchBar
:formConfigs="[{ label: '近24小时检测记录', type: 'title' }]" :formConfigs="[{ label: '近24小时检测记录', type: 'title' }]"
ref="search-bar" /> ref="search-bar" />
<pre><code v-html="jsondemo"></code></pre> <!-- <pre><code v-html="jsondemo"></code></pre> -->
<el-skeleton v-if="initing" :rows="6" animated />
<base-table <base-table
v-else
:table-props="tableProps" :table-props="tableProps"
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
@ -21,11 +24,13 @@
</template> </template>
<script> <script>
import hljs from 'highlight.js/lib/highlight'; import response from './response.json';
import json from 'highlight.js/lib/languages/json'; import { handleNameData, handleDynamicData } from '@/utils/dynamicProps';
import 'highlight.js/styles/github-gist.css'; // import hljs from 'highlight.js/lib/highlight';
// import json from 'highlight.js/lib/languages/json';
// import 'highlight.js/styles/github-gist.css';
hljs.registerLanguage('json', json); // hljs.registerLanguage('json', json);
export default { export default {
name: 'QualityRecentHours', name: 'QualityRecentHours',
@ -33,18 +38,19 @@ export default {
props: {}, props: {},
data() { data() {
return { return {
initing: false,
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
}, },
jsondemo: '', // jsondemo: '',
list: [ list: [
{ // {
inspectionContent: '检测内容1', // inspectionContent: '1',
'2023-03-18T00:00:00-产线1': '产线1-asdf', // '2023-03-18T00:00:00-线1': '线1-asdf',
'2023-03-18T01:00:00-产线2': '产线2-kldf', // '2023-03-18T01:00:00-线2': '线2-kldf',
'2023-03-18T02:00:00-产线1': '产线1-vasdkj', // '2023-03-18T02:00:00-线1': '线1-vasdkj',
}, // },
], ],
tableProps: [ tableProps: [
{ {
@ -52,79 +58,6 @@ export default {
label: '检测内容', label: '检测内容',
align: 'center', align: 'center',
}, },
//
// mock
{
prop: '2023-03-18T00:00:00',
label: '2023-03-18T00:00:00',
align: 'center',
children: [
{
prop: '2023-03-18T00:00:00-产线1',
label: '产线1',
align: 'center',
},
{
prop: '2023-03-18T00:00:00-产线2',
label: '产线2',
align: 'center',
},
{
prop: '2023-03-18T00:00:00-产线3',
label: '产线3',
align: 'center',
},
{
prop: '2023-03-18T00:00:00-产线4',
label: '产线4',
align: 'center',
},
{
prop: '2023-03-18T00:00:00-产线5',
label: '产线5',
align: 'center',
},
],
},
{
prop: '2023-03-18T01:00:00',
label: '2023-03-18T01:00:00',
align: 'center',
children: [
{
prop: '2023-03-18T01:00:00-产线1',
label: '产线1',
align: 'center',
},
{
prop: '2023-03-18T01:00:00-产线2',
label: '产线2',
align: 'center',
},
{
prop: '2023-03-18T01:00:00-产线3',
label: '产线3',
align: 'center',
},
],
},
{
prop: '2023-03-18T02:00:00',
label: '2023-03-18T02:00:00',
align: 'center',
children: [
{
prop: '2023-03-18T02:00:00-产线1',
label: '产线1',
align: 'center',
},
{
prop: '2023-03-18T02:00:00-产线2',
label: '产线2',
align: 'center',
},
],
},
], ],
}; };
}, },
@ -134,47 +67,36 @@ export default {
}, },
methods: { methods: {
async getList() { async getList() {
const response = await this.$axios({ // const response = await this.$axios({
url: '/monitoring/record-in-one-day/get', // url: '/monitoring/record-in-one-day/get',
method: 'get', // method: 'get',
}); // });
console.log(response); console.log(response);
// const {
// // data: { nameData },
// code,
// } = response;
// this.jsondemo = hljs.highlight(
// 'json',
// JSON.stringify(response, null, 2),
// true
// ).value;
const { const {
// data: { nameData }, data: { data: dyanmicData, nameData },
code,
} = response; } = response;
this.jsondemo = hljs.highlight(
'json', this.initing = true;
JSON.stringify(response, null, 2), const dynamicProps = handleNameData(nameData);
true this.tableProps.push(...dynamicProps);
).value; const dataList = handleDynamicData(dyanmicData);
}, this.list = dataList;
filterNameData(nameData) { this.queryParams.pageSize = dataList.length;
const ndSet = new Set();
nameData.forEach((nd) => { setTimeout(() => {
ndSet.add(nd.name); this.initing = false;
}); }, 1000);
return Array.from(ndSet.values())
.sort()
.map((name) => ({
prop: name,
label: name,
}));
},
filterData(data) {
return data.map((item) => {
const { data: innerData } = item;
const keyValuePairs = {};
innerData.map((d) => {
keyValuePairs[d.dynamicName] = d.dynamicValue;
});
return {
inspectionContent: item.inspectionContent,
...keyValuePairs,
sumInput: item.sumInput,
};
});
}, },
handleEmitFun(payload) { handleEmitFun(payload) {
console.log('payload', payload); console.log('payload', payload);
}, },

View File

@ -0,0 +1,80 @@
{
"tableProps": [
{
"prop": "inspectionContent",
"label": "检测内容",
"align": "center"
},
{
"prop": "2023-03-18T00:00:00",
"label": "2023-03-18T00:00:00",
"align": "center",
"children": [
{
"prop": "2023-03-18T00:00:00-产线1",
"label": "产线1",
"align": "center"
},
{
"prop": "2023-03-18T00:00:00-产线2",
"label": "产线2",
"align": "center"
},
{
"prop": "2023-03-18T00:00:00-产线3",
"label": "产线3",
"align": "center"
},
{
"prop": "2023-03-18T00:00:00-产线4",
"label": "产线4",
"align": "center"
},
{
"prop": "2023-03-18T00:00:00-产线5",
"label": "产线5",
"align": "center"
}
]
},
{
"prop": "2023-03-18T01:00:00",
"label": "2023-03-18T01:00:00",
"align": "center",
"children": [
{
"prop": "2023-03-18T01:00:00-产线1",
"label": "产线1",
"align": "center"
},
{
"prop": "2023-03-18T01:00:00-产线2",
"label": "产线2",
"align": "center"
},
{
"prop": "2023-03-18T01:00:00-产线3",
"label": "产线3",
"align": "center"
}
]
},
{
"prop": "2023-03-18T02:00:00",
"label": "2023-03-18T02:00:00",
"align": "center",
"children": [
{
"prop": "2023-03-18T02:00:00-产线1",
"label": "产线1",
"align": "center"
},
{
"prop": "2023-03-18T02:00:00-产线2",
"label": "产线2",
"align": "center"
}
]
}
]
}