增加流量计页面
This commit is contained in:
zhangyue
parent
eff70e8ab5
commit
3183720b27
|
|
@ -5,90 +5,49 @@ import { render } from '/@/utils/common/renderUtils';
|
|||
//列表数据
|
||||
export const columns: BasicColumn[] = [
|
||||
{
|
||||
title: '租户号',
|
||||
align: "center",
|
||||
dataIndex: 'tenantId'
|
||||
title: '设备编号',
|
||||
align: 'center',
|
||||
dataIndex: 'deployCode',
|
||||
},
|
||||
{
|
||||
title: '乐观锁',
|
||||
align: "center",
|
||||
dataIndex: 'reVision'
|
||||
title: '累计流量',
|
||||
align: 'center',
|
||||
dataIndex: 'sData1',
|
||||
},
|
||||
{
|
||||
title: '创建人',
|
||||
align: "center",
|
||||
dataIndex: 'createdBy'
|
||||
title: '瞬时流量',
|
||||
align: 'center',
|
||||
dataIndex: 'sData2',
|
||||
},
|
||||
{
|
||||
title: '创建时间',
|
||||
align: "center",
|
||||
dataIndex: 'createTime',
|
||||
customRender:({text}) =>{
|
||||
return !text?"":(text.length>10?text.substr(0,10):text);
|
||||
},
|
||||
title: '空高值',
|
||||
align: 'center',
|
||||
dataIndex: 'sData3',
|
||||
},
|
||||
{
|
||||
title: '更新人',
|
||||
align: "center",
|
||||
dataIndex: 'updatedBy'
|
||||
title: '液位值',
|
||||
align: 'center',
|
||||
dataIndex: 'sData4',
|
||||
},
|
||||
{
|
||||
title: '逻辑删除',
|
||||
align: "center",
|
||||
dataIndex: 'isDel'
|
||||
},
|
||||
{
|
||||
title: '更新时间',
|
||||
align: "center",
|
||||
dataIndex: 'updatedTime',
|
||||
customRender:({text}) =>{
|
||||
return !text?"":(text.length>10?text.substr(0,10):text);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '数据1',
|
||||
align: "center",
|
||||
dataIndex: 'sData1'
|
||||
},
|
||||
{
|
||||
title: '数据2',
|
||||
align: "center",
|
||||
dataIndex: 'sData2'
|
||||
},
|
||||
{
|
||||
title: '数据3',
|
||||
align: "center",
|
||||
dataIndex: 'sData3'
|
||||
},
|
||||
{
|
||||
title: '数据4',
|
||||
align: "center",
|
||||
dataIndex: 'sData4'
|
||||
},
|
||||
{
|
||||
title: '数据5',
|
||||
align: "center",
|
||||
dataIndex: 'sData5'
|
||||
title: '当前流速值',
|
||||
align: 'center',
|
||||
dataIndex: 'sData5',
|
||||
},
|
||||
{
|
||||
title: '数据更新时间',
|
||||
align: "center",
|
||||
dataIndex: 'sDateTime',
|
||||
customRender:({text}) =>{
|
||||
return !text?"":(text.length>10?text.substr(0,10):text);
|
||||
align: 'center',
|
||||
dataIndex: 'dataDateTime',
|
||||
customRender: ({ text }) => {
|
||||
return !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据',
|
||||
align: "center",
|
||||
dataIndex: 'dataGatherType'
|
||||
},
|
||||
{
|
||||
title: '转储时间',
|
||||
align: "center",
|
||||
align: 'center',
|
||||
dataIndex: 'transDate',
|
||||
customRender:({text}) =>{
|
||||
return !text?"":(text.length>10?text.substr(0,10):text);
|
||||
customRender: ({ text }) => {
|
||||
return !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
|
||||
},
|
||||
},
|
||||
];
|
||||
|
|
|
|||
|
|
@ -3,76 +3,41 @@
|
|||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="租户号" v-bind="validateInfos.tenantId">
|
||||
<a-input v-model:value="formData.tenantId" placeholder="请输入租户号" :disabled="disabled"></a-input>
|
||||
<a-form-item label="设备编号" v-bind="validateInfos.deployCode">
|
||||
<a-input v-model:value="formData.deployCode" placeholder="请输入设备编号" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="乐观锁" v-bind="validateInfos.reVision">
|
||||
<a-input-number v-model:value="formData.reVision" placeholder="请输入乐观锁" style="width: 100%" :disabled="disabled"/>
|
||||
<a-form-item label="数据更新时间" v-bind="validateInfos.dataDateTime">
|
||||
<a-date-picker placeholder="请选择数据更新时间" v-model:value="formData.dataDateTime" value-format="YYYY-MM-DD" style="width: 100%" :disabled="disabled"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="创建人" v-bind="validateInfos.createdBy">
|
||||
<a-input v-model:value="formData.createdBy" placeholder="请输入创建人" :disabled="disabled"></a-input>
|
||||
<a-form-item label="累计流量" v-bind="validateInfos.sData1">
|
||||
<a-input v-model:value="formData.sData1" placeholder="请输入累计流量" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="创建时间" v-bind="validateInfos.createTime">
|
||||
<a-date-picker placeholder="请选择创建时间" v-model:value="formData.createTime" value-format="YYYY-MM-DD" style="width: 100%" :disabled="disabled"/>
|
||||
<a-form-item label="瞬时流量" v-bind="validateInfos.sData2">
|
||||
<a-input v-model:value="formData.sData2" placeholder="请输入瞬时流量" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="更新人" v-bind="validateInfos.updatedBy">
|
||||
<a-input v-model:value="formData.updatedBy" placeholder="请输入更新人" :disabled="disabled"></a-input>
|
||||
<a-form-item label="空高值" v-bind="validateInfos.sData3">
|
||||
<a-input v-model:value="formData.sData3" placeholder="请输入空高值" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="逻辑删除" v-bind="validateInfos.isDel">
|
||||
<a-input-number v-model:value="formData.isDel" placeholder="请输入逻辑删除" style="width: 100%" :disabled="disabled"/>
|
||||
<a-form-item label="液位值" v-bind="validateInfos.sData4">
|
||||
<a-input v-model:value="formData.sData4" placeholder="请输入液位值" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="更新时间" v-bind="validateInfos.updatedTime">
|
||||
<a-date-picker placeholder="请选择更新时间" v-model:value="formData.updatedTime" value-format="YYYY-MM-DD" style="width: 100%" :disabled="disabled"/>
|
||||
<a-form-item label="当前流速值" v-bind="validateInfos.sData5">
|
||||
<a-input v-model:value="formData.sData5" placeholder="请输入当前流速值" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据1" v-bind="validateInfos.sData1">
|
||||
<a-input v-model:value="formData.sData1" placeholder="请输入数据1" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据2" v-bind="validateInfos.sData2">
|
||||
<a-input v-model:value="formData.sData2" placeholder="请输入数据2" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据3" v-bind="validateInfos.sData3">
|
||||
<a-input v-model:value="formData.sData3" placeholder="请输入数据3" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据4" v-bind="validateInfos.sData4">
|
||||
<a-input v-model:value="formData.sData4" placeholder="请输入数据4" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据5" v-bind="validateInfos.sData5">
|
||||
<a-input v-model:value="formData.sData5" placeholder="请输入数据5" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据更新时间" v-bind="validateInfos.sDateTime">
|
||||
<a-date-picker placeholder="请选择数据更新时间" v-model:value="formData.sDateTime" value-format="YYYY-MM-DD" style="width: 100%" :disabled="disabled"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据" v-bind="validateInfos.dataGatherType">
|
||||
<a-input v-model:value="formData.dataGatherType" placeholder="请输入数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
|
||||
<a-form-item label="转储时间" v-bind="validateInfos.transDate">
|
||||
<a-date-picker placeholder="请选择转储时间" v-model:value="formData.transDate" value-format="YYYY-MM-DD" style="width: 100%" :disabled="disabled"/>
|
||||
</a-form-item>
|
||||
|
|
|
|||
|
|
@ -5,83 +5,50 @@ import { render } from '/@/utils/common/renderUtils';
|
|||
//列表数据
|
||||
export const columns: BasicColumn[] = [
|
||||
{
|
||||
title: '租户号',
|
||||
align: "center",
|
||||
dataIndex: 'tenantId'
|
||||
title: '设备编号',
|
||||
align: 'center',
|
||||
dataIndex: 'deployCode',
|
||||
},
|
||||
{
|
||||
title: '乐观锁',
|
||||
align: "center",
|
||||
dataIndex: 'reVision'
|
||||
title: '累计流量',
|
||||
align: 'center',
|
||||
dataIndex: 'sData1',
|
||||
},
|
||||
{
|
||||
title: '创建人',
|
||||
align: "center",
|
||||
dataIndex: 'createdBy'
|
||||
title: '瞬时流量',
|
||||
align: 'center',
|
||||
dataIndex: 'sData2',
|
||||
},
|
||||
{
|
||||
title: '创建时间',
|
||||
align: "center",
|
||||
dataIndex: 'createTime',
|
||||
customRender:({text}) =>{
|
||||
return !text?"":(text.length>10?text.substr(0,10):text);
|
||||
},
|
||||
title: '空高值',
|
||||
align: 'center',
|
||||
dataIndex: 'sData3',
|
||||
},
|
||||
{
|
||||
title: '更新人',
|
||||
align: "center",
|
||||
dataIndex: 'updatedBy'
|
||||
title: '液位值',
|
||||
align: 'center',
|
||||
dataIndex: 'sData4',
|
||||
},
|
||||
{
|
||||
title: '逻辑删除',
|
||||
align: "center",
|
||||
dataIndex: 'isDel'
|
||||
},
|
||||
{
|
||||
title: '更新时间',
|
||||
align: "center",
|
||||
dataIndex: 'updatedTime',
|
||||
customRender:({text}) =>{
|
||||
return !text?"":(text.length>10?text.substr(0,10):text);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '数据1',
|
||||
align: "center",
|
||||
dataIndex: 'sData1'
|
||||
},
|
||||
{
|
||||
title: '数据2',
|
||||
align: "center",
|
||||
dataIndex: 'sData2'
|
||||
},
|
||||
{
|
||||
title: '数据3',
|
||||
align: "center",
|
||||
dataIndex: 'sData3'
|
||||
},
|
||||
{
|
||||
title: '数据4',
|
||||
align: "center",
|
||||
dataIndex: 'sData4'
|
||||
},
|
||||
{
|
||||
title: '数据5',
|
||||
align: "center",
|
||||
dataIndex: 'sData5'
|
||||
title: '当前流速值',
|
||||
align: 'center',
|
||||
dataIndex: 'sData5',
|
||||
},
|
||||
{
|
||||
title: '数据更新时间',
|
||||
align: "center",
|
||||
dataIndex: 'sDateTime',
|
||||
customRender:({text}) =>{
|
||||
return !text?"":(text.length>10?text.substr(0,10):text);
|
||||
align: 'center',
|
||||
dataIndex: 'dataDateTime',
|
||||
customRender: ({ text }) => {
|
||||
return !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据',
|
||||
align: "center",
|
||||
dataIndex: 'dataGatherType'
|
||||
title: '转储时间',
|
||||
align: 'center',
|
||||
dataIndex: 'transDate',
|
||||
customRender: ({ text }) => {
|
||||
return !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,74 +3,42 @@
|
|||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="租户号" v-bind="validateInfos.tenantId">
|
||||
<a-input v-model:value="formData.tenantId" placeholder="请输入租户号" :disabled="disabled"></a-input>
|
||||
<a-form-item label="设备编号" v-bind="validateInfos.deployCode">
|
||||
<a-input v-model:value="formData.deployCode" placeholder="请输入设备编号" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="乐观锁" v-bind="validateInfos.reVision">
|
||||
<a-input-number v-model:value="formData.reVision" placeholder="请输入乐观锁" style="width: 100%" :disabled="disabled"/>
|
||||
<a-form-item label="数据更新时间" v-bind="validateInfos.dataDateTime">
|
||||
<a-date-picker placeholder="请选择数据更新时间" v-model:value="formData.dataDateTime" value-format="YYYY-MM-DD" style="width: 100%" :disabled="disabled"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="创建人" v-bind="validateInfos.createdBy">
|
||||
<a-input v-model:value="formData.createdBy" placeholder="请输入创建人" :disabled="disabled"></a-input>
|
||||
<a-form-item label="累计流量" v-bind="validateInfos.sData1">
|
||||
<a-input v-model:value="formData.sData1" placeholder="请输入累计流量" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="创建时间" v-bind="validateInfos.createTime">
|
||||
<a-date-picker placeholder="请选择创建时间" v-model:value="formData.createTime" value-format="YYYY-MM-DD" style="width: 100%" :disabled="disabled"/>
|
||||
<a-form-item label="瞬时流量" v-bind="validateInfos.sData2">
|
||||
<a-input v-model:value="formData.sData2" placeholder="请输入瞬时流量" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="更新人" v-bind="validateInfos.updatedBy">
|
||||
<a-input v-model:value="formData.updatedBy" placeholder="请输入更新人" :disabled="disabled"></a-input>
|
||||
<a-form-item label="空高值" v-bind="validateInfos.sData3">
|
||||
<a-input v-model:value="formData.sData3" placeholder="请输入空高值" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="逻辑删除" v-bind="validateInfos.isDel">
|
||||
<a-input-number v-model:value="formData.isDel" placeholder="请输入逻辑删除" style="width: 100%" :disabled="disabled"/>
|
||||
<a-form-item label="液位值" v-bind="validateInfos.sData4">
|
||||
<a-input v-model:value="formData.sData4" placeholder="请输入液位值" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="更新时间" v-bind="validateInfos.updatedTime">
|
||||
<a-date-picker placeholder="请选择更新时间" v-model:value="formData.updatedTime" value-format="YYYY-MM-DD" style="width: 100%" :disabled="disabled"/>
|
||||
<a-form-item label="当前流速值" v-bind="validateInfos.sData5">
|
||||
<a-input v-model:value="formData.sData5" placeholder="请输入当前流速值" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据1" v-bind="validateInfos.sData1">
|
||||
<a-input v-model:value="formData.sData1" placeholder="请输入数据1" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据2" v-bind="validateInfos.sData2">
|
||||
<a-input v-model:value="formData.sData2" placeholder="请输入数据2" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据3" v-bind="validateInfos.sData3">
|
||||
<a-input v-model:value="formData.sData3" placeholder="请输入数据3" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据4" v-bind="validateInfos.sData4">
|
||||
<a-input v-model:value="formData.sData4" placeholder="请输入数据4" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据5" v-bind="validateInfos.sData5">
|
||||
<a-input v-model:value="formData.sData5" placeholder="请输入数据5" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据更新时间" v-bind="validateInfos.sDateTime">
|
||||
<a-date-picker placeholder="请选择数据更新时间" v-model:value="formData.sDateTime" value-format="YYYY-MM-DD" style="width: 100%" :disabled="disabled"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据" v-bind="validateInfos.dataGatherType">
|
||||
<a-input v-model:value="formData.dataGatherType" placeholder="请输入数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据" :disabled="disabled"></a-input>
|
||||
</a-form-item>
|
||||
|
||||
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@
|
|||
const confirmLoading = ref<boolean>(false);
|
||||
//表单验证
|
||||
const validatorRules = {
|
||||
tenantId: [{ required: true, message: '主体不能为空', trigger: 'blur' }],
|
||||
// tenantId: [{ required: true, message: '主体不能为空', trigger: 'blur' }],
|
||||
configName: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
|
||||
configType: [{ required: true, message: '参数类型不能为空', trigger: 'blur' }],
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue