Merge branch 'equipment-module-dev' into lb

This commit is contained in:
lb 2023-09-01 17:05:27 +08:00
commit b6df60a315
7 changed files with 1237 additions and 665 deletions

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

@ -0,0 +1,78 @@
import Mock from 'mockjs';
const baseURL = 'http://192.168.1.49:48080/admin-api';
Mock.setup({
timeout: 200,
});
// @database
const list = Mock.mock({
'data|1-10': [
{
'id|+1': 1,
productionLine: (options) => {
// console.log('otpsion', options.context.currentContext);
return `EQ${options.context.currentContext.id}`;
},
workshopSection: ({ context: { currentContext } }) =>
`EQ${currentContext.id}_WS${Mock.Random.integer(1, 10)}`,
equipmentName: ({ context: { currentContext } }) =>
`设备${currentContext.id}`,
equipmentCode: ({ context: { currentContext } }) =>
`${currentContext.equipmentName}_Code`,
plcCode: ({ context: { currentContext } }) =>
`PLC_TABLE_CODE_${currentContext.id}`,
plcTableName: ({ context: { currentContext } }) =>
`PLC_TABLE_${currentContext.id}`,
plcName: ({ context: { currentContext } }) => `PLC_${currentContext.id}`,
'bindingParameters|1-10': 1,
},
],
});
// @page
Mock.mock(
RegExp(baseURL + '/base/equipment-plc-connect/page' + '.*'),
'get',
(options) => {
console.log('[Mock url]', options.url, list);
return {
code: 0,
data: {
list: list.data,
total: list.data.length,
},
};
}
);
// @create
Mock.mock(baseURL + '/base/equipment-plc-connect/create', 'post', (options) => {
console.log('options', options);
const { url, type, body } = options;
const newItem = JSON.parse(body);
list.data.push(newItem);
return {
code: 0,
data: null,
msg: 'success',
};
});
// @update
Mock.mock(
baseURL + '/admin-api/base/equipment-plc-connect/update',
'put',
(options) => {
const { url, type, body } = options;
const { id } = JSON.parse(body);
const newItem = list.data.find((item) => item.id == id);
newItem = { ...newItem, ...JSON.parse(body) };
return {
code: 0,
msg: 'success',
data: null,
};
}
);

View File

@ -1,209 +1,349 @@
<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="plc表iD" prop="plcId"> :table-props="tableProps"
<el-input v-model="queryParams.plcId" placeholder="请输入plc表iD" clearable @keyup.enter.native="handleQuery"/> :page="queryParams.pageNo"
</el-form-item> :limit="queryParams.pageSize"
<el-form-item label="设备表id" prop="equipmentId"> :table-data="list"
<el-input v-model="queryParams.equipmentId" placeholder="请输入设备表id" 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-connect: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-connect: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="plc表iD" align="center" prop="plcId" /> :dialogVisible="open"
<el-table-column label="设备表id" align="center" prop="equipmentId" /> width="700px"
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> @close="cancel"
<template v-slot="scope"> @cancel="cancel"
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" @confirm="submitForm">
v-hasPermi="['base:equipment-plc-connect:update']">修改</el-button> <DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" </base-dialog>
v-hasPermi="['base:equipment-plc-connect:delete']">删除</el-button> </div>
</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="plc表iD" prop="plcId">
<el-input v-model="form.plcId" placeholder="请输入plc表iD" />
</el-form-item>
<el-form-item label="设备表id" prop="equipmentId">
<el-input v-model="form.equipmentId" placeholder="请输入设备表id" />
</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 { createEquipmentPlcConnect, updateEquipmentPlcConnect, deleteEquipmentPlcConnect, getEquipmentPlcConnect, getEquipmentPlcConnectPage, exportEquipmentPlcConnectExcel } from "@/api/base/equipmentPlcConnect"; import {
createEquipmentPlcConnect,
updateEquipmentPlcConnect,
deleteEquipmentPlcConnect,
getEquipmentPlcConnect,
getEquipmentPlcConnectPage,
exportEquipmentPlcConnectExcel,
} from '@/api/base/equipmentPlcConnect';
import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin';
// import './http';
export default { export default {
name: "EquipmentPlcConnect", name: 'EquipmentPlcConnect',
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: { tableBtn: [
pageNo: 1, {
pageSize: 10, type: 'edit',
plcId: null, btnName: '修改',
equipmentId: null, },
}, // {
// // type: 'params-bind',
form: {}, // btnName: '',
// // },
rules: { {
plcId: [{ required: true, message: "plc表iD不能为空", trigger: "blur" }], type: 'delete',
equipmentId: [{ required: true, message: "设备表id不能为空", trigger: "blur" }], btnName: '删除',
} },
}; ],
}, tableProps: [
created() { // {
this.getList(); // prop: 'createTime',
}, // label: '',
methods: { // fixed: true,
/** 查询列表 */ // width: 180,
getList() { // filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
this.loading = true; // },
// { prop: 'productionLine', label: '产线', align: 'center' },
getEquipmentPlcConnectPage(this.queryParams).then(response => { { prop: 'workshopSection', label: '工段', align: 'center' },
this.list = response.data.list; { prop: 'equipmentName', label: '设备名', align: 'center' },
this.total = response.data.total; { prop: 'equipmentCode', label: '设备编码', align: 'center' },
this.loading = false; { prop: 'plcCode', label: '关联表编码', align: 'center' },
}); { prop: 'plcTableName', label: '关联表名', align: 'center' },
}, { prop: 'plcName', label: '标识名称', align: 'center' },
/** 取消按钮 */ { prop: 'bindingParameters', label: '绑定参数数量', align: 'center' },
cancel() { {
this.open = false; _action: 'params-bind',
this.reset(); label: '查看绑定',
}, align: 'center',
/** 表单重置 */ subcomponent: {
reset() { props: ['injectData'],
this.form = { render: function (h) {
id: undefined, const _this = this;
plcId: undefined, return h(
equipmentId: undefined, 'el-button',
}; {
this.resetForm("form"); props: { type: 'text' },
}, on: {
/** 搜索按钮操作 */ click: function () {
handleQuery() { console.log('inejctdata', _this.injectData);
this.queryParams.pageNo = 1; _this.$emit('emitData', {
this.getList(); action: _this.injectData._action,
}, payload: _this.injectData,
/** 重置按钮操作 */ });
resetQuery() { },
this.resetForm("queryForm"); },
this.handleQuery(); },
}, '查看绑定'
/** 新增按钮操作 */ );
handleAdd() { },
this.reset(); },
this.open = true; },
this.title = "添加设备与实时采集关系表(一对多)"; ],
}, searchBarFormConfig: [
/** 修改按钮操作 */ {
handleUpdate(row) { type: 'input',
this.reset(); label: '设备名',
const id = row.id; placeholder: '请输入设备名',
getEquipmentPlcConnect(id).then(response => { param: 'equipmentId',
this.form = response.data; },
this.open = true; {
this.title = "修改设备与实时采集关系表(一对多)"; type: 'input',
}); label: '编码',
}, placeholder: '请输入编码',
/** 提交按钮 */ param: 'plcId',
submitForm() { },
this.$refs["form"].validate(valid => { {
if (!valid) { type: 'button',
return; btnName: '查询',
} name: 'search',
// color: 'primary',
if (this.form.id != null) { },
updateEquipmentPlcConnect(this.form).then(response => { {
this.$modal.msgSuccess("修改成功"); type: 'separate',
this.open = false; },
this.getList(); {
}); // type: this.$auth.hasPermi('base:equipment-plc:create')
return; // ? 'button'
} // : '',
// type: 'button',
createEquipmentPlcConnect(this.form).then(response => { btnName: '新增',
this.$modal.msgSuccess("新增成功"); name: 'add',
this.open = false; plain: true,
this.getList(); color: 'success',
}); },
}); // {
}, // type: this.$auth.hasPermi('base:equipment-plc:export') ? 'button' : '',
/** 删除按钮操作 */ // btnName: '',
handleDelete(row) { // name: 'export',
const id = row.id; // color: 'warning',
this.$modal.confirm('是否确认删除设备与实时采集关系表(一对多)编号为"' + id + '"的数据项?').then(function() { // },
return deleteEquipmentPlcConnect(id); ],
}).then(() => { rows: [
this.getList(); [
this.$modal.msgSuccess("删除成功"); {
}).catch(() => {}); select: true,
}, label: '关联表名',
/** 导出按钮操作 */ prop: 'plcId',
handleExport() { url: '/base/equipment-plc/listAll',
// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
let params = {...this.queryParams}; },
params.pageNo = undefined; ],
params.pageSize = undefined; [
this.$modal.confirm('是否确认导出所有设备与实时采集关系表(一对多)数据项?').then(() => { {
this.exportLoading = true; select: true,
return exportEquipmentPlcConnectExcel(params); label: '设备',
}).then(response => { prop: 'equipmentId',
this.$download.excel(response, '设备与实时采集关系表(一对多).xls'); url: '/base/equipment/page?pageNo=1&pageSize=99',
this.exportLoading = false; rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
}).catch(() => {}); },
} ],
} ],
open: false,
//
queryParams: {
pageNo: 1,
pageSize: 10,
plcId: null,
equipmentId: null,
},
//
form: {},
};
},
created() {
this.getList();
},
methods: {
/** 覆盖 handleEmitFun 的默认实现 */
handleEmitFun({ action, payload }) {
switch (action) {
case 'params-bind':
this.reset();
const {
id,
equipmentName,
equipmentId,
plcId,
plcName,
plcTableName,
} = payload;
// console.log('Cha', id, equipmentName, plcTableName);
this.$router.push({
name: 'EquipmentPlcParam',
params: {
id,
equipmentName,
plcTableName,
},
});
break;
}
},
/** 查询列表 */
getList() {
this.loading = true;
//
getEquipmentPlcConnectPage(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,
plcId: undefined,
equipmentId: 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;
getEquipmentPlcConnect(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) {
updateEquipmentPlcConnect(this.form).then((response) => {
this.$modal.msgSuccess('修改成功');
this.open = false;
this.getList();
});
return;
}
//
createEquipmentPlcConnect(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 deleteEquipmentPlcConnect(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 exportEquipmentPlcConnectExcel(params);
})
.then((response) => {
this.$download.excel(response, '设备与实时采集关系表(一对多).xls');
this.exportLoading = false;
})
.catch(() => {});
},
},
}; };
</script> </script>

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>

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"