diff --git a/index.html b/index.html index b6d8790..ddea88f 100644 --- a/index.html +++ b/index.html @@ -27,5 +27,6 @@
+ diff --git a/src/views/biz/nuBaseInfo/QyxxList.vue b/src/views/biz/nuBaseInfo/QyxxList.vue index 3b55272..18ebde8 100644 --- a/src/views/biz/nuBaseInfo/QyxxList.vue +++ b/src/views/biz/nuBaseInfo/QyxxList.vue @@ -36,59 +36,58 @@ - + - 查询 重置 - - - - - - - - - + + + + +

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

+

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

+

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

+
+ 启用 + 停用 + 更名 + 设备 + + + 二维码 + +
+ + + - @@ -289,4 +254,53 @@ const { createMessage } = useMessage(); width: 100%; } } + + + +.zxClass { + font-size: 12px; + background: linear-gradient(to right, #1ea0fa, #017de9); + border-radius: 8px; + height: 25px; + color: white; + line-height: 25px; + padding: 5px; +} + +.lxClass { + font-size: 12px; + background: linear-gradient(to right, #d1d4d5, #d3d5d6); + border-radius: 8px; + height: 25px; + color: white; + line-height: 25px; + padding: 5px; +} + +.selected-card { + border: 2px solid #1890ff; + box-shadow: 0 0 8px rgba(24, 144, 255, 0.3); +} + +.cardContent{ + margin-top: -10px;background:white;margin:0 10px;border-radius:8px; +} + +/* 基础卡片样式 */ +.card-3d { + border-radius: 8px; + border: 1px solid #f0f0f0; /* 边框增强立体感 */ + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); + transition: all 0.3s ease; + background: white; + position: relative; +} + +/* 鼠标悬停：阴影加深 + 轻微上浮 */ +.card-3d:hover { + border: 2px solid #1890ff; + box-shadow: 0 4px 8px rgba(24, 144, 255, 0.4); + transform: translate(-3px,-3px); +} + diff --git a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue index aa80434..adcc8a1 100644 --- a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue +++ b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue @@ -1,6 +1,58 @@ - 智能水表 + 智能水表 + 报修状态： + 正常 + 维修中 + 报废 + {{item.nuId_dictText?item.nuId_dictText:'未配置'}} NUID: {{item.nuId?item.nuId:'未配置'}} @@ -88,22 +154,26 @@
抄表 - +
开阀 - +
关阀 - +
清零 - +
日志 + +
+ 报修 +

@@ -122,7 +192,12 @@ - 温湿度计 + 温湿度计 + 报修状态： + 正常 + 维修中 + 报废 + {{item.nuId_dictText?item.nuId_dictText:'未配置'}} NUID: {{item.nuId?item.nuId:'未配置'}} @@ -151,14 +226,18 @@
抄表 - + +
日志 + +
+ 报修 +

@@ -175,6 +254,9 @@ + + + @@ -187,13 +269,19 @@ import ApiLogModal from "@/views/iot/tq/electricity/apilog/ApiLogModal.vue"; import ApiLogWaterModal from "@/views/iot/tq/electricity/apilog/WaterApiLogModal.vue"; import ApiLogAlarmModal from '/@/views/iot/yiweilian/components/ApiLogAlarmModal.vue' import DeviceInfoDrawer from "/@/views/iot/yiweilian/components/DeviceInfoDrawer.vue"; + import CameraPreviewModal from '/@/views/iot/tplink/camera/components/CameraPreviewModal.vue' + import CameraPictureConfigModal from '/@/views/iot/tplink/camera/components/CameraPictureConfigModal.vue'; import {useDrawer} from "@/components/Drawer"; import {updateDeviceRealTime} from '/@/views/iot/yiweilian/humid.api'; import {eleSbReset, eleSbControl, eleSbRead } from "/@/views/iot/tq/water/water.api"; +import { ReloadOutlined } from '@ant-design/icons-vue'; const formRef = ref(); const apiLogModal = ref(); const apiLogWaterModal = ref(); const apiLogAlarmModal = ref(); + const previewModal = ref(); + const cameraPictureConfigModal = ref(); +const sxtList = ref({records: []});//摄像头 const zndbList = ref({records: []});//智能电表 const znsbList = ref({records: []});//智能水表 const wsdjList = ref({records: []});//温湿度计 @@ -201,11 +289,48 @@ const anyInfo = ref({});//区域信息 //注册drawer const [registerDrawer, { openDrawer }] = useDrawer(); +function handleBaoxiu(record,type){ +console.log("🚀 ~ handleBaoxiu ~ record,type:", record,type) + + Modal.confirm({ + title: '报修', + content: '是否进行报修?', + closable: true, + okText: '确定', + cancelText: '取消', + async onOk() { + var url = ""; + if(type=='1'){//摄像头报修 + url = '/iot/tplink/cameraInfo/baoxiu'; + }else if(type=='2'){ //电表报修 + url = '/iot/tq/electricityMeter/baoxiu'; + }else if(type=='3'){ //水表报修 + url = '/iot/tq/waterMeter/baoxiu'; + }else if(type=='4'){ //温湿度计报修 + url = '/iot/yiweilian/humidDevice/baoxiu'; + } + defHttp.post({url: url,params:{id:record.id}}).then(res => { + edit(anyInfo.value); + }); + }, + }); +} function edit(record) { -anyInfo.value = record; -getZndb(record);//智能电表 -getZnsb(record);//智能水表 -getWsdj(record);//温湿度计 + console.log("🚀 ~ edit ~ record:", record) + anyInfo.value = record; + getSxt(record);//摄像头 + getZndb(record);//智能电表 + getZnsb(record);//智能水表 + getWsdj(record);//温湿度计 +} +//获取摄像头 +function getSxt(record){ + var queryParam = {pageSize:-1,nuId:record.nuId} + defHttp.get({url: '/iot/tplink/cameraInfo/list',params:queryParam}).then(res => { + console.log("🚀 ~ defHttp.get ~ res:", res) + sxtList.value = res; + console.log("🚀 ~ defHttp.get ~ 获取摄像头:", sxtList) + }); } //获取智能电表 function getZndb(record){ @@ -429,6 +554,31 @@ function getWsdj(record){ } + + /** + * 摄像头预览 + */ + function handlePreview(record: Recordable) { + previewModal.value.disableSubmit = true; + previewModal.value.edit(record); + } + + /** + * 摄像头画面配置 + */ + function handlePicConfig(record) { + var params = { + deviceIndex: record.deviceIndex, + parentId: record.parentId, + multitrans: record.multitrans, + projectId: record.projectId, + regionId: record.regionId, + ip: record.ip + } + cameraPictureConfigModal.value.disableSubmit = true; + cameraPictureConfigModal.value.edit(params); + } + defineExpose({ edit, }); diff --git a/src/views/biz/nuBaseInfo/components/NuBaseInfoForm.vue b/src/views/biz/nuBaseInfo/components/NuBaseInfoForm.vue index 1c0e377..d21c0b7 100644 --- a/src/views/biz/nuBaseInfo/components/NuBaseInfoForm.vue +++ b/src/views/biz/nuBaseInfo/components/NuBaseInfoForm.vue @@ -5,7 +5,7 @@ - + diff --git a/src/views/biz/nuBaseInfo/components/NuBaseInfoModal.vue b/src/views/biz/nuBaseInfo/components/NuBaseInfoModal.vue index 9833fd6..0641e05 100644 --- a/src/views/biz/nuBaseInfo/components/NuBaseInfoModal.vue +++ b/src/views/biz/nuBaseInfo/components/NuBaseInfoModal.vue @@ -1,5 +1,5 @@ diff --git a/src/views/iot/tplink/camera/components/CameraCommonForm.vue b/src/views/iot/tplink/camera/components/CameraCommonForm.vue index 44ecaa0..c6419fd 100644 --- a/src/views/iot/tplink/camera/components/CameraCommonForm.vue +++ b/src/views/iot/tplink/camera/components/CameraCommonForm.vue @@ -1,6 +1,6 @@