+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue b/src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue
index 4fe0075..e3addbc 100644
--- a/src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue
+++ b/src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue
@@ -5,8 +5,8 @@
-
-
- 表号：{{item.address}}
+
+
+
+
+
-
- {{item.relayState=='1'?'在线':'离线'}}
+
+
-
- SN：{{item.address}}
+ 抄表时间：{{item.readTime?item.readTime:'未抄表'}}
{{item.relayState=='1'?'在线':'离线'}}
- 护理单元名称：{{item.nuName?item.nuName:'未配置'}} -
-- 上次抄表时间：{{item.readTime?item.readTime:'未抄表'}} -
-
-
m³
+ 用水量
+
-
- 抄表
- 
+ 抄表
+
+
+ 
+ 开阀
+
+
+ 
+ 关阀
+
+
+ 
+ 清零
+
+
+ 
+ 日志
+
+
+
共 {{ tableData.total }} 条数据
diff --git a/src/views/iot/tq/wsdDevice/humid.data.ts b/src/views/iot/tq/wsdDevice/humid.data.ts
index 93f3fbb..8e2831b 100644
--- a/src/views/iot/tq/wsdDevice/humid.data.ts
+++ b/src/views/iot/tq/wsdDevice/humid.data.ts
@@ -14,7 +14,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'nuName'
},
{
- title: '设备序号',
+ title: 'SN',
align: "center",
dataIndex: 'sn'
},
@@ -99,7 +99,7 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 6 },
},
{
- label: '设备序号',
+ label: 'SN',
field: 'sn',
component: 'Input',
colProps: { span: 6 },
@@ -127,7 +127,7 @@ export const formSchema: FormSchema[] = [
ifShow: false,
},
{
- label: '设备序号',
+ label: 'SN',
field: 'sn',
component: 'Input',
dynamicDisabled: ({ values }) => {
@@ -347,108 +347,49 @@ export const formSchema: FormSchema[] = [
//列表数据
export const logColumns: BasicColumn[] = [
{
- title: '设备序号',
+ title: 'SN',
align: "center",
dataIndex: 'sn'
},
{
- title: '操作时间',
+ title: '抄表时间',
align: "center",
dataIndex: 'optTime'
},
+ // {
+ // title: '数据上报时间',
+ // align: "center",
+ // dataIndex: 'reportingTime'
+ // },
+ // {
+ // title: '操作人',
+ // align: "center",
+ // dataIndex: 'optBy'
+ // },
{
- title: '操作人',
+ title: '温度',
align: "center",
- dataIndex: 'optBy'
+ dataIndex: 'temperature',
},
{
- title: '操作类型',
+ title: '湿度',
align: "center",
- dataIndex: 'optType',
+ dataIndex: 'humidity',
+ },
+ // {
+ // title: '设备状态',
+ // align: "center",
+ // dataIndex: 'status',
+ // customRender:({record})=>{
+ // return record.status?(record.status=='0'?'在线':'离线'):'';
+ // },
+ // },
+ {
+ title: '状态',
+ align: "center",
+ dataIndex: 'status',
customRender:({record})=>{
- if(record.optType == 'insert'){
- return '新增';
- }else if(record.optType == 'update'){
- return '修改';
- }else if(record.optType == 'delete'){
- return '删除';
- }else{
- return '';
- }
- },
- },
- {
- title: '记录间隔',
- align: "center",
- dataIndex: 'recordInterval'
- },
- {
- title: '上报间隔',
- align: "center",
- dataIndex: 'reportingInterval'
- },
- {
- title: '历史数据上报时刻',
- align: "center",
- dataIndex: 'historyReportTime'
- },
- {
- title: '历史数据上报间隔',
- align: "center",
- dataIndex: 'historyInterval'
- },
- {
- title: '温度预警-上限',
- align: "center",
- dataIndex: 'temperatureHigh'
- },
- {
- title: '温度预警-下限',
- align: "center",
- dataIndex: 'temperatureLow'
- },
- {
- title: '温度缓冲值',
- align: "center",
- dataIndex: 'temperatureBuffer'
- },
- {
- title: '湿度预警-上限',
- align: "center",
- dataIndex: 'humidityHigh'
- },
- {
- title: '湿度预警-下限',
- align: "center",
- dataIndex: 'humidityLow'
- },
- {
- title: '湿度缓冲值',
- align: "center",
- dataIndex: 'humidityBuffer'
- },
- {
- title: '断电报警',
- align: "center",
- dataIndex: 'izOutages',
- customRender:({record})=>{
- return record.izOutages?(record.izOutages=='0'?'开启':'关闭'):'';
- },
- },
- {
- title: '低电报警',
- align: "center",
- dataIndex: 'izLowBattery',
- customRender:({record})=>{
- return record.izLowBattery?(record.izLowBattery=='0'?'开启':'关闭'):'';
- },
- },
- {
- title: '上下线通知',
- align: "center",
- dataIndex: 'izOnline',
- customRender:({record})=>{
- return record.izOnline?(record.izOnline=='0'?'开启':'关闭'):'';
+ return record.status?(record.status=='0'?'抄表成功':'抄表失败'):'';
},
},
];
@@ -473,7 +414,7 @@ export const logQuerySchema: FormSchema[] = [
//列表数据
export const alarmColumns: BasicColumn[] = [
{
- title: '设备序号',
+ title: 'SN',
align: "center",
dataIndex: 'sn'
},
diff --git a/src/views/iot/tq/wsdDevice/index.vue b/src/views/iot/tq/wsdDevice/index.vue
index 4f2aefc..3a075de 100644
--- a/src/views/iot/tq/wsdDevice/index.vue
+++ b/src/views/iot/tq/wsdDevice/index.vue
@@ -6,8 +6,14 @@
- 表号
-
+
+
+
+ 护理单元
+
@@ -19,12 +25,54 @@
- 上次抄表时间：{{item.readTime?item.readTime:'未抄表'}} + 上次抄表时间：{{item.reportingTime?item.reportingTime:'未抄表'}}
+
+
共 {{ tableData.total }} 条数据
From 0b98f28de66f2bac63bc8f8d7140ac5c9da99eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 30 Jun 2025 11:46:15 +0800
Subject: [PATCH 5/8] =?UTF-8?q?tplink=E8=8E=B7=E5=8F=96=E6=8A=A4=E7=90=86?=
=?UTF-8?q?=E5=8D=95=E5=85=83=E4=BF=A1=E6=81=AF=E8=B7=AF=E5=BE=84=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/common/api.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/api/common/api.ts b/src/api/common/api.ts
index c09cdc8..1d687d1 100644
--- a/src/api/common/api.ts
+++ b/src/api/common/api.ts
@@ -15,7 +15,7 @@ enum Api {
getDictItems = '/sys/dict/getDictItems/',
getTableList = '/sys/user/queryUserComponentData',
getCategoryData = '/sys/category/loadAllData',
- getNuList = '/iot/cameraInfo/nuList',//后期调整
+ getNuList = '/iot/tplink/cameraInfo/nuList',//后期调整
}
/**
From 686fe4edca8d224e0db90033406c1bf348b7d062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 30 Jun 2025 14:23:13 +0800
Subject: [PATCH 6/8] =?UTF-8?q?tplink=E6=91=84=E5=83=8F=E5=A4=B4=E5=8F=98?=
=?UTF-8?q?=E7=84=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/iot/tplink/camera/camera.api.ts | 14 ++++
.../camera/components/CameraLeftTree.vue | 46 +++++--------
.../camera/components/CameraPreviewForm.vue | 67 ++++++++++++++++++-
.../camera/components/CameraPreviewModal.vue | 5 ++
4 files changed, 102 insertions(+), 30 deletions(-)
diff --git a/src/views/iot/tplink/camera/camera.api.ts b/src/views/iot/tplink/camera/camera.api.ts
index 50e1e82..a04d781 100644
--- a/src/views/iot/tplink/camera/camera.api.ts
+++ b/src/views/iot/tplink/camera/camera.api.ts
@@ -6,6 +6,7 @@ enum Api {
syncProject = '/iot/tplink/projectInfo/sync',
syncRegion = '/iot/tplink/regionInfo/sync',
list = '/iot/tplink/cameraInfo/list',
+ syncProjectIpcDevice = '/iot/tplink/cameraInfo/syncProjectIpcDevice',
ipcCapability = '/iot/tplink/cameraInfo/getIpcCapability',
nuList = '/iot/tplink/cameraInfo/nuList',
edit = '/iot/tplink/cameraInfo/edit',
@@ -38,6 +39,7 @@ enum Api {
uploadToServer = '/iot/tplink/cameraInfo/uploadToServer',
stopUploadToServer = '/iot/tplink/cameraInfo/stopUploadToServer',
getUploadToServerProcess = '/iot/tplink/cameraInfo/getUploadToServerProcess',
+ motionCtrl = '/iot/tplink/cameraInfo/motionCtrl',
}
@@ -72,6 +74,12 @@ export const syncRegion = (params?) => defHttp.get({ url: Api.syncRegion, params
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
+/**
+ * 同步此项目下的IPC设备
+ * @param params
+ */
+export const syncProjectIpcDevice = (params) => defHttp.get({ url: Api.syncProjectIpcDevice, params });
+
/**
* 获取IPC能力集
* @param params
@@ -266,3 +274,9 @@ export const stopUploadToServer = (params) => defHttp.get({ url: Api.stopUploadT
*/
export const getUploadToServerProcess = (params) => defHttp.get({ url: Api.getUploadToServerProcess, params });
+/**
+ * 控制球机转动
+ * @param params
+ */
+export const motionCtrl = (params) => defHttp.get({ url: Api.motionCtrl, params });
+
diff --git a/src/views/iot/tplink/camera/components/CameraLeftTree.vue b/src/views/iot/tplink/camera/components/CameraLeftTree.vue
index 12ff870..26d37d1 100644
--- a/src/views/iot/tplink/camera/components/CameraLeftTree.vue
+++ b/src/views/iot/tplink/camera/components/CameraLeftTree.vue
@@ -3,10 +3,7 @@
刷新
-
-
-
-
+ 同步设备
@@ -35,8 +32,9 @@
import { useModal } from '/@/components/Modal';
import { useMessage } from '/@/hooks/web/useMessage';
import { useMethods } from '/@/hooks/system/useMethods';
+ import { syncProjectIpcDevice,queryProjectTreeSync, queryRegionTreeSync, syncProject, syncRegion } from '../camera.api';
+
const { createMessage } = useMessage();
- import { queryProjectTreeSync, queryRegionTreeSync, syncProject, syncRegion } from '../camera.api';
const emit = defineEmits(['select', 'rootTreeData']);
const syncoading = ref(false);
@@ -172,31 +170,21 @@
}
/**
- * 同步项目
+ * 同步设备
*/
- // async function syncProjectInfo(){
- // syncoading.value = true;
- // await syncProject();
- // await loadRootTreeData();
- // }
-
- /**
- * 同步区域
- */
- // async function syncRegionInfo(){
- // let data = currentRegion.value;
- // if (data == null) {
- // createMessage.warning('请先选择一个区域');
- // return;
- // }
- // const record = {
- // projectId: data.projectId,
- // regionId: data.regionId
- // };
- // syncoading.value = true;
- // await syncRegion(record);
- // await loadRootTreeData();
- // }
+ async function getProjectIpcDevice(){
+ let data = currentRegion.value;
+ if (data == null) {
+ createMessage.warning('请先选择一个区域');
+ return;
+ }
+ const record = {
+ projectId: data.projectId
+ };
+ await syncProjectIpcDevice(record);
+ currentRegion.value["timestamp"] = new Date().getTime();
+ emit('select', currentRegion.value);
+ }
defineExpose({
loadRootTreeData,
diff --git a/src/views/iot/tplink/camera/components/CameraPreviewForm.vue b/src/views/iot/tplink/camera/components/CameraPreviewForm.vue
index fd3567d..a173140 100644
--- a/src/views/iot/tplink/camera/components/CameraPreviewForm.vue
+++ b/src/views/iot/tplink/camera/components/CameraPreviewForm.vue
@@ -61,6 +61,17 @@
报警
+
+
+ 变焦
+
+
+
@@ -76,7 +87,8 @@
getMultitransUrl,
getPreviewUrl,
setImageCommon,
- testAudio
+ testAudio,
+ motionCtrl
} from "../camera.api";
const props = defineProps({
@@ -328,6 +340,59 @@
izPhone.value = false;
}
+ /**
+ * 缩放
+ */
+ function zoomInOut(type){
+ let delayTime = 6000;
+ if(type == 'in'){
+ formData.zoom = formData.zoom+0.4;
+ if(formData.zoom > 4){
+ formData.zoom = 4;
+ }
+ formData.sliderValue = formData.zoom;
+ moveCtrl(10,1,1);
+ if(formData.sliderValue<=2){
+ delayTime = 0.4*6000;
+ }else{
+ delayTime = 0.2*6000;
+ }
+ delayExecute(moveCtrl,[10,0,1],delayTime);
+ }else{
+ formData.zoom = formData.zoom-0.4;
+ if(formData.zoom < 1){
+ formData.zoom = 1;
+ }
+ formData.sliderValue = formData.zoom;
+ moveCtrl(9,1,1);
+ if(formData.sliderValue<=2){
+ delayTime = 0.4*6000;
+ }else{
+ delayTime = 0.2*6000;
+ }
+ delayExecute(moveCtrl,[9,0,1],delayTime);
+ }
+ }
+
+ /**
+ * 控制球机
+ */
+ function moveCtrl(direction,startOrNot,speed){
+ let params = {
+ "deviceIndex": formData.deviceIndex,
+ "direction": direction,
+ "startOrNot": startOrNot,
+ "speed": speed,
+ };
+ motionCtrl(params);
+ }
+
+ function delayExecute(fn, args, delay) {
+ setTimeout(() => {
+ fn.apply(this,args) // 使用apply传递参数数组
+ }, delay)
+ }
+
/**
* 销毁
*/
diff --git a/src/views/iot/tplink/camera/components/CameraPreviewModal.vue b/src/views/iot/tplink/camera/components/CameraPreviewModal.vue
index 8491d96..d7c6cea 100644
--- a/src/views/iot/tplink/camera/components/CameraPreviewModal.vue
+++ b/src/views/iot/tplink/camera/components/CameraPreviewModal.vue
@@ -63,5 +63,10 @@
.jee-hidden {
display: none !important;
}
+
+ .ant-modal-body {
+ height: auto !important;
+ overflow: hidden !important;
+ }
From 972a1b13a193a2fbfa641a93cef44b1ae471ef58 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 30 Jun 2025 14:54:10 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=A9=E6=B9=BF?=
=?UTF-8?q?=E5=BA=A6=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/iot/a10.png | Bin 0 -> 2055 bytes
src/assets/iot/a11.png | Bin 0 -> 1666 bytes
src/views/iot/tq/electricity/index.vue | 6 +-
src/views/iot/tq/water/index.vue | 11 +-
.../iot/yiweilian/components/AlarmList.vue | 3 +-
.../iot/yiweilian/components/ApiLogList.vue | 3 +-
src/views/iot/yiweilian/humid.data.ts | 46 ++++----
src/views/iot/yiweilian/index.vue | 111 +++++++++++++-----
8 files changed, 117 insertions(+), 63 deletions(-)
create mode 100644 src/assets/iot/a10.png
create mode 100644 src/assets/iot/a11.png
diff --git a/src/assets/iot/a10.png b/src/assets/iot/a10.png
new file mode 100644
index 0000000000000000000000000000000000000000..d14400a6417eb8f96fe69943d797b3513d6a9a49
GIT binary patch
literal 2055
zcmaJ?c~nz(77n0*1dzRgD33r3u|SeXNJu1L$O94v7@C4Cc1E&1AV3zAM+neDX|1dl
zWD%$!iYSF5j)1B~Fqk=qd*8O>Sv2-rvzn%}hF>vt+BBK)sDJdy#Dei7kc^rX6qtOUNkN|?ND8f~dDnWQE
zSBb)5BLV~~1agrK5lJP0CL)h7O-2|vRPAqNh-JaSZv#sd>&-&jMo{r&1d~^jNTg7y9v&VP63L(FNo3MkRCgkU1hI%@$a90skth(JL;!DaMZa??f6Aq^TxN#!C^YB3>#3K(ZSZaE=g3gwhlRUenuksjyt6goXZcsTg?E9J=To0(?P`
z=85X|a3_*A;%Ok+-;?R*$MW-Mc`(UL+&WkIj>6Zu;Q!?kP%#9}WdAVf4HvpT8uRV$
zqL;VZ4@=OMm!rG={MQ%N7|bRm2V#b)Chtb=V_SY?aWOkk82zg$)6_;-d5(?q*)`}L
z=*#7R_Cu|;*J~OWIo^RIuVzJC({t?ozhc_?7xC=ubL>u^w(4|V%?(Vmj*3m}ZATVV
zPj6L?e5Z;zzgS7TuuPA;HTT(nyUca<^i~I0$7ZP^lj?_FRYgT6dPfXhbZ}X;Zu0##
z-44CKV{YydBqsiBUf=e?Y*$(lHf!8it&JtmCu@~|o)4_vbb^?ndo#DnwpH{D{UX~v
z46PWyxRHLc`xC&1tGj>a%k9wt{2qU}3a#8r0FuuP9~y7`X*njibbrc@<+_dq#CdM)-;Q7Eiv0E>
z^>>brH#z7HSflkF2SbyCd_B$v009;<1M_rYg+MuwkH9q8__c0NkC;@kUtk&vBjF+wew
znJ{*WW*K8sXRTXmzr))JV$ba;vUt5>Cd2Q~Pn_?zxfyObC7$~r9rq1;Wmtxo{*UjB^ti&8B`Wr3t$(`KAO=+sm0%o5iJ@$cGDO1klXT~!2
z+E?a8jGYR4w6iet(GP`~C`xh{WkHebS3hC&nZc2$g0azEVa3x@seMSxRpZC2;zs2G
zeVc|VJhU<+0H19B$)fvT4fbW<{yc2j^!(NK6NT6A1Pvse`t)ndg$oU1{SU7?)y|YY
zv}uO;|G_ISJWs%e)fm|J-nQ&OLIhek!>Z{V@A`t#rF1!a?SVlSFs3_Q`&Y(^ZC>Y2
zDvxB9Y#)jJvCOz_*sT97$E^Hhhczt;nhJh2UaTSBuP?Zs2gNrhP^;6eW=hF}m7t8^
z|MXk^DX=F}xjozDs}@RgUR~=xTU+Nf?J>)^nS&XfUtTI<8CNItd_Q}NoUJP6CPD_T7Ue-AhuvtDTdFb7ekfqGwMqrck4|`1_pE&*n
zzSkG-STfgo!)2vcl{;Tq{4ypeKNq`8+n@{=)kZDu#qZAGx2b|p%{h-q+*gI;IpsTy
zP9N`dQHM}1Ox*vQJ|sr67De^|kw|c??GA(;5&CmBnd(%^bfFsM$B>i~j*>|2nAv
literal 0
HcmV?d00001
diff --git a/src/assets/iot/a11.png b/src/assets/iot/a11.png
new file mode 100644
index 0000000000000000000000000000000000000000..6df176422282fce2cffcf67b70179b7b6b4eea65
GIT binary patch
literal 1666
zcmaJ?Yfuws6irn`DU_lpN)gwEL7v%UAtc#Jz(5iKlYjvw1#t+;LINZkl7)naR^dm%
z2Le)&zMwFQiWNn$6d%~4Wk3a?1*BsIEh;ZTtVE?syFt+YuC
z8?7wtEl4DiRd5hjOq}kfcgbSnd$qYWnmAVDJP96-#p8OZ7A0}ySR4ujtE3627?sM?
zQ(93LiL`LNGD3n&gaSl{smM|jhHOx22sVkt@;7LtvLqA-;?M-8nhj2zZvp|OoDD|O
zgcPAB5LGCHGPG!ThA2XoktAcvL4QAhWk84kDioIj234|JhZxx4Y+Qt}O>PJTW+8YI
z8+bTuwDc&T+x^AWhH
zPNr3Aa3!V&OcAAVSSrp23AL}wP-%q1H-XibabL;jF?Hh(>$5z-}@7pfP@-^i^)<|s2UIEvO&T_mMi554AW>-3NMgG
zqxn*)d!
z9MdT<4FLO)>40mbQZ2{yIyX~q=cJ-qWg05yYcUlt+Z;ss4gmo$%w!O{Y2FkclXxcV
z!)I`Kyg(j5kjC-hfOA~=I|`rU!vD*K2r-apvj3U%yo*>Lllf+MiOZYqN7cm2Yl+=v
zy^<7>NDC%|xts{Y?_-B!a)q01TP7O3$IDw=a%u$JL65>}TQ{g89;|S-b}Y7I8En?w
zcM`i;@Z9c%fy*a>{(FZmShijXqFNVq;uE(sTc)DxMUO-e$C%H)&U{$Ote$x^ad9SL
zqW)Rb-@g@y9Jvx!V3W5Fq;^U-)%Elo7FF35jhV|h-|caz9msMynC`g8Rcn88w2BwK
zIG(=_vER4!m|(iS_odxqkAVgjLpB-~-kNC}UbsTpdyjwai7}QfsN9#8NGY3cgs&%V
z$V*%GqCG_9(8up4>xa*UE{d)jrat#XF4M-QKJ6aw+|{+zBNua`NOdaljO-`2-19XRG*YSHN0
z@5FAGukj1CsGDkhaN5QpRJ$lyn=96rJpK4D+?YNxyv-bzTj%tRd~tNwHv_YUJBh
zX*Qub?t>WVhfjDDo?eFJ@6p9vr|6Q
zaO5aZn|-c?^HKQT>Z~rHvAOaeOU?BJ@|l(#$Ehk7&fwbRY~W^k8jaSroG!-QrM-zR
z+f?lhQO$#UP8sh|dc)fSBDRi;m)Lo7dvo^sAtSGXKEL?5N#^e#(0JQ8V;N!(GD=e>
zJ$zj3ms@H2w7X%tX9?+TtakrtB7@^6{_Jap6E^j8Sx
LiMXc%Vzd7Rs9lrm
literal 0
HcmV?d00001
diff --git a/src/views/iot/tq/electricity/index.vue b/src/views/iot/tq/electricity/index.vue
index 199057d..7dc4d11 100644
--- a/src/views/iot/tq/electricity/index.vue
+++ b/src/views/iot/tq/electricity/index.vue
@@ -7,13 +7,13 @@
SN
-
护理单元
-
@@ -38,7 +38,7 @@
- {{item.nuName?item.nuName:'未配置'}}
+ {{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 ba7fec7..e723f0a 100644
--- a/src/views/iot/tq/water/index.vue
+++ b/src/views/iot/tq/water/index.vue
@@ -7,13 +7,13 @@
SN
-
护理单元
-
@@ -38,7 +38,7 @@
- {{item.nuName?item.nuName:'未配置'}}
+ {{item.nuId_dictText?item.nuId_dictText:'未配置'}}
NUID: {{item.nuId?item.nuId:'未配置'}}
@@ -57,11 +57,11 @@
抄表
-
+
开阀 -
+
关阀 @@ -103,6 +103,7 @@ import { Pagination } from 'ant-design-vue'; import ApiLogModal from "@/views/iot/tq/electricity/apilog/WaterApiLogModal.vue"; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import { set } from 'lodash-es'; +import JInput from "/@/components/Form/src/jeecg/components/JInput.vue"; const formRef = ref(); const queryParam = reactive({});
diff --git a/src/views/iot/yiweilian/components/AlarmList.vue b/src/views/iot/yiweilian/components/AlarmList.vue
index 6e574ab..60ebd18 100644
--- a/src/views/iot/yiweilian/components/AlarmList.vue
+++ b/src/views/iot/yiweilian/components/AlarmList.vue
@@ -1,6 +1,6 @@
-
+
@@ -30,6 +30,7 @@
columns:alarmColumns,
canResize:false,
showActionColumn: false,
+ useSearchForm: false,
// showTableSetting: false,
formConfig: {
//labelWidth: 120,
diff --git a/src/views/iot/yiweilian/components/ApiLogList.vue b/src/views/iot/yiweilian/components/ApiLogList.vue
index 38c2e3c..a77d70f 100644
--- a/src/views/iot/yiweilian/components/ApiLogList.vue
+++ b/src/views/iot/yiweilian/components/ApiLogList.vue
@@ -1,6 +1,6 @@
-
+
@@ -31,6 +31,7 @@
canResize:false,
showActionColumn: false,
// showTableSetting: false,
+ useSearchForm: false,
formConfig: {
//labelWidth: 120,
schemas: logQuerySchema,
diff --git a/src/views/iot/yiweilian/humid.data.ts b/src/views/iot/yiweilian/humid.data.ts
index 8e2831b..a96ec5c 100644
--- a/src/views/iot/yiweilian/humid.data.ts
+++ b/src/views/iot/yiweilian/humid.data.ts
@@ -418,18 +418,18 @@ export const alarmColumns: BasicColumn[] = [
align: "center",
dataIndex: 'sn'
},
- {
- title: '状态',
- align: "center",
- dataIndex: 'status',
- customRender:({record})=>{
- if(record.optType == '0'){
- return '告警';
- }else {
- return '清除';
- }
- },
- },
+ // {
+ // title: '状态',
+ // align: "center",
+ // dataIndex: 'status',
+ // customRender:({record})=>{
+ // if(record.optType == '0'){
+ // return '告警';
+ // }else {
+ // return '清除';
+ // }
+ // },
+ // },
{
title: '告警时间',
align: "center",
@@ -446,20 +446,20 @@ export const alarmColumns: BasicColumn[] = [
dataIndex: 'wrData'
},
{
- title: '清除时间',
+ title: '消除告警时间',
align: "center",
dataIndex: 'clearDate'
},
- {
- title: '清除内容',
- align: "center",
- dataIndex: 'clearContent'
- },
- {
- title: '清除值',
- align: "center",
- dataIndex: 'clearData'
- },
+ // {
+ // title: '清除内容',
+ // align: "center",
+ // dataIndex: 'clearContent'
+ // },
+ // {
+ // title: '清除值',
+ // align: "center",
+ // dataIndex: 'clearData'
+ // },
];
export const alarmQuerySchema: FormSchema[] = [
diff --git a/src/views/iot/yiweilian/index.vue b/src/views/iot/yiweilian/index.vue
index e976acd..a94ad97 100644
--- a/src/views/iot/yiweilian/index.vue
+++ b/src/views/iot/yiweilian/index.vue
@@ -6,8 +6,14 @@
- 表号
-
+
+
+
+ 护理单元
+
@@ -19,47 +25,63 @@
+
开阀 -
+
关阀 @@ -103,6 +103,7 @@ import { Pagination } from 'ant-design-vue'; import ApiLogModal from "@/views/iot/tq/electricity/apilog/WaterApiLogModal.vue"; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import { set } from 'lodash-es'; +import JInput from "/@/components/Form/src/jeecg/components/JInput.vue"; const formRef = ref(); const queryParam = reactive
-
-
- 表号：{{item.sn}}
+
+
+
+
+
-
- {{item.status=='0'?'在线':'离线'}}
+
+
-
- SN：{{item.sn}}
+ 抄表时间：{{item.reportingTime?item.reportingTime:'未抄表'}}
{{item.status=='1'?'在线':'离线'}}
- 护理单元名称：{{item.nuName?item.nuName:'未配置'}} -
-- 上次抄表时间：{{item.readTime?item.readTime:'未抄表'}} -
-
+ {{item.temperature?item.temperature:'-'}}
+ ℃
+ 
+ {{item.humidity?item.humidity:'-'}}
+ %
+
+
+
@@ -83,8 +105,10 @@
import ApiLogAlarmModal from './components/ApiLogAlarmModal.vue'
import DeviceInfoDrawer from "./components/DeviceInfoDrawer.vue";
+ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { set } from 'lodash-es';
import {useDrawer} from "@/components/Drawer";
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
//注册drawer
const [registerDrawer, { openDrawer }] = useDrawer();
@@ -173,4 +197,31 @@ const pageParams = ref({ pageNo: 1, pageSize: 8 })
display: block;
position: absolute;
}
+.zxClass{
+ font-size:14px;
+ background: linear-gradient(to right, #1ea0fa, #017de9);
+ border-radius: 8px;
+ height: 35px;
+ color: white;
+ line-height: 35px;
+}
+
+.lxClass{
+ font-size:14px;
+ background: linear-gradient(to right, #cccccc, #cccccc);
+ border-radius: 8px;
+ height: 35px;
+ color: white;
+ line-height: 35px;
+}
+.tbClass{
+ background: #f6f6f6;
+ padding: 8px;
+ border-radius: 5px;
+}
+.antTitle{
+ margin-top: 10px;
+ display: block;
+ font-size: 12px;
+}
From 058158fa571d50fc5c89ef9a26b135a3b45d68e8 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 30 Jun 2025 15:28:15 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E5=A4=B9=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ApiRequestLog.api.ts} | 14 +-
.../ApiRequestLog.data.ts} | 0
.../ApiRequestLogList.vue} | 10 +-
.../ApiRequestLogList2.vue} | 10 +-
.../ApiRequestLogList3.vue} | 10 +-
.../components/ApiRequestLogForm.vue} | 24 +--
.../components/ApiRequestLogModal.vue} | 2 +-
.../iot/tq/electricity/apilog/ApiLogList.vue | 28 +--
.../tq/electricity/apilog/WaterApiLogList.vue | 28 +--
.../NuIotTqElectricitySyncLog.api.ts | 72 -------
.../NuIotTqElectricitySyncLog.data.ts | 68 -------
.../NuIotTqElectricitySyncLogList.vue | 169 ----------------
.../NuIotTqElectricitySyncLogListModal.vue | 66 -------
.../NuIotTqElectricitySyncLogForm.vue | 187 ------------------
.../NuIotTqElectricitySyncLogModal.vue | 77 --------
15 files changed, 63 insertions(+), 702 deletions(-)
rename src/views/iot/tq/{nuIotTqApiRequestLog/NuIotTqApiRequestLog.api.ts => ApiRequestLog/ApiRequestLog.api.ts} (74%)
rename src/views/iot/tq/{nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts => ApiRequestLog/ApiRequestLog.data.ts} (100%)
rename src/views/iot/tq/{nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue => ApiRequestLog/ApiRequestLogList.vue} (92%)
rename src/views/iot/tq/{nuIotTqApiRequestLog/NuIotTqApiRequestLogList2.vue => ApiRequestLog/ApiRequestLogList2.vue} (93%)
rename src/views/iot/tq/{nuIotTqApiRequestLog/NuIotTqApiRequestLogList3.vue => ApiRequestLog/ApiRequestLogList3.vue} (93%)
rename src/views/iot/tq/{nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue => ApiRequestLog/components/ApiRequestLogForm.vue} (88%)
rename src/views/iot/tq/{nuIotTqApiRequestLog/components/NuIotTqApiRequestLogModal.vue => ApiRequestLog/components/ApiRequestLogModal.vue} (95%)
delete mode 100644 src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLog.api.ts
delete mode 100644 src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLog.data.ts
delete mode 100644 src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogList.vue
delete mode 100644 src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogListModal.vue
delete mode 100644 src/views/iot/tq/nuIotTqElectricitySyncLog/components/NuIotTqElectricitySyncLogForm.vue
delete mode 100644 src/views/iot/tq/nuIotTqElectricitySyncLog/components/NuIotTqElectricitySyncLogModal.vue
diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.api.ts b/src/views/iot/tq/ApiRequestLog/ApiRequestLog.api.ts
similarity index 74%
rename from src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.api.ts
rename to src/views/iot/tq/ApiRequestLog/ApiRequestLog.api.ts
index 66086fb..ca93ac0 100644
--- a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.api.ts
+++ b/src/views/iot/tq/ApiRequestLog/ApiRequestLog.api.ts
@@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
- list = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/list',
- save='/nuIotTqApiRequestLog/nuIotTqApiRequestLog/add',
- edit='/nuIotTqApiRequestLog/nuIotTqApiRequestLog/edit',
- deleteOne = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/delete',
- deleteBatch = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/deleteBatch',
- importExcel = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/importExcel',
- exportXls = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/exportXls',
+ list = '/iot/tq/ApiRequestLog/list',
+ save='/iot/tq/ApiRequestLog/add',
+ edit='/iot/tq/ApiRequestLog/edit',
+ deleteOne = '/iot/tq/ApiRequestLog/delete',
+ deleteBatch = '/iot/tq/ApiRequestLog/deleteBatch',
+ importExcel = '/iot/tq/ApiRequestLog/importExcel',
+ exportXls = '/iot/tq/ApiRequestLog/exportXls',
}
/**
diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts b/src/views/iot/tq/ApiRequestLog/ApiRequestLog.data.ts
similarity index 100%
rename from src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts
rename to src/views/iot/tq/ApiRequestLog/ApiRequestLog.data.ts
diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue
similarity index 92%
rename from src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue
rename to src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue
index 003dc51..820f826 100644
--- a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue
+++ b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue
@@ -13,18 +13,18 @@
-
-
-
-
diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogListModal.vue b/src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogListModal.vue
deleted file mode 100644
index 131b9a4..0000000
--- a/src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLogListModal.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-
-