diff --git a/public/components/property/inspectionPointQrCode/inspectionPointQrCode.html b/public/components/property/inspectionPointQrCode/inspectionPointQrCode.html
new file mode 100644
index 000000000..16af995ae
--- /dev/null
+++ b/public/components/property/inspectionPointQrCode/inspectionPointQrCode.html
@@ -0,0 +1,29 @@
+
\ No newline at end of file
diff --git a/public/components/property/inspectionPointQrCode/inspectionPointQrCode.js b/public/components/property/inspectionPointQrCode/inspectionPointQrCode.js
new file mode 100644
index 000000000..d4445cb95
--- /dev/null
+++ b/public/components/property/inspectionPointQrCode/inspectionPointQrCode.js
@@ -0,0 +1,35 @@
+(function(vc) {
+
+ vc.extends({
+ data: {
+ inspectionPointQrCodeInfo: {
+ url: '',
+ inspectionName: '',
+ }
+ },
+ _initMethod: function() {},
+ _initEvent: function() {
+ vc.on('inspectionPointQrCode', 'openInspectionPointQrCodeModal', function(_param) {
+ vc.copyObject(_param, $that.inspectionPointQrCodeInfo);
+ $('#inspectionPointQrCodeModel').modal('show');
+ $that._viewQr($that.inspectionPointQrCodeInfo.url);
+ });
+ },
+ methods: {
+ // 两分钟后显示遮罩层
+ _viewQr: function(_url) {
+ document.getElementById("qrcode").innerHTML = "";
+ let qrcode = new QRCode(document.getElementById("qrcode"), {
+ text: "213", //你想要填写的文本
+ width: 200, //生成的二维码的宽度
+ height: 200, //生成的二维码的高度
+ colorDark: "#000000", // 生成的二维码的深色部分
+ colorLight: "#ffffff", //生成二维码的浅色部分
+ correctLevel: QRCode.CorrectLevel.L
+ });
+ qrcode.makeCode(_url);
+ }
+ }
+ });
+
+})(window.vc);
\ No newline at end of file
diff --git a/public/components/property/simplifyMeterWaterLog/simplifyMeterWaterLog.html b/public/components/property/simplifyMeterWaterLog/simplifyMeterWaterLog.html
index c3cd77b4b..55e47de4c 100644
--- a/public/components/property/simplifyMeterWaterLog/simplifyMeterWaterLog.html
+++ b/public/components/property/simplifyMeterWaterLog/simplifyMeterWaterLog.html
@@ -8,8 +8,7 @@
-
@@ -17,37 +16,38 @@
diff --git a/public/pages/property/inspectionPointManage/inspectionPointManage.html b/public/pages/property/inspectionPointManage/inspectionPointManage.html
index 41329f9ea..7f98c9f28 100755
--- a/public/pages/property/inspectionPointManage/inspectionPointManage.html
+++ b/public/pages/property/inspectionPointManage/inspectionPointManage.html
@@ -93,6 +93,10 @@
删除
+
+ 二维码
+
+
@@ -113,4 +117,5 @@
+
\ No newline at end of file
diff --git a/public/pages/property/inspectionPointManage/inspectionPointManage.js b/public/pages/property/inspectionPointManage/inspectionPointManage.js
index 75e5afc26..18d775bb5 100755
--- a/public/pages/property/inspectionPointManage/inspectionPointManage.js
+++ b/public/pages/property/inspectionPointManage/inspectionPointManage.js
@@ -1,7 +1,7 @@
/**
入驻小区
**/
-(function (vc) {
+(function(vc) {
var DEFAULT_PAGE = 1;
var DEFAULT_ROWS = 10;
vc.extends({
@@ -22,23 +22,23 @@
}
}
},
- _initMethod: function () {
+ _initMethod: function() {
//与字典表关联
- vc.getDict('inspection_point', "point_obj_type", function (_data) {
+ vc.getDict('inspection_point', "point_obj_type", function(_data) {
vc.component.inspectionPointManageInfo.pointObjTypes = _data;
});
vc.component._listInspectionPoints(DEFAULT_PAGE, DEFAULT_ROWS);
},
- _initEvent: function () {
- vc.on('inspectionPointManage', 'listInspectionPoint', function (_param) {
+ _initEvent: function() {
+ vc.on('inspectionPointManage', 'listInspectionPoint', function(_param) {
vc.component._listInspectionPoints(DEFAULT_PAGE, DEFAULT_ROWS);
});
- vc.on('pagination', 'page_event', function (_currentPage) {
+ vc.on('pagination', 'page_event', function(_currentPage) {
vc.component._listInspectionPoints(_currentPage, DEFAULT_ROWS);
});
},
methods: {
- _listInspectionPoints: function (_page, _rows) {
+ _listInspectionPoints: function(_page, _rows) {
vc.component.inspectionPointManageInfo.conditions.page = _page;
vc.component.inspectionPointManageInfo.conditions.row = _rows;
vc.component.inspectionPointManageInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
@@ -52,7 +52,7 @@
vc.http.get('inspectionPointManage',
'list',
param,
- function (json, res) {
+ function(json, res) {
var _inspectionPointManageInfo = JSON.parse(json);
vc.component.inspectionPointManageInfo.total = _inspectionPointManageInfo.total;
vc.component.inspectionPointManageInfo.records = _inspectionPointManageInfo.records;
@@ -62,39 +62,43 @@
dataCount: vc.component.inspectionPointManageInfo.total,
currentPage: _page
});
- }, function (errInfo, error) {
+ },
+ function(errInfo, error) {
console.log('请求失败处理');
}
);
},
- _openAddInspectionPointModal: function () {
+ _openAddInspectionPointModal: function() {
vc.emit('addInspectionPoint', 'openAddInspectionPointModal', {});
},
- _openEditInspectionPointModel: function (_inspectionPoint) {
+ _openEditInspectionPointModel: function(_inspectionPoint) {
vc.emit('editInspectionPoint', 'openEditInspectionPointModal', _inspectionPoint);
},
- _openDeleteInspectionPointModel: function (_inspectionPoint) {
+ _openDeleteInspectionPointModel: function(_inspectionPoint) {
vc.emit('deleteInspectionPoint', 'openDeleteInspectionPointModal', _inspectionPoint);
},
//查询
- _queryInspectionPointMethod: function () {
+ _queryInspectionPointMethod: function() {
vc.component._listInspectionPoints(DEFAULT_PAGE, DEFAULT_ROWS);
},
//重置
- _resetInspectionPointMethod: function () {
+ _resetInspectionPointMethod: function() {
vc.component.inspectionPointManageInfo.conditions.inspectionId = '';
vc.component.inspectionPointManageInfo.conditions.inspectionName = '';
vc.component.inspectionPointManageInfo.conditions.machineCode = '';
vc.component.inspectionPointManageInfo.conditions.pointObjType = '';
vc.component._listInspectionPoints(DEFAULT_PAGE, DEFAULT_ROWS);
},
- _moreCondition: function () {
+ _moreCondition: function() {
if (vc.component.inspectionPointManageInfo.moreCondition) {
vc.component.inspectionPointManageInfo.moreCondition = false;
} else {
vc.component.inspectionPointManageInfo.moreCondition = true;
}
+ },
+ _pointQrCode: function(_inspectionPoint) {
+ vc.emit('inspectionPointQrCode', 'openInspectionPointQrCodeModal', _inspectionPoint);
}
}
});
-})(window.vc);
+})(window.vc);
\ No newline at end of file