From b1b52d61acedccd6fdd58b32dcd04ebf14a96f38 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 二月 2020 13:43:03 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js | 84 +++++++++++++++++++++++++++++++++++------
1 files changed, 71 insertions(+), 13 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 6d305dc..93dbdd3 100644
--- a/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js
+++ b/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js
@@ -15,13 +15,16 @@
authCode: '',
machineIp: '',
machineMac: '',
- floorId:'',
- floorNum:'',
- floorName:'',
- unitId:'',
- unitName:'',
- roomId:'',
- roomName:''
+ floorId: '',
+ floorNum: '',
+ floorName: '',
+ unitId: '',
+ unitName: '',
+ roomId: '',
+ locationTypeCd: '',
+ locationObjId: '',
+ roomName: '',
+ direction:''
}
},
_initMethod: function () {
@@ -31,9 +34,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
}, {
@@ -75,6 +92,19 @@
errInfo: "璁惧绫诲瀷鏍煎紡閿欒"
},
],
+ 'addMachineInfo.direction':
+ [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "璁惧鏂瑰悜涓嶈兘涓虹┖"
+ },
+ {
+ limit: "num",
+ param: "",
+ errInfo: "璁惧鏂瑰悜鏍煎紡閿欒"
+ },
+ ],
'addMachineInfo.authCode':
[
{
@@ -103,17 +133,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);
+ vc.toast(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);
@@ -157,10 +215,10 @@
authCode: '',
machineIp: '',
machineMac: '',
-
+ direction:''
};
},
- _initAddMachineData:function () {
+ _initAddMachineData: function () {
$('.floorSelector').select2({
placeholder: '蹇呭～锛岃閫夋嫨妤兼爧',
ajax: {
@@ -170,7 +228,7 @@
data: function (params) {
return {
floorNum: vc.component.addMachineInfo.floorNum,
- /* page:*/
+ /* page:*/
};
},
processResults: function (data) {
--
Gitblit v1.8.0