From 5d09d7360dc19afeba2c117774bcfea20e917d55 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 22 十二月 2019 12:53:49 +0800
Subject: [PATCH] 优化其他小区添加
---
WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js b/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js
index 8fc6a5c..c87ab15 100644
--- a/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js
+++ b/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js
@@ -15,7 +15,15 @@
authCode: '',
machineIp: '',
machineMac: '',
-
+ floorId: '',
+ floorNum: '',
+ floorName: '',
+ unitId: '',
+ unitName: '',
+ roomId: '',
+ locationTypeCd: '',
+ locationObjId: '',
+ roomName: ''
}
},
_initMethod: function () {
@@ -25,9 +33,23 @@
vc.on('addMachine', 'openAddMachineModal', function () {
$('#addMachineModel').modal('show');
});
+
+ vc.on("addMachine", "notify", function (_param) {
+ if (_param.hasOwnProperty("floorId")) {
+ vc.component.addMachineInfo.floorId = _param.floorId;
+ }
+
+ if (_param.hasOwnProperty("unitId")) {
+ vc.component.addMachineInfo.unitId = _param.unitId;
+ }
+
+ if(_param.hasOwnProperty("roomId")){
+ vc.component.addMachineInfo.roomId = _param.roomId;
+ }
+ });
},
methods: {
- addMachineValidate() {
+ addMachineValidate: function () {
return vc.validate.validate({
addMachineInfo: vc.component.addMachineInfo
}, {
@@ -97,17 +119,45 @@
param: "64",
errInfo: "璁惧MAC 鏍煎紡閿欒"
}
+ ],
+ 'addMachineInfo.locationTypeCd':
+ [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "璇烽�夋嫨璁惧浣嶇疆"
+ }
+ ],
+ 'addMachineInfo.locationObjId':
+ [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "璇烽�夋嫨浣嶇疆"
+ }
]
});
},
saveMachineInfo: function () {
+ vc.component.addMachineInfo.communityId = vc.getCurrentCommunity().communityId;
+ if (vc.component.addMachineInfo.locationTypeCd != '2000' && vc.component.addMachineInfo.locationTypeCd != '3000') { //澶ч棬鏃剁洿鎺ュ啓 灏忓尯ID
+ vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.communityId;
+ } else if (vc.component.addMachineInfo.locationTypeCd == '2000') {
+ vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.unitId;
+ } else if (vc.component.addMachineInfo.locationTypeCd == '3000') {
+ vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.roomId;
+ } else {
+ vc.toast("璁惧浣嶇疆鍊奸敊璇�");
+ return;
+ }
+
if (!vc.component.addMachineValidate()) {
vc.message(vc.validate.errInfo);
return;
}
- vc.component.addMachineInfo.communityId = vc.getCurrentCommunity().communityId;
+
//涓嶆彁浜ゆ暟鎹皢鏁版嵁 鍥炶皟缁欎睛鍚鐞�
if (vc.notNull($props.callBackListener)) {
vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addMachineInfo);
@@ -153,6 +203,29 @@
machineMac: '',
};
+ },
+ _initAddMachineData: function () {
+ $('.floorSelector').select2({
+ placeholder: '蹇呭～锛岃閫夋嫨妤兼爧',
+ ajax: {
+ url: "sdata.json",
+ dataType: 'json',
+ delay: 250,
+ data: function (params) {
+ return {
+ floorNum: vc.component.addMachineInfo.floorNum,
+ /* page:*/
+ };
+ },
+ processResults: function (data) {
+ return {
+ results: data
+ };
+ },
+ cache: true
+ },
+ minimumInputLength: 2
+ });
}
}
});
--
Gitblit v1.8.0