From da723b5ee8898c1a5b8e2d0cfa83fd90f3848bda Mon Sep 17 00:00:00 2001 From: qfzc Date: Thu, 1 May 2025 10:23:47 +0800 Subject: [PATCH] =?UTF-8?q?refactor(public):=20=E4=BC=98=E5=8C=96=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E7=BB=84=E4=BB=B6=E7=9A=84=E6=A0=B7=E5=BC=8F=E5=92=8C?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了多个组件中的控制台日志输出 - 调整了部分组件的布局和样式 - 优化了部分组件的功能，如添加新房间结构颜色逻辑 - 删除了未使用的代码和注释 --- .../components/frame/commonTop/commonTop.html | 6 - .../components/frame/commonTop/commonTop.js | 8 +- public/components/frame/initData/initData.js | 2 +- .../property/payFeeDiscount/payFeeDiscount.js | 10 +- public/index1.html | 4 +- public/pages/fee/printPayFee/printPayFee.html | 159 +++++++++--------- .../property/payFeeOrder/payFeeOrder.html | 3 +- .../reportOweFeeDetail/reportOweFeeDetail.js | 27 +-- .../property/roomStructure/roomStructure.js | 50 ++++-- public/vcCore/vc-zh-cn.js | 10 +- 10 files changed, 135 insertions(+), 144 deletions(-) diff --git a/public/components/frame/commonTop/commonTop.html b/public/components/frame/commonTop/commonTop.html index b09ab03a4..fd3c16c42 100644 --- a/public/components/frame/commonTop/commonTop.html +++ b/public/components/frame/commonTop/commonTop.html @@ -4,12 +4,6 @@ diff --git a/public/components/frame/commonTop/commonTop.js b/public/components/frame/commonTop/commonTop.js index 6ff24bacb..383f674d9 100644 --- a/public/components/frame/commonTop/commonTop.js +++ b/public/components/frame/commonTop/commonTop.js @@ -1,9 +1,3 @@ -console.log('############################################################'); -console.log('# HC小区项目开源于https://gitee.com/wuxw7/MicroCommunity #'); -console.log('# HC智慧家园项目开源于https://gitee.com/wuxw7/MicroCommunity #'); -console.log('# 开源不易，请star #'); -console.log('# 官网：http://www.homecommunity.cn/ #'); -console.log('############################################################'); var _hmt = _hmt || []; (function() { @@ -11,4 +5,4 @@ var _hmt = _hmt || []; hm.src = "https://hm.baidu.com/hm.js?adedae9bc250561cc17e96dc1fb46079"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(hm, s); - })(); \ No newline at end of file + })(); diff --git a/public/components/frame/initData/initData.js b/public/components/frame/initData/initData.js index bd60eb31d..3df2bfe9d 100644 --- a/public/components/frame/initData/initData.js +++ b/public/components/frame/initData/initData.js @@ -147,4 +147,4 @@ }); -})(window.vc); \ No newline at end of file +})(window.vc); diff --git a/public/components/property/payFeeDiscount/payFeeDiscount.js b/public/components/property/payFeeDiscount/payFeeDiscount.js index 6da83c0b0..ba400f013 100644 --- a/public/components/property/payFeeDiscount/payFeeDiscount.js +++ b/public/components/property/payFeeDiscount/payFeeDiscount.js @@ -43,9 +43,9 @@ if ($that.payFeeDiscountInfo.cycles < 0) { return; } - - + + $that._listFeeDiscounts(DEFAULT_PAGE, DEFAULT_ROWS); }); }, @@ -87,9 +87,9 @@ function (json, res) { let _payFeeDiscountInfo = JSON.parse(json); $that.payFeeDiscountInfo.feeDiscounts = _payFeeDiscountInfo.data; - $that.payFeeDiscountInfo.feeDiscounts.forEach(item => { - $that.payFeeDiscountInfo.selectDiscountIds.push(item.discountId); - }) + // $that.payFeeDiscountInfo.feeDiscounts.forEach(item => { + // $that.payFeeDiscountInfo.selectDiscountIds.push(item.discountId); + // }) }, function (errInfo, error) { console.log('请求失败处理'); } diff --git a/public/index1.html b/public/index1.html index 7be4f2986..ff75a2226 100644 --- a/public/index1.html +++ b/public/index1.html @@ -4,7 +4,7 @@ - HC智慧物业管理系统 + 智慧物业管理系统 @@ -80,4 +80,4 @@ - \ No newline at end of file + diff --git a/public/pages/fee/printPayFee/printPayFee.html b/public/pages/fee/printPayFee/printPayFee.html index 346d80755..d9e71b07a 100644 --- a/public/pages/fee/printPayFee/printPayFee.html +++ b/public/pages/fee/printPayFee/printPayFee.html @@ -1,88 +1,89 @@
-
-
-
{{printPayFeeInfo.communityName}} {{printPayFeeInfo.apply == 'Y'?'申请单':'收据单'}}
- +
+
北城物业-{{printPayFeeInfo.communityName}}- {{printPayFeeInfo.apply == 'Y'?'申请单':'收据单'}}
+
+
+
+
-
-
- ：{{printPayFeeInfo.payObjName}} -
-
- ：{{printPayFeeInfo.receiptNum}} -
- ：{{printPayFeeInfo.feeTime}} -
+
+ {{printPayFeeInfo.receiptNum}} +
+ ：{{printPayFeeInfo.feeTime}}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{index +1}}{{item.feeName}}{{item.objName}} - {{vc.dateFormat(item.startTime)}} - - {{vc.dateFormat(item.endTime)}}
- {{item.preDegrees}} 至 {{item.curDegrees}} - 		- 无 - - {{vc.dateFormat(item.startTime)}}{{vc.dateFormat(item.endTime)}} - {{item.squarePrice}}
{{item.units}}		{{item.area}}{{item.amount}}{{item.amount}}{{item.remark}}
（元）{{vc.changeNumMoneyToChinese(printPayFeeInfo.amount)}} - {{printPayFeeInfo.amount}}
- - -
- - 		- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{index +1}}{{item.feeName}}{{printPayFeeInfo.payObjName}}{{ item.objName}}{{vc.dateFormat(item.startTime)}}{{vc.dateFormat(item.endTime)}}{{item.squarePrice}}{{item.units}}{{item.primeRate}}{{item.amount}}{{item.amount}} + + {{item.discountPrice || 0}}
（元）{{vc.changeNumMoneyToChinese(printPayFeeInfo.amount)}} + {{printPayFeeInfo.amount}}
+
+ 		+ +
+
-
：
-
：{{vc.getData('/nav/getUserInfo').name}}
-
：
-
：
+ +
：{{vc.getData('/nav/getUserInfo').name}}
+ +
\ No newline at end of file +
diff --git a/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.js b/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.js index 447e99353..16e60b6c5 100644 --- a/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.js +++ b/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.js @@ -14,7 +14,7 @@ moreCondition: false, title: '', feeTypeCds: [], - communitys: [], + communitys:[], totalPreferentialAmount: 0.0, allOweAmount: 0.0, conditions: { @@ -26,15 +26,15 @@ startTime: '', endTime: '', communityId: '', - ownerNameLike: '', + ownerNameLike:'', } } }, _initMethod: function () { - vc.initDate('startTime', function (_value) { + vc.initDate('startTime',function(_value){ $that.reportOweFeeDetailInfo.conditions.startTime = _value; }); - vc.initDate('endTime', function (_value) { + vc.initDate('endTime',function(_value){ $that.reportOweFeeDetailInfo.conditions.endTime = _value; }); vc.getDict('pay_fee_config', "fee_type_cd", function (_data) { @@ -147,22 +147,7 @@ } }, _exportExcel: function () { - $that.reportOweFeeDetailInfo.conditions.pagePath = 'reportOweFeeDetail'; - let _param = { - params: $that.reportOweFeeDetailInfo.conditions - } - vc.http.apiGet('/export.exportData', - _param, - function (json, res) { - let _json = JSON.parse(json); - vc.toast(_json.msg); - if (_json.code == 0) { - vc.jumpToPage('/#/pages/property/downloadTempFile?tab=下载中心') - } - }, - function (errInfo, error) { - console.log('请求失败处理'); - }); + vc.jumpToPage('/callComponent/exportReportFee/exportData?pagePath=reportOweFeeDetail&' + vc.objToGetParam($that.reportOweFeeDetailInfo.conditions)); }, _loadStaffCommunitys: function () { let param = { @@ -184,7 +169,7 @@ } ); }, - _changCommunity: function () { + _changCommunity:function(){ $that.reportOweFeeDetailInfo.conditions.floorId = ""; $that._listFloors(); $that._listFees(DEFAULT_PAGE, DEFAULT_ROWS); diff --git a/public/pages/property/roomStructure/roomStructure.js b/public/pages/property/roomStructure/roomStructure.js index cbfe7e62b..4a4749c17 100644 --- a/public/pages/property/roomStructure/roomStructure.js +++ b/public/pages/property/roomStructure/roomStructure.js @@ -58,27 +58,12 @@ * @returns */ _getBgColor: function (room) { - if (room.oweAmount > 0) { - return "#DC3545"; - } if (!room.ownerName) { return "#1AB394"; } - if (room.state == '2001') { - return '#1296db' - } - if (room.state == '2003') { - return '#4C8CDE' - } - if (room.state == '2005') { - return '#085DC9' - } if (room.state == '2004') { return '#9DBFEA' } - if (room.state == '2006') { - return '#365A87' - } if (room.state == '2007') { return '#1053A8' } @@ -88,7 +73,38 @@ if (room.state == '2009') { return '#5B81B1' } - return "#1296db" + // const formattedOweAmount = parseFloat(room.oweAmount).toFixed(2); + // const formattedMonthlyFee = parseFloat(room.monthlyFee).toFixed(2); + + const formattedOweAmount = parseFloat(room.oweAmount); + const formattedMonthlyFee = parseFloat(room.monthlyFee); + + if (formattedOweAmount === 0) { + return "#28a745"; + } + else if (formattedOweAmount > formattedMonthlyFee) { + return "#DC3545"; + } + else if (formattedOweAmount === formattedMonthlyFee) { + return "#e8c019"; + } + else { + if (room.state == '2001') { + return '#1296db' + } + if (room.state == '2003') { + return '#4C8CDE' + } + if (room.state == '2005') { + return '#085DC9' + } + + if (room.state == '2006') { + return '#365A87' + } + + return "#1296db" + } }, _toSimplifyAcceptance: function (_room) { let _date = new Date(); @@ -118,4 +134,4 @@ } } }); -})(window.vc); \ No newline at end of file +})(window.vc); diff --git a/public/vcCore/vc-zh-cn.js b/public/vcCore/vc-zh-cn.js index d72c65d1b..17de76541 100644 --- a/public/vcCore/vc-zh-cn.js +++ b/public/vcCore/vc-zh-cn.js @@ -3,17 +3,17 @@ */ (function(window) { window.lang = { - "systemName": "HC", - "systemSimpleName": "HC", + "systemName": "循环", + "systemSimpleName": "循环", "subSystemName": "小区管理系统", "companyTeam": "java110团队", - "welcome": "欢迎访问HC小区管理系统", + "welcome": "欢迎访问小区管理系统", "signOut": "退出", "signIn": "登录", "register": "注册", "moreCommunity": "更多小区", "moreMsg": "查看全部消息", - "title": "HC小区管理系统", + "title": "小区管理系统", "noAccount": "还没有账号？ ", "areyouhasaccount": "已经有账户了？", "保存": "保存", @@ -1211,4 +1211,4 @@ "addAttrSpec": { "字符串": "字符串", "否": "否", "小区属性": "小区属性", "规格名称": "规格名称", "说明": "说明", "必填": "必填", "设备属性": "设备属性", "查询显示": "查询显示", "展示": "展示", "是": "是", "值类型": "值类型", "整数": "整数", "停车场属性": "停车场属性", "添加属性配置": "添加属性配置", "属性表": "属性表", "房屋属性": "房屋属性", "业主属性": "业主属性", "车辆属性": "车辆属性", "金额": "金额", "规格类型": "规格类型" } } -})(window) \ No newline at end of file +})(window) -- Gitee