Browse Source

模型参数初版可新增

pull/1/head
ljlong_2630 1 year ago
parent
commit
9c60df45b2
  1. 2
      package.json
  2. 12
      src/api/model/modelparam.js
  3. 14
      src/views/model/devicemodel/index.vue
  4. 410
      src/views/model/devicemodel/modelparams.vue

2
package.json

@ -17,6 +17,7 @@
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "2.0.10", "@element-plus/icons-vue": "2.0.10",
"@kjgl77/datav-vue3": "^1.6.1", "@kjgl77/datav-vue3": "^1.6.1",
"@vee-validate/rules": "4.5.8",
"@vueuse/core": "9.5.0", "@vueuse/core": "9.5.0",
"axios": "0.27.2", "axios": "0.27.2",
"bpmn-js": "^11.4.1", "bpmn-js": "^11.4.1",
@ -30,6 +31,7 @@
"jsencrypt": "3.3.1", "jsencrypt": "3.3.1",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"pinia": "2.0.22", "pinia": "2.0.22",
"vee-validate": "4.5.8",
"vkbeautify": "^0.99.3", "vkbeautify": "^0.99.3",
"vue": "3.2.45", "vue": "3.2.45",
"vue-baidu-map-3x": "^1.0.34", "vue-baidu-map-3x": "^1.0.34",

12
src/api/model/modelparamrela.js → src/api/model/modelparam.js

@ -1,7 +1,7 @@
import request from '@/utils/request' import request from '@/utils/request'
// 查询设备模型参数明细列表 // 查询设备模型参数明细列表
export function listModelparamrela(query) { export function listModelparam(query) {
return request({ return request({
url: '/model/dcModelDeviceParam/list', url: '/model/dcModelDeviceParam/list',
method: 'get', method: 'get',
@ -10,7 +10,7 @@ export function listModelparamrela(query) {
} }
// 查询设备模型参数明细详细 // 查询设备模型参数明细详细
export function getModelparamrela(id) { export function getModelparam(id) {
return request({ return request({
url: '/model/dcModelDeviceParam/' + id, url: '/model/dcModelDeviceParam/' + id,
method: 'get' method: 'get'
@ -18,7 +18,7 @@ export function getModelparamrela(id) {
} }
// 新增设备模型参数明细 // 新增设备模型参数明细
export function addModelparamrela(data) { export function addModelparam(data) {
return request({ return request({
url: '/model/dcModelDeviceParam', url: '/model/dcModelDeviceParam',
method: 'post', method: 'post',
@ -27,7 +27,7 @@ export function addModelparamrela(data) {
} }
// 修改设备模型参数明细 // 修改设备模型参数明细
export function updateModelparamrela(data) { export function updateModelparam(data) {
return request({ return request({
url: '/model/dcModelDeviceParam', url: '/model/dcModelDeviceParam',
method: 'put', method: 'put',
@ -36,7 +36,7 @@ export function updateModelparamrela(data) {
} }
// 删除设备模型参数明细 // 删除设备模型参数明细
export function delModelparamrela(id) { export function delModelparam(id) {
return request({ return request({
url: '/model/dcModelDeviceParam/' + id, url: '/model/dcModelDeviceParam/' + id,
method: 'delete' method: 'delete'
@ -44,7 +44,7 @@ export function delModelparamrela(id) {
} }
// 导出设备模型参数明细 // 导出设备模型参数明细
export function exportModelparamrela(query) { export function exportModelparam(query) {
return request({ return request({
url: '/${baseUrl}/export', url: '/${baseUrl}/export',
method: 'get', method: 'get',

14
src/views/model/devicemodel/index.vue

@ -96,7 +96,11 @@
<el-table-column label="模型名称" align="center" prop="modelName" /> <el-table-column label="模型名称" align="center" prop="modelName" />
<el-table-column label="模型编码" align="center" prop="modelCode" /> <el-table-column label="模型编码" align="center" prop="modelCode" />
<el-table-column label="排序" align="center" prop="sort" /> <el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="模型类别Id" align="center" prop="modelTypeId" /> <el-table-column label="模型类别Id" align="center" prop="modelTypeId">
<template #default="scope">
<dict-tag :options="dc_model_type" :value="scope.row.modelTypeId" />
</template>
</el-table-column>
<el-table-column label="上级id" align="center" prop="pid" /> <el-table-column label="上级id" align="center" prop="pid" />
<el-table-column label="备注" align="center" prop="note" /> <el-table-column label="备注" align="center" prop="note" />
<el-table-column label="是否是叶节点" align="center" prop="isLeaf"> <el-table-column label="是否是叶节点" align="center" prop="isLeaf">
@ -117,12 +121,6 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['model:devicemodel:edit']" v-hasPermi="['model:devicemodel:edit']"
>修改</el-button> >修改</el-button>
<el-button
type="text"
icon="Plus"
@click="handleAdd(scope.row)"
v-hasPermi="['model:devicemodel:add']"
>新增</el-button>
<el-button <el-button
type="text" type="text"
icon="Delete" icon="Delete"
@ -196,7 +194,7 @@
import { listDevicemodel, getDevicemodel, delDevicemodel, addDevicemodel, updateDevicemodel } from "@/api/model/devicemodel"; import { listDevicemodel, getDevicemodel, delDevicemodel, addDevicemodel, updateDevicemodel } from "@/api/model/devicemodel";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { available, dc_is_leaf } = proxy.useDict('available', 'dc_is_leaf'); const { dc_model_type } = proxy.useDict('dc_model_type');
const devicemodelList = ref([]); const devicemodelList = ref([]);
const devicemodelOptions = ref([]); const devicemodelOptions = ref([]);

410
src/views/model/devicemodel/modelparams.vue

@ -0,0 +1,410 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="参数模型ID" prop="paramClassId">
<el-input
v-model="queryParams.paramClassId"
placeholder="请输入参数模型ID"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="设备模型ID" prop="modelId">
<el-input
v-model="queryParams.modelId"
placeholder="请输入设备模型ID"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="分区" prop="devicePartion">
<el-input
v-model="queryParams.devicePartion"
placeholder="请输入分区"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="PLC地址位" prop="plcAdr">
<el-input
v-model="queryParams.plcAdr"
placeholder="请输入PLC地址位"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="是/否可以控制" prop="controllab">
<el-select v-model="queryParams.controllab" placeholder="请选择是/否可以控制" clearable>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="采集设备ID" prop="collectDeviceId">
<el-input
v-model="queryParams.collectDeviceId"
placeholder="请输入采集设备ID"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="分区" prop="partion">
<el-input
v-model="queryParams.partion"
placeholder="请输入分区"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button type="info" plain 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="success"
icon="Plus"
@click="handleAdd"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="Edit"
@click="handleUpdate"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="Delete"
@click="handleDelete"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="Download"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="modelparamList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="参数模型ID" align="center" prop="paramClassId" />
<el-table-column label="设备模型ID" align="center" prop="modelId" />
<el-table-column label="备注" align="center" prop="note" />
<el-table-column label="分区" align="center" prop="devicePartion" />
<el-table-column label="PLC地址位" align="center" prop="plcAdr" />
<el-table-column label="是/否可以控制" align="center" prop="controllab" />
<el-table-column label="采集设备ID" align="center" prop="collectDeviceId" />
<el-table-column label="分区" align="center" prop="partion" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
type="text"
icon="Edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
type="text"
icon="Delete"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改设备模型参数明细对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="modelparamRef" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="乐观锁" prop="version">
<el-input v-model="form.version" placeholder="请输入乐观锁" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="创建人" prop="createBy">
<el-input v-model="form.createBy" placeholder="请输入创建人" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="创建时间" prop="createTime">
<el-date-picker clearable
v-model="form.createTime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="更新人" prop="updateBy">
<el-input v-model="form.updateBy" placeholder="请输入更新人" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="更新时间" prop="updateTime">
<el-date-picker clearable
v-model="form.updateTime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择更新时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部门ID" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门ID" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户Id" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户Id" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="删除人" prop="deleteBy">
<el-input v-model="form.deleteBy" placeholder="请输入删除人" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="删除时间" prop="deleteTime">
<el-date-picker clearable
v-model="form.deleteTime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择删除时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="参数模型ID" prop="paramClassId">
<el-input v-model="form.paramClassId" placeholder="请输入参数模型ID" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备模型ID" prop="modelId">
<el-input v-model="form.modelId" placeholder="请输入设备模型ID" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="note">
<el-input v-model="form.note" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="分区" prop="devicePartion">
<el-input v-model="form.devicePartion" placeholder="请输入分区" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="PLC地址位" prop="plcAdr">
<el-input v-model="form.plcAdr" placeholder="请输入PLC地址位" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是/否可以控制" prop="controllab">
<el-select v-model="form.controllab" placeholder="请选择是/否可以控制">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="采集设备ID" prop="collectDeviceId">
<el-input v-model="form.collectDeviceId" placeholder="请输入采集设备ID" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="分区" prop="partion">
<el-input v-model="form.partion" placeholder="请输入分区" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="Modelparam">
import { listModelparam, getModelparam, delModelparam, addModelparam, updateModelparam } from "@/api/model/modelparam";
const { proxy } = getCurrentInstance();
const modelparamList = ref([]);
const open = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
paramClassId: null,
modelId: null,
note: null,
devicePartion: null,
plcAdr: null,
controllab: null,
collectDeviceId: null,
partion: null
},
rules: {
paramClassId: [
{ required: true, message: "参数模型ID不能为空", trigger: "blur" }
],
modelId: [
{ required: true, message: "设备模型ID不能为空", trigger: "blur" }
],
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询设备模型参数明细列表 */
function getList() {
loading.value = true;
listModelparam(queryParams.value).then(response => {
modelparamList.value = response.rows;
total.value = response.total;
loading.value = false;
});
}
//
function cancel() {
open.value = false;
reset();
}
//
function reset() {
form.value = {
tentantId: null,
version: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
deptId: null,
userId: null,
deleteBy: null,
deleteTime: null,
id: null,
paramClassId: null,
modelId: null,
note: null,
devicePartion: null,
plcAdr: null,
controllab: null,
collectDeviceId: null,
partion: null
};
proxy.resetForm("modelparamRef");
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
function resetQuery() {
proxy.resetForm("queryRef");
handleQuery();
}
//
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
function handleAdd() {
reset();
open.value = true;
title.value = "添加设备模型参数明细";
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset();
const _id = row.id || ids.value
getModelparam(_id).then(response => {
form.value = response.data;
open.value = true;
title.value = "修改设备模型参数明细";
});
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["modelparamRef"].validate(valid => {
if (valid) {
if (form.value.id != null) {
updateModelparam(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
});
} else {
addModelparam(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
});
}
}
});
}
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value;
proxy.$modal.confirm('是否确认删除设备模型参数明细编号为"' + _ids + '"的数据项?').then(function() {
return delModelparam(_ids);
}).then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
}).catch(() => {});
}
/** 导出按钮操作 */
function handleExport() {
proxy.download('model/modelparam/export', {
...queryParams.value
}, `modelparam_${new Date().getTime()}.xlsx`)
}
getList();
</script>
Loading…
Cancel
Save