lb #19

Merged
g7hoo merged 80 commits from lb into test 2023-09-11 15:05:16 +08:00
2 changed files with 457 additions and 246 deletions
Showing only changes of commit 31dbc025c8 - Show all commits

View File

@ -53,7 +53,7 @@ import {
} from '@/api/base/equipmentPlcConnect'; } from '@/api/base/equipmentPlcConnect';
import moment from 'moment'; import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
import './http'; // import './http';
export default { export default {
name: 'EquipmentPlcConnect', name: 'EquipmentPlcConnect',
@ -214,7 +214,23 @@ export default {
switch (action) { switch (action) {
case 'params-bind': case 'params-bind':
this.reset(); this.reset();
console.log('Cha看绑定参数弹窗') const {
id,
equipmentName,
equipmentId,
plcId,
plcName,
plcTableName,
} = payload;
// console.log('Cha', id, equipmentName, plcTableName);
this.$router.push({
name: 'EquipmentPlcParam',
params: {
id,
equipmentName,
plcTableName,
},
});
break; break;
} }
}, },

View File

@ -1,129 +1,205 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <SearchBar
<el-form-item label="实时数采表id" prop="connectId"> :formConfigs="searchBarFormConfig"
<el-input v-model="queryParams.connectId" placeholder="请输入实时数采表id" clearable @keyup.enter.native="handleQuery"/> ref="search-bar"
</el-form-item> @headBtnClick="handleSearchBarBtnClick" />
<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-plc-param: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-plc-param:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <base-table
<el-table-column label="ID" align="center" prop="id" /> :table-props="tableProps"
<el-table-column label="实时数采表id" align="center" prop="connectId" /> :page="queryParams.pageNo"
<el-table-column label="plc实际的列名参数列名" align="center" prop="plcParamName" /> :limit="queryParams.pageSize"
<el-table-column label="参数名称" align="center" prop="name" /> :table-data="list"
<el-table-column label="单位 关联数据字典表label_value" align="center" prop="unit"> @emitFun="handleEmitFun">
<template v-slot="scope"> <method-btn
<dict-tag :type="DICT_TYPE.UNIT_DICT" :value="scope.row.unit" /> v-if="tableBtn.length"
</template> slot="handleBtn"
</el-table-column> label="操作"
<el-table-column label="最小值 数值型可用" align="center" prop="minValue" /> :method-list="tableBtn"
<el-table-column label="最大值 数值型可用" align="center" prop="maxValue" /> @clickBtn="handleTableBtnClick" />
<el-table-column label="参数设定标准值" align="center" prop="defaultValue" /> </base-table>
<el-table-column label="0 代表不采集, 1 代表采集" align="center" prop="collection" />
<el-table-column label="描述" align="center" prop="description" />
<el-table-column label="备注" align="center" prop="remark" />
<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-param:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['base:equipment-plc-param: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
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
@pagination="getList" /> @pagination="getList" />
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body> <base-dialog
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> :dialogTitle="title"
<el-form-item label="实时数采表id" prop="connectId"> :dialogVisible="open"
<el-input v-model="form.connectId" placeholder="请输入实时数采表id" /> width="700px"
</el-form-item> @close="cancel"
<el-form-item label="plc实际的列名参数列名" prop="plcParamName"> @cancel="cancel"
<el-input v-model="form.plcParamName" placeholder="请输入plc实际的列名参数列名" /> @confirm="submitForm">
</el-form-item> <DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
<el-form-item label="参数名称" prop="name"> </base-dialog>
<el-input v-model="form.name" placeholder="请输入参数名称" />
</el-form-item>
<el-form-item label="单位 关联数据字典表label_value" prop="unit">
<el-select v-model="form.unit" placeholder="请选择单位 关联数据字典表label_value">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.UNIT_DICT)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="最小值 数值型可用" prop="minValue">
<el-input v-model="form.minValue" placeholder="请输入最小值 数值型可用" />
</el-form-item>
<el-form-item label="最大值 数值型可用" prop="maxValue">
<el-input v-model="form.maxValue" placeholder="请输入最大值 数值型可用" />
</el-form-item>
<el-form-item label="参数设定标准值" prop="defaultValue">
<el-input v-model="form.defaultValue" 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-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>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { createEquipmentPlcParam, updateEquipmentPlcParam, deleteEquipmentPlcParam, getEquipmentPlcParam, getEquipmentPlcParamPage, exportEquipmentPlcParamExcel } from "@/api/base/equipmentPlcParam"; import {
import Editor from '@/components/Editor'; createEquipmentPlcParam,
updateEquipmentPlcParam,
deleteEquipmentPlcParam,
getEquipmentPlcParam,
getEquipmentPlcParamPage,
exportEquipmentPlcParamExcel,
} from '@/api/base/equipmentPlcParam';
import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin';
import { publicFormatter } from '@/utils/dict';
export default { export default {
name: "EquipmentPlcParam", name: 'EquipmentPlcParam',
components: { mixins: [basicPageMixin],
Editor
},
data() { data() {
return { return {
// tableProps: [
loading: true, // {
// // prop: 'createTime',
exportLoading: false, // label: '',
// // fixed: true,
showSearch: true, // width: 180,
// // filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
total: 0, // },
// { prop: 'plcParamName', label: '参数列名', align: 'center' },
list: [], { prop: 'name', label: '参数名称', align: 'center' },
// {
title: "", prop: 'unit',
// label: '单位',
align: 'center',
filter: publicFormatter('unit_dict'),
},
{
prop: 'collection',
label: '是否采集',
align: 'center',
filter: (val) => (val != null ? ['否', '是'][val] : '-'),
},
{ prop: 'minValue', label: '最小值', align: 'center' },
{ prop: 'maxValue', label: '最大值', align: 'center' },
{ prop: 'defaultValue', label: '标准值', align: 'center' },
{ prop: 'description', label: '描述', align: 'center' },
{ prop: 'remark', label: '备注', align: 'center' },
// {
// _action: 'params-bind',
// label: '',
// align: 'center',
// 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,
// });
// },
// },
// },
// ''
// );
// },
// },
// },
],
rows: [
[
{
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,
},
},
],
[
{
input: true,
label: '最小值',
prop: 'minValue',
rules: [
{
type: 'number',
message: '请输入正确的数字',
trigger: 'blur',
transform: (val) => Number(val),
},
],
},
{
input: true,
label: '最大值',
prop: 'maxValue',
rules: [
{
type: 'number',
message: '请输入正确的数字',
trigger: 'blur',
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' }],
},
],
],
open: false, open: false,
// //
queryParams: { queryParams: {
@ -133,23 +209,128 @@ export default {
}, },
// //
form: {}, form: {},
// connectId: null,
rules: { equipmentName: '',
connectId: [{ required: true, message: "实时数采表id不能为空", trigger: "blur" }], plcTableName: '',
plcParamName: [{ required: true, message: "plc实际的列名参数列名不能为空", trigger: "blur" }], searchBarFormConfig: [
name: [{ required: true, message: "参数名称不能为空", trigger: "blur" }], {
} type: 'input',
label: '设备名',
disabled: true,
param: 'equipmentName',
defaultSelect: '',
},
{
type: 'input',
label: '关联表名',
disabled: true,
param: 'plcName',
defaultSelect: '',
},
{
type:
this.$auth.hasPermi('base:equipment-plc-param:create') &&
!this.isDetailPage
? 'button'
: '',
btnName: '新增',
name: 'add',
plain: true,
color: 'success',
},
],
}; };
}, },
created() { computed: {
isDetailPage() {
return this.$route.params.detail === true;
},
tableBtn() {
return [
this.$auth.hasPermi('base:equipment-plc-param:update') &&
!this.isDetailPage
? {
type: 'edit',
btnName: '修改',
}
: undefined,
this.$auth.hasPermi('base:equipment-plc-param:delete') &&
!this.isDetailPage
? {
type: 'delete',
btnName: '删除',
}
: undefined,
].filter((v) => v);
},
// searchBarFormConfig() {
// console.log(
// 'ers',
// JSON.stringify({ eid: this.equipmentName, plc: this.plcTableName })
// );
// return [
// {
// type: 'input',
// label: '',
// disabled: true,
// param: 'equipmentName',
// defaultSelect: this.equipmentName,
// },
// {
// type: 'input',
// label: '',
// disabled: true,
// param: 'plcName',
// defaultSelect: this.plcTableName,
// },
// {
// type:
// this.$auth.hasPermi('base:equipment-plc-param:create') &&
// !this.isDetailPage
// ? 'button'
// : '',
// btnName: '',
// name: 'add',
// plain: true,
// color: 'success',
// },
// ];
// },
},
activated() {
console.log('activated,,,');
//
const { equipmentName, id: connectId, plcTableName } = this.$route.params;
// this.equipmentName = equipmentName;
// this.plcTableName = plcTableName;
this.setSearchBarFormValue('equipmentName', equipmentName);
this.setSearchBarFormValue('plcName', plcTableName);
this.queryParams.connectId = connectId;
// if (!equipmentGroupId) this.getList(); //
this.getList(); this.getList();
}, },
deactivated() {
console.log('deactivated,,,');
this.setSearchBarFormValue('equipmentName', '');
this.setSearchBarFormValue('plcName', '');
// this.equipmentName = null;
// this.plcTableName = null;
this.queryParams.connectId = null;
},
methods: { methods: {
/** 设置 searchBarForm 的默认值 - 用得比较少 */
setSearchBarFormValue(param, value) {
this.searchBarFormConfig.forEach((config) => {
if (config.param == param) {
config.defaultSelect = value;
}
});
},
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
this.loading = true; this.loading = true;
// //
getEquipmentPlcParamPage(this.queryParams).then(response => { getEquipmentPlcParamPage(this.queryParams).then((response) => {
this.list = response.data.list; this.list = response.data.list;
this.total = response.data.total; this.total = response.data.total;
this.loading = false; this.loading = false;
@ -175,7 +356,7 @@ export default {
description: undefined, description: undefined,
remark: undefined, remark: undefined,
}; };
this.resetForm("form"); this.resetForm('form');
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
@ -184,43 +365,49 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm('queryForm');
this.handleQuery(); this.handleQuery();
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加设备数采详情"; this.title = '添加设备数采详情';
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id; const id = row.id;
getEquipmentPlcParam(id).then(response => { getEquipmentPlcParam(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改设备数采详情"; this.title = '修改设备数采详情';
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs['form'].validate((valid) => {
if (!valid) { if (!valid) {
return; return;
} }
// //
if (this.form.id != null) { if (this.form.id != null) {
updateEquipmentPlcParam(this.form).then(response => { updateEquipmentPlcParam({
this.$modal.msgSuccess("修改成功"); ...this.form,
connectId: this.queryParams.connectId,
}).then((response) => {
this.$modal.msgSuccess('修改成功');
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
return; return;
} }
// //
createEquipmentPlcParam(this.form).then(response => { createEquipmentPlcParam({
this.$modal.msgSuccess("新增成功"); ...this.form,
connectId: this.queryParams.connectId,
}).then((response) => {
this.$modal.msgSuccess('新增成功');
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -229,12 +416,16 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除设备数采详情编号为"' + id + '"的数据项?').then(function() { this.$modal
.confirm('是否确认删除设备数采详情编号为"' + id + '"的数据项?')
.then(function () {
return deleteEquipmentPlcParam(id); return deleteEquipmentPlcParam(id);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess('删除成功');
}).catch(() => {}); })
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@ -242,14 +433,18 @@ export default {
let params = { ...this.queryParams }; let params = { ...this.queryParams };
params.pageNo = undefined; params.pageNo = undefined;
params.pageSize = undefined; params.pageSize = undefined;
this.$modal.confirm('是否确认导出所有设备数采详情数据项?').then(() => { this.$modal
.confirm('是否确认导出所有设备数采详情数据项?')
.then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportEquipmentPlcParamExcel(params); return exportEquipmentPlcParamExcel(params);
}).then(response => { })
.then((response) => {
this.$download.excel(response, '设备数采详情.xls'); this.$download.excel(response, '设备数采详情.xls');
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); })
} .catch(() => {});
} },
},
}; };
</script> </script>