From 69e2baf5518079bfc16cfadc2fb29842fb3de85d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 14 一月 2020 21:02:48 +0800
Subject: [PATCH] 加入userName
---
WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.js | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 109 insertions(+), 2 deletions(-)
diff --git a/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.js b/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.js
index 74790e8..787c87e 100644
--- a/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.js
+++ b/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.js
@@ -11,6 +11,16 @@
authCode: '',
machineIp: '',
machineMac: '',
+ floorId: '',
+ floorNum: '',
+ floorName: '',
+ unitId: '',
+ unitNum: '',
+ roomId: '',
+ locationTypeCd: '',
+ locationObjId: '',
+ roomNum: '',
+ machineUrl: '',
}
},
@@ -22,10 +32,70 @@
vc.component.refreshEditMachineInfo();
$('#editMachineModel').modal('show');
vc.copyObject(_params, vc.component.editMachineInfo);
+ vc.component._initMachineUrl();
+ //鏍规嵁浣嶇疆绫诲瀷 浼犺緭鏁版嵁
+ if (vc.component.editMachineInfo.locationTypeCd == '2000') {
+ vc.emit('editMachine', 'floorSelect2', 'setFloor', {
+ floorId: vc.component.editMachineInfo.floorId,
+ floorNum: vc.component.editMachineInfo.floorNum
+ });
+ vc.emit('editMachine', 'unitSelect2', 'setUnit', {
+ floorId: vc.component.editMachineInfo.floorId,
+ floorNum: vc.component.editMachineInfo.floorNum,
+ unitId: vc.component.editMachineInfo.unitId,
+ unitNum: vc.component.editMachineInfo.unitNum,
+ });
+ } else if (vc.component.editMachineInfo.locationTypeCd == '3000') {
+ vc.emit('editMachine', 'floorSelect2', 'setFloor', {
+ floorId: vc.component.editMachineInfo.floorId,
+ floorNum: vc.component.editMachineInfo.floorNum
+ });
+ vc.emit('editMachine', 'unitSelect2', 'setUnit', {
+ floorId: vc.component.editMachineInfo.floorId,
+ floorNum: vc.component.editMachineInfo.floorNum,
+ unitId: vc.component.editMachineInfo.unitId,
+ unitNum: vc.component.editMachineInfo.unitNum,
+ });
+ vc.emit('editMachine', 'roomSelect2', 'setRoom', {
+ floorId: vc.component.editMachineInfo.floorId,
+ floorNum: vc.component.editMachineInfo.floorNum,
+ unitId: vc.component.editMachineInfo.unitId,
+ unitNum: vc.component.editMachineInfo.unitNum,
+ roomId: vc.component.editMachineInfo.roomId,
+ roomNum: vc.component.editMachineInfo.roomNum,
+ });
+ }
vc.component.editMachineInfo.communityId = vc.getCurrentCommunity().communityId;
+ });
+
+ vc.on("editMachine", "notify", function (_param) {
+ if (_param.hasOwnProperty("floorId")) {
+ vc.component.editMachineInfo.floorId = _param.floorId;
+ }
+
+ if (_param.hasOwnProperty("unitId")) {
+ vc.component.editMachineInfo.unitId = _param.unitId;
+ }
+
+ if (_param.hasOwnProperty("roomId")) {
+ vc.component.editMachineInfo.roomId = _param.roomId;
+ }
});
},
methods: {
+ _initMachineUrl: function () {
+ var sysInfo = vc.getData("_sysInfo");
+ if (sysInfo == null) {
+ return;
+ }
+
+ var apiUrl = sysInfo.apiUrl + "/api/machineTranslate.machineHeartbeart?communityId="
+ + vc.getCurrentCommunity().communityId + "&transaction_id=-1&req_time=20181113225612&user_id=-1"
+ + "&app_id=" + vc.component.editMachineInfo.machineTypeCd;
+ vc.component.editMachineInfo.machineUrl = apiUrl;
+
+
+ },
editMachineValidate: function () {
return vc.validate.validate({
editMachineInfo: vc.component.editMachineInfo
@@ -103,14 +173,41 @@
limit: "required",
param: "",
errInfo: "璁惧ID涓嶈兘涓虹┖"
- }]
+ }],
+ 'editMachineInfo.locationTypeCd':
+ [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "璇烽�夋嫨璁惧浣嶇疆"
+ }
+ ],
+ 'editMachineInfo.locationObjId':
+ [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "璇烽�夋嫨浣嶇疆"
+ }
+ ]
})
;
},
editMachine: function () {
+ vc.component.editMachineInfo.communityId = vc.getCurrentCommunity().communityId;
+ if (vc.component.editMachineInfo.locationTypeCd != '2000' && vc.component.editMachineInfo.locationTypeCd != '3000') { //澶ч棬鏃剁洿鎺ュ啓 灏忓尯ID
+ vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.communityId;
+ } else if (vc.component.editMachineInfo.locationTypeCd == '2000') {
+ vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.unitId;
+ } else if (vc.component.editMachineInfo.locationTypeCd == '3000') {
+ vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.roomId;
+ } else {
+ vc.toast("璁惧浣嶇疆鍊奸敊璇�");
+ return;
+ }
if (!vc.component.editMachineValidate()) {
- vc.message(vc.validate.errInfo);
+ vc.toast(vc.validate.errInfo);
return;
}
@@ -147,6 +244,16 @@
authCode: '',
machineIp: '',
machineMac: '',
+ floorId: '',
+ floorNum: '',
+ floorName: '',
+ unitId: '',
+ unitNum: '',
+ roomId: '',
+ locationTypeCd: '',
+ locationObjId: '',
+ roomNum: '',
+ machineUrl: ''
}
}
--
Gitblit v1.8.0