Ox*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 @@
- 表号
-
+ SN
+
+
+
+
+
+ 护理单元
+
@@ -19,47 +25,63 @@