From b4de48e8e7c3b895a3e9adadd5e846b71eb4f648 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 15 Aug 2025 16:34:48 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Application/src/AppLogo.vue | 2 +- src/components/SimpleMenu/src/SimpleMenu.vue | 14 + src/layouts/default/header/index.vue | 438 +++++++++--------- .../components/ConfigMaterialInfoForm.vue | 4 +- .../components/WlqianyiModal.vue | 2 +- 5 files changed, 233 insertions(+), 227 deletions(-) diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue index 06294c8..eb30eec 100644 --- a/src/components/Application/src/AppLogo.vue +++ b/src/components/Application/src/AppLogo.vue @@ -3,7 +3,7 @@ * @Description: logo component --> -

单元名称:{{item.nuName}}

-

创建时间:{{item.createTime}}

-

单元类型:{{item.areaFlag_dictText}}

-
- 启用 - 停用 - 更名 - 设备 - - - 二维码 - + +
+ +

单元名称:{{item.nuName}}

+

创建时间:{{item.createTime}}

+

单元类型:{{item.areaFlag_dictText}}

+
+ 启用 + 停用 + 更名 + 设备 + + + 二维码 + +
+ diff --git a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue index adcc8a1..a1e2263 100644 --- a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue +++ b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue @@ -2,7 +2,7 @@
- + - - 摄像头 - 报修状态: - 正常 - 维修中 - 报废 - - {{item.nuId_dictText?item.nuId_dictText:'未配置'}} + + NUID: {{item.nuId?item.nuId:'未配置'}} - NUID: {{item.nuId?item.nuId:'未配置'}} + {{item.nuId_dictText?item.nuId_dictText:'未配置'}} - 摄像头 + + + 摄像头 + + 正常 + 维修中 + 报废 +
报修状态
-
- +

@@ -54,7 +54,7 @@ - + - - 智能电表 - 报修状态: - 正常 - 维修中 - 报废 - - {{item.nuId_dictText?item.nuId_dictText:'未配置'}} + + NUID: {{item.nuId?item.nuId:'未配置'}} - NUID: {{item.nuId?item.nuId:'未配置'}} + {{item.nuId_dictText?item.nuId_dictText:'未配置'}} {{item.eleValue?item.eleValue:'0.00'}} @@ -84,8 +81,15 @@

KWH
用电量
+ 智能电表 + + 正常 + 维修中 + 报废 +
报修状态
+
- +


@@ -117,7 +121,7 @@ - + - - 智能水表 - 报修状态: - 正常 - 维修中 - 报废 - - {{item.nuId_dictText?item.nuId_dictText:'未配置'}} + + NUID: {{item.nuId?item.nuId:'未配置'}} - NUID: {{item.nuId?item.nuId:'未配置'}} + {{item.nuId_dictText?item.nuId_dictText:'未配置'}} {{item.eleValue?item.eleValue:'0.00'}} @@ -147,8 +148,15 @@

用水量
+ 智能水表 + + 正常 + 维修中 + 报废 +
报修状态
+
- +


@@ -179,7 +187,7 @@ - + - - 温湿度计 - 报修状态: - 正常 - 维修中 - 报废 - - {{item.nuId_dictText?item.nuId_dictText:'未配置'}} + + NUID: {{item.nuId?item.nuId:'未配置'}} - NUID: {{item.nuId?item.nuId:'未配置'}} + {{item.nuId_dictText?item.nuId_dictText:'未配置'}} - + @@ -219,8 +224,15 @@ + 温湿度计 + + 正常 + 维修中 + 报废 +

报修状态
+ - +


diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue index dfd7085..fc0350d 100644 --- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue +++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue @@ -39,17 +39,7 @@ - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

- + -

+ +


预览 diff --git a/src/views/iot/tq/electricity/index.vue b/src/views/iot/tq/electricity/index.vue index cdd6162..05b45ff 100644 --- a/src/views/iot/tq/electricity/index.vue +++ b/src/views/iot/tq/electricity/index.vue @@ -25,7 +25,7 @@

- + - + {{item.nuId_dictText?item.nuId_dictText:'未配置'}} NUID: {{item.nuId?item.nuId:'未配置'}} diff --git a/src/views/iot/tq/water/index.vue b/src/views/iot/tq/water/index.vue index a8fdd03..d09d52d 100644 --- a/src/views/iot/tq/water/index.vue +++ b/src/views/iot/tq/water/index.vue @@ -25,7 +25,7 @@ - + - + {{item.nuId_dictText?item.nuId_dictText:'未配置'}} NUID: {{item.nuId?item.nuId:'未配置'}} diff --git a/src/views/iot/yiweilian/index.vue b/src/views/iot/yiweilian/index.vue index bb72d3a..1d6c045 100644 --- a/src/views/iot/yiweilian/index.vue +++ b/src/views/iot/yiweilian/index.vue @@ -25,7 +25,7 @@ - + - + {{item.nuId_dictText?item.nuId_dictText:'未配置'}} NUID: {{item.nuId?item.nuId:'未配置'}} From 18c604817104d56b1ead64a50270106c02380da8 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 19 Aug 2025 13:38:10 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BaseWlsbListForm.vue | 8 +-- .../components/WlqianyiForm.vue | 4 +- src/views/iot/tplink/camera/camera.data.ts | 23 ++++++--- .../camera/components/CameraInfoList.vue | 6 +-- .../iot/tq/electricity/apilog/ApiLogModal.vue | 14 ++++-- .../electricity/apilog/WaterApiLogModal.vue | 13 +++-- .../yiweilian/components/ApiLogAlarmModal.vue | 14 ++++-- .../iot/yiweilian/components/ApiLogList.vue | 2 +- src/views/iot/yiweilian/humid.data.ts | 50 +++++++++++++++---- 9 files changed, 99 insertions(+), 35 deletions(-) diff --git a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue index a1e2263..deac248 100644 --- a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue +++ b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue @@ -20,7 +20,7 @@ NUID: {{item.nuId?item.nuId:'未配置'}} - {{item.nuId_dictText?item.nuId_dictText:'未配置'}} + {{item.nuName?item.nuName:'未配置'}} @@ -72,7 +72,7 @@ NUID: {{item.nuId?item.nuId:'未配置'}} - {{item.nuId_dictText?item.nuId_dictText:'未配置'}} + {{item.nuName?item.nuName:'未配置'}} {{item.eleValue?item.eleValue:'0.00'}} @@ -139,7 +139,7 @@ NUID: {{item.nuId?item.nuId:'未配置'}} - {{item.nuId_dictText?item.nuId_dictText:'未配置'}} + {{item.nuName?item.nuName:'未配置'}} {{item.eleValue?item.eleValue:'0.00'}} @@ -205,7 +205,7 @@ NUID: {{item.nuId?item.nuId:'未配置'}} - {{item.nuId_dictText?item.nuId_dictText:'未配置'}} + {{item.nuName?item.nuName:'未配置'}} diff --git a/src/views/invoicing/ConfigMaterial/components/WlqianyiForm.vue b/src/views/invoicing/ConfigMaterial/components/WlqianyiForm.vue index 977fe2f..39133ed 100644 --- a/src/views/invoicing/ConfigMaterial/components/WlqianyiForm.vue +++ b/src/views/invoicing/ConfigMaterial/components/WlqianyiForm.vue @@ -16,12 +16,12 @@ - + - + diff --git a/src/views/iot/tplink/camera/camera.data.ts b/src/views/iot/tplink/camera/camera.data.ts index f4d40a1..ce0258d 100644 --- a/src/views/iot/tplink/camera/camera.data.ts +++ b/src/views/iot/tplink/camera/camera.data.ts @@ -82,6 +82,12 @@ export const formSchema: FormSchema[] = [ // } dynamicDisabled: true }, + { + label: 'SN', + field: 'sn', + component: 'Input', + dynamicDisabled: true + }, { label: '设备名称', field: 'deviceName', @@ -119,12 +125,14 @@ export const formSchema: FormSchema[] = [ label: '区域名称', field: 'regionName', component: 'Input', + ifShow: false, dynamicDisabled: true }, { label: '父设备名称', field: 'parentDeviceName', component: 'Input', + ifShow: false, dynamicDisabled: true }, { @@ -137,23 +145,26 @@ export const formSchema: FormSchema[] = [ label: '项目名称', field: 'projectName', component: 'Input', + ifShow: false, dynamicDisabled: true }, { label: '位置名称', field: 'locationName', component: 'Input', + ifShow: false, dynamicDisabled: true }, { label: '区域', field: 'nuId', - component: 'JSelectNu', - componentProps: { - rowKey: 'nuId', - labelKey: 'nuName', - selectType: true, - }, + component: 'Input', + dynamicDisabled: true, + // componentProps: { + // rowKey: 'nuId', + // labelKey: 'nuName', + // selectType: true, + // }, }, { label: '设备重启', diff --git a/src/views/iot/tplink/camera/components/CameraInfoList.vue b/src/views/iot/tplink/camera/components/CameraInfoList.vue index a52dbad..f4bbf70 100644 --- a/src/views/iot/tplink/camera/components/CameraInfoList.vue +++ b/src/views/iot/tplink/camera/components/CameraInfoList.vue @@ -28,9 +28,9 @@ @@ -275,8 +332,8 @@ /** * 鱼眼画面显示模式 */ - function setFishEyeDisplayMode(){ - player.value.setFishEyeDisplayMode(fishEyeDisplayMode.value); + function setFishEyeDisplayMode(value){ + player.value.setFishEyeDisplayMode(value); } /** @@ -452,4 +509,110 @@ height: 500px; background: #1a1a1a; } + .buttonSpan{ + display: inline-flex; align-items: flex-end; + margin-left: 20px; + border: 1px solid #f6faff; + padding: 5px 10px; + } + .buttonSpan:hover{ + border: 1px solid #1ea0fa; + color: #1ea0fa; + border-radius: 10px; + cursor: pointer; + } + .buttonImg{ + width:20px;margin-right:10px;vertical-align: bottom; + } + .fxjImgUp{ + width:50px;height: 50px; + margin-right:10px;vertical-align: bottom; + cursor: pointer; + border-radius: 5px;transform: rotate(270deg); + background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat; + } + .fxjImgUp:hover{ + background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat; + } + .fxjImgLeft{ + width:50px;height: 50px;margin-right:10px;vertical-align: bottom;transform: rotate(180deg); + cursor: pointer; + background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat; + } + .fxjImgLeft:hover{ + background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat; + } + .fxjImgDown{ + width:50px;height: 50px;margin-right:10px;vertical-align: bottom;transform: rotate(90deg); + cursor: pointer; + background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat; + } + .fxjImgDown:hover{ + background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat; + } + .fxjImgRight{ + width:50px;height: 50px;margin-right:10px;vertical-align: bottom; + cursor: pointer; + background: url('../../../../../assets/iot/fxj.png') center/contain no-repeat; + } + .fxjImgRight:hover{ + background: url('../../../../../assets/iot/fxj_blue.png') center/contain no-repeat; + } + + .selectDiv{ + text-align: center; + border: 1px solid #f6faff; + padding: 3px 10px; + width: 100px; + margin-top:5px; + } + .selectDiv:hover{ + border: 1px solid #a2a3a3; + background: #a2a3a3; + color:white; + border-radius: 10px; + cursor: pointer; + } + .djImg{ + background: url('../../../../../assets/iot/monitor_1.png') left/contain no-repeat; + } + .djImg:hover{ + background: url('../../../../../assets/iot/monitor_1_1.png') left/contain no-repeat; + } + .qxdImg{ + background: url('../../../../../assets/iot/monitor_5.png') left/contain no-repeat; + } + .qxdImg:hover{ + background: url('../../../../../assets/iot/monitor_5_1.png') left/contain no-repeat; + } + .lzImg{ + background: url('../../../../../assets/iot/monitor_4.png') left/contain no-repeat; + } + .lzImg:hover{ + background: url('../../../../../assets/iot/monitor_4_1.png') left/contain no-repeat; + } + .jtImg{ + background: url('../../../../../assets/iot/monitor_3.png') left/contain no-repeat; + } + .jtImg:hover{ + background: url('../../../../../assets/iot/monitor_3_1.png') left/contain no-repeat; + } + .bjImg{ + background: url('../../../../../assets/iot/monitor_8.png') left/contain no-repeat; + } + .bjImg:hover{ + background: url('../../../../../assets/iot/monitor_8_1.png') left/contain no-repeat; + } + .fpImg{ + background: url('../../../../../assets/iot/monitor_6.png') left/contain no-repeat; + } + .fpImg:hover{ + background: url('../../../../../assets/iot/monitor_6_1.png') left/contain no-repeat; + } + .hmxzImg{ + background: url('../../../../../assets/iot/monitor_7.png') left/contain no-repeat; + } + .hmxzImg:hover{ + background: url('../../../../../assets/iot/monitor_7_1.png') left/contain no-repeat; + } diff --git a/src/views/iot/tplink/camera/components/CameraPreviewModal.vue b/src/views/iot/tplink/camera/components/CameraPreviewModal.vue index c7f09e8..fb392a3 100644 --- a/src/views/iot/tplink/camera/components/CameraPreviewModal.vue +++ b/src/views/iot/tplink/camera/components/CameraPreviewModal.vue @@ -1,9 +1,16 @@