lianmei
/
dc-ui
mirror of https://gitee.com/lmlz_0/dc-ui.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'develop' of https://gitee.com/lmlz_0/dc-ui into develop

pull/1/head
lxg 1 year ago
parent
d45b8d75ad 19a153e412
commit
bc72877731
4 changed files with 488 additions and 421 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/api/model/device.js
  2. 9
      src/assets/styles/self-defined.scss
  3. 620
      src/views/model/device/index.vue
  4. 270
      src/views/model/params/index.vue

8
src/api/model/device.js
View File

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

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

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

620
src/views/model/device/index.vue
View File

@ -25,145 +25,150 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="通讯来源设备ID" prop="deviceSourceId">
<el-input
v-model="queryParams.deviceSourceId"
placeholder="请输入通讯来源设备ID"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="是否可用" prop="enabledFlag">
<el-select v-model="queryParams.enabledFlag" placeholder="请选择是否可用" clearable>
<el-option
v-for="dict in enabledFlag"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="设备类型" prop="deviceType">
<el-select v-model="queryParams.deviceType" placeholder="请选择设备类型" clearable>
<el-option
v-for="dict in dc_device_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="所属组织编码" prop="orgCode">
<el-input
v-model="queryParams.orgCode"
placeholder="请输入所属组织编码"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="所属组织名称" prop="orgName">
<el-input
v-model="queryParams.orgName"
placeholder="请输入所属组织名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="位置编码" prop="locationCode">
<el-input
v-model="queryParams.locationCode"
placeholder="请输入位置编码"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="位置名称" prop="locationName">
<el-input
v-model="queryParams.locationName"
placeholder="请输入位置名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="设备应用范围" prop="deviceClass">
<el-input
v-model="queryParams.deviceClass"
placeholder="请输入设备应用范围"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="接口名称" prop="apiName">
<el-input
v-model="queryParams.apiName"
placeholder="请输入接口名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="服务器地址" prop="serverIp">
<el-input
v-model="queryParams.serverIp"
placeholder="请输入服务器地址"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="从属网关ID" prop="gatewayId">
<el-input
v-model="queryParams.gatewayId"
placeholder="请输入从属网关ID"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="纬度" prop="latValue">
<el-input
v-model="queryParams.latValue"
placeholder="请输入纬度"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="经度" prop="lagValue">
<el-input
v-model="queryParams.lagValue"
placeholder="请输入经度"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="是否告警" prop="alertEnabled">
<el-select v-model="queryParams.alertEnabled" placeholder="请选择设备类型" clearable>
<el-option
v-for="dict in alertEnabled"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="设备模型" prop="deviceModelId">
<el-select v-model="queryParams.deviceModelId" placeholder="请选择设备模型id" clearable>
<el-option label="请选择设备模型" value="deviceModelId" />
</el-select>
</el-form-item>
<el-form-item label="租户号" prop="tentantId">
<el-input
v-model="queryParams.tentantId"
placeholder="请输入租户号"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="设备分组" prop="deviceGroupId">
<el-select v-model="queryParams.deviceGroupId" placeholder="请选择设备分组ID" clearable>
<el-option label="请添加设备分组" value="" />
</el-select>
</el-form-item>
<el-form-item>
<el-collapse-transition>
<div v-show="collapseVisible">
<el-form-item label="通讯来源设备ID" prop="deviceSourceId">
<el-input
v-model="queryParams.deviceSourceId"
placeholder="请输入通讯来源设备ID"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="是否可用" prop="enabledFlag">
<el-select v-model="queryParams.enabledFlag" placeholder="请选择是否可用" clearable>
<el-option
v-for="dict in enabledFlag"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="设备类型" prop="deviceType">
<el-select v-model="queryParams.deviceType" placeholder="请选择设备类型" clearable>
<el-option
v-for="dict in dc_device_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="所属组织编码" prop="orgCode">
<el-input
v-model="queryParams.orgCode"
placeholder="请输入所属组织编码"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="所属组织名称" prop="orgName">
<el-input
v-model="queryParams.orgName"
placeholder="请输入所属组织名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="位置编码" prop="locationCode">
<el-input
v-model="queryParams.locationCode"
placeholder="请输入位置编码"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="位置名称" prop="locationName">
<el-input
v-model="queryParams.locationName"
placeholder="请输入位置名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="设备应用范围" prop="deviceClass">
<el-input
v-model="queryParams.deviceClass"
placeholder="请输入设备应用范围"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="接口名称" prop="apiName">
<el-input
v-model="queryParams.apiName"
placeholder="请输入接口名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="服务器地址" prop="serverIp">
<el-input
v-model="queryParams.serverIp"
placeholder="请输入服务器地址"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="从属网关ID" prop="gatewayId">
<el-input
v-model="queryParams.gatewayId"
placeholder="请输入从属网关ID"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="纬度" prop="latValue">
<el-input
v-model="queryParams.latValue"
placeholder="请输入纬度"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="经度" prop="lagValue">
<el-input
v-model="queryParams.lagValue"
placeholder="请输入经度"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="是否告警" prop="alertEnabled">
<el-select v-model="queryParams.alertEnabled" placeholder="请选择设备类型" clearable>
<el-option
v-for="dict in alertEnabled"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="设备模型" prop="deviceModelId">
<el-select v-model="queryParams.deviceModelId" placeholder="请选择设备模型id" clearable>
<el-option label="请选择设备模型" value="deviceModelId" />
</el-select>
</el-form-item>
<el-form-item label="租户号" prop="tentantId">
<el-input
v-model="queryParams.tentantId"
placeholder="请输入租户号"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="设备分组" prop="deviceGroupId">
<el-select v-model="queryParams.deviceGroupId" placeholder="请选择设备分组ID" clearable>
<el-option label="请添加设备分组" value="" />
</el-select>
</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="info" plain icon="Refresh" @click="resetQuery">重置</el-button>
<el-button @click="toggleCollapse">{{editName}}</el-button>
</el-form-item>
</el-form>
@ -175,13 +180,13 @@
@click="handleAdd"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="success"
icon="Edit"
@click="handleUpdate"
>修改</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
type="success"
@ -201,41 +206,41 @@
</el-row>
<el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="中台设备编码" align="center" prop="centerDeviceCode" />
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="通讯来源类型" align="center" prop="deviceSource" />
<el-table-column label="通讯来源设备ID" align="center" prop="deviceSourceId" />
<el-table-column label="是否可用" align="center" prop="enabledFlag" >
<el-table-column type="selection" width="55" align="center" fixed="left"/>
<el-table-column label="中台设备编码" align="center" prop="centerDeviceCode" :width="120"/>
<el-table-column label="设备名称" align="center" prop="deviceName" :width="120"/>
<el-table-column label="通讯来源类型" align="center" prop="deviceSource" :width="120"/>
<el-table-column label="通讯来源设备ID" align="center" prop="deviceSourceId" :width="120"/>
<el-table-column label="是否可用" align="center" prop="enabledFlag" :width="120">
<template #default="scope">
<dict-tag :options="enabledFlag" :value="scope.row.enabledFlag"/>
<dict-tag :options="enabledFlagTable" :value="scope.row.enabledFlag"/>
</template>
</el-table-column>
<el-table-column label="设备类型" align="center" prop="deviceType">
<el-table-column label="设备类型" align="center" prop="deviceType" :width="120">
<template #default="scope">
<dict-tag :options="dc_device_type" :value="scope.row.deviceType"/>
</template>
</el-table-column>
<el-table-column label="所属组织编码" align="center" prop="orgCode" />
<el-table-column label="所属组织名称" align="center" prop="orgName" />
<el-table-column label="位置编码" align="center" prop="locationCode" />
<el-table-column label="位置名称" align="center" prop="locationName" />
<el-table-column label="设备应用范围" align="center" prop="deviceClass" />
<el-table-column label="接口名称" align="center" prop="apiName" />
<el-table-column label="服务器地址" align="center" prop="serverIp" />
<el-table-column label="从属网关ID" align="center" prop="gatewayId" />
<el-table-column label="纬度" align="center" prop="latValue" />
<el-table-column label="经度" align="center" prop="lagValue" />
<el-table-column label="是否告警" align="center" prop="alertEnabled" >
<el-table-column label="所属组织编码" align="center" prop="orgCode" :width="120"/>
<el-table-column label="所属组织名称" align="center" prop="orgName" :width="120" />
<el-table-column label="位置编码" align="center" prop="locationCode" :width="120"/>
<el-table-column label="位置名称" align="center" prop="locationName" :width="120"/>
<el-table-column label="设备应用范围" align="center" prop="deviceClass" :width="120"/>
<el-table-column label="接口名称" align="center" prop="apiName" :width="120"/>
<el-table-column label="服务器地址" align="center" prop="serverIp" :width="120"/>
<el-table-column label="从属网关ID" align="center" prop="gatewayId" :width="120"/>
<el-table-column label="纬度" align="center" prop="latValue" :width="120"/>
<el-table-column label="经度" align="center" prop="lagValue" :width="120"/>
<el-table-column label="是否告警" align="center" prop="alertEnabled" :width="120">
<template #default="scope">
<dict-tag :options="alert_enabled" :value="scope.row.alertEnabled"/>
<dict-tag :options="alertEnabledTable" :value="scope.row.alertEnabled"/>
</template>
</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 label="租户号" align="center" prop="tentantId" />
<el-table-column label="设备分组" align="center" prop="deviceGroupId" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="租户号" align="center" prop="tentantId" :width="120"/>
<el-table-column label="设备分组" align="center" prop="deviceGroupId" :width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" :width="300">
<template #default="scope">
<el-button
type="text"
@ -267,134 +272,133 @@
<!-- 添加或修改设备信息对话框 -->
<el-dialog :title="title" v-model="open" width="800px" append-to-body>
<el-form ref="deviceRef" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="中台设备编码" prop="centerDeviceCode">
<el-input v-model="form.centerDeviceCode" placeholder="请输入中台设备编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="通讯来源类型" prop="deviceSource">
<el-input v-model="form.deviceSource" placeholder="请输入通讯来源类型;ThingsDB/KingIO/Tk" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="通讯来源设备ID" prop="deviceSourceId">
<el-input v-model="form.deviceSourceId" placeholder="请输入通讯来源设备ID" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否可用" prop="enabledFlag">
<el-select v-model="form.enabledFlag" placeholder="请选择是否可用">
<el-option
v-for="dict in enabledFlag"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备类型" prop="deviceType">
<el-select v-model="form.deviceType" placeholder="请选择设备类型">
<el-option
v-for="dict in dc_device_type"
:key="dict.value"
:label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属组织编码" prop="orgCode">
<el-input v-model="form.orgCode" placeholder="请输入所属组织编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属组织名称" prop="orgName">
<el-input v-model="form.orgName" placeholder="请输入所属组织名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="位置编码" prop="locationCode">
<el-input v-model="form.locationCode" placeholder="请输入位置编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="位置名称" prop="locationName">
<el-input v-model="form.locationName" placeholder="请输入位置名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备应用范围" prop="deviceClass">
<el-input v-model="form.deviceClass" placeholder="请输入设备应用范围" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="接口名称" prop="apiName">
<el-input v-model="form.apiName" placeholder="请输入接口名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="服务器地址" prop="serverIp">
<el-input v-model="form.serverIp" placeholder="请输入服务器地址" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="从属网关ID" prop="gatewayId">
<el-input v-model="form.gatewayId" placeholder="请输入从属网关ID" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纬度" prop="latValue">
<el-input v-model="form.latValue" placeholder="请输入纬度" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="经度" prop="lagValue">
<el-input v-model="form.lagValue" placeholder="请输入经度" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否告警" prop="alertEnabled">
<el-select v-model="form.alertEnabled" placeholder="请选择是否告警">
<el-option
v-for="dict in alertEnabled"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备模型" prop="deviceModelId">
<el-select v-model="form.deviceModelId" placeholder="请选择设备模型id">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="租户号" prop="tentantId">
<el-input v-model="form.tentantId" placeholder="请输入租户号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备分组" prop="deviceGroupId">
<el-select v-model="form.deviceGroupId" placeholder="请选择设备分组ID">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="中台设备编码" prop="centerDeviceCode">
<el-input disabled v-model="form.centerDeviceCode" placeholder="请输入中台设备编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="通讯来源类型" prop="deviceSource">
<el-input v-model="form.deviceSource" placeholder="请输入通讯来源类型;ThingsDB/KingIO/Tk" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="通讯来源设备ID" prop="deviceSourceId">
<el-input v-model="form.deviceSourceId" placeholder="请输入通讯来源设备ID" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否可用" prop="enabledFlag">
<el-select v-model="form.enabledFlag" placeholder="请选择是否可用">
<el-option
v-for="dict in enabledFlag"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备类型" prop="deviceType">
<el-select v-model="form.deviceType" placeholder="请选择设备类型">
<el-option
v-for="dict in dc_device_type"
:key="dict.value"
:label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属组织编码" prop="orgCode">
<el-input v-model="form.orgCode" placeholder="请输入所属组织编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属组织名称" prop="orgName">
<el-input v-model="form.orgName" placeholder="请输入所属组织名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="位置编码" prop="locationCode">
<el-input v-model="form.locationCode" placeholder="请输入位置编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="位置名称" prop="locationName">
<el-input v-model="form.locationName" placeholder="请输入位置名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备应用范围" prop="deviceClass">
<el-input v-model="form.deviceClass" placeholder="请输入设备应用范围" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="接口名称" prop="apiName">
<el-input v-model="form.apiName" placeholder="请输入接口名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="服务器地址" prop="serverIp">
<el-input v-model="form.serverIp" placeholder="请输入服务器地址" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="从属网关ID" prop="gatewayId">
<el-input v-model="form.gatewayId" placeholder="请输入从属网关ID" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纬度" prop="latValue">
<el-input v-model="form.latValue" placeholder="请输入纬度" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="经度" prop="lagValue">
<el-input v-model="form.lagValue" placeholder="请输入经度" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否告警" prop="alertEnabled">
<el-select v-model="form.alertEnabled" placeholder="请选择是否告警">
<el-option
v-for="dict in alertEnabled"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备模型" prop="deviceModelId">
<el-select v-model="form.deviceModelId" placeholder="请选择设备模型id">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="租户号" prop="tentantId">
<el-input v-model="form.tentantId" placeholder="请输入租户号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备分组" prop="deviceGroupId">
<el-select v-model="form.deviceGroupId" placeholder="请选择设备分组ID">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -405,9 +409,11 @@
</el-dialog>
</div>
</template>
<style lang="scss" >
@import "@/assets/styles/self-defined.scss";
</style>
<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 { dc_device_type } = proxy.useDict('dc_device_type');
@ -422,11 +428,21 @@ const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const collapseVisible = ref(false);
const editName = 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: 'false', elTagType: 'default', elTagClass: null}
]);
const alert_enabled = ref([
const alertEnabledTable = ref([
{label: '告警', value: 'true', elTagType: 'default', elTagClass: null},
{label: '不告警', value: 'false', elTagType: 'default', elTagClass: null}
]);
@ -539,6 +555,11 @@ function handleSelectionChange(selection) {
/** 新增按钮操作 */
function handleAdd() {
loading.value = true;
getUuid().then(response=>{
form.value.centerDeviceCode = response.msg;
loading.value = false;
});
reset();
open.value = true;
title.value = "添加设备信息";
@ -590,7 +611,7 @@ function handleDelete(row) {
/** 导出按钮操作 */
function handleExport() {
proxy.download('model/device/export', {
proxy.download('model/dcBaseDeviceinfo/export', {
...queryParams.value
}, `device_${new Date().getTime()}.xlsx`)
}
@ -615,5 +636,14 @@ function handleParams(row){
});
}
function toggleCollapse() {
collapseVisible.value = !collapseVisible.value;
if(collapseVisible.value){
editName.value = "折叠筛选项";
}else{
editName.value = "更多筛选项"
}
}
getList();
</script>

270
src/views/model/params/index.vue
View File

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

Write Preview
Loading…
Cancel
Save