fix: 功能优化,新增数据查询、设备属性、报警设置3个按钮及对应功能修改。
This commit is contained in:
@@ -5,7 +5,8 @@
|
||||
<nut-config-provider :theme-vars="themeVars">
|
||||
<view class="body">
|
||||
<nut-row>
|
||||
<nut-col :span="24">
|
||||
<!-- 设备信息区域 -->
|
||||
<nut-col :span="24" v-if="!section || section === 'deviceInfo'">
|
||||
<nut-cell class="wqm_body">
|
||||
<nut-row>
|
||||
<nut-col :span="24" class="title"> 设备信息 </nut-col>
|
||||
@@ -63,10 +64,29 @@
|
||||
</nut-cell>
|
||||
</nut-cell-group>
|
||||
</nut-col>
|
||||
<!-- 将解除绑定按钮移到设备信息区域内 -->
|
||||
<nut-col :span="24" :style="{ marginTop: '20rpx' }">
|
||||
<nut-button
|
||||
block
|
||||
shape="square"
|
||||
size="large"
|
||||
color="#E22323"
|
||||
:style="{
|
||||
fontWeight: 'bold',
|
||||
fontSize: '14px !important',
|
||||
borderRadius: '10px',
|
||||
}"
|
||||
@click="unbind"
|
||||
:loading="b_isLoading"
|
||||
v-if="Uid==rootuserid"
|
||||
>解除绑定</nut-button
|
||||
>
|
||||
</nut-col>
|
||||
</nut-row>
|
||||
</nut-cell>
|
||||
</nut-col>
|
||||
<nut-col :span="24">
|
||||
<!-- 溶解氧配置区域 -->
|
||||
<nut-col :span="24" v-if="!section || section === 'alarmSettings'">
|
||||
<nut-cell class="wqm_body">
|
||||
<nut-row>
|
||||
<nut-col :span="24" class="title"> 溶解氧配置 </nut-col>
|
||||
@@ -336,40 +356,6 @@
|
||||
</nut-row>
|
||||
</nut-cell>
|
||||
</nut-col>
|
||||
<!-- <nut-col :span="24" :style="{ marginBottom: '20rpx' }">
|
||||
<nut-button
|
||||
block
|
||||
shape="square"
|
||||
size="large"
|
||||
color="#E22323"
|
||||
plain
|
||||
:style="{
|
||||
fontWeight: 'bold',
|
||||
fontSize: '14px !important',
|
||||
borderRadius: '10px',
|
||||
}"
|
||||
@click="removeDev"
|
||||
:loading="r_isLoading"
|
||||
>移除设备</nut-button
|
||||
>
|
||||
</nut-col> -->
|
||||
<nut-col :span="24">
|
||||
<nut-button
|
||||
block
|
||||
shape="square"
|
||||
size="large"
|
||||
color="#E22323"
|
||||
:style="{
|
||||
fontWeight: 'bold',
|
||||
fontSize: '14px !important',
|
||||
borderRadius: '10px',
|
||||
}"
|
||||
@click="unbind"
|
||||
:loading="b_isLoading"
|
||||
v-if="Uid==rootuserid"
|
||||
>解除绑定</nut-button
|
||||
>
|
||||
</nut-col>
|
||||
</nut-row>
|
||||
</view>
|
||||
</nut-config-provider>
|
||||
@@ -687,6 +673,7 @@ const instance = Taro.getCurrentInstance();
|
||||
const id = instance.router.params.id;
|
||||
const name = instance.router.params.name;
|
||||
const page = instance.router.params.page;
|
||||
const section = instance.router.params.section; // 获取区域参数
|
||||
// const name = undefined
|
||||
Taro.setNavigationBarTitle({
|
||||
title: "水质检测仪设置",
|
||||
|
||||
Reference in New Issue
Block a user