修改bug

This commit is contained in:
yangjun 2025-08-22 17:12:20 +08:00
parent 454428b68e
commit 00aeef66db
16 changed files with 175 additions and 154 deletions

View File

@ -501,8 +501,8 @@
padding: 10px;
.ant-form {
padding: 24px 10px 0px 10px;
margin-bottom: 8px;
padding: 14px 10px 0px 10px;
// margin-bottom: 8px;
background-color: @component-background;
border-radius: 8px;
}

View File

@ -5,11 +5,20 @@
// update-end--author:liaozhiyang---date:20240130---for【issues/5857】Button color类型颜色失效
// @import './table.less';
.jeecg-basic-table-form-container .ant-form {
margin-bottom: 14px !important;
}
.jeecg-basic-table-form-container .table-page-search-submitButtons {
margin-bottom: 12px !important;
}
.ant-form-item {
margin-bottom: 14px !important;
}
// TODO beta.11 fix
.ant-col {
width: 100%;
}
.ant-image-preview-root {
img {
display: unset;

View File

@ -22,9 +22,9 @@
</a-row>
</a-form>
</div>
<a-row>
<a-col :span="6" v-for="(item,index) in dataList" :key="index" style="padding: 5px 10px 0 0;height: 240px;">
<a-row style="padding: 5px;background-color: white;border-radius: 8px;height: 220px;">
<a-row style="margin-top: -5px;">
<a-col v-for="(item,index) in dataList" :key="index" style="padding: 5px 14px 0 0;height: 230px;" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="4" >
<a-row style="padding: 0 5px;background-color: white;border-radius: 8px;height: 220px;">
<a-col :span="4">
<div class="bjclass">
<img :src="handleHeadPath(item.headPath)" style="width: 40px;height:40px;margin-top: 10px;" @error="setDefaultImage"/>

View File

@ -45,8 +45,8 @@
</a-row>
</a-form>
</div>
<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-row style="margin-top: -7px;">
<a-col v-for="(item,index) in tableData" style="padding: 7px 14px 7px 0;" :key="index" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6">
<a-card
:class="['card-3d']"
:headStyle="{ height: '60px', padding: '0 24px',border:'0px' }"
@ -54,8 +54,7 @@
@mouseleave="item.key"
@click="isSelected = item">
<template #extra>
<span class="lxClass" v-if="item.status == 5">停用</span>
<span class="zxClass" v-if="item.status != 5">启用</span>
<span class="hldyClass" >{{item.areaFlag_dictText}}</span>
</template>
<template #title>
<a-row>
@ -67,9 +66,8 @@
<div style="margin-top: -30px;">
<a-divider style="margin: 0 0 10px 0 " />
<p>单元名称{{item.nuName}}</p>
<p>创建时间{{item.createTime}}</p>
<p>单元类型{{item.areaFlag_dictText}}</p>
<div style="float:left;">
<p style="margin-top: -10px;">创建时间{{item.createTime}}</p>
<div style="float:left;margin-top: 20px;">
<a-button type="dashed" size="small" @click="handleEdit(item)">更名</a-button>
<a-button type="dashed" size="small" @click="handleWlsb(item)" style="margin-left:10px" >设备</a-button>
<a-popover title="二维码" >
@ -85,7 +83,7 @@
</a-popover>
</div>
<div style="float:right;">
<div style="float:right;margin-top: 20px;">
<a-switch style="margin-left:10px" :checked="item.status!=5" checked-children="" @change="(checked) => handleChangeValidateStatus(item, checked)" un-checked-children="" />
</div>
@ -280,25 +278,16 @@ function handleChangeValidateStatus(record,checked) {
.zxClass {
.hldyClass {
font-size: 12px;
background: linear-gradient(to right, #1ea0fa, #017de9);
border-radius: 8px;
background: #f5f7ff;
border-radius: 15px;
height: 25px;
color: white;
line-height: 25px;
padding: 5px;
padding: 5px 15px;
border: 1px solid #ebedf2;
}
.lxClass {
font-size: 12px;
background: linear-gradient(to right, #d1d4d5, #d3d5d6);
border-radius: 8px;
height: 25px;
color: white;
line-height: 25px;
padding: 5px;
}
.selected-card {
border: 2px solid #1890ff;
@ -313,17 +302,13 @@ function handleChangeValidateStatus(record,checked) {
.card-3d {
border-radius: 8px;
border: 1px solid #f0f0f0; /* 边框增强立体感 */
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
transition: all 0.3s ease;
background: white;
position: relative;
}
/* 鼠标悬停:阴影加深 + 轻微上浮 */
.card-3d:hover {
border: 2px solid #1890ff;
box-shadow: 0 4px 8px rgba(24, 144, 255, 0.4);
transform: translate(-3px,-3px);
border: 1px solid #1890ff;
}
</style>

View File

@ -1,5 +1,5 @@
<template>
<div class="p-2">
<div >
<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-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
@ -9,7 +9,7 @@
<div>SN<span style="font-weight: bold;">{{item.sn}}</span></div>
<div style="font-size: 12px;">名称{{item.deviceName}}</div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<a-col :span="6" style="display: flex; justify-content: flex-end;">
<div :class="item.deviceStatus=='1'?'zxClass':'lxClass'">{{item.deviceStatus=='1'?'在线':'离线'}}</div>
</a-col>
<a-col :span="24">
@ -18,23 +18,23 @@
</a-row>
</template>
<a-row style="margin-top:-20px;">
<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" ><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="text-align: right;">
{{item.nuName?item.nuName:'未配置'}}
</a-col>
<a-col :span="24" style="text-align: center;font-size: 44px;font-weight: bold;margin-top:18px;">
</a-col> -->
<a-col :span="24" style="text-align: center;font-size: 44px;font-weight: bold;margin-top:10px;">
<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;">
<a-col :span="12" style="margin-top: -1px;"><a-tag color="purple">摄像头</a-tag></a-col>
<a-col :span="12" style="margin-top: -11px;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==1" style="font-weight:700;font-size:16px;color:red;">维修中</span>
<span v-if="item.maintainStatus==2" style="font-weight:700;font-size:16px;">报废</span>
<div style="font-size: 12px;color: #9d9d9d;">报修状态</div>
<div style="font-size: 12px;color: #9d9d9d;margin-top:-5px">报修状态</div>
</a-col>
</a-row>
<a-divider style="margin: 10px 0 20px 0" />
<p style="text-align:center;">
<p style="text-align:center;margin-bottom:5px !important">
<span style="display:inline-block;cursor: pointer;" @click="handlePreview(item)">
<span class="tbClass"><img src="../../../../assets/iot/a14.png" style="width:20px;" /></span><br/>
@ -61,7 +61,7 @@
<div>SN<span style="font-weight: bold;">{{item.address}}</span></div>
<div style="font-size: 12px;">抄表时间{{item.readTime?item.readTime:'未抄表'}}</div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<a-col :span="6" style="display: flex; justify-content: flex-end;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'合闸':'拉闸'}}</div>
</a-col>
<a-col :span="24">
@ -70,27 +70,27 @@
</a-row>
</template>
<a-row style="margin-top:-20px;">
<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" ><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="text-align: right;">
{{item.nuName?item.nuName:'未配置'}}
</a-col>
<a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:18px;">
</a-col> -->
<a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:10px;">
<span>{{item.eleValue?item.eleValue:'0.00'}}</span>
</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-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;">
<a-col :span="12" style="margin-top: 10px;"><a-tag color="red">智能电表</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==1" style="font-weight:700;font-size:16px;color:red;">维修中</span>
<span v-if="item.maintainStatus==2" style="font-weight:700;font-size:16px;">报废</span>
<div style="font-size: 12px;color: #9d9d9d;">报修状态</div>
<div style="font-size: 12px;color: #9d9d9d;margin-top:-5px">报修状态</div>
</a-col>
</a-row>
<a-divider style="margin: 10px 0 20px 0" />
<p style="text-align:center;">
<p style="text-align:center;margin-bottom:5px !important">
<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="antTitle">抄表</span>
@ -128,7 +128,7 @@
<div>SN<span style="font-weight: bold;">{{item.address}}</span></div>
<div style="font-size: 12px;">抄表时间{{item.readTime?item.readTime:'未抄表'}}</div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<a-col :span="6" style="display: flex; justify-content: flex-end;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'开阀':'关阀'}}</div>
</a-col>
<a-col :span="24">
@ -137,27 +137,27 @@
</a-row>
</template>
<a-row style="margin-top:-20px;">
<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" ><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="text-align: right;">
{{item.nuName?item.nuName:'未配置'}}
</a-col>
<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>
</a-col> -->
<a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;margin-top:10px;">
<span>{{item.waterValue?item.waterValue:'0.00'}}</span>
</a-col>
<a-col :span="8" style="padding: 12px 0 0 5px;margin-top:18px;">
<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>
</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;">
<a-col :span="12" style="margin-top: 10px;"><a-tag color="blue">智能水表</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==1" style="font-weight:700;font-size:16px;color:red;">维修中</span>
<span v-if="item.maintainStatus==2" style="font-weight:700;font-size:16px;">报废</span>
<div style="font-size: 12px;color: #9d9d9d;">报修状态</div>
<div style="font-size: 12px;color: #9d9d9d;margin-top:-5px">报修状态</div>
</a-col>
</a-row>
<a-divider style="margin: 10px 0 20px 0" />
<p style="text-align:center;">
<p style="text-align:center;margin-bottom:5px !important">
<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="antTitle">抄表</span>
@ -194,8 +194,8 @@
<div>SN<span style="font-weight: bold;">{{item.sn}}</span></div>
<div style="font-size: 12px;">抄表时间{{item.reportingTime?item.reportingTime:'未抄表'}}</div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<div :class="item.status=='1'?'zxClass':'lxClass'">{{item.status=='1'?'在线':'离线'}}</div>
<a-col :span="6" style="display: flex; justify-content: flex-end;">
<div :class="item.status=='0'?'zxClass':'lxClass'">{{item.status=='0'?'在线':'离线'}}</div>
</a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
@ -203,14 +203,14 @@
</a-row>
</template>
<a-row style="margin-top:-20px;">
<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" ><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="text-align: right;">
{{item.nuName?item.nuName:'未配置'}}
</a-col>
<a-col :span="24" style="padding: 12px 0 0 5px;margin-top:18px;">
</a-col> -->
<a-col :span="24" style="padding: 12px 0 0 5px;margin-top:10px;">
<a-row>
<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: -1px;" /></span>
<span style="font-size: 30px;font-weight:700;">{{item.temperature?item.temperature:'-'}}</span>
<span style="font-size: 16px;"></span>
</a-col>
@ -224,16 +224,16 @@
</a-col>
</a-row>
</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;">
<a-col :span="12" style="margin-top: 20px;"><a-tag color="green">温湿度计</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==1" style="font-weight:700;font-size:16px;color:red;">维修中</span>
<span v-if="item.maintainStatus==2" style="font-weight:700;font-size:16px;">报废</span>
<div style="font-size: 12px;color: #9d9d9d;">报修状态</div>
<div style="font-size: 12px;color: #9d9d9d;margin-top:-5px">报修状态</div>
</a-col>
</a-row>
<a-divider style="margin: 10px 0 20px 0" />
<p style="text-align:center;">
<p style="text-align:center;margin-bottom:5px !important;">
<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="antTitle">抄表</span>
@ -616,18 +616,24 @@ defineExpose({
font-size:14px;
background: linear-gradient(to right, #1ea0fa, #017de9);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.lxClass{
font-size:14px;
background: linear-gradient(to right, #cccccc, #cccccc);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.tbClass{
background: #f6f6f6;
@ -635,7 +641,7 @@ defineExpose({
border-radius: 5px;
}
.antTitle{
margin-top: 10px;
margin-top: 8px;
display: block;
font-size: 12px;
}

View File

@ -1,7 +1,13 @@
<template>
<j-modal :title="title" :width="width" :maxHeight="`200px`" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<!-- <j-modal :title="title" :width="width" :maxHeight="`200px`" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> -->
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true" bodyStyle="padding:14px;"
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
<BaseWlsbListForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></BaseWlsbListForm>
</j-modal>
<template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
</template>
</a-drawer>
<!-- </j-modal> -->
</template>
<script lang="ts" setup>

View File

@ -7,7 +7,7 @@
<a-row>
<a-col :span="24" style="margin-top: 60px;margin-bottom: 60px;">
<a-form-item label="区域名称" v-bind="validateInfos.nuName" id="NuBaseInfoForm-nuName" name="nuName">
<a-input v-model:value="formData.nuName" placeholder="请输入区域名称" allow-clear></a-input>
<a-input v-model:value="formData.nuName" placeholder="请输入区域名称" maxLength="15" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24" hidden>
@ -64,6 +64,7 @@ const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
//
const validatorRules = reactive({
nuName: [{ required: true, message: '请输入文件类型!' },],
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });

View File

@ -1,7 +1,14 @@
<template>
<j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<!-- <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭"> -->
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true" bodyStyle="padding:14px;"
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
<NuBaseInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuBaseInfoForm>
</j-modal>
<template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
<a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
</template>
</a-drawer>
<!-- </j-modal> -->
</template>
<script lang="ts" setup>

View File

@ -5,29 +5,6 @@
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
:wrapper-col="wrapperCol">
<a-row :gutter="24">
<!-- <a-col :lg="6">
<a-form-item name="categoryId">
<template #label><span title="一级分类">一级分类</span></template>
<j-dict-select-tag type='list' placeholder="请选择一级分类" v-model:value="queryParam.categoryId"
dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="typeId">
<template #label><span title="二级分类">二级分类</span></template>
<j-dict-select-tag type='list' placeholder="请选择二级分类" v-model:value="queryParam.typeId"
:dictCode="`nu_config_material_type,type_name,id,iz_enabled = 0 and del_flag = 0 and category_id = ${queryParam.categoryId || -1}`"
allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="medicationId">
<template #label><span title="三级分类">三级分类</span></template>
<j-dict-select-tag type='list' placeholder="请选择三级分类" v-model:value="queryParam.medicationId"
:dictCode="`config_material_medication,medication_name,id,iz_enabled = 0 and del_flag = 0 and type_id = ${queryParam.typeId || -1}`"
allow-clear />
</a-form-item>
</a-col> -->
<a-col :lg="5">
<a-form-item name="materialName">
<template #label><span title="货品名称">货品名称</span></template>
@ -68,7 +45,7 @@
<div>
<div style="width:300px;float: left;">
<div class="container-height"
style="background: white; border-radius: 8px; padding: 8px; margin-right: 18px; overflow-y: auto;">
style="background: white; border-radius: 8px; padding: 8px; margin-right: 14px; overflow-y: auto;">
<div style="width: 100%;height: 40px;">
<div style="text-align: right;float: right;">
<a-radio-group v-model:value="treeParam.izEnabled" @change="getTreeData">

View File

@ -1,5 +1,5 @@
<template>
<div class="p-2">
<div style="padding: 4px;">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -23,8 +23,8 @@
</a-row>
</a-form>
</div>
<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-row style="margin-top: -20px;">
<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 6px 6px 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title>
<a-row style="font-weight: normal;">
@ -32,7 +32,7 @@
<div style="font-size: 14px;">SN<span style="font-weight: bold;">{{item.sn?item.sn:'未配置'}}</span></div>
<div style="font-size: 12px;">设备名称{{item.deviceName}}</div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<a-col :span="6" style="display: flex; justify-content: flex-end;">
<div :class="item.deviceStatus=='1'?'zxClass':'lxClass'">{{item.deviceStatus =='1'?'在线':'离线'}}</div>
</a-col>
<a-col :span="24">
@ -41,6 +41,16 @@
</a-row>
</template>
<a-row style="margin-top:-10px;">
<a-col :span="12" style="margin-top: -10px;font-size:12px">{{item.nuId_dictText?item.nuId_dictText:'未配置'}}</a-col>
<a-col :span="12" style="text-align: right;margin-top: -10px;font-size:12px">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span>
</a-col>
<a-col :span="24" style="text-align: center;font-size: 44px;font-weight: bold;margin-top:18px;">
<img src="../../../../../assets/iot/sxt.png" style="width:80px;" />
</a-col>
</a-row>
<a-divider />
<p style="text-align:center;">
<span style="display:inline-block;cursor: pointer;" @click="handlePreview(item)">
<span class="tbClass"><img src="../../../../../assets/iot/a14.png" style="width:20px;" /></span><br/>
@ -56,13 +66,6 @@
</span> -->
</p>
<a-divider />
<a-row>
<a-col :span="12" style="margin-top: -10px;margin-bottom: 10px;">{{item.nuId_dictText?item.nuId_dictText:'未配置'}}</a-col>
<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>
</a-col>
</a-row>
</a-card>
</a-col>
<a-col v-if="tableData.total==0" >
@ -239,18 +242,24 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
font-size:14px;
background: linear-gradient(to right, #1ea0fa, #017de9);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.lxClass{
font-size:14px;
background: linear-gradient(to right, #cccccc, #cccccc);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.tbClass{
background: #f6f6f6;

View File

@ -1,5 +1,5 @@
<template>
<div class="p-2">
<div style="padding: 4px;">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -23,8 +23,8 @@
</a-row>
</a-form>
</div>
<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-row style="margin-top: -18px;">
<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 6px 6px 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title>
<a-row style="font-weight: normal;">
@ -32,7 +32,7 @@
<div>SN<span style="font-weight: bold;">{{item.address}}</span></div>
<div style="font-size: 12px;">抄表时间{{item.readTime?item.readTime:'未抄表'}}</div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<a-col :span="6" style="display: flex; justify-content: flex-end;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'合闸':'拉闸'}}</div>
</a-col>
<a-col :span="24">
@ -247,18 +247,24 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
font-size:14px;
background: linear-gradient(to right, #1ea0fa, #017de9);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.lxClass{
font-size:14px;
background: linear-gradient(to right, #cccccc, #cccccc);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.tbClass{
background: #f6f6f6;

View File

@ -1,5 +1,5 @@
<template>
<div class="p-2">
<div style="padding: 4px;">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -23,8 +23,8 @@
</a-row>
</a-form>
</div>
<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-row style="margin-top: -18px;">
<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 6px 6px 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title>
<a-row style="font-weight: normal;">
@ -32,7 +32,7 @@
<div>SN<span style="font-weight: bold;">{{item.address}}</span></div>
<div style="font-size: 12px;">抄表时间{{item.readTime?item.readTime:'未抄表'}}</div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<a-col :span="6" style="display: flex; justify-content: flex-end;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'开阀':'关阀'}}</div>
</a-col>
<a-col :span="24">
@ -46,7 +46,7 @@
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:5px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span>
</a-col>
<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.waterValue?item.waterValue:'0.00'}}</span>
</a-col>
<a-col :span="8" style="padding: 12px 0 0 5px;margin-top:18px;">
<div style="font-size: 12px;margin: 8px 0 -5px 2px;"></div>
@ -247,18 +247,24 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
font-size:14px;
background: linear-gradient(to right, #1ea0fa, #017de9);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.lxClass{
font-size:14px;
background: linear-gradient(to right, #cccccc, #cccccc);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.tbClass{
background: #f6f6f6;

View File

@ -1,5 +1,5 @@
<template>
<div class="p-2">
<div style="padding: 4px;">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -17,14 +17,17 @@
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
<span class="table-page-search-submitButtons">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
<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-row style="margin-top: -18px;">
<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 6px 6px 8px;">
<a-card style="width: 100%;border-radius: 8px;" :headStyle="{ height: '70px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title>
<a-row style="font-weight: normal;">
@ -32,7 +35,7 @@
<div>SN<span style="font-weight: bold;">{{item.sn}}</span></div>
<div style="font-size: 12px;">抄表时间{{item.reportingTime?item.reportingTime:'未抄表'}}</div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<a-col :span="6" style="display: flex; justify-content: flex-end;">
<div :class="item.status=='0'?'zxClass':'lxClass'">{{item.status=='0'?'在线':'离线'}}</div>
</a-col>
<a-col :span="24">
@ -204,18 +207,24 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
font-size:14px;
background: linear-gradient(to right, #1ea0fa, #017de9);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.lxClass{
font-size:14px;
background: linear-gradient(to right, #cccccc, #cccccc);
border-radius: 8px;
height: 35px;
height: 25px;
color: white;
line-height: 35px;
line-height: 25px;
text-align: center;
width:50px;
margin-top:11px;
}
.tbClass{
background: #f6f6f6;

View File

@ -24,8 +24,8 @@
</a-row>
</a-form>
</div>
<a-row>
<a-col v-for="directive of tableData.records" :key="directive.id" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="4" style="padding: 5px 10px 0 0;height: 200px;">
<a-row style="margin-top: -5px;">
<a-col v-for="directive of tableData.records" :key="directive.id" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="4" style="padding: 5px 14px 0 0;height: 200px;">
<a-row class="cardDivClass">
<a-col :span="24">
<a-row style="padding: 10px">

View File

@ -73,7 +73,7 @@
</a-form>
</div>
<div>
<div style="width:350px;float: left;height:80vh; background: white; overflow:auto;position: relative;margin-right: 18px;">
<div style="width:350px;float: left;height:80vh; background: white; overflow:auto;position: relative;margin-right: 14px;">
<div
style="position: absolute; top: 8px; right: 8px; z-index: 1; background: white; padding: 0px; border-radius: 4px;">
<a-radio-group v-model:value="filterIzEnabled" @change="searchQuery">

View File

@ -22,8 +22,8 @@
</a-row>
</a-form>
</div>
<a-row>
<a-col :span="6" v-for="directive of tableData.records" :key="directive.id" style="padding: 5px 10px 0 0;height: 240px;">
<a-row style="margin-top: -5px;">
<a-col v-for="directive of tableData.records" :key="directive.id" style="padding: 7px 14px 3px 0;height: 235px;" :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="6" >
<a-row style="padding: 5px;background-color: white;border-radius: 8px;height: 220px;">
<a-col :span="4">
<div class="bjclass">