diff --git a/src/views/biz/nuBaseInfo/devicesBind/DbList.vue b/src/views/biz/nuBaseInfo/devicesBind/DbList.vue
index 7b41050..c8ffda6 100644
--- a/src/views/biz/nuBaseInfo/devicesBind/DbList.vue
+++ b/src/views/biz/nuBaseInfo/devicesBind/DbList.vue
@@ -27,14 +27,15 @@
用电量
-
+
-
+
+
电表
diff --git a/src/views/biz/nuBaseInfo/devicesBind/SbList.vue b/src/views/biz/nuBaseInfo/devicesBind/SbList.vue
index 92ae7bb..0485beb 100644
--- a/src/views/biz/nuBaseInfo/devicesBind/SbList.vue
+++ b/src/views/biz/nuBaseInfo/devicesBind/SbList.vue
@@ -27,14 +27,15 @@
用水量
-
+
-
+
+
水表
diff --git a/src/views/biz/nuBaseInfo/devicesBind/SxtList.vue b/src/views/biz/nuBaseInfo/devicesBind/SxtList.vue
index 921e0cc..cb4a117 100644
--- a/src/views/biz/nuBaseInfo/devicesBind/SxtList.vue
+++ b/src/views/biz/nuBaseInfo/devicesBind/SxtList.vue
@@ -23,14 +23,15 @@
-
+
-
- 正常
- 损坏
-
- 维修状态
+
+
+
+
+
+
diff --git a/src/views/biz/nuBaseInfo/devicesBind/WsdjList.vue b/src/views/biz/nuBaseInfo/devicesBind/WsdjList.vue
index 4cf0980..d16fe79 100644
--- a/src/views/biz/nuBaseInfo/devicesBind/WsdjList.vue
+++ b/src/views/biz/nuBaseInfo/devicesBind/WsdjList.vue
@@ -37,14 +37,15 @@
-
+
-
+
+
温湿度计
diff --git a/src/views/iot/manager/DeviceManagerList.vue b/src/views/iot/manager/DeviceManagerList.vue
index 52ef193..5ef33b2 100644
--- a/src/views/iot/manager/DeviceManagerList.vue
+++ b/src/views/iot/manager/DeviceManagerList.vue
@@ -152,15 +152,13 @@
return [
{
label: '绑定区域',
- onClick: handleDeviceBroken.bind(null, record),
- // ifShow: record.onlineStatus!='待集成' && record.dimension == '区域维度' && record.nuId == null
- ifShow: record.dimension == '区域维度' && record.nuId == null
+ onClick: handleDeviceGh.bind(null, record,"绑定"),
+ ifShow: record.onlineStatus!='待集成' && record.dimension == '区域维度' && record.nuId == null
},
{
label: '更换',
- onClick: handleDeviceGh.bind(null, record),
- // ifShow: (record.onlineStatus!='待集成' && record.dimension == '区域维度') && record.nuId != null
- ifShow: (record.dimension == '区域维度') && record.nuId != null
+ onClick: handleDeviceGh.bind(null, record,"更换"),
+ ifShow: (record.onlineStatus!='待集成' && record.dimension == '区域维度') && record.nuId != null
},
{
label: '损坏',
@@ -181,7 +179,8 @@
/**
* 更换
*/
- function handleDeviceGh(record: Recordable) {
+ function handleDeviceGh(record: Recordable,optType) {
+ record.optType = optType;
ghDrawer.value.disableSubmit = false;
ghDrawer.value.edit(record);
}
@@ -189,7 +188,8 @@
/**
* 设备清单
*/
- function handleDevicePreview(record: Recordable) {
+ function handleDevicePreview(record: Recordable,optType) {
+ record.optType = optType;
previewDrawer.value.disableSubmit = true;
previewDrawer.value.edit(record);
}
diff --git a/src/views/iot/manager/components/DeviceGhModal.vue b/src/views/iot/manager/components/DeviceGhModal.vue
index e6b027a..fb8e035 100644
--- a/src/views/iot/manager/components/DeviceGhModal.vue
+++ b/src/views/iot/manager/components/DeviceGhModal.vue
@@ -39,7 +39,8 @@ function add(record) {
* @param record
*/
function edit(record) {
- title.value = disableSubmit.value ? '详情' : '更换';
+ title.value = record.optType;
+ // title.value = disableSubmit.value ? '详情' : '更换';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);