test #47

Merged
gtz217 merged 273 commits from test into master 2023-10-17 08:53:54 +08:00
4 changed files with 382 additions and 223 deletions
Showing only changes of commit b23b5256f9 - Show all commits

View File

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

View File

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

View File

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

View File

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