修改bug

This commit is contained in:
yangjun 2025-08-18 17:00:45 +08:00
parent 3fea115834
commit c0e0e01f7e
11 changed files with 163 additions and 120 deletions

BIN
src/assets/iot/sxt.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

View File

@ -230,10 +230,10 @@
left: auto !important; left: auto !important;
margin-right: 16px; margin-right: 16px;
} }
.jeecg-layout-content{ // .jeecg-layout-content{
position: relative; // position: relative;
flex: 1 1 auto; // flex: 1 1 auto;
min-height: 0; // min-height: 0;
padding: 3px; // padding: 3px;
} // }
</style> </style>

View File

@ -47,8 +47,9 @@
</div> </div>
<a-row> <a-row>
<a-col v-for="(item,index) in tableData" style="padding: 5px" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6"> <a-col v-for="(item,index) in tableData" style="padding: 5px" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6">
<a-card :title="`NUID`+item.nuId" <a-card
:class="['card-3d']" :class="['card-3d']"
:headStyle="{ height: '60px', padding: '0 24px',border:'0px' }"
@mouseenter="item.key" @mouseenter="item.key"
@mouseleave="item.key" @mouseleave="item.key"
@click="isSelected = item"> @click="isSelected = item">
@ -56,26 +57,37 @@
<span class="lxClass" v-if="item.status == 5">停用</span> <span class="lxClass" v-if="item.status == 5">停用</span>
<span class="zxClass" v-if="item.status != 5">启用</span> <span class="zxClass" v-if="item.status != 5">启用</span>
</template> </template>
<p>单元名称{{item.nuName}}</p> <template #title>
<p>创建时间{{item.createTime}}</p> <a-row>
<p>单元类型{{item.areaFlag_dictText}}</p> <a-col>
<div style="text-align: center;"> NUID{{item.nuId}}
<a-button size="small" @click="handleQiyong(item)" v-if="item.status == 5" style="margin-left:10px" >启用</a-button> </a-col>
<a-button size="small" @click="handleTingyong(item)" v-if="item.status != 5" style="margin-left:10px" >停用</a-button> </a-row>
<a-button size="small" @click="handleEdit(item)" style="margin-left:10px" >更名</a-button> </template>
<a-button size="small" @click="handleWlsb(item)" style="margin-left:10px" >设备</a-button> <div style="margin-top: -30px;">
<a-popover title="二维码" > <a-divider style="margin: 0 0 10px 0 " />
<template #content> <p>单元名称{{item.nuName}}</p>
<QRCodeWithLogo <p>创建时间{{item.createTime}}</p>
:text="item.nuId" <p>单元类型{{item.areaFlag_dictText}}</p>
:logoUrl="logoUrl" <div style="text-align: center;">
:size="150" <a-button size="small" @click="handleQiyong(item)" v-if="item.status == 5" style="margin-left:10px" >启用</a-button>
:logoSize="40" <a-button size="small" @click="handleTingyong(item)" v-if="item.status != 5" style="margin-left:10px" >停用</a-button>
/> <a-button size="small" @click="handleEdit(item)" style="margin-left:10px" >更名</a-button>
</template> <a-button size="small" @click="handleWlsb(item)" style="margin-left:10px" >设备</a-button>
<a-button size="small" style="margin-left:10px">二维码</a-button> <a-popover title="二维码" >
</a-popover> <template #content>
<QRCodeWithLogo
:text="item.nuId"
:logoUrl="logoUrl"
:size="150"
:logoSize="40"
/>
</template>
<a-button size="small" style="margin-left:10px">二维码</a-button>
</a-popover>
</div>
</div> </div>
</a-card> </a-card>
</a-col> </a-col>
</a-row> </a-row>

View File

@ -2,7 +2,7 @@
<div class="p-2"> <div class="p-2">
<a-row> <a-row>
<a-col v-for="(item,index) in sxtList.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;"> <a-col v-for="(item,index) in sxtList.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '60px', padding: '0 24px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }"> <a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title> <template #title>
<a-row style="font-weight: normal;"> <a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;"> <a-col :span="18" style="font-size: 14px;">
@ -10,30 +10,30 @@
<div style="font-size: 12px;">名称{{item.deviceName}}</div> <div style="font-size: 12px;">名称{{item.deviceName}}</div>
</a-col> </a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;"> <a-col :span="6" style="text-align: center;padding-top: 4px;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.deviceStatus=='1'?'在线':'离线'}}</div> <div :class="item.deviceStatus=='1'?'zxClass':'lxClass'">{{item.deviceStatus=='1'?'在线':'离线'}}</div>
</a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col> </a-col>
</a-row> </a-row>
</template> </template>
<a-row> <a-row style="margin-top:-20px;">
<a-col :span="12" style="margin-top: -10px;"><a-tag color="purple">摄像头</a-tag></a-col> <a-col :span="12" ><span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span></a-col>
<a-col :span="12" style="margin-top: -10px;text-align:right;">报修状态
<span v-if="item.maintainStatus==0">正常</span>
<span v-if="item.maintainStatus==1">维修中</span>
<span v-if="item.maintainStatus==2">报废</span>
</a-col>
<a-col :span="12" >{{item.nuId_dictText?item.nuId_dictText:'未配置'}}</a-col>
<a-col :span="12" style="text-align: right;"> <a-col :span="12" style="text-align: right;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span> {{item.nuId_dictText?item.nuId_dictText:'未配置'}}
</a-col> </a-col>
<a-col :span="24" style="text-align: center;font-size: 44px;font-weight: bold;margin-top:18px;"> <a-col :span="24" style="text-align: center;font-size: 44px;font-weight: bold;margin-top:18px;">
<span>摄像头</span> <img src="../../../../assets/iot/sxt.png" style="width:80px;" />
</a-col>
<a-col :span="12" style="margin-top: -10px;"><a-tag color="purple">摄像头</a-tag></a-col>
<a-col :span="12" style="margin-top: -20px;text-align:right;">
<span v-if="item.maintainStatus==0" style="font-weight:700;font-size:16px;">正常</span>
<span v-if="item.maintainStatus==1" style="font-weight:700;font-size:16px;">维修中</span>
<span v-if="item.maintainStatus==2" style="font-weight:700;font-size:16px;">报废</span>
<div style="font-size: 12px;color: #9d9d9d;">报修状态</div>
</a-col> </a-col>
<!-- <a-col :span="8" style="padding: 12px 0 0 5px;margin-top:18px;">
<div style="font-size: 12px;margin: 5px 0 -5px 2px;padding:2px;">KWH</div>
<div style="margin-top:-3px;"><span style="background:#eeeeee;padding: 2px;border-radius:5px;font-size:11px;">用电量</span></div>
</a-col> -->
</a-row> </a-row>
<a-divider /> <a-divider style="margin: 10px 0 20px 0" />
<p style="text-align:center;"> <p style="text-align:center;">
<span style="display:inline-block;cursor: pointer;" @click="handlePreview(item)"> <span style="display:inline-block;cursor: pointer;" @click="handlePreview(item)">
@ -54,7 +54,7 @@
<a-col v-for="(item,index) in zndbList.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;"> <a-col v-for="(item,index) in zndbList.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '60px', padding: '0 24px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }"> <a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title> <template #title>
<a-row style="font-weight: normal;"> <a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;"> <a-col :span="18" style="font-size: 14px;">
@ -64,18 +64,15 @@
<a-col :span="6" style="text-align: center;padding-top: 4px;"> <a-col :span="6" style="text-align: center;padding-top: 4px;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div> <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
</a-col> </a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col>
</a-row> </a-row>
</template> </template>
<a-row> <a-row style="margin-top:-20px;">
<a-col :span="12" style="margin-top: -10px;"><a-tag color="red">智能电表</a-tag></a-col> <a-col :span="12" ><span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span></a-col>
<a-col :span="12" style="margin-top: -10px;text-align:right;">报修状态
<span v-if="item.maintainStatus==0">正常</span>
<span v-if="item.maintainStatus==1">维修中</span>
<span v-if="item.maintainStatus==2">报废</span>
</a-col>
<a-col :span="12" >{{item.nuId_dictText?item.nuId_dictText:'未配置'}}</a-col>
<a-col :span="12" style="text-align: right;"> <a-col :span="12" style="text-align: right;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span> {{item.nuId_dictText?item.nuId_dictText:'未配置'}}
</a-col> </a-col>
<a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:18px;"> <a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:18px;">
<span>{{item.eleValue?item.eleValue:'0.00'}}</span> <span>{{item.eleValue?item.eleValue:'0.00'}}</span>
@ -84,8 +81,15 @@
<div style="font-size: 12px;margin: 5px 0 -5px 2px;padding:2px;">KWH</div> <div style="font-size: 12px;margin: 5px 0 -5px 2px;padding:2px;">KWH</div>
<div style="margin-top:-3px;"><span style="background:#eeeeee;padding: 2px;border-radius:5px;font-size:11px;">用电量</span></div> <div style="margin-top:-3px;"><span style="background:#eeeeee;padding: 2px;border-radius:5px;font-size:11px;">用电量</span></div>
</a-col> </a-col>
<a-col :span="12" style="margin-top: 0px;"><a-tag color="red">智能电表</a-tag></a-col>
<a-col :span="12" style="margin-top: -10px;text-align:right;">
<span v-if="item.maintainStatus==0" style="font-weight:700;font-size:16px;">正常</span>
<span v-if="item.maintainStatus==1" style="font-weight:700;font-size:16px;">维修中</span>
<span v-if="item.maintainStatus==2" style="font-weight:700;font-size:16px;">报废</span>
<div style="font-size: 12px;color: #9d9d9d;">报修状态</div>
</a-col>
</a-row> </a-row>
<a-divider /> <a-divider style="margin: 10px 0 20px 0" />
<p style="text-align:center;"> <p style="text-align:center;">
<span style="display:inline-block;cursor: pointer;" @click="handleRead(item)"> <span style="display:inline-block;cursor: pointer;" @click="handleRead(item)">
<span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br/> <span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br/>
@ -117,7 +121,7 @@
<a-col v-for="(item,index) in znsbList.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;"> <a-col v-for="(item,index) in znsbList.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '60px', padding: '0 24px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }"> <a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title> <template #title>
<a-row style="font-weight: normal;"> <a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;"> <a-col :span="18" style="font-size: 14px;">
@ -127,18 +131,15 @@
<a-col :span="6" style="text-align: center;padding-top: 4px;"> <a-col :span="6" style="text-align: center;padding-top: 4px;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div> <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
</a-col> </a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col>
</a-row> </a-row>
</template> </template>
<a-row> <a-row style="margin-top:-20px;">
<a-col :span="12" style="margin-top: -10px;"><a-tag color="blue">智能水表</a-tag></a-col> <a-col :span="12" ><span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span></a-col>
<a-col :span="12" style="margin-top: -10px;text-align:right;">报修状态
<span v-if="item.maintainStatus==0">正常</span>
<span v-if="item.maintainStatus==1">维修中</span>
<span v-if="item.maintainStatus==2">报废</span>
</a-col>
<a-col :span="12" >{{item.nuId_dictText?item.nuId_dictText:'未配置'}}</a-col>
<a-col :span="12" style="text-align: right;"> <a-col :span="12" style="text-align: right;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span> {{item.nuId_dictText?item.nuId_dictText:'未配置'}}
</a-col> </a-col>
<a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:18px;"> <a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:18px;">
<span>{{item.eleValue?item.eleValue:'0.00'}}</span> <span>{{item.eleValue?item.eleValue:'0.00'}}</span>
@ -147,8 +148,15 @@
<div style="font-size: 12px;margin: 8px 0 -5px 2px;"></div> <div style="font-size: 12px;margin: 8px 0 -5px 2px;"></div>
<div style="margin-top:-3px;"><span style="background:#eeeeee;padding: 2px;border-radius:5px;font-size:11px;">用水量</span></div> <div style="margin-top:-3px;"><span style="background:#eeeeee;padding: 2px;border-radius:5px;font-size:11px;">用水量</span></div>
</a-col> </a-col>
<a-col :span="12" style="margin-top: 0px;"><a-tag color="blue">智能水表</a-tag></a-col>
<a-col :span="12" style="margin-top: -10px;text-align:right;">
<span v-if="item.maintainStatus==0" style="font-weight:700;font-size:16px;">正常</span>
<span v-if="item.maintainStatus==1" style="font-weight:700;font-size:16px;">维修中</span>
<span v-if="item.maintainStatus==2" style="font-weight:700;font-size:16px;">报废</span>
<div style="font-size: 12px;color: #9d9d9d;">报修状态</div>
</a-col>
</a-row> </a-row>
<a-divider /> <a-divider style="margin: 10px 0 20px 0" />
<p style="text-align:center;"> <p style="text-align:center;">
<span style="display:inline-block;cursor: pointer;" @click="handleSbRead(item)"> <span style="display:inline-block;cursor: pointer;" @click="handleSbRead(item)">
<span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br/> <span class="tbClass"><img src="../../../../assets/iot/a1.png" style="width:20px;" /></span><br/>
@ -179,7 +187,7 @@
</a-col> </a-col>
<a-col v-for="(item,index) in wsdjList.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;"> <a-col v-for="(item,index) in wsdjList.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;">
<a-card style="width: 100%;border-radius: 8px;min-height:280px;" :headStyle="{ height: '60px', padding: '0 24px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }"> <a-card style="width: 100%;border-radius: 8px;min-height:280px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title> <template #title>
<a-row style="font-weight: normal;"> <a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;"> <a-col :span="18" style="font-size: 14px;">
@ -187,22 +195,19 @@
<div style="font-size: 12px;">抄表时间{{item.reportingTime?item.reportingTime:'未抄表'}}</div> <div style="font-size: 12px;">抄表时间{{item.reportingTime?item.reportingTime:'未抄表'}}</div>
</a-col> </a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;"> <a-col :span="6" style="text-align: center;padding-top: 4px;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.status=='1'?'在线':'离线'}}</div> <div :class="item.status=='1'?'zxClass':'lxClass'">{{item.status=='1'?'在线':'离线'}}</div>
</a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col> </a-col>
</a-row> </a-row>
</template> </template>
<a-row> <a-row style="margin-top:-20px;">
<a-col :span="12" style="margin-top: -10px;"><a-tag color="green">温湿度计</a-tag></a-col> <a-col :span="12" ><span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span></a-col>
<a-col :span="12" style="margin-top: -10px;text-align:right;">报修状态
<span v-if="item.maintainStatus==0">正常</span>
<span v-if="item.maintainStatus==1">维修中</span>
<span v-if="item.maintainStatus==2">报废</span>
</a-col>
<a-col :span="12" >{{item.nuId_dictText?item.nuId_dictText:'未配置'}}</a-col>
<a-col :span="12" style="text-align: right;"> <a-col :span="12" style="text-align: right;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span> {{item.nuId_dictText?item.nuId_dictText:'未配置'}}
</a-col> </a-col>
<a-col :span="24" style="padding: 12px 0 0 5px;margin-top:28px;"> <a-col :span="24" style="padding: 12px 0 0 5px;margin-top:18px;">
<a-row> <a-row>
<a-col :span="11" style="text-align: center;"> <a-col :span="11" style="text-align: center;">
<span><img src="../../../../assets/iot/a8.png" style="width:25px;margin-top: -15px;" /></span> <span><img src="../../../../assets/iot/a8.png" style="width:25px;margin-top: -15px;" /></span>
@ -219,8 +224,15 @@
</a-col> </a-col>
</a-row> </a-row>
</a-col> </a-col>
<a-col :span="12" style="margin-top: 10px;"><a-tag color="green">温湿度计</a-tag></a-col>
<a-col :span="12" style="margin-top: 0px;text-align:right;">
<span v-if="item.maintainStatus==0" style="font-weight:700;font-size:16px;">正常</span>
<span v-if="item.maintainStatus==1" style="font-weight:700;font-size:16px;">维修中</span>
<span v-if="item.maintainStatus==2" style="font-weight:700;font-size:16px;">报废</span>
<div style="font-size: 12px;color: #9d9d9d;">报修状态</div>
</a-col>
</a-row> </a-row>
<a-divider /> <a-divider style="margin: 10px 0 20px 0" />
<p style="text-align:center;"> <p style="text-align:center;">
<span style="display:inline-block;cursor: pointer;" @click="handleWsdjRead(item)"> <span style="display:inline-block;cursor: pointer;" @click="handleWsdjRead(item)">
<span class="tbClass"><img src="../../../../assets/iot/a7.png" style="width:20px;" /></span><br/> <span class="tbClass"><img src="../../../../assets/iot/a7.png" style="width:20px;" /></span><br/>

View File

@ -39,17 +39,7 @@
<a-input v-model:value="formData.salesUnitPrice" placeholder="请输入销售单价" maxlength="10" style="width: 100%" /> <a-input v-model:value="formData.salesUnitPrice" placeholder="请输入销售单价" maxlength="10" style="width: 100%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8" hidden>
<a-form-item label="参考单价" v-bind="validateInfos.referenceUnitPrice" id="ConfigMaterialInfoForm-referenceUnitPrice" name="referenceUnitPrice">
<a-input v-model:value="formData.referenceUnitPrice" placeholder="请输入参考单价" maxlength="10" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="货品单位" v-bind="validateInfos.materialUnits" id="ConfigMaterialInfoForm-materialUnits" name="materialUnits">
<a-input v-model:value="formData.materialUnits" placeholder="请输入货品单位" maxlength="10" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="多单位开关" v-bind="validateInfos.multiUnitSwitch" id="ConfigMaterialInfoForm-multiUnitSwitch" name="multiUnitSwitch"> <a-form-item label="多单位开关" v-bind="validateInfos.multiUnitSwitch" id="ConfigMaterialInfoForm-multiUnitSwitch" name="multiUnitSwitch">
<j-dict-select-tag type='radio' v-model:value="formData.multiUnitSwitch" dictCode="multiUnitSwitch" placeholder="请选择多单位开关" allow-clear /> <j-dict-select-tag type='radio' v-model:value="formData.multiUnitSwitch" dictCode="multiUnitSwitch" placeholder="请选择多单位开关" allow-clear />
</a-form-item> </a-form-item>
@ -64,36 +54,51 @@
<j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" placeholder="请选择是否启用" allow-clear /> <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" placeholder="请选择是否启用" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8" v-if="formData.multiUnitSwitch == '1'"> <a-col :span="8" v-if="formData.multiUnitType == '1'">
<a-form-item label="二级单位" v-bind="validateInfos.oneUnit" id="ConfigMaterialInfoForm-oneUnit" name="oneUnit">
<a-input v-model:value="formData.oneUnit" placeholder="请输入二级单位" maxlength="10" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="8" v-if="formData.multiUnitSwitch == '1'">
<a-form-item label="二级单位兑换比例" v-bind="validateInfos.oneUnitProportion" id="ConfigMaterialInfoForm-oneUnitProportion" name="oneUnitProportion">
<a-input-number v-model:value="formData.oneUnitProportion" maxlength="10" placeholder="请输入二级单位兑换比例" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="8" v-if="formData.multiUnitSwitch == '1'">
<a-form-item label="二级单位价格" v-bind="validateInfos.oneUnitPrice" id="ConfigMaterialInfoForm-oneUnitPrice" name="oneUnitPrice">
<a-input-number v-model:value="formData.oneUnitPrice" maxlength="10" placeholder="请输入二级单位价格" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="8" v-if="formData.multiUnitSwitch == '1'">
<a-form-item label="一级单位" v-bind="validateInfos.twoUnit" id="ConfigMaterialInfoForm-twoUnit" name="twoUnit"> <a-form-item label="一级单位" v-bind="validateInfos.twoUnit" id="ConfigMaterialInfoForm-twoUnit" name="twoUnit">
<a-input v-model:value="formData.twoUnit" placeholder="请输入一级单位" maxlength="10" allow-clear ></a-input> <a-input v-model:value="formData.twoUnit" placeholder="请输入一级单位" maxlength="10" allow-clear ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8" v-if="formData.multiUnitSwitch == '1'"> <a-col :span="8" v-if="formData.multiUnitType == '1'">
<a-form-item label="一级单位兑换比例" v-bind="validateInfos.twoUnitProportion" id="ConfigMaterialInfoForm-twoUnitProportion" name="twoUnitProportion"> <a-form-item label="一级单位兑换比例" v-bind="validateInfos.twoUnitProportion" id="ConfigMaterialInfoForm-twoUnitProportion" name="twoUnitProportion">
<a-input-number v-model:value="formData.twoUnitProportion" maxlength="10" placeholder="请输入一级单位兑换比例" style="width: 100%" /> <a-input-number v-model:value="formData.twoUnitProportion" maxlength="10" placeholder="请输入一级单位兑换比例" style="width: 100%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8" v-if="formData.multiUnitSwitch == '1'"> <a-col :span="8" v-if="formData.multiUnitType == '1'">
<a-form-item label="一级单位价格" v-bind="validateInfos.twoUnitPrice" id="ConfigMaterialInfoForm-twoUnitPrice" name="twoUnitPrice"> <a-form-item label="一级单位价格" v-bind="validateInfos.twoUnitPrice" id="ConfigMaterialInfoForm-twoUnitPrice" name="twoUnitPrice">
<a-input-number v-model:value="formData.twoUnitPrice" maxlength="10" placeholder="请输入一级单位价格" style="width: 100%" /> <a-input-number v-model:value="formData.twoUnitPrice" maxlength="10" placeholder="请输入一级单位价格" style="width: 100%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8" v-if="formData.multiUnitType == '1' || formData.multiUnitType == '2'">
<a-form-item label="二级单位" v-bind="validateInfos.oneUnit" id="ConfigMaterialInfoForm-oneUnit" name="oneUnit">
<a-input v-model:value="formData.oneUnit" placeholder="请输入二级单位" maxlength="10" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="8" v-if="formData.multiUnitType == '1' || formData.multiUnitType == '2'">
<a-form-item label="二级单位兑换比例" v-bind="validateInfos.oneUnitProportion" id="ConfigMaterialInfoForm-oneUnitProportion" name="oneUnitProportion">
<a-input-number v-model:value="formData.oneUnitProportion" maxlength="10" placeholder="请输入二级单位兑换比例" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="8" v-if="formData.multiUnitType == '1' || formData.multiUnitType == '2'">
<a-form-item label="二级单位价格" v-bind="validateInfos.oneUnitPrice" id="ConfigMaterialInfoForm-oneUnitPrice" name="oneUnitPrice">
<a-input-number v-model:value="formData.oneUnitPrice" maxlength="10" placeholder="请输入二级单位价格" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="三级单位" v-bind="validateInfos.materialUnits" id="ConfigMaterialInfoForm-materialUnits" name="materialUnits">
<a-input v-model:value="formData.materialUnits" placeholder="请输入货品单位" maxlength="10" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="8" >
<a-form-item label="三级单位兑换比例" v-bind="validateInfos.sdwdhbl" id="ConfigMaterialInfoForm-sdwdhbl" name="sdwdhbl">
<a-input-number v-model:value="formData.sdwdhbl" maxlength="10" readonly placeholder="请输入二级单位兑换比例" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="三级单位价格" v-bind="validateInfos.referenceUnitPrice" id="ConfigMaterialInfoForm-referenceUnitPrice" name="referenceUnitPrice">
<a-input v-model:value="formData.referenceUnitPrice" placeholder="请输入参考单价" maxlength="10" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="8" hidden> <a-col :span="8" hidden>
<a-form-item label="物料上限" v-bind="validateInfos.upperLimit" id="ConfigMaterialInfoForm-upperLimit" name="upperLimit"> <a-form-item label="物料上限" v-bind="validateInfos.upperLimit" id="ConfigMaterialInfoForm-upperLimit" name="upperLimit">
<a-input v-model:value="formData.upperLimit" maxlength="10" placeholder="请输入物料上限" style="width: 100%" /> <a-input v-model:value="formData.upperLimit" maxlength="10" placeholder="请输入物料上限" style="width: 100%" />
@ -157,20 +162,21 @@
salesUnitPrice: undefined, salesUnitPrice: undefined,
referenceUnitPrice: undefined, referenceUnitPrice: undefined,
materialUnits: '', materialUnits: '',
multiUnitSwitch: '2', multiUnitSwitch: '1',
oneUnit: '', oneUnit: '',
oneUnitProportion: undefined, oneUnitProportion: undefined,
oneUnitPrice: undefined, oneUnitPrice: undefined,
twoUnit: '', twoUnit: '',
twoUnitProportion: undefined, twoUnitProportion: undefined,
twoUnitPrice: undefined, twoUnitPrice: undefined,
multiUnitType: '0', multiUnitType: '3',
izEnabled: '0', izEnabled: '0',
suppliers: '', suppliers: '',
materialImg: '', materialImg: '',
materialIdent: '', materialIdent: '',
upperLimit: undefined, upperLimit: undefined,
lowerLimit: undefined, lowerLimit: undefined,
sdwdhbl:'1'
}); });
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 9 } }); const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 9 } });

View File

@ -6,12 +6,12 @@
<a-row> <a-row>
<a-col :span="24" v-if="showDictSelect"> <a-col :span="24" v-if="showDictSelect">
<a-form-item label="一级分类" v-bind="validateInfos.categoryId" id="ConfigMaterialMedicationForm-categoryId" name="categoryId"> <a-form-item label="一级分类" v-bind="validateInfos.categoryId" id="ConfigMaterialMedicationForm-categoryId" name="categoryId">
<j-dict-select-tag type='radio' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类" allow-clear/> <j-dict-select-tag type='list' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类" allow-clear/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24" v-if="showDictSelect"> <a-col :span="24" v-if="showDictSelect">
<a-form-item label="二级分类" v-bind="validateInfos.typeId" id="ConfigMaterialMedicationForm-typeId" name="typeId"> <a-form-item label="二级分类" v-bind="validateInfos.typeId" id="ConfigMaterialMedicationForm-typeId" name="typeId">
<j-dict-select-tag type='radio' v-model:value="formData.typeId" :dictCode="`nu_config_material_type,type_name,id,iz_enabled = 0 and del_flag = 0 and category_id = ${formData.categoryId || -1}`" placeholder="请选择二级分类" allow-clear/> <j-dict-select-tag type='list' v-model:value="formData.typeId" :dictCode="`nu_config_material_type,type_name,id,iz_enabled = 0 and del_flag = 0 and category_id = ${formData.categoryId || -1}`" placeholder="请选择二级分类" allow-clear/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">

View File

@ -6,7 +6,7 @@
<a-row> <a-row>
<a-col :span="24" v-if="showDictSelect"> <a-col :span="24" v-if="showDictSelect">
<a-form-item label="一级分类" v-bind="validateInfos.categoryId" id="ConfigMaterialTypeForm-categoryId" name="categoryId"> <a-form-item label="一级分类" v-bind="validateInfos.categoryId" id="ConfigMaterialTypeForm-categoryId" name="categoryId">
<j-dict-select-tag type='radio' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类" allow-clear/> <j-dict-select-tag type='list' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类" allow-clear/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">

View File

@ -25,7 +25,7 @@
</div> </div>
<a-row> <a-row>
<a-col v-for="(item,index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;"> <a-col v-for="(item,index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '60px', padding: '0 24px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }"> <a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title> <template #title>
<a-row style="font-weight: normal;"> <a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;"> <a-col :span="18" style="font-size: 14px;">
@ -35,9 +35,13 @@
<a-col :span="6" style="text-align: center;padding-top: 4px;"> <a-col :span="6" style="text-align: center;padding-top: 4px;">
<div :class="item.deviceStatus=='1'?'zxClass':'lxClass'">{{item.deviceStatus =='1'?'在线':'离线'}}</div> <div :class="item.deviceStatus=='1'?'zxClass':'lxClass'">{{item.deviceStatus =='1'?'在线':'离线'}}</div>
</a-col> </a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col>
</a-row> </a-row>
</template> </template>
<p style="text-align:center;margin-top: 15px;">
<p style="text-align:center;">
<span style="display:inline-block;cursor: pointer;" @click="handlePreview(item)"> <span style="display:inline-block;cursor: pointer;" @click="handlePreview(item)">
<span class="tbClass"><img src="../../../../../assets/iot/a14.png" style="width:20px;" /></span><br/> <span class="tbClass"><img src="../../../../../assets/iot/a14.png" style="width:20px;" /></span><br/>
<span class="antTitle">预览</span> <span class="antTitle">预览</span>

View File

@ -25,7 +25,7 @@
</div> </div>
<a-row> <a-row>
<a-col v-for="(item,index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;"> <a-col v-for="(item,index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '60px', padding: '0 24px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }"> <a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title> <template #title>
<a-row style="font-weight: normal;"> <a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;"> <a-col :span="18" style="font-size: 14px;">
@ -35,9 +35,12 @@
<a-col :span="6" style="text-align: center;padding-top: 4px;"> <a-col :span="6" style="text-align: center;padding-top: 4px;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div> <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
</a-col> </a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col>
</a-row> </a-row>
</template> </template>
<a-row> <a-row style="margin-top:-10px;">
<a-col :span="12" style="margin-top: -10px;">{{item.nuId_dictText?item.nuId_dictText:'未配置'}}</a-col> <a-col :span="12" style="margin-top: -10px;">{{item.nuId_dictText?item.nuId_dictText:'未配置'}}</a-col>
<a-col :span="12" style="text-align: right;margin-top: -10px;"> <a-col :span="12" style="text-align: right;margin-top: -10px;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span> <span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span>

View File

@ -25,7 +25,7 @@
</div> </div>
<a-row> <a-row>
<a-col v-for="(item,index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;"> <a-col v-for="(item,index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '60px', padding: '0 24px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }"> <a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title> <template #title>
<a-row style="font-weight: normal;"> <a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;"> <a-col :span="18" style="font-size: 14px;">
@ -35,9 +35,12 @@
<a-col :span="6" style="text-align: center;padding-top: 4px;"> <a-col :span="6" style="text-align: center;padding-top: 4px;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div> <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
</a-col> </a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col>
</a-row> </a-row>
</template> </template>
<a-row> <a-row style="margin-top:-10px;">
<a-col :span="12" style="margin-top: -10px;">{{item.nuId_dictText?item.nuId_dictText:'未配置'}}</a-col> <a-col :span="12" style="margin-top: -10px;">{{item.nuId_dictText?item.nuId_dictText:'未配置'}}</a-col>
<a-col :span="12" style="text-align: right;margin-top: -10px;"> <a-col :span="12" style="text-align: right;margin-top: -10px;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span> <span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span>

View File

@ -25,7 +25,7 @@
</div> </div>
<a-row> <a-row>
<a-col v-for="(item,index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;"> <a-col v-for="(item,index) in tableData.records" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" style="padding: 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '60px', padding: '0 24px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }"> <a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title> <template #title>
<a-row style="font-weight: normal;"> <a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;"> <a-col :span="18" style="font-size: 14px;">
@ -35,9 +35,12 @@
<a-col :span="6" style="text-align: center;padding-top: 4px;"> <a-col :span="6" style="text-align: center;padding-top: 4px;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.status=='1'?'在线':'离线'}}</div> <div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.status=='1'?'在线':'离线'}}</div>
</a-col> </a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col>
</a-row> </a-row>
</template> </template>
<a-row> <a-row style="margin-top:-10px;">
<a-col :span="12" style="margin-top: -10px;">{{item.nuId_dictText?item.nuId_dictText:'未配置'}}</a-col> <a-col :span="12" style="margin-top: -10px;">{{item.nuId_dictText?item.nuId_dictText:'未配置'}}</a-col>
<a-col :span="12" style="text-align: right;margin-top: -10px;"> <a-col :span="12" style="text-align: right;margin-top: -10px;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span> <span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span>