Browse Source

临时设备信息设备参数维护功能代码

pull/1/head
ljlong_2630 1 year ago
parent
commit
253ca03055
  1. 8
      src/api/model/device.js
  2. 9
      src/assets/styles/self-defined.scss
  3. 94
      src/views/model/device/index.vue
  4. 98
      src/views/model/params/index.vue

8
src/api/model/device.js

@ -51,3 +51,11 @@ export function exportDevice(query) {
params: query params: query
}) })
} }
//获取总台设备的UUID
export function getUuid(){
return request({
url: '/model/dcBaseDeviceinfo/getUuid',
method: 'post',
})
}

9
src/assets/styles/self-defined.scss

@ -137,3 +137,12 @@
.height260{ .height260{
height:260px; height:260px;
} }
.childTextAlignCenter{
display: block!important;
div{
display: block!important;
text-align: center!important;
}
}

94
src/views/model/device/index.vue

@ -25,6 +25,8 @@
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-collapse-transition>
<div v-show="collapseVisible">
<el-form-item label="通讯来源设备ID" prop="deviceSourceId"> <el-form-item label="通讯来源设备ID" prop="deviceSourceId">
<el-input <el-input
v-model="queryParams.deviceSourceId" v-model="queryParams.deviceSourceId"
@ -161,9 +163,12 @@
<el-option label="请添加设备分组" value="" /> <el-option label="请添加设备分组" value="" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> </div>
</el-collapse-transition>
<el-form-item class="childTextAlignCenter">
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button> <el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button>
<el-button @click="toggleCollapse">{{editName}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -175,13 +180,13 @@
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
icon="Edit" icon="Edit"
@click="handleUpdate" @click="handleUpdate"
>修改</el-button> >修改</el-button>
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -201,41 +206,41 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" fixed="left"/>
<el-table-column label="中台设备编码" align="center" prop="centerDeviceCode" /> <el-table-column label="中台设备编码" align="center" prop="centerDeviceCode" :width="120"/>
<el-table-column label="设备名称" align="center" prop="deviceName" /> <el-table-column label="设备名称" align="center" prop="deviceName" :width="120"/>
<el-table-column label="通讯来源类型" align="center" prop="deviceSource" /> <el-table-column label="通讯来源类型" align="center" prop="deviceSource" :width="120"/>
<el-table-column label="通讯来源设备ID" align="center" prop="deviceSourceId" /> <el-table-column label="通讯来源设备ID" align="center" prop="deviceSourceId" :width="120"/>
<el-table-column label="是否可用" align="center" prop="enabledFlag" > <el-table-column label="是否可用" align="center" prop="enabledFlag" :width="120">
<template #default="scope"> <template #default="scope">
<dict-tag :options="enabledFlag" :value="scope.row.enabledFlag"/> <dict-tag :options="enabledFlagTable" :value="scope.row.enabledFlag"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备类型" align="center" prop="deviceType"> <el-table-column label="设备类型" align="center" prop="deviceType" :width="120">
<template #default="scope"> <template #default="scope">
<dict-tag :options="dc_device_type" :value="scope.row.deviceType"/> <dict-tag :options="dc_device_type" :value="scope.row.deviceType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属组织编码" align="center" prop="orgCode" /> <el-table-column label="所属组织编码" align="center" prop="orgCode" :width="120"/>
<el-table-column label="所属组织名称" align="center" prop="orgName" /> <el-table-column label="所属组织名称" align="center" prop="orgName" :width="120" />
<el-table-column label="位置编码" align="center" prop="locationCode" /> <el-table-column label="位置编码" align="center" prop="locationCode" :width="120"/>
<el-table-column label="位置名称" align="center" prop="locationName" /> <el-table-column label="位置名称" align="center" prop="locationName" :width="120"/>
<el-table-column label="设备应用范围" align="center" prop="deviceClass" /> <el-table-column label="设备应用范围" align="center" prop="deviceClass" :width="120"/>
<el-table-column label="接口名称" align="center" prop="apiName" /> <el-table-column label="接口名称" align="center" prop="apiName" :width="120"/>
<el-table-column label="服务器地址" align="center" prop="serverIp" /> <el-table-column label="服务器地址" align="center" prop="serverIp" :width="120"/>
<el-table-column label="从属网关ID" align="center" prop="gatewayId" /> <el-table-column label="从属网关ID" align="center" prop="gatewayId" :width="120"/>
<el-table-column label="纬度" align="center" prop="latValue" /> <el-table-column label="纬度" align="center" prop="latValue" :width="120"/>
<el-table-column label="经度" align="center" prop="lagValue" /> <el-table-column label="经度" align="center" prop="lagValue" :width="120"/>
<el-table-column label="是否告警" align="center" prop="alertEnabled" > <el-table-column label="是否告警" align="center" prop="alertEnabled" :width="120">
<template #default="scope"> <template #default="scope">
<dict-tag :options="alert_enabled" :value="scope.row.alertEnabled"/> <dict-tag :options="alertEnabledTable" :value="scope.row.alertEnabled"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备模型" align="center" prop="deviceModelId" > <el-table-column label="设备模型" align="center" prop="deviceModelId" :width="120">
</el-table-column> </el-table-column>
<el-table-column label="租户号" align="center" prop="tentantId" /> <el-table-column label="租户号" align="center" prop="tentantId" :width="120"/>
<el-table-column label="设备分组" align="center" prop="deviceGroupId" /> <el-table-column label="设备分组" align="center" prop="deviceGroupId" :width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" :width="300">
<template #default="scope"> <template #default="scope">
<el-button <el-button
type="text" type="text"
@ -270,7 +275,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="中台设备编码" prop="centerDeviceCode"> <el-form-item label="中台设备编码" prop="centerDeviceCode">
<el-input v-model="form.centerDeviceCode" placeholder="请输入中台设备编码" /> <el-input disabled v-model="form.centerDeviceCode" placeholder="请输入中台设备编码" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -393,7 +398,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<template #footer> <template #footer>
@ -405,9 +409,11 @@
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<style lang="scss" >
@import "@/assets/styles/self-defined.scss";
</style>
<script setup name="Device"> <script setup name="Device">
import { listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/model/device"; import { getUuid, listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/model/device";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { dc_device_type } = proxy.useDict('dc_device_type'); const { dc_device_type } = proxy.useDict('dc_device_type');
@ -422,11 +428,21 @@ const single = ref(true);
const multiple = ref(true); const multiple = ref(true);
const total = ref(0); const total = ref(0);
const title = ref(""); const title = ref("");
const collapseVisible = ref(false);
const editName = ref("更多筛选项");
const enabledFlag = ref([ const enabledFlag = ref([
{label: '可用', value: true, elTagType: 'default', elTagClass: null},
{label: '不可用', value: false, elTagType: 'default', elTagClass: null}
]);
const alertEnabled = ref([
{label: '告警', value: true, elTagType: 'default', elTagClass: null},
{label: '不告警', value: false, elTagType: 'default', elTagClass: null}
]);
const enabledFlagTable = ref([
{label: '可用', value: 'true', elTagType: 'default', elTagClass: null}, {label: '可用', value: 'true', elTagType: 'default', elTagClass: null},
{label: '不可用', value: 'false', elTagType: 'default', elTagClass: null} {label: '不可用', value: 'false', elTagType: 'default', elTagClass: null}
]); ]);
const alert_enabled = ref([ const alertEnabledTable = ref([
{label: '告警', value: 'true', elTagType: 'default', elTagClass: null}, {label: '告警', value: 'true', elTagType: 'default', elTagClass: null},
{label: '不告警', value: 'false', elTagType: 'default', elTagClass: null} {label: '不告警', value: 'false', elTagType: 'default', elTagClass: null}
]); ]);
@ -539,6 +555,11 @@ function handleSelectionChange(selection) {
/** 新增按钮操作 */ /** 新增按钮操作 */
function handleAdd() { function handleAdd() {
loading.value = true;
getUuid().then(response=>{
form.value.centerDeviceCode = response.msg;
loading.value = false;
});
reset(); reset();
open.value = true; open.value = true;
title.value = "添加设备信息"; title.value = "添加设备信息";
@ -615,5 +636,14 @@ function handleParams(row){
}); });
} }
function toggleCollapse() {
collapseVisible.value = !collapseVisible.value;
if(collapseVisible.value){
editName.value = "折叠筛选项";
}else{
editName.value = "更多筛选项"
}
}
getList(); getList();
</script> </script>

98
src/views/model/params/index.vue

@ -5,7 +5,7 @@
<el-input <el-input
v-model="queryParams.deviceUuid" v-model="queryParams.deviceUuid"
placeholder="请输入中台设备UUID" placeholder="请输入中台设备UUID"
clearable disabled
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -25,6 +25,8 @@
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-collapse-transition>
<div v-show="collapseVisible">
<el-form-item label="数据类型" prop="paramType"> <el-form-item label="数据类型" prop="paramType">
<el-select v-model="queryParams.paramType" placeholder="请选择数据类型" clearable> <el-select v-model="queryParams.paramType" placeholder="请选择数据类型" clearable>
<el-option <el-option
@ -110,9 +112,12 @@
<el-option label="请选择字典生成" value="" /> <el-option label="请选择字典生成" value="" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> </div>
</el-collapse-transition>
<el-form-item class="childTextAlignCenter">
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button> <el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button>
<el-button @click="toggleCollapse">{{editName}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -124,13 +129,13 @@
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
icon="Edit" icon="Edit"
@click="handleUpdate" @click="handleUpdate"
>修改</el-button> >修改</el-button>
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -149,44 +154,44 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="paramsList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="paramsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" fixed="left"/>
<el-table-column label="主键" align="center" prop="id" /> <el-table-column label="主键" align="center" prop="id" />
<el-table-column label="中台设备UUID" align="center" prop="deviceUuid" /> <el-table-column label="中台设备UUID" align="center" prop="deviceUuid" :width="120"/>
<el-table-column label="参数名称" align="center" prop="paramName" /> <el-table-column label="参数名称" align="center" prop="paramName" :width="120"/>
<el-table-column label="参数编码" align="center" prop="paramCode" /> <el-table-column label="参数编码" align="center" prop="paramCode" :width="120"/>
<el-table-column label="数据类型" align="center" prop="paramType"> <el-table-column label="数据类型" align="center" prop="paramType" :width="120">
<template #default="scope"> <template #default="scope">
<dict-tag :options="dc_param_value_type" :value="scope.row.paramType"/> <dict-tag :options="dc_param_value_type" :value="scope.row.paramType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否可控" align="center" prop="contrlFlag"> <el-table-column label="是否可控" align="center" prop="contrlFlag" :width="120">
<template #default="scope"> <template #default="scope">
<dict-tag :options="contrlFlag" :value="scope.row.contrlFlag"/> <dict-tag :options="contrlFlagTable" :value="scope.row.contrlFlag"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="参数单位" align="center" prop="contrlType"> <el-table-column label="参数单位" align="center" prop="contrlType" :width="120">
<template #default="scope"> <template #default="scope">
<dict-tag :options="dc_param_uint_type" :value="scope.row.contrlType"/> <dict-tag :options="dc_param_uint_type" :value="scope.row.contrlType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否有效" align="center" prop="enabled"> <el-table-column label="是否有效" align="center" prop="enabled" :width="120">
<template #default="scope"> <template #default="scope">
<dict-tag :options="enabled" :value="scope.row.enabled"/> <dict-tag :options="enabledTable" :value="scope.row.enabled"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设置值" align="center" prop="setDefautvalue" /> <el-table-column label="设置值" align="center" prop="setDefautvalue" :width="120"/>
<el-table-column label="偏移量" align="center" prop="setAdjustvalue" /> <el-table-column label="偏移量" align="center" prop="setAdjustvalue" :width="120"/>
<el-table-column label="验证范围" align="center" prop="validateScope" /> <el-table-column label="验证范围" align="center" prop="validateScope" :width="120"/>
<el-table-column label="全局统一编码" align="center" prop="globalCode" /> <el-table-column label="全局统一编码" align="center" prop="globalCode" :width="120"/>
<el-table-column label="参数模版" align="center" prop="paramModelId" > <el-table-column label="参数模版" align="center" prop="paramModelId" :width="120">
<template #default="scope"> <template #default="scope">
<span>{{ getParamModelName(scope.row.paramModelId) }}</span> <span>{{ getParamModelName(scope.row.paramModelId) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="分区(字典)" align="center" prop="partion" /> <el-table-column label="分区(字典)" align="center" prop="partion" :width="120"/>
<el-table-column label="plc地址" align="center" prop="plcAdr" /> <el-table-column label="plc地址" align="center" prop="plcAdr" :width="120"/>
<el-table-column label="是/否可控制" align="center" prop="controllab" /> <el-table-column label="是/否可控制" align="center" prop="controllab" :width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :width="200" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button <el-button
type="text" type="text"
@ -211,13 +216,13 @@
/> />
<!-- 添加或修改设备参数明细对话框 --> <!-- 添加或修改设备参数明细对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog :title="title" v-model="open" width="800px" append-to-body>
<el-form ref="paramsRef" :model="form" :rules="rules" label-width="80px"> <el-form ref="paramsRef" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="中台设备UUID" prop="deviceUuid"> <el-form-item label="中台设备UUID" prop="deviceUuid">
<el-input v-model="form.deviceUuid" placeholder="请输入中台设备UUID" /> <el-input v-model="form.deviceUuid" placeholder="请输入中台设备UUID" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -238,7 +243,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="参数编码" prop="paramCode"> <el-form-item label="参数编码" prop="paramCode">
<el-input v-model="form.paramCode" placeholder="请输入参数编码" /> <el-input v-model="form.paramCode" placeholder="请输入参数编码" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -283,7 +288,7 @@
<el-option <el-option
v-for="dict in enabled" v-for="dict in enabled"
:label="dict.label" :label="dict.label"
:value=dict.value> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -305,7 +310,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="全局统一编码" prop="globalCode"> <el-form-item label="全局统一编码" prop="globalCode">
<el-input v-model="form.globalCode" placeholder="请输入全局统一编码" /> <el-input v-model="form.globalCode" placeholder="请输入全局统一编码" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -348,7 +353,9 @@
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<style lang="scss" >
@import "@/assets/styles/self-defined.scss";
</style>
<script setup name="Params"> <script setup name="Params">
import { listParams, getParams, delParams, addParams, updateParams } from "@/api/model/params"; import { listParams, getParams, delParams, addParams, updateParams } from "@/api/model/params";
import { listParamclass } from "@/api/model/paramclass"; import { listParamclass } from "@/api/model/paramclass";
@ -366,6 +373,8 @@ const multiple = ref(true);
const total = ref(0); const total = ref(0);
const title = ref(""); const title = ref("");
const paramClassList = ref([]); const paramClassList = ref([]);
const collapseVisible = ref(false);
const editName = ref("更多筛选项");
const deviceUuid = router.currentRoute._value.query.deviceUuid; const deviceUuid = router.currentRoute._value.query.deviceUuid;
const deviceCode = router.currentRoute._value.query.deviceCode; const deviceCode = router.currentRoute._value.query.deviceCode;
const contrlFlag = ref([ const contrlFlag = ref([
@ -376,6 +385,14 @@ const enabled = ref([
{label: '有效', value: true, elTagType: 'default', elTagClass: null}, {label: '有效', value: true, elTagType: 'default', elTagClass: null},
{label: '无效', value: false, elTagType: 'default', elTagClass: null} {label: '无效', value: false, elTagType: 'default', elTagClass: null}
]); ]);
const contrlFlagTable = ref([
{label: '可控', value: 'true', elTagType: 'default', elTagClass: null},
{label: '不可控', value: 'false', elTagType: 'default', elTagClass: null}
]);
const enabledTable = ref([
{label: '有效', value: 'true', elTagType: 'default', elTagClass: null},
{label: '无效', value: 'false', elTagType: 'default', elTagClass: null}
]);
const data = reactive({ const data = reactive({
form: { form: {
contrlFlag:contrlFlag, contrlFlag:contrlFlag,
@ -486,6 +503,7 @@ function handleSelectionChange(selection) {
/** 新增按钮操作 */ /** 新增按钮操作 */
function handleAdd() { function handleAdd() {
reset(); reset();
form.value.deviceUuid = deviceUuid;
open.value = true; open.value = true;
title.value = "添加设备参数明细"; title.value = "添加设备参数明细";
} }
@ -542,9 +560,6 @@ function handleExport() {
function getParamModel() { function getParamModel() {
listParamclass({}).then(response => { listParamclass({}).then(response => {
console.log("response");
console.log(response);
console.log(response.rows);
paramClassList.value = response.rows; paramClassList.value = response.rows;
}); });
} }
@ -558,18 +573,23 @@ function getParamModelName(id){
} }
function checkedParamModel(val){ function checkedParamModel(val){
console.log("val");
console.log(val);
let paramClassCodeSeleted = ""; let paramClassCodeSeleted = "";
paramClassList.value.forEach(item=>{ paramClassList.value.forEach(item=>{
console.log("item");
console.log(item);
console.log(item.id == val);
if(item.id == val){ if(item.id == val){
paramClassCodeSeleted = item.paramClassCode; paramClassCodeSeleted = item.paramClassCode;
} }
}) })
form.value.paramCode = deviceCode+paramClassCodeSeleted; form.value.paramCode = deviceCode+"-"+paramClassCodeSeleted;
form.value.globalCode = deviceUuid +"-"+ deviceCode +"-"+paramClassCodeSeleted;
}
function toggleCollapse() {
collapseVisible.value = !collapseVisible.value;
if(collapseVisible.value){
editName.value = "折叠筛选项";
}else{
editName.value = "更多筛选项"
}
} }
getList(); getList();

Loading…
Cancel
Save