From 7d45a78c90aeff41c1f4d09ef04e3b19580ecb2e Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Mon, 22 Jan 2024 14:50:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/bigScreen/public.html | 4 +- .../communityDataToIot/communityDataToIot.js | 2 +- .../communityManage/communityManage.html | 8 +- .../editEquipmentAccount.html | 324 ++++++++++-------- .../editEquipmentAccount.js | 21 +- 5 files changed, 192 insertions(+), 167 deletions(-) diff --git a/public/bigScreen/public.html b/public/bigScreen/public.html index 56c8e2673..baf3bebc4 100644 --- a/public/bigScreen/public.html +++ b/public/bigScreen/public.html @@ -45,9 +45,9 @@
diff --git a/public/components/common/communityDataToIot/communityDataToIot.js b/public/components/common/communityDataToIot/communityDataToIot.js index 9363de96e..be6dd5a4c 100644 --- a/public/components/common/communityDataToIot/communityDataToIot.js +++ b/public/components/common/communityDataToIot/communityDataToIot.js @@ -10,7 +10,7 @@ }, _initEvent: function () { vc.on('communityDataToIot', 'openCommunityDataToIotModal', function (_params) { - vc.copyOBject(_params,$that.communityDataToIotInfo); + vc.copyObject(_params,$that.communityDataToIotInfo); $('#communityDataToIotModel').modal('show'); }); }, diff --git a/public/pages/common/communityManage/communityManage.html b/public/pages/common/communityManage/communityManage.html index ed1181e97..18c59ff46 100644 --- a/public/pages/common/communityManage/communityManage.html +++ b/public/pages/common/communityManage/communityManage.html @@ -11,15 +11,15 @@
-
+
+ v-model="communityManageInfo.conditions.communityId" class=" form-control form-control-sm">
-
+
+ v-model="communityManageInfo.conditions.name" class=" form-control form-control-sm">
diff --git a/public/pages/property/editEquipmentAccount/editEquipmentAccount.html b/public/pages/property/editEquipmentAccount/editEquipmentAccount.html index 201c5f4d7..199c0ca32 100644 --- a/public/pages/property/editEquipmentAccount/editEquipmentAccount.html +++ b/public/pages/property/editEquipmentAccount/editEquipmentAccount.html @@ -8,160 +8,182 @@
-
-
-
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
-
-
- - -
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
\ No newline at end of file diff --git a/public/pages/property/editEquipmentAccount/editEquipmentAccount.js b/public/pages/property/editEquipmentAccount/editEquipmentAccount.js index 373b2d10a..d21f91d56 100644 --- a/public/pages/property/editEquipmentAccount/editEquipmentAccount.js +++ b/public/pages/property/editEquipmentAccount/editEquipmentAccount.js @@ -36,12 +36,12 @@ _initMethod: function () { $that.editEquipmentAccountInfo.machineId = vc.getParam('machineId'); vc.getDict('equipment_account', "importance_level", function (_data) { - vc.component.editEquipmentAccountInfo.importanceLevels = _data; + $that.editEquipmentAccountInfo.importanceLevels = _data; }); vc.getDict('equipment_account', "state", function (_data) { - vc.component.editEquipmentAccountInfo.useStatus = _data; + $that.editEquipmentAccountInfo.useStatus = _data; }); - vc.component._initAddEquipmentAccountInfo(); + $that._initAddEquipmentAccountInfo(); $that._listEquipmentAccounts(); }, _initEvent: function () { @@ -61,7 +61,7 @@ $('.addFirstEnableTime').datetimepicker() .on('changeDate', function (ev) { var value = $(".addFirstEnableTime").val(); - vc.component.editEquipmentAccountInfo.firstEnableTime = value; + $that.editEquipmentAccountInfo.firstEnableTime = value; }); $('.addWarrantyDeadlineE').datetimepicker({ language: 'zh-CN', @@ -75,13 +75,13 @@ $('.addWarrantyDeadlineE').datetimepicker() .on('changeDate', function (ev) { var value = $(".addWarrantyDeadlineE").val(); - vc.component.editEquipmentAccountInfo.warrantyDeadline = value; + $that.editEquipmentAccountInfo.warrantyDeadline = value; }); }, editEquipmentAccountValidate() { return vc.validate.validate({ - editEquipmentAccountInfo: vc.component.editEquipmentAccountInfo + editEquipmentAccountInfo: $that.editEquipmentAccountInfo }, { 'editEquipmentAccountInfo.machineName': [ { @@ -204,14 +204,14 @@ }); }, saveEquipmentAccountInfo: function () { - if (!vc.component.editEquipmentAccountValidate()) { + if (!$that.editEquipmentAccountValidate()) { vc.toast(vc.validate.errInfo); return; } - vc.component.editEquipmentAccountInfo.communityId = vc.getCurrentCommunity().communityId; + $that.editEquipmentAccountInfo.communityId = vc.getCurrentCommunity().communityId; vc.http.apiPost( '/equipmentAccount.updateEquipmentAccount', - JSON.stringify(vc.component.editEquipmentAccountInfo), + JSON.stringify($that.editEquipmentAccountInfo), { emulateJSON: true }, @@ -252,6 +252,9 @@ } ); }, + _goBack:function(){ + vc.goBack() + } } }); })(window.vc);