yangjun
/
hldy_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

This commit is contained in:
1378012178@qq.com 2025-06-27 15:24:11 +08:00
parent 7ede994731 1bb3dfe975
commit c252a10311
5 changed files with 68 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/iot/tq/electricity/electricity.data.ts
View File

@ -14,7 +14,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'nuName'
},
{
title: '表号',
title: '设备号',
align: "center",
dataIndex: 'address'
},
@ -112,7 +112,7 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 6 },
},
{
label: '表号',
label: '设备号',
field: 'address',
component: 'Input',
colProps: { span: 6 },

56
src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts
View File

@ -6,7 +6,7 @@ import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '表号',
title: '设备号',
align: "center",
dataIndex: 'address'
},
@ -16,34 +16,34 @@ export const columns: BasicColumn[] = [
dataIndex: 'type_dictText'
},
{
title: '上次请求值',
title: '上次抄表值',
align: "center",
dataIndex: 'requestValue'
},
{
title: '本次请求值',
title: '本次抄表值',
align: "center",
dataIndex: 'resolveValue'
},
{
title: '本次请求时间',
title: '本次抄表时间',
align: "center",
dataIndex: 'requestTime'
},
{
title: '本次请求状态',
align: "center",
dataIndex: 'requestStatus_dictText'
},
{
title: '本次反馈时间',
align: "center",
dataIndex: 'resolveTime'
},
// {
// title: '本次抄表状态',
// align: "center",
// dataIndex: 'requestStatus_dictText'
// },
// {
// title: '本次反馈时间',
// align: "center",
// dataIndex: 'resolveTime'
// },
{
title: '本次反馈状态',
align: "center",
dataIndex: 'resolveStatus_dictText'
dataIndex: 'resolveStatus'
},
{
title: '反馈描述',
@ -56,7 +56,7 @@ export const columns: BasicColumn[] = [
//列表数据
export const columns2: BasicColumn[] = [
{
title: '表号',
title: '设备号',
align: "center",
dataIndex: 'address'
},
@ -66,24 +66,14 @@ export const columns2: BasicColumn[] = [
dataIndex: 'type_dictText'
},
{
title: '本次请求时间',
title: '本次抄表时间',
align: "center",
dataIndex: 'requestTime'
},
{
title: '本次请求状态',
align: "center",
dataIndex: 'requestStatus_dictText'
},
{
title: '本次反馈时间',
align: "center",
dataIndex: 'resolveTime'
},
{
title: '本次反馈状态',
align: "center",
dataIndex: 'resolveStatus_dictText'
dataIndex: 'resolveStatus'
},
{
title: '反馈描述',
@ -95,12 +85,12 @@ export const columns2: BasicColumn[] = [
// 高级查询数据
export const superQuerySchema = {
address: {title: '表号',order: 0,view: 'text', type: 'string',},
address: {title: '设备号',order: 0,view: 'text', type: 'string',},
type: {title: '类型',order: 1,view: 'list', type: 'string',dictCode: 'dbsb_type',},
requestValue: {title: '请求时的值',order: 2,view: 'text', type: 'string',},
requestTime: {title: '请求时间',order: 3,view: 'text', type: 'string',},
requestStatus: {title: '请求状态',order: 4,view: 'list', type: 'string',dictCode: '',},
requestRemark: {title: '请求描述',order: 5,view: 'text', type: 'string',},
requestValue: {title: '抄表时的值',order: 2,view: 'text', type: 'string',},
requestTime: {title: '抄表时间',order: 3,view: 'text', type: 'string',},
requestStatus: {title: '抄表状态',order: 4,view: 'list', type: 'string',dictCode: '',},
requestRemark: {title: '抄表描述',order: 5,view: 'text', type: 'string',},
resolveValue: {title: '反馈值',order: 6,view: 'text', type: 'string',},
resolveTime: {title: '反馈时间',order: 7,view: 'text', type: 'string',},
resolveStatus: {title: '反馈状态',order: 8,view: 'list', type: 'string',dictCode: 'dbsb_status',},

4
src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue
View File

@ -5,8 +5,8 @@
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="NuIotTqApiRequestLogForm">
<a-row>
<a-col :span="24">
<a-form-item label="表号" v-bind="validateInfos.address" id="NuIotTqApiRequestLogForm-address" name="address">
<a-input v-model:value="formData.address" placeholder="请输入表号" allow-clear ></a-input>
<a-form-item label="设备号" v-bind="validateInfos.address" id="NuIotTqApiRequestLogForm-address" name="address">
<a-input v-model:value="formData.address" placeholder="请输入设备号" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">

4
src/views/iot/tq/water/water.data.ts
View File

@ -14,7 +14,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'nuName'
},
{
title: '表号',
title: '设备号',
align: "center",
dataIndex: 'address'
},
@ -120,7 +120,7 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 6 },
},
{
label: '表号',
label: '设备号',
field: 'address',
component: 'Input',
colProps: { span: 6 },

54
src/views/iot/yiweilian/humid.data.ts
View File

@ -14,7 +14,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'nuName'
},
{
title: '设备序号',
title: '设备号',
align: "center",
dataIndex: 'sn'
},
@ -99,7 +99,7 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 6 },
},
{
label: '设备序号',
label: '设备号',
field: 'sn',
component: 'Input',
colProps: { span: 6 },
@ -127,7 +127,7 @@ export const formSchema: FormSchema[] = [
ifShow: false,
},
{
label: '设备序号',
label: '设备号',
field: 'sn',
component: 'Input',
dynamicDisabled: ({ values }) => {
@ -347,7 +347,7 @@ export const formSchema: FormSchema[] = [
//列表数据
export const logColumns: BasicColumn[] = [
{
title: '设备序号',
title: '设备号',
align: "center",
dataIndex: 'sn'
},
@ -361,10 +361,21 @@ export const logColumns: BasicColumn[] = [
align: "center",
dataIndex: 'optBy'
},
{
title: '温度',
align: "center",
dataIndex: 'temperature',
},
{
title: '湿度',
align: "center",
dataIndex: 'humidity',
},
{
title: '操作类型',
align: "center",
dataIndex: 'optType',
defaultHidden: true,
customRender:({record})=>{
if(record.optType == 'insert'){
return '新增';
@ -380,52 +391,62 @@ export const logColumns: BasicColumn[] = [
{
title: '记录间隔',
align: "center",
dataIndex: 'recordInterval'
dataIndex: 'recordInterval',
defaultHidden: true
},
{
title: '上报间隔',
align: "center",
dataIndex: 'reportingInterval'
dataIndex: 'reportingInterval',
defaultHidden: true
},
{
title: '历史数据上报时刻',
align: "center",
dataIndex: 'historyReportTime'
dataIndex: 'historyReportTime',
defaultHidden: true
},
{
title: '历史数据上报间隔',
align: "center",
dataIndex: 'historyInterval'
dataIndex: 'historyInterval',
defaultHidden: true
},
{
title: '温度预警-上限',
align: "center",
dataIndex: 'temperatureHigh'
dataIndex: 'temperatureHigh',
defaultHidden: true
},
{
title: '温度预警-下限',
align: "center",
dataIndex: 'temperatureLow'
dataIndex: 'temperatureLow',
defaultHidden: true
},
{
title: '温度缓冲值',
align: "center",
dataIndex: 'temperatureBuffer'
dataIndex: 'temperatureBuffer',
defaultHidden: true
},
{
title: '湿度预警-上限',
align: "center",
dataIndex: 'humidityHigh'
dataIndex: 'humidityHigh',
defaultHidden: true
},
{
title: '湿度预警-下限',
align: "center",
dataIndex: 'humidityLow'
dataIndex: 'humidityLow',
defaultHidden: true
},
{
title: '湿度缓冲值',
align: "center",
dataIndex: 'humidityBuffer'
dataIndex: 'humidityBuffer',
defaultHidden: true
},
{
title: '断电报警',
@ -434,6 +455,7 @@ export const logColumns: BasicColumn[] = [
customRender:({record})=>{
return record.izOutages?(record.izOutages=='0'?'开启':'关闭'):'';
},
defaultHidden: true
},
{
title: '低电报警',
@ -442,6 +464,7 @@ export const logColumns: BasicColumn[] = [
customRender:({record})=>{
return record.izLowBattery?(record.izLowBattery=='0'?'开启':'关闭'):'';
},
defaultHidden: true
},
{
title: '上下线通知',
@ -450,6 +473,7 @@ export const logColumns: BasicColumn[] = [
customRender:({record})=>{
return record.izOnline?(record.izOnline=='0'?'开启':'关闭'):'';
},
defaultHidden: true
},
];
@ -473,7 +497,7 @@ export const logQuerySchema: FormSchema[] = [
//列表数据
export const alarmColumns: BasicColumn[] = [
{
title: '设备序号',
title: '设备号',
align: "center",
dataIndex: 'sn'
},