From ec1ee929bab988aded0f80ebcaae2940dffd518a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?= <188633308@qq.com> Date: Mon, 7 Jun 2021 10:22:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E7=BB=9F=E8=AE=A1=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/src/assets/style/extend.less | 3 + Web/src/assets/style/lib/form.less | 44 ++++ Web/src/assets/style/lib/radio.less | 11 - .../business/statistics/summary/index.vue | 38 +++- .../statistics/summary/tab1/charts.vue | 209 ++++++++++++++++++ .../statistics/summary/tab1/index.vue | 79 +++++++ .../statistics/summary/tab1/table.vue | 204 +++++++++++++++++ .../statistics/summary/tab2/charts.vue | 3 + .../statistics/summary/tab2/index.vue | 25 +++ .../statistics/summary/tab2/table.vue | 3 + Web/vue.config.js | 4 +- 11 files changed, 610 insertions(+), 13 deletions(-) create mode 100644 Web/src/pages/business/statistics/summary/tab1/charts.vue create mode 100644 Web/src/pages/business/statistics/summary/tab1/index.vue create mode 100644 Web/src/pages/business/statistics/summary/tab1/table.vue create mode 100644 Web/src/pages/business/statistics/summary/tab2/charts.vue create mode 100644 Web/src/pages/business/statistics/summary/tab2/index.vue create mode 100644 Web/src/pages/business/statistics/summary/tab2/table.vue diff --git a/Web/src/assets/style/extend.less b/Web/src/assets/style/extend.less index a1febd0..8925437 100644 --- a/Web/src/assets/style/extend.less +++ b/Web/src/assets/style/extend.less @@ -1,3 +1,6 @@ @import '~ant-design-vue/dist/antd.less'; @padding-xxs: 4px; @padding-xl: 32px; +body { + line-height: 1.42857143; +} diff --git a/Web/src/assets/style/lib/form.less b/Web/src/assets/style/lib/form.less index ba167e9..aabf708 100644 --- a/Web/src/assets/style/lib/form.less +++ b/Web/src/assets/style/lib/form.less @@ -323,3 +323,47 @@ background: none; } } +.yo-form-page { + .ant-form { + .ant-radio-button-wrapper { + margin-right: @padding-xs; + margin-bottom: @padding-xs; + + border-left: @border-width-base @border-style-base @normal-color; + &:not(:first-child) { + &::before { + content: none; + } + } + } + } +} +.yo-filter-item { + display: flex; + flex-flow: row wrap; + + margin-bottom: 0; + .ant-tag-checkable { + font-size: @font-size-base; + } + .ant-radio-button-wrapper { + border: 0 !important; + background-color: transparent; + &:hover { + color: @red-6; + } + } + .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) { + border-color: @red-6; + background-color: @red-6; + &:hover { + border-color: @red-5; + background-color: @red-5; + } + &:active { + border-color: @red-7; + background-color: @red-7; + box-shadow: none; + } + } +} diff --git a/Web/src/assets/style/lib/radio.less b/Web/src/assets/style/lib/radio.less index 1fb4871..92d3239 100644 --- a/Web/src/assets/style/lib/radio.less +++ b/Web/src/assets/style/lib/radio.less @@ -1,15 +1,4 @@ @import (reference) '~@/assets/style/extend.less'; -.ant-radio-button-wrapper { - margin-right: @padding-xs; - margin-bottom: @padding-xs; - - border-left: @border-width-base @border-style-base @normal-color; - &:not(:first-child) { - &::before { - content: none; - } - } -} .ant-radio-button-wrapper-checked { &:not(.ant-radio-button-wrapper-disabled), &:not(.ant-radio-button-wrapper-disabled):hover { diff --git a/Web/src/pages/business/statistics/summary/index.vue b/Web/src/pages/business/statistics/summary/index.vue index 3feff78..35bc164 100644 --- a/Web/src/pages/business/statistics/summary/index.vue +++ b/Web/src/pages/business/statistics/summary/index.vue @@ -6,6 +6,20 @@ + + + + + + + +
@@ -25,13 +46,24 @@ \ No newline at end of file diff --git a/Web/src/pages/business/statistics/summary/tab1/charts.vue b/Web/src/pages/business/statistics/summary/tab1/charts.vue new file mode 100644 index 0000000..7c8374c --- /dev/null +++ b/Web/src/pages/business/statistics/summary/tab1/charts.vue @@ -0,0 +1,209 @@ + + + \ No newline at end of file diff --git a/Web/src/pages/business/statistics/summary/tab1/index.vue b/Web/src/pages/business/statistics/summary/tab1/index.vue new file mode 100644 index 0000000..b8586e8 --- /dev/null +++ b/Web/src/pages/business/statistics/summary/tab1/index.vue @@ -0,0 +1,79 @@ + + \ No newline at end of file diff --git a/Web/src/pages/business/statistics/summary/tab1/table.vue b/Web/src/pages/business/statistics/summary/tab1/table.vue new file mode 100644 index 0000000..194abcd --- /dev/null +++ b/Web/src/pages/business/statistics/summary/tab1/table.vue @@ -0,0 +1,204 @@ + + \ No newline at end of file diff --git a/Web/src/pages/business/statistics/summary/tab2/charts.vue b/Web/src/pages/business/statistics/summary/tab2/charts.vue new file mode 100644 index 0000000..0a7d82c --- /dev/null +++ b/Web/src/pages/business/statistics/summary/tab2/charts.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/Web/src/pages/business/statistics/summary/tab2/index.vue b/Web/src/pages/business/statistics/summary/tab2/index.vue new file mode 100644 index 0000000..503bf54 --- /dev/null +++ b/Web/src/pages/business/statistics/summary/tab2/index.vue @@ -0,0 +1,25 @@ + + \ No newline at end of file diff --git a/Web/src/pages/business/statistics/summary/tab2/table.vue b/Web/src/pages/business/statistics/summary/tab2/table.vue new file mode 100644 index 0000000..7ca3410 --- /dev/null +++ b/Web/src/pages/business/statistics/summary/tab2/table.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/Web/vue.config.js b/Web/vue.config.js index 1e3652f..74c8511 100644 --- a/Web/vue.config.js +++ b/Web/vue.config.js @@ -25,5 +25,7 @@ module.exports = { plugins: [ new MonacoWebpackPlugin() ] - } + }, + + productionSourceMap: false } \ No newline at end of file From 2156f2d71c91952e7f175265f224ec974973a3c1 Mon Sep 17 00:00:00 2001 From: ky_yusj <2655568377@qq.com> Date: Mon, 7 Jun 2021 23:16:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E6=88=BF=E5=B1=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=A1=A8=E5=8D=95=E5=92=8C=E5=B7=A1=E6=9F=A5=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E8=A1=A8=E5=8D=95=EF=BC=8C=E9=99=A4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=96=E7=9A=84=E5=85=B6=E4=BB=96=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=AD=A3=E5=B8=B8=E4=BF=9D=E5=AD=98/=E6=9B=B4?= =?UTF-8?q?=E6=96=B0/=E8=AF=BB=E5=8F=96=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Api/Ewide.Application/Entity/BsHouseInfo.cs | 2 +- Api/Ewide.Application/Ewide.Application.xml | 4 +-- .../HouseInfo/Dto/HouseInfoInput.cs | 2 +- .../HouseSafety/HouseInfo/HouseInfoService.cs | 16 ++++----- .../HouseTask/Dto/HouseTaskInput.cs | 2 +- .../business/house/info/form/base/aspect.vue | 4 +-- .../business/house/info/form/base/drawing.vue | 5 +++ .../house/info/form/base/identification.vue | 8 ++--- .../business/house/info/form/base/index.vue | 25 +++++++------- .../house/info/form/base/investigation.vue | 33 +++++++++++++------ .../house/info/form/base/ownership.vue | 16 ++++----- .../business/house/info/form/patrol/grade.vue | 6 ++-- .../house/info/form/patrol/handling.vue | 4 +-- .../business/house/info/form/patrol/index.vue | 13 +++----- .../house/info/form/patrol/inspection.vue | 2 +- .../house/info/form/patrol/result.vue | 18 +++++++--- 16 files changed, 90 insertions(+), 70 deletions(-) diff --git a/Api/Ewide.Application/Entity/BsHouseInfo.cs b/Api/Ewide.Application/Entity/BsHouseInfo.cs index e0eac9c..1a929a4 100644 --- a/Api/Ewide.Application/Entity/BsHouseInfo.cs +++ b/Api/Ewide.Application/Entity/BsHouseInfo.cs @@ -398,7 +398,7 @@ namespace Ewide.Application /// 房屋使用状态 /// [Comment("房屋使用状态")] - public int? UsedStatus { get; set; } + public int? HouseUsedStatus { get; set; } /// /// 1、待建档（需要建档的数据未暂存未保存的）2、暂存（点击了暂存的数据）3、待提交（点击了保存的数据） 4、退回（审核被退回的数据）5、审核中6、审核通过 diff --git a/Api/Ewide.Application/Ewide.Application.xml b/Api/Ewide.Application/Ewide.Application.xml index 7f95702..d54baee 100644 --- a/Api/Ewide.Application/Ewide.Application.xml +++ b/Api/Ewide.Application/Ewide.Application.xml @@ -299,7 +299,7 @@ 房屋等级 1,2,3,4,C,d - + 房屋使用状态 @@ -920,7 +920,7 @@ 房屋等级 1,2,3,4,C,d - + 房屋使用状态 diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs index 931eeb6..4cc0e85 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs @@ -194,7 +194,7 @@ namespace Ewide.Application /// /// 房屋使用状态 /// - public int? UsedStatus { get; set; } + public int? HouseUsedStatus { get; set; } #endregion #region 图纸资料存档处drawing diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs index 477a6b8..3aed519 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs @@ -27,14 +27,16 @@ namespace Ewide.Application.Service.HouseSafety.HouseInfo private readonly IRepository _houseCodeRep; private readonly IRepository _houseInfoRep; + private readonly IRepository _houseTaskRep; private readonly IUserManager _userManager; private readonly IDapperRepository _dapperRepository; - public HouseInfoService(IRepository HouseCodeRep,IRepository HouseInfoRep, IUserManager userManager, IDapperRepository dapperRepository) + public HouseInfoService(IRepository HouseCodeRep,IRepository HouseInfoRep, IRepository HouseTaskRep, IUserManager userManager, IDapperRepository dapperRepository) { _houseCodeRep = HouseCodeRep; _houseInfoRep = HouseInfoRep; + _houseTaskRep = HouseTaskRep; _userManager = userManager; _dapperRepository = dapperRepository; } @@ -74,9 +76,8 @@ namespace Ewide.Application.Service.HouseSafety.HouseInfo [AllowAnonymous] public async Task GetByTaskId([Required] string taskId) { - var houseTaskRep = Db.GetRepository(); //获取任务实体 - var houseTask = await houseTaskRep.DetachedEntities.FirstOrDefaultAsync(t=>t.Id == taskId); + var houseTask = await _houseTaskRep.DetachedEntities.FirstOrDefaultAsync(t=>t.Id == taskId); if(houseTask == null) throw Oops.Oh("任务不存在"); //获取房屋编码信息 @@ -102,11 +103,10 @@ WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId } HouseCode = houseCodeOutput }; - houseInfoOutputForDetailPage.PatrolInfo = new HouseTaskOutput - { - PatrolDate = houseTask.PatrolDate.GetValueOrDefault(DateTime.Now), - PatrolUser = String.IsNullOrEmpty(houseTask.PatrolUser) ? currentUser.Name : houseTask.PatrolUser - }; + var taskOutput = houseTask.Adapt(); + taskOutput.PatrolDate = houseTask.PatrolDate.GetValueOrDefault(DateTime.Now); + taskOutput.PatrolUser = String.IsNullOrEmpty(houseTask.PatrolUser) ? currentUser.Name : houseTask.PatrolUser; + houseInfoOutputForDetailPage.PatrolInfo = taskOutput; if (houseInfo == null) { diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskInput.cs b/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskInput.cs index 5642484..24b2789 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskInput.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskInput.cs @@ -107,7 +107,7 @@ namespace Ewide.Application } - public class EditHouseTaskInput + public class EditHouseTaskInput : HouseTaskInput { [Required(ErrorMessage = "任务Id不能为空")] public string Id { get; set; } diff --git a/Web/src/pages/business/house/info/form/base/aspect.vue b/Web/src/pages/business/house/info/form/base/aspect.vue index 4399121..cd63d50 100644 --- a/Web/src/pages/business/house/info/form/base/aspect.vue +++ b/Web/src/pages/business/house/info/form/base/aspect.vue @@ -71,7 +71,7 @@ export default { /** 验证格式 */ rules: { /* ... */ - 'houseInfo.facadePhoto': [{ required: true, message: '请上传外立面照片' }], + // 'houseInfo.facadePhoto': [{ required: true, message: '请上传外立面照片' }], }, /** 加载异步数据状态 */ @@ -135,7 +135,7 @@ export default { /** 验证通过后可以对数据进行转换得到想要提交的格式 */ /* ... */ - record.facadePhoto = record.facadePhoto.map((p) => p.response).join(','); + record.houseInfo.facadePhoto = record.houseInfo.facadePhoto.map((p) => p.response).join(','); reslove(record); } else { diff --git a/Web/src/pages/business/house/info/form/base/drawing.vue b/Web/src/pages/business/house/info/form/base/drawing.vue index 776cc12..6db5833 100644 --- a/Web/src/pages/business/house/info/form/base/drawing.vue +++ b/Web/src/pages/business/house/info/form/base/drawing.vue @@ -93,6 +93,10 @@ export default { await this.onLoadCodes(); /** 将默认数据覆盖到form */ const record = this.param && this.param.record; + record.houseInfo.drawingMaterial = record.houseInfo.drawingMaterial + ? record.houseInfo.drawingMaterial.split(',') + : ['1']; + const form = this.$_.cloneDeep(defaultForm); if (record) { @@ -114,6 +118,7 @@ export default { const record = this.$_.cloneDeep(this.form); /** 验证通过后可以对数据进行转换得到想要提交的格式 */ + record.houseInfo.drawingMaterial = this.form.houseInfo.drawingMaterial.join(','); /* ... */ reslove(record); diff --git a/Web/src/pages/business/house/info/form/base/identification.vue b/Web/src/pages/business/house/info/form/base/identification.vue index 1012acd..dc78607 100644 --- a/Web/src/pages/business/house/info/form/base/identification.vue +++ b/Web/src/pages/business/house/info/form/base/identification.vue @@ -43,7 +43,7 @@ {{ item.value }} @@ -52,7 +52,7 @@ {{ item.value }} @@ -68,8 +68,8 @@ const defaultForm = { /* ... */ houseInfo: { // identification: null, - houseUsedStatus: null, - houseGrade: null, + houseUsedStatus: '1', + houseGrade: '1', }, }; diff --git a/Web/src/pages/business/house/info/form/base/index.vue b/Web/src/pages/business/house/info/form/base/index.vue index dc93fd4..c5cb878 100644 --- a/Web/src/pages/business/house/info/form/base/index.vue +++ b/Web/src/pages/business/house/info/form/base/index.vue @@ -71,18 +71,18 @@ export default { title: '图纸资料存档处', component: () => import('./drawing'), }, - { - title: '相关附件资料', - component: () => import('./attachments'), - }, // { - // title: '物业维修资金', - // component: () => import('./fund'), + // title: '相关附件资料', + // component: () => import('./attachments'), + // }, + // // { + // // title: '物业维修资金', + // // component: () => import('./fund'), + // // }, + // { + // title: '建筑概貌', + // component: () => import('./aspect'), // }, - { - title: '建筑概貌', - component: () => import('./aspect'), - }, { title: '调查单位', component: () => import('./unit'), @@ -103,10 +103,7 @@ export default { const form = this.$refs.forms[i]; try { const data = await form.onGetData(); - formData = { - ...formData, - ...data, - }; + formData = this.$_.defaultsDeep(formData, data); } catch (e) { flag = false; reject(e); diff --git a/Web/src/pages/business/house/info/form/base/investigation.vue b/Web/src/pages/business/house/info/form/base/investigation.vue index efec6a6..ee2596e 100644 --- a/Web/src/pages/business/house/info/form/base/investigation.vue +++ b/Web/src/pages/business/house/info/form/base/investigation.vue @@ -66,7 +66,7 @@ {{ item.value }} @@ -77,7 +77,7 @@ {{ item.value }} @@ -133,14 +133,14 @@ const defaultForm = { /* ... */ houseInfo: { - houseSite: null, - adjacentConstruction: null, - chemicalErosion: null, - structuralDismantling: null, - addingLayer: null, - repairAndReinforce: null, - historicalCalamity: null, - functionalChange: null, + houseSite: ['1'], + adjacentConstruction: ['0'], + chemicalErosion: ['0'], + structuralDismantling: '0', + addingLayer: '0', + repairAndReinforce: ['0'], + historicalCalamity: ['0'], + functionalChange: ['0'], otherContents: null, }, }; @@ -222,6 +222,13 @@ export default { /** 将默认数据覆盖到form */ const record = this.param && this.param.record; + record.houseInfo.houseSite = record.houseInfo.houseSite.split(','); + record.houseInfo.adjacentConstruction = record.houseInfo.adjacentConstruction.split(','); + record.houseInfo.chemicalErosion = record.houseInfo.chemicalErosion.split(','); + record.houseInfo.repairAndReinforce = record.houseInfo.repairAndReinforce.split(','); + record.houseInfo.historicalCalamity = record.houseInfo.historicalCalamity.split(','); + record.houseInfo.functionalChange = record.houseInfo.functionalChange.split(','); + const form = this.$_.cloneDeep(defaultForm); if (record) { @@ -243,6 +250,12 @@ export default { const record = this.$_.cloneDeep(this.form); /** 验证通过后可以对数据进行转换得到想要提交的格式 */ + record.houseInfo.houseSite = this.form.houseInfo.houseSite.join(','); + record.houseInfo.adjacentConstruction = this.form.houseInfo.adjacentConstruction.join(','); + record.houseInfo.chemicalErosion = this.form.houseInfo.chemicalErosion.join(','); + record.houseInfo.repairAndReinforce = this.form.houseInfo.repairAndReinforce.join(','); + record.houseInfo.historicalCalamity = this.form.houseInfo.historicalCalamity.join(','); + record.houseInfo.functionalChange = this.form.houseInfo.functionalChange.join(','); /* ... */ reslove(record); diff --git a/Web/src/pages/business/house/info/form/base/ownership.vue b/Web/src/pages/business/house/info/form/base/ownership.vue index b610dd8..47ea56f 100644 --- a/Web/src/pages/business/house/info/form/base/ownership.vue +++ b/Web/src/pages/business/house/info/form/base/ownership.vue @@ -236,14 +236,14 @@ const defaultForm = { /* ... */ houseInfo: { propertyRights: null, - straightHouseCount: null, - selfHouseCount: null, - otherCount: null, - businessCount: null, - changeHouseCount: null, - resettlementHouseCount: null, - privateHouseCount: null, - houseCount: null, + straightHouseCount: 0, + selfHouseCount: 0, + otherCount: 0, + businessCount: 0, + changeHouseCount: 0, + resettlementHouseCount: 0, + privateHouseCount: 0, + houseCount: 0, propertyUnit: null, propertyUnitUser: null, propertyUnitUserTel: null, diff --git a/Web/src/pages/business/house/info/form/patrol/grade.vue b/Web/src/pages/business/house/info/form/patrol/grade.vue index d241699..701612d 100644 --- a/Web/src/pages/business/house/info/form/patrol/grade.vue +++ b/Web/src/pages/business/house/info/form/patrol/grade.vue @@ -22,7 +22,7 @@ {{ item.value }} @@ -33,7 +33,7 @@ {{ item.value }} @@ -44,7 +44,7 @@ {{ item.value }} diff --git a/Web/src/pages/business/house/info/form/patrol/handling.vue b/Web/src/pages/business/house/info/form/patrol/handling.vue index 90a75c8..81d291a 100644 --- a/Web/src/pages/business/house/info/form/patrol/handling.vue +++ b/Web/src/pages/business/house/info/form/patrol/handling.vue @@ -22,7 +22,7 @@ {{ item.value }} @@ -46,7 +46,7 @@ {{ item.value }} diff --git a/Web/src/pages/business/house/info/form/patrol/index.vue b/Web/src/pages/business/house/info/form/patrol/index.vue index cbf92e0..bc82a41 100644 --- a/Web/src/pages/business/house/info/form/patrol/index.vue +++ b/Web/src/pages/business/house/info/form/patrol/index.vue @@ -52,10 +52,10 @@ export default { title: '巡查基本情况', component: () => import('./base'), }, - { - title: '房屋检查', - component: () => import('./inspection'), - }, + // { + // title: '房屋检查', + // component: () => import('./inspection'), + // }, { title: '等级划分', component: () => import('./grade'), @@ -84,10 +84,7 @@ export default { const form = this.$refs.forms[i]; try { const data = await form.onGetData(); - formData = { - ...formData, - ...data, - }; + formData = this.$_.defaultsDeep(formData, data); } catch (e) { flag = false; reject(e); diff --git a/Web/src/pages/business/house/info/form/patrol/inspection.vue b/Web/src/pages/business/house/info/form/patrol/inspection.vue index fb41029..6f6cfa7 100644 --- a/Web/src/pages/business/house/info/form/patrol/inspection.vue +++ b/Web/src/pages/business/house/info/form/patrol/inspection.vue @@ -151,7 +151,7 @@ export default { /** 验证通过后可以对数据进行转换得到想要提交的格式 */ /* ... */ - record.facadePhoto = record.facadePhoto.map((p) => p.response).join(','); + //record.facadePhoto = record.facadePhoto.map((p) => p.response).join(','); reslove(record); } else { diff --git a/Web/src/pages/business/house/info/form/patrol/result.vue b/Web/src/pages/business/house/info/form/patrol/result.vue index 1bbf1cf..eb330f0 100644 --- a/Web/src/pages/business/house/info/form/patrol/result.vue +++ b/Web/src/pages/business/house/info/form/patrol/result.vue @@ -20,12 +20,15 @@ - 正常 - 异常 + {{ item.value }} - +