test #47

Merged
gtz217 merged 273 commits from test into master 2023-10-17 08:53:54 +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,255 +1,450 @@
<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="实时数采表id" prop="connectId"> :table-props="tableProps"
<el-input v-model="queryParams.connectId" placeholder="请输入实时数采表id" clearable @keyup.enter.native="handleQuery"/> :page="queryParams.pageNo"
</el-form-item> :limit="queryParams.pageSize"
<el-form-item> :table-data="list"
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> @emitFun="handleEmitFun">
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <method-btn
</el-form-item> v-if="tableBtn.length"
</el-form> slot="handleBtn"
label="操作"
:method-list="tableBtn"
@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-param: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-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-dialog
<el-table-column label="ID" align="center" prop="id" /> :dialogTitle="title"
<el-table-column label="实时数采表id" align="center" prop="connectId" /> :dialogVisible="open"
<el-table-column label="plc实际的列名参数列名" align="center" prop="plcParamName" /> width="700px"
<el-table-column label="参数名称" align="center" prop="name" /> @close="cancel"
<el-table-column label="单位 关联数据字典表label_value" align="center" prop="unit"> @cancel="cancel"
<template v-slot="scope"> @confirm="submitForm">
<dict-tag :type="DICT_TYPE.UNIT_DICT" :value="scope.row.unit" /> <DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
</template> </base-dialog>
</el-table-column> </div>
<el-table-column label="最小值 数值型可用" align="center" prop="minValue" />
<el-table-column label="最大值 数值型可用" align="center" prop="maxValue" />
<el-table-column label="参数设定标准值" align="center" prop="defaultValue" />
<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="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="实时数采表id" prop="connectId">
<el-input v-model="form.connectId" placeholder="请输入实时数采表id" />
</el-form-item>
<el-form-item label="plc实际的列名参数列名" prop="plcParamName">
<el-input v-model="form.plcParamName" placeholder="请输入plc实际的列名参数列名" />
</el-form-item>
<el-form-item label="参数名称" prop="name">
<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>
</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() {
}, return {
data() { tableProps: [
return { // {
// // prop: 'createTime',
loading: true, // label: '',
// // fixed: true,
exportLoading: false, // width: 180,
// // filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
showSearch: true, // },
// { prop: 'plcParamName', label: '参数列名', align: 'center' },
total: 0, { prop: 'name', label: '参数名称', align: 'center' },
// {
list: [], prop: 'unit',
// label: '单位',
title: "", align: 'center',
// filter: publicFormatter('unit_dict'),
open: false, },
// {
queryParams: { prop: 'collection',
pageNo: 1, label: '是否采集',
pageSize: 10, align: 'center',
connectId: null, filter: (val) => (val != null ? ['否', '是'][val] : '-'),
}, },
// { prop: 'minValue', label: '最小值', align: 'center' },
form: {}, { prop: 'maxValue', label: '最大值', align: 'center' },
// { prop: 'defaultValue', label: '标准值', align: 'center' },
rules: { { prop: 'description', label: '描述', align: 'center' },
connectId: [{ required: true, message: "实时数采表id不能为空", trigger: "blur" }], { prop: 'remark', label: '备注', align: 'center' },
plcParamName: [{ required: true, message: "plc实际的列名参数列名不能为空", trigger: "blur" }], // {
name: [{ required: true, message: "参数名称不能为空", trigger: "blur" }], // _action: 'params-bind',
} // label: '',
}; // align: 'center',
}, // subcomponent: {
created() { // props: ['injectData'],
this.getList(); // render: function (h) {
}, // const _this = this;
methods: { // return h(
/** 查询列表 */ // 'el-button',
getList() { // {
this.loading = true; // props: { type: 'text' },
// // on: {
getEquipmentPlcParamPage(this.queryParams).then(response => { // click: function () {
this.list = response.data.list; // console.log('inejctdata', _this.injectData);
this.total = response.data.total; // _this.$emit('emitData', {
this.loading = false; // action: _this.injectData._action,
}); // payload: _this.injectData,
}, // });
/** 取消按钮 */ // },
cancel() { // },
this.open = false; // },
this.reset(); // ''
}, // );
/** 表单重置 */ // },
reset() { // },
this.form = { // },
id: undefined, ],
connectId: undefined, rows: [
plcParamName: undefined, [
name: undefined, {
unit: undefined, input: true,
minValue: undefined, label: '参数列名',
maxValue: undefined, prop: 'plcParamName',
defaultValue: undefined, rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
collection: undefined, },
description: undefined, {
remark: undefined, input: true,
}; label: '参数名称',
this.resetForm("form"); prop: 'name',
}, rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
/** 搜索按钮操作 */ },
handleQuery() { ],
this.queryParams.pageNo = 1; [
this.getList(); {
}, select: true,
/** 重置按钮操作 */ label: '单位',
resetQuery() { prop: 'unit',
this.resetForm("queryForm"); options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
this.handleQuery(); // rules: [{ required: true, message: '', trigger: 'blur' }],
}, },
/** 新增按钮操作 */ {
handleAdd() { switch: true,
this.reset(); label: '是否采集',
this.open = true; prop: 'collection',
this.title = "添加设备数采详情"; bind: {
}, 'active-value': 1,
/** 修改按钮操作 */ 'inactive-value': 0,
handleUpdate(row) { },
this.reset(); },
const id = row.id; ],
getEquipmentPlcParam(id).then(response => { [
this.form = response.data; {
this.open = true; input: true,
this.title = "修改设备数采详情"; label: '最小值',
}); prop: 'minValue',
}, rules: [
/** 提交按钮 */ {
submitForm() { type: 'number',
this.$refs["form"].validate(valid => { message: '请输入正确的数字',
if (!valid) { trigger: 'blur',
return; transform: (val) => Number(val),
} },
// ],
if (this.form.id != null) { },
updateEquipmentPlcParam(this.form).then(response => { {
this.$modal.msgSuccess("修改成功"); input: true,
this.open = false; label: '最大值',
this.getList(); prop: 'maxValue',
}); rules: [
return; {
} type: 'number',
// message: '请输入正确的数字',
createEquipmentPlcParam(this.form).then(response => { trigger: 'blur',
this.$modal.msgSuccess("新增成功"); transform: (val) => Number(val),
this.open = false; },
this.getList(); ],
}); // rules: [{ required: true, message: '', trigger: 'blur' }],
}); },
}, ],
/** 删除按钮操作 */ [
handleDelete(row) { {
const id = row.id; input: true,
this.$modal.confirm('是否确认删除设备数采详情编号为"' + id + '"的数据项?').then(function() { label: '标准值',
return deleteEquipmentPlcParam(id); prop: 'defaultValue',
}).then(() => { // rules: [{ required: true, message: '', trigger: 'blur' }],
this.getList(); },
this.$modal.msgSuccess("删除成功"); {
}).catch(() => {}); input: true,
}, label: '描述',
/** 导出按钮操作 */ prop: 'description',
handleExport() { // rules: [{ required: true, message: '', trigger: 'blur' }],
// },
let params = {...this.queryParams}; ],
params.pageNo = undefined; [
params.pageSize = undefined; {
this.$modal.confirm('是否确认导出所有设备数采详情数据项?').then(() => { input: true,
this.exportLoading = true; label: '备注',
return exportEquipmentPlcParamExcel(params); prop: 'remark',
}).then(response => { // rules: [{ required: true, message: '', trigger: 'blur' }],
this.$download.excel(response, '设备数采详情.xls'); },
this.exportLoading = false; ],
}).catch(() => {}); ],
} open: false,
} //
queryParams: {
pageNo: 1,
pageSize: 10,
connectId: null,
},
//
form: {},
connectId: null,
equipmentName: '',
plcTableName: '',
searchBarFormConfig: [
{
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',
},
],
};
},
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();
},
deactivated() {
console.log('deactivated,,,');
this.setSearchBarFormValue('equipmentName', '');
this.setSearchBarFormValue('plcName', '');
// this.equipmentName = null;
// this.plcTableName = null;
this.queryParams.connectId = null;
},
methods: {
/** 设置 searchBarForm 的默认值 - 用得比较少 */
setSearchBarFormValue(param, value) {
this.searchBarFormConfig.forEach((config) => {
if (config.param == param) {
config.defaultSelect = value;
}
});
},
/** 查询列表 */
getList() {
this.loading = true;
//
getEquipmentPlcParamPage(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,
connectId: undefined,
plcParamName: undefined,
name: undefined,
unit: undefined,
minValue: undefined,
maxValue: undefined,
defaultValue: undefined,
collection: undefined,
description: 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;
getEquipmentPlcParam(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) {
updateEquipmentPlcParam({
...this.form,
connectId: this.queryParams.connectId,
}).then((response) => {
this.$modal.msgSuccess('修改成功');
this.open = false;
this.getList();
});
return;
}
//
createEquipmentPlcParam({
...this.form,
connectId: this.queryParams.connectId,
}).then((response) => {
this.$modal.msgSuccess('新增成功');
this.open = false;
this.getList();
});
});
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal
.confirm('是否确认删除设备数采详情编号为"' + id + '"的数据项?')
.then(function () {
return deleteEquipmentPlcParam(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 exportEquipmentPlcParamExcel(params);
})
.then((response) => {
this.$download.excel(response, '设备数采详情.xls');
this.exportLoading = false;
})
.catch(() => {});
},
},
}; };
</script> </script>