From e981e0414f455769506574dc288b42a135178c14 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Mon, 21 Mar 2022 10:21:51 +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 --- .../inspectionPointQrCode.html | 29 ++++++++++ .../inspectionPointQrCode.js | 35 +++++++++++ .../simplifyMeterWaterLog.html | 58 +++++++++---------- .../inspectionPointManage.html | 5 ++ .../inspectionPointManage.js | 36 +++++++----- 5 files changed, 118 insertions(+), 45 deletions(-) create mode 100644 public/components/property/inspectionPointQrCode/inspectionPointQrCode.html create mode 100644 public/components/property/inspectionPointQrCode/inspectionPointQrCode.js 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 @@
- - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + + +
表类型对象名称上期度数本期度数上期读表时间本期读表时间创建时间操作
表类型对象名称上期度数本期度数上期读表时间本期读表时间创建时间操作
{{_getMeteTypeName(meterWater.meterType)}}{{meterWater.objName}}{{meterWater.preDegrees}}{{meterWater.curDegrees}}{{meterWater.preReadingTime}}{{meterWater.curReadingTime}}{{meterWater.createTime}} -
-
{{meterWater.meterTypeName}}{{meterWater.objName}}{{meterWater.preDegrees}}{{meterWater.curDegrees}}{{meterWater.preReadingTime}}{{meterWater.curReadingTime}}{{meterWater.createTime}} +
+ -
-
-
+
+ -
-
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