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

修改bug

This commit is contained in:
yangjun 2025-08-18 17:01:45 +08:00
parent c581bcc6f0
commit 86575e6b29
6 changed files with 155 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 55 KiB

48
src/views/deviceSync/compoents/DbList.vue
View File

@ -1,34 +1,48 @@
<template>
<a-col v-for="(item,index) in tableData" :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: '60px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title>
<a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;">
<div style="font-size: 12px;">SN：<span style="font-weight: bold;">{{item.address}}</span></div>
<div style="font-size: 12px;">设备类型：电表</div>
<div style="font-size: 12px;">设备类型：<a-tag color="red">电表</a-tag></div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
</a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col>
</a-row>
</template>
<a-row>
<a-col :span="12" style="margin-top: -10px;">
NUID: {{item.nuId?item.nuId:'未配置'}}
</a-col>
<a-col :span="12" style="margin-top: -10px;">
用电量：{{item.eleValue?item.eleValue:'0.0'}}KWH
</a-col>
<a-col :span="12" style="text-align: left;margin-top: 10px;">
同步状态：{{item.syncType =='1'?'已同步':'未同步'}}
<a-row>
<a-col :span="24" style="margin-top: -10px;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:10px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span>
</a-col>
<a-col :span="12" style="text-align: left;margin-top: 10px;">
维修状态：
<span v-if="item.maintainStatus=='0'">正常</span>
<span v-if="item.maintainStatus=='1'" style="color: red;">维修中</span>
<span v-if="item.maintainStatus=='2'">报废</span>
<a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;">
<span>{{item.eleValue?item.eleValue:'0.00'}}</span>
</a-col>
<a-col :span="24" style="text-align: center;margin-top: 20px;">
<a-col :span="8" style="padding: 12px 0 0 5px;">
<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="text-align: left;">
<div style="font-weight: 700;font-size:16px;">{{item.syncType =='1'?'已同步':'未同步'}}</div>
<div style="font-size: 12px;">同步状态</div>
</a-col>
<a-col :span="12" style="text-align: right;">
<div style="font-weight: 700;font-size:16px;">
<span v-if="item.maintainStatus=='0'">正常</span>
<span v-if="item.maintainStatus=='1'" style="color: red;">维修中</span>
<span v-if="item.maintainStatus=='2'">报废</span>
</div>
<div style="font-size: 12px;">维修状态</div>
</a-col>
<a-col>
<a-divider style="margin: 12px 0 16px 0px;" />
</a-col>
<a-col :span="24" style="text-align: center;">
<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>

54
src/views/deviceSync/compoents/SbList.vue
View File

@ -1,41 +1,47 @@
<template>
<a-col v-for="(item,index) in tableData" :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: '60px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title>
<a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;">
<div style="font-size: 12px;">SN：<span style="font-weight: bold;">{{item.address}}</span></div>
<div style="font-size: 12px;">设备类型：水表</div>
<div style="font-size: 12px;">设备类型：<a-tag color="blue">水表</a-tag></div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<div :class="item.relayState=='1'?'zxClass':'lxClass'">{{item.relayState=='1'?'在线':'离线'}}</div>
</a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col>
</a-row>
</template>
<a-row>
<a-col :span="12" style="margin-top: -10px;">
NUID: {{item.nuId?item.nuId:'未配置'}}
</a-col>
<a-col :span="12" style="margin-top: -10px;">
用水量：{{item.eleValue?item.eleValue:'0.0'}}m³
</a-col>
<a-col :span="12" style="text-align: left;margin-top: 10px;">
同步状态：{{item.syncType =='1'?'已同步':'未同步'}}
<a-row>
<a-col :span="24" style="margin-top: -10px;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:10px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span>
</a-col>
<a-col :span="12" style="text-align: left;margin-top: 10px;">
维修状态：
<span v-if="item.maintainStatus=='0'">正常</span>
<span v-if="item.maintainStatus=='1'" style="color: red;">维修中</span>
<span v-if="item.maintainStatus=='2'">报废</span>
<a-col :span="14" style="text-align: right;font-size: 44px;font-weight: bold;">
<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:18px;">
<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="24" style="text-align: center;margin-top: 20px;">
<a-col :span="8" style="padding: 12px 0 0 5px;">
<div style="font-size: 12px;margin: 8px 0 -5px 2px;">m³</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="text-align: left;">
<div style="font-weight: 700;font-size:16px;">{{item.syncType =='1'?'已同步':'未同步'}}</div>
<div style="font-size: 12px;">同步状态</div>
</a-col>
<a-col :span="12" style="text-align: right;">
<div style="font-weight: 700;font-size:16px;">
<span v-if="item.maintainStatus=='0'">正常</span>
<span v-if="item.maintainStatus=='1'" style="color: red;">维修中</span>
<span v-if="item.maintainStatus=='2'">报废</span>
</div>
<div style="font-size: 12px;">维修状态</div>
</a-col>
<a-col>
<a-divider style="margin: 12px 0 16px 0px;" />
</a-col>
<a-col :span="24" style="text-align: center;">
<span style="display:inline-block;cursor: pointer;" @click="handleRead(item)">
<span class="tbClass"><img src="../../../assets/iot/a11.png" style="width:20px;" /></span><br/>
<span class="antTitle">抄表</span>

34
src/views/deviceSync/compoents/SxtList.vue
View File

@ -1,31 +1,43 @@
<template>
<a-col v-for="(item,index) in tableData" :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: '60px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title>
<a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;">
<div style="font-size: 12px;">SN：<span style="font-weight: bold;">{{item.sn}}</span></div>
<div style="font-size: 12px;">设备类型：摄像头</div>
<div style="font-size: 12px;">设备类型：<a-tag color="purple">摄像头</a-tag></div>
</a-col>
<a-col :span="6" style="text-align: center;padding-top: 4px;">
<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-row>
</template>
<a-row>
<a-col :span="24" style="margin-top: -10px;">
NUID: {{item.nuId?item.nuId:'未配置'}}
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:10px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span>
</a-col>
<a-col :span="12" style="text-align: left;margin-top: 10px;">
同步状态：{{item.syncType =='1'?'已同步':'未同步'}}
<a-col :span="24" style="text-align: center;">
<img src="../../../assets/iot/sxt.png" style="width: 84px;margin-top: 10px;">
</a-col>
<a-col :span="12" style="text-align: left;margin-top: 10px;">
维修状态：
<span v-if="item.maintainStatus=='0'">正常</span>
<span v-if="item.maintainStatus=='1'" style="color: red;">维修中</span>
<span v-if="item.maintainStatus=='2'">报废</span>
<a-col :span="12" style="text-align: left;margin-top: -20px;">
<div style="font-weight: 700;font-size:16px;">{{item.syncType =='1'?'已同步':'未同步'}}</div>
<div style="font-size: 12px;">同步状态</div>
</a-col>
<a-col :span="24" style="text-align: center;margin-top: 20px;">
<a-col :span="12" style="text-align: right;margin-top: -20px;">
<div style="font-weight: 700;font-size:16px;">
<span v-if="item.maintainStatus=='0'">正常</span>
<span v-if="item.maintainStatus=='1'" style="color: red;">维修中</span>
<span v-if="item.maintainStatus=='2'">报废</span>
</div>
<div style="font-size: 12px;">维修状态</div>
</a-col>
<a-col>
<a-divider style="margin: 12px 0 16px 0px;" />
</a-col>
<a-col :span="24" 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/>
<span class="antTitle">预览</span>

58
src/views/deviceSync/compoents/WsdjList.vue
View File

@ -1,41 +1,57 @@
<template>
<a-col v-for="(item,index) in tableData" :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: '60px', padding: '0 24px',border:'0px' }" :bodyStyle="{ padding: '24px 24px 4px 24px' }">
<template #title>
<a-row style="font-weight: normal;">
<a-col :span="18" style="font-size: 14px;">
<div style="font-size: 12px;">SN：<span style="font-weight: bold;">{{item.sn}}</span></div>
<div style="font-size: 12px;">设备类型：温湿度计</div>
<div style="font-size: 12px;">设备类型：<a-tag color="green">温湿度计</a-tag></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>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col>
</a-row>
</template>
<a-row>
<a-col :span="24" style="margin-top: -10px;">
<span style="text-align: right;background:#f6f6f6;padding: 2px 10px;border-radius:10px;">NUID: {{item.nuId?item.nuId:'未配置'}}</span>
</a-col>
<a-col :span="24" style="padding: 12px 0 0 5px;">
<a-row>
<a-col :span="12" style="margin-top: -10px;">
温度：{{item.temperature?item.temperature:'-'}}℃
<a-col :span="11" style="text-align: center;">
<span><img src="../../../assets/iot/a8.png" style="width:25px;margin-top: -15px;" /></span>
<span style="font-size: 30px;font-weight:700;">{{item.temperature?item.temperature:'-'}}</span>
<span style="font-size: 16px;">℃</span>
</a-col>
<a-col :span="12" style="margin-top: -10px;">
湿度：{{item.humidity?item.humidity:'-'}}%
<a-col :span="2" style="text-align: center;">
<a-divider type="vertical" style="height: 40px;"/>
</a-col>
<a-col :span="12" style="text-align: left;margin-top: 10px;">
同步状态：{{item.syncType =='1'?'已同步':'未同步'}}
<a-col :span="11" style="text-align: center;">
<span style="margin-top:0px;"><img src="../../../assets/iot/a9.png" style="width:25px;margin-top: -15px;" /></span>
<span style="font-size: 30px;font-weight:700;margin-left: 6px;">{{item.humidity?item.humidity:'-'}}</span>
<span style="font-size: 16px;">%</span>
</a-col>
</a-row>
</a-col>
<a-col :span="12" style="text-align: left;margin-top: 10px;">
维修状态：
<span v-if="item.maintainStatus=='0'">正常</span>
<span v-if="item.maintainStatus=='1'" style="color: red;">维修中</span>
<span v-if="item.maintainStatus=='2'">报废</span>
<a-col :span="12" style="text-align: left;margin-top:9px;">
<div style="font-weight: 700;font-size:16px;">{{item.syncType =='1'?'已同步':'未同步'}}</div>
<div style="font-size: 12px;">同步状态</div>
</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="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="24" style="text-align: center;margin-top: 20px;">
<a-col :span="12" style="text-align: right;margin-top:9px;">
<div style="font-weight: 700;font-size:16px;">
<span v-if="item.maintainStatus=='0'">正常</span>
<span v-if="item.maintainStatus=='1'" style="color: red;">维修中</span>
<span v-if="item.maintainStatus=='2'">报废</span>
</div>
<div style="font-size: 12px;">维修状态</div>
</a-col>
<a-col>
<a-divider style="margin: 12px 0 16px 0px;" />
</a-col>
<a-col :span="24" style="text-align: center;">
<span style="display:inline-block;cursor: pointer;" @click="handleRead(item)">
<span class="tbClass"><img src="../../../assets/iot/a7.png" style="width:20px;" /></span><br/>
<span class="antTitle">抄表</span>

146
src/views/deviceSync/index.vue
View File

@ -26,11 +26,12 @@
style="min-height: 290px;padding-right: 8px;">
<div class="org-card" :class="{ 'active': item.orgId == orgData?.orgId }">
<a-card
:class="{ 'selected-card': selectedOrgs.some(org => org.orgCode === item.orgCode) }"
style="width: 100%; border-radius: 8px; border:0px; "
:headStyle="{ height: '60px', padding: '0 24px' }"
:class="{ 'selected-card': orgData?.orgCode === item.orgCode }"
style="width: 100%; border-radius: 8px; "
:headStyle="{ height: '60px', padding: '0 24px',border:'0px' }"
:style="{ cursor: showChoose ? 'pointer' : 'default' }"
:bodyStyle="{ padding: '24px 24px 4px 24px !important' }">
:bodyStyle="{ padding: '24px 24px 4px 24px !important' }"
@click="handleCardSelect(item)">
<template #title>
<a-row style="font-weight: normal;">
<a-col :span="21" style="font-size: 14px; padding-top: 4px;">
@ -42,15 +43,12 @@
<a-col :span="3" style="text-align: center; padding-top: 4px;">
<div class="zxClass">{{ item.orgCode }}</div>
</a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col>
</a-row>
</template>
<!-- <p>机构负责人：{{ item.orgLeader }}</p>
<p>负责人电话：{{ item.orgLeaderPhone }}</p>
<p>加盟时间：{{ item.franchiseTime?.substring(0, 10) }}</p>
<p :title="item.comRegisterAddress">
机构地址：{{ item.comRegisterAddress }}</p> -->
<div>
<div style="margin-top: -20px;">
<div><span style="color: #909399;">机构负责人：</span>{{ item.orgLeader }}</div>
<div><span style="color: #909399;">负责人电话：</span>{{ item.orgLeaderPhone }}</div>
</div>
@ -92,17 +90,31 @@
<a-button type="primary" @click="handlePrview(orgData)" style="margin-left: 10px;">设备预览</a-button>
</a-col>
<a-col v-for="(item,index) in nuDataList" style="padding: 0 5px 10px 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']"
:headStyle="{ height: '60px', padding: '0 24px',border:'0px' }"
@mouseenter="item.key"
@mouseleave="item.key"
@click="isSelected = item">
<p>单元名称：{{item.nuName}}</p>
<p>创建时间：{{item.createTime}}</p>
<p>单元类型：{{item.areaFlagText}}</p>
<div style="text-align: center;">
<a-button size="small" @click="handleSbgl(item)" >设备管理</a-button>
<template #title>
<a-row>
<a-col>
NUID：{{item.nuId}}
</a-col>
<a-col :span="24">
<a-divider style="margin: 10px 0 0 0" />
</a-col>
</a-row>
</template>
<div style="margin-top: -20px;">
<p>单元名称：{{item.nuName}}</p>
<p>创建时间：{{item.createTime}}</p>
<p>单元类型：{{item.areaFlagText}}</p>
<div style="text-align: center;">
<a-button size="small" @click="handleSbgl(item)" >设备管理</a-button>
</div>
</div>
</a-card>
</a-col>
<a-col :span="24" v-show="nuDataList.length == 0" >
@ -203,9 +215,13 @@ const handleOrgSelected = async (org) => {
orgSelectedCon.value = false;
getNuList(org)
};
//点击卡片
const handleCardSelect = async (org) => {
orgData.value = org;
};
function getNuList(org){
defHttp.get({ url: '/admin/nuBaseInfo/nuBaseInfo/getBaseWlsbList', params: {orgCode: org.orgCode} }).then(res => {
console.log("🚀 ~ handleOrgSelected ~ res:", res)
nuDataList.value = res
})
}
@ -301,13 +317,6 @@ onMounted(() => {
/* 新增的机构卡片样式 */
.org-cards-container {
max-height: 75vh;
overflow-y: auto;
padding: 8px;
}
.org-card {
margin-bottom: 16px;
border-radius: 8px;
@ -337,93 +346,6 @@ onMounted(() => {
}
.org-container {
//background: transparent;
background: white;
.org-card {
padding: 0px;
border: 1px solid #f0f0f0;
border-radius: 8px;
// transition: all 0.3s;
background: white;
&:hover {
// border-color: #1890ff;
// box-shadow: 0 2px 12px rgba(24, 144, 255, 0.2);
}
&.active {
border: 1px solid #1890ff;
//background: #f0f8ff;
}
.org-header {
display: flex;
align-items: center;
margin-bottom: 12px;
.org-title {
margin: 0 0 0 8px;
font-size: 16px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
.contact-line {
display: flex;
justify-content: space-between;
>span {
display: inline-flex;
align-items: center;
.anticon {
margin-right: 4px;
color: #8c8c8c;
}
}
}
:deep(.ant-descriptions) {
.ant-descriptions-item-label {
width: 80px;
color: #666;
}
}
}
}
.org-info-content {
.info-row {
display: flex;
margin-bottom: 5px;
&:last-child {
margin-bottom: 0;
}
}
.info-item {
flex: 1;
padding: 0 8px;
.label {
color: #8c8c8c;
font-size: 13px;
margin-right: 8px;
}
.value {
color: #262626;
font-size: 13px;
word-break: break-all;
}
}
}
.zxClass {
font-size: 12px;
background: linear-gradient(to right, #1ea0fa, #017de9);