diff --git a/pages/dev-ops/device.vue b/pages/dev-ops/device.vue
index d2ec987..9a30884 100644
--- a/pages/dev-ops/device.vue
+++ b/pages/dev-ops/device.vue
@@ -2,12 +2,12 @@
 	<z-paging ref="paging" @query="queryList" v-model="dataList" :auto-show-system-loading="true"
 		empty-view-text="抱歉，暂时还没有相关数据！">
 		<template #top>
-			<custom-nav-bar :left="true" title="基站"></custom-nav-bar>
+			<custom-nav-bar :left="true" title="设备运维"></custom-nav-bar>
 		</template>
 
 		<view class="card">
-			<uni-collapse>
-				<uni-collapse-item title-border="none" :border="false" :open="true">
+			<uni-collapse v-if="dataList.length">
+				<uni-collapse-item title-border="none" :border="false" v-if="dataList[0]">
 					<template v-slot:title>
 						<view class="cards-title">
 							<view>
@@ -16,80 +16,73 @@
 						</view>
 					</template>
 					<view class="content">
-						<view class="cards-content">
-							<!-- <view class="card card-grey">
-								<view class="cards-title">
-									<view>
-										<view>基站：E0002001</view>
-										<uni-tag class="bg-green" :circle="true" text="在线" />
-									</view>
-									<view class="right">
-										<u-button type="success" size="mini" text="刷新" />
-									</view>
-								</view>
-								<view class="cards-content">
-									<view class="txt-list">
-										<view class="list2">
-											<view style="flex: 1 1 0%;"><text>软/硬件版本：</text>20 / JSY_LS_RTOS</view>
-											<view style="width: 30%;"><text>频段：</text>433</view>
-										</view>
-									</view>
-									<view class="btn-grid">
-										<u-button type="primary" size="normal" text="更换基站" />
-										<u-button type="primary" size="normal" text="下发列表" />
-										<u-button type="primary" size="normal" text="修改频段" />
-										<u-button type="primary" size="normal" text="获取配置" />
-										<u-button type="primary" size="normal" text="压力校准" />
-										<u-button type="primary" size="normal" text="重启" />
-										<u-button type="primary">
-											子设备<u-badge type="success" max="999" />
-										</u-button>
-										<u-button type="primary" size="normal" text="基站升级" />
-										<u-button type="primary" size="normal" text="阀门升级" />
-									</view>
-								</view>
-							</view> -->
+						<view class="cards-content" v-for="item in dataList[0]">
 							<view class="card card-grey">
 								<view class="cards-title">
 									<view>
-										<view>基站：E0002001</view>
-										<uni-tag class="bg-red" :circle="true" text="离线" />
+										<view>{{ item.deviceCode}}</view>
+										<uni-tag class="bg-green" :circle="true" text="在线"
+											v-if="dc.dataObj[item.deviceCode]?.online" />
+										<uni-tag class="bg-red" :circle="true" text="离线" v-else />
 									</view>
 									<view class="right">
-										<u-button type="success" size="mini" text="刷新" />
+										<u-button type="success" size="mini" text="刷新"
+											:loading="dc.dataObj[item.deviceCode]?.refresh"
+											@click="dc.refreshDeviceItem(item.deviceCode, item)" />
 									</view>
 								</view>
 								<view class="cards-content">
 									<view class="txt-list">
 										<view class="list2">
-											<view style="width: 70%;"><text>软/硬件版本：</text>20 / JSY_LS_RTOS</view>
-											<view style="width: 30%;"><text>频段：</text>433</view>
+											<view style="width: 70%;">
+												<text>软/硬件版本：</text>
+												{{ dataObj[item.deviceCode]?.sv || item.softVer}}
+												/
+												{{ dataObj[item.deviceCode]?.dv || item.deviceVersion}}
+											</view>
+											<view style="width: 30%;">
+												<text>频段：</text>{{ dataObj[item.deviceCode]?.lf || item.rolaFrequency}}
+											</view>
 										</view>
 									</view>
 									<view class="btn-grid">
-										<u-button type="primary" size="normal" text="更换基站" />
-										<u-button type="primary" size="normal" text="下发列表" />
-										<u-button type="primary" size="normal" text="修改频段" />
-										<u-button type="primary" size="normal" text="获取配置" />
-										<u-button type="primary" size="normal" text="压力校准" />
-										<u-button type="primary" size="normal" text="重启" />
-										<u-button type="primary">
-											子设备<u-badge type="success" max="999" />
+										<u-button type="primary" size="normal" text="更换基站" @click="changeStation(item)"
+											disabled />
+										<u-button type="primary" size="normal" text="下发列表"
+											v-hasPermi="['iot:dev-ops:gvl']" @click="sendTopoList(item)" />
+										<u-button type="primary" size="normal" text="修改频段"
+											v-hasPermi="['iot:dev-ops:slf']" @click="SLF(item)" />
+										<u-button type="primary" size="normal" text="获取配置"
+											v-hasPermi="['iot:dev-ops:gsc']" @click="getStationConfig(item)" />
+										<u-button type="primary" size="normal" text="压力校准"
+											@click="pressureCalibrationTopo(item)" disabled />
+										<u-button type="primary" size="normal" text="重启" @click="stationRestart(item)"
+											disabled />
+										<u-button type="primary" v-hasPermi="['iot:dev-ops:valve']"
+											@click="topoDevice(item)">
+											子设备<u-badge type="success" max="999" :value="item.topoCount" />
 										</u-button>
-										<u-button type="primary" size="normal" text="基站升级" />
-										<u-button type="primary" size="normal" text="阀门升级" />
+										<u-button type="primary" size="normal" text="基站升级"
+											v-hasPermi="['iot:dev-ops:upgradeStation']" @click="upgradeStation(item)" />
+										<u-button type="primary" size="normal" text="阀门升级"
+											@click="upgradeTopoValve(item)" disabled />
 									</view>
 								</view>
 							</view>
 						</view>
-
 					</view>
 				</uni-collapse-item>
-			</uni-collapse>
-		</view>
-		<view class="card">
-			<uni-collapse>
-				<uni-collapse-item title-border="none" :border="false">
+				<uni-collapse-item title-border="none" :border="false" v-if="dataList[1]">
+					<template v-slot:title>
+						<view class="cards-title">
+							<view>
+								<view class="text">蝶阀</view>
+							</view>
+						</view>
+					</template>
+					<view class="content"></view>
+				</uni-collapse-item>
+				<uni-collapse-item title-border="none" :border="false" v-if="dataList[2]">
 					<template v-slot:title>
 						<view class="cards-title">
 							<view>
@@ -98,60 +91,54 @@
 						</view>
 					</template>
 					<view class="content">
-						<view class="cards-content">
+						<view class="cards-content" v-for="item in dataList[2]">
 							<view class="card card-grey">
 								<view class="cards-title">
 									<view>
-										<view>三通阀：F4000101</view>
-										<uni-tag class="bg-green" :circle="true" text="在线" />
+										<view>{{ item.device.deviceCode}}</view>
+										<uni-tag class="bg-green" :circle="true" text="在线"
+											v-if="dc.dataObj[item.device.deviceCode]?.online" />
+										<uni-tag class="bg-red" :circle="true" text="离线" v-else />
 									</view>
 									<view class="right">
-										<u-button type="success" size="mini" text="刷新" />
+										<u-button type="success" size="mini" text="刷新"
+											:loading="dc.dataObj[item.device.deviceCode]?.refresh"
+											@click="dc.refreshDeviceItem(item.device.deviceCode, item)" />
 									</view>
 								</view>
 								<view class="cards-content">
 									<view class="txt-list">
 										<view class="list2">
-											<view style="width: 60%;"><text>软/硬件版本：</text>/hup</view>
-											<view style="width: 40%;"><text>信号强度：</text>29</view>
-											<view style="width: 60%;"><text>电量：</text>100%</view>
-											<view style="width: 40%;"><text>压力：</text>[-0.02,-0.02]</view>
+											<view style="width: 60%;">
+												<text>软/硬件版本：</text>
+												{{ dataObj[item.device.deviceCode]?.sv || item.device.deviceCode.softVer}}
+												/
+												{{ dataObj[item.device.deviceCode]?.dv || item.device.deviceVersion}}
+											</view>
+											<view style="width: 40%;">
+												<text>信号强度：</text>{{ dc.dataObj[item.device.deviceCode]?.comm.rssi || '-' }}
+											</view>
+											<view style="width: 60%;">
+												<text>电量：</text>{{ dc.dataObj[item.device.deviceCode]?.adc.b || '-' }}%
+											</view>
+											<view style="width: 40%;">
+												<text>压力：</text>{{ dc.dataObj[item.device.deviceCode]?.adc.p || '-' }}
+											</view>
 										</view>
 									</view>
 									<view class="btn-grid">
-										<u-button type="primary" size="normal" text="获取配置" />
-										<u-button type="primary" size="normal" text="重启" />
-										<u-button type="primary" size="normal" text="升级" />
-										<u-button type="primary" size="normal" text="压力校准" />
-										<u-button type="primary" size="normal" text="压力查询" />
-									</view>
-								</view>
-							</view>
-							<view class="card card-grey">
-								<view class="cards-title">
-									<view>
-										<view>三通阀：F4000101</view>
-										<uni-tag class="bg-red" :circle="true" text="离线" />
-									</view>
-									<view class="right">
-										<u-button type="success" size="mini" text="刷新" />
-									</view>
-								</view>
-								<view class="cards-content">
-									<view class="txt-list">
-										<view class="list2">
-											<view style="width: 60%;"><text>软/硬件版本：</text>/hup</view>
-											<view style="width: 40%;"><text>信号强度：</text>29</view>
-											<view style="width: 60%;"><text>电量：</text>100%</view>
-											<view style="width: 40%;"><text>压力：</text>[-0.02,-0.02]</view>
-										</view>
-									</view>
-									<view class="btn-grid">
-										<u-button type="primary" size="normal" text="获取配置" />
-										<u-button type="primary" size="normal" text="重启" />
-										<u-button type="primary" size="normal" text="升级" />
-										<u-button type="primary" size="normal" text="压力校准" />
-										<u-button type="primary" size="normal" text="压力查询" />
+										<u-button type="primary" size="normal" text="获取配置"
+											@click="getValve4Config(item.device)" disabled />
+										<u-button type="primary" size="normal" text="重启"
+											@click="restartValve4(item.device)" disabled />
+										<u-button type="primary" size="normal" text="升级"
+											v-if="item.device.newDeviceVersionId"
+											v-hasPermi="['iot:dev-ops:upgradeValve4G']"
+											@click="upgradeValve4(item.device)" />
+										<u-button type="primary" size="normal" text="压力校准"
+											@click="pressureCalibrationValve4(item.device)" disabled />
+										<u-button type="primary" size="normal" text="压力查询"
+											@click="pressureSelect(item.device)" disabled />
 									</view>
 								</view>
 							</view>
@@ -160,177 +147,6 @@
 				</uni-collapse-item>
 			</uni-collapse>
 		</view>
-		<!-- <uni-collapse accordion v-if="dataList.length">
-			<uni-collapse-item title="基站">
-				<view class="index-container" v-if="dataList[0]">
-					<view class="item-container" v-for="item in dataList[0]">
-						<view style="display: flex; align-items: center; justify-content: space-between;">
-							<view class="flex-text" style="margin: 15px;">
-								<view class="flex-text-one" style="color: black;">基站：</view>
-								<view>{{ item.deviceCode}}</view>
-								<view style="margin-left: 10px;">
-									<u-tag text="在线" type="success" plain v-if="dc.dataObj[item.deviceCode]?.online" />
-									<u-tag text="离线" type="error" plain v-else />
-								</view>
-							</view>
-							<view style="margin-right: 5px;">
-								<u-button type="success" text="刷新" icon="reload"
-									:loading="dc.dataObj[item.deviceCode]?.refresh"
-									@click="dc.refreshDeviceItem(item.deviceCode, item)" />
-							</view>
-						</view>
-						<u-gap height="1" bgColor="#D2D2D2"></u-gap>
-						<view style="display: flex;justify-content: space-between;align-items: center;">
-							<uni-row class="data">
-								<uni-col :span="12">
-									<view class="flex-text global-font-size-1">
-										<view class="flex-text-one">软/硬件版本：</view>
-										<view>{{ dataObj[item.deviceCode]?.sv || item.softVer}} /
-											{{ dataObj[item.deviceCode]?.dv || item.deviceVersion}}
-										</view>
-									</view>
-								</uni-col>
-								<uni-col :span="12">
-									<view class="flex-text global-font-size-1">
-										<view class="flex-text-one">频段：</view>
-										<view>{{ dataObj[item.deviceCode]?.lf || item.rolaFrequency}}</view>
-									</view>
-								</uni-col>
-								<uni-col :span="8">
-									<u-button type="success" @click="changeStation(item)" disabled>
-										更换基站
-									</u-button>
-								</uni-col>
-								<uni-col :span="8" v-hasPermi="['iot:dev-ops:gvl']">
-									<u-button type="success" @click="sendTopoList(item)">
-										下发列表
-									</u-button>
-								</uni-col>
-								<uni-col :span="8" v-hasPermi="['iot:dev-ops:slf']">
-									<u-button type="success" @click="SLF(item)">
-										修改频段
-									</u-button>
-								</uni-col>
-								<uni-col :span="8" v-hasPermi="['iot:dev-ops:gsc']">
-									<u-button type="success" @click="getStationConfig(item)">
-										获取配置
-									</u-button>
-								</uni-col>
-								<uni-col :span="8">
-									<u-button type="success" @click="pressureCalibrationTopo(item)" disabled>
-										压力校准
-									</u-button>
-								</uni-col>
-								<uni-col :span="8">
-									<u-button type="success" @click="stationRestart(item)" disabled>
-										重启
-									</u-button>
-								</uni-col>
-								<uni-col :span="8" v-hasPermi="['iot:dev-ops:valve']">
-									<u-button type="success" @click="topoDevice(item)">
-										子设备<u-badge type="primary" max="999" :value="item.topoCount" />
-									</u-button>
-								</uni-col>
-								<uni-col :span="8" v-hasPermi="['iot:dev-ops:upgradeStation']"
-									v-if="item.newDeviceVersionId">
-									<u-button type="success" @click="upgradeStation(item)">
-										基站升级
-									</u-button>
-								</uni-col>
-								<uni-col :span="8">
-									<u-button type="success" @click="upgradeTopoValve(item)" disabled>
-										阀门升级
-									</u-button>
-								</uni-col>
-							</uni-row>
-						</view>
-					</view>
-				</view>
-			</uni-collapse-item>
-			<uni-collapse-item title="蝶阀">
-				<view class="index-container" v-if="dataList[1]"></view>
-			</uni-collapse-item>
-			<uni-collapse-item title="4G阀门">
-				<view class="index-container" v-if="dataList[2]">
-					<view class="item-container" v-for="item in dataList[2]">
-						<view style="display: flex; align-items: center; justify-content: space-between;">
-							<view class="flex-text" style="margin: 15px;">
-								<view class="flex-text-one" style="color: black;">三通阀：</view>
-								<view>{{ item.device.deviceCode}}</view>
-								<view style="margin-left: 10px;">
-									<u-tag text="在线" type="success" plain
-										v-if="dc.dataObj[item.device.deviceCode]?.online" />
-									<u-tag text="离线" type="error" plain v-else />
-								</view>
-							</view>
-							<view style="margin-right: 5px;">
-								<u-button type="success" text="刷新" icon="reload"
-									:loading="dc.dataObj[item.device.deviceCode]?.refresh"
-									@click="dc.refreshDeviceItem(item.device.deviceCode, item)" />
-							</view>
-						</view>
-						<u-gap height="1" bgColor="#D2D2D2"></u-gap>
-						<view style="display: flex;justify-content: space-between;align-items: center;">
-							<uni-row class="data">
-								<uni-col :span="12">
-									<view class="flex-text global-font-size-1">
-										<view class="flex-text-one">软/硬件版本：</view>
-										<view>{{ dataObj[item.device.deviceCode]?.sv || item.device.deviceCode.softVer}}
-											/
-											{{ dataObj[item.device.deviceCode]?.dv || item.device.deviceVersion}}
-										</view>
-									</view>
-								</uni-col>
-								<uni-col :span="12">
-									<view class="flex-text global-font-size-1">
-										<view class="flex-text-one">信号强度：</view>
-										<view>{{ dc.dataObj[item.device.deviceCode]?.comm.rssi || '-' }}</view>
-									</view>
-								</uni-col>
-								<uni-col :span="12">
-									<view class="flex-text global-font-size-1">
-										<view class="flex-text-one">电量：</view>
-										<view>{{ dc.dataObj[item.device.deviceCode]?.adc.b || '-' }}%</view>
-									</view>
-								</uni-col>
-								<uni-col :span="12">
-									<view class="flex-text global-font-size-1">
-										<view class="flex-text-one">压力：</view>
-										<view>{{ dc.dataObj[item.device.deviceCode]?.adc.p || '-' }}</view>
-									</view>
-								</uni-col>
-								<uni-col :span="8">
-									<u-button type="success" @click="getValve4Config(item.device)" disabled>
-										获取配置
-									</u-button>
-								</uni-col>
-								<uni-col :span="8">
-									<u-button type="success" @click="restartValve4(item.device)" disabled>
-										重启
-									</u-button>
-								</uni-col>
-								<uni-col :span="8" v-hasPermi="['iot:dev-ops:upgradeValve4G']"
-									v-if="item.device.newDeviceVersionId">
-									<u-button type="success" @click="upgradeValve4(item.device)">
-										升级
-									</u-button>
-								</uni-col>
-								<uni-col :span="12">
-									<u-button type="success" @click="pressureCalibrationValve4(item.device)" disabled>
-										压力校准
-									</u-button>
-								</uni-col>
-								<uni-col :span="12">
-									<u-button type="success" @click="pressureSelect(item.device)" disabled>
-										压力查询
-									</u-button>
-								</uni-col>
-							</uni-row>
-						</view>
-					</view>
-				</view>
-			</uni-collapse-item>
-		</uni-collapse> -->
 	</z-paging>
 
 	<!-- 修改基站频段 -->