From 70c2b3067919f55def9a3f54db3b34daa817c479 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 31 May 2022 10:50:35 +0800 Subject: [PATCH 01/29] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cabaseinfo/caloudong-add-or-update.vue | 370 ++++++++++++++ src/views/modules/cabaseinfo/caloudong.vue | 108 ++++ .../cabaseinfo/capingfang-add-or-update.vue | 370 ++++++++++++++ src/views/modules/cabaseinfo/capingfang.vue | 108 ++++ .../cabaseinfo/carental-add-or-update.vue | 342 +++++++++++++ src/views/modules/cabaseinfo/carental.vue | 104 ++++ .../cabaseinfo/caresident-add-or-update.vue | 440 +++++++++++++++++ src/views/modules/cabaseinfo/caresident.vue | 118 +++++ .../cabaseinfo/carotators-add-or-update.vue | 461 ++++++++++++++++++ src/views/modules/cabaseinfo/carotators.vue | 121 +++++ 10 files changed, 2542 insertions(+) create mode 100644 src/views/modules/cabaseinfo/caloudong-add-or-update.vue create mode 100644 src/views/modules/cabaseinfo/caloudong.vue create mode 100644 src/views/modules/cabaseinfo/capingfang-add-or-update.vue create mode 100644 src/views/modules/cabaseinfo/capingfang.vue create mode 100644 src/views/modules/cabaseinfo/carental-add-or-update.vue create mode 100644 src/views/modules/cabaseinfo/carental.vue create mode 100644 src/views/modules/cabaseinfo/caresident-add-or-update.vue create mode 100644 src/views/modules/cabaseinfo/caresident.vue create mode 100644 src/views/modules/cabaseinfo/carotators-add-or-update.vue create mode 100644 src/views/modules/cabaseinfo/carotators.vue diff --git a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue new file mode 100644 index 000000000..52942152c --- /dev/null +++ b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue @@ -0,0 +1,370 @@ + + + diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue new file mode 100644 index 000000000..378306ede --- /dev/null +++ b/src/views/modules/cabaseinfo/caloudong.vue @@ -0,0 +1,108 @@ + + + diff --git a/src/views/modules/cabaseinfo/capingfang-add-or-update.vue b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue new file mode 100644 index 000000000..52942152c --- /dev/null +++ b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue @@ -0,0 +1,370 @@ + + + diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue new file mode 100644 index 000000000..5792cb814 --- /dev/null +++ b/src/views/modules/cabaseinfo/capingfang.vue @@ -0,0 +1,108 @@ + + + diff --git a/src/views/modules/cabaseinfo/carental-add-or-update.vue b/src/views/modules/cabaseinfo/carental-add-or-update.vue new file mode 100644 index 000000000..81e66bfb7 --- /dev/null +++ b/src/views/modules/cabaseinfo/carental-add-or-update.vue @@ -0,0 +1,342 @@ + + + diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue new file mode 100644 index 000000000..87573be5a --- /dev/null +++ b/src/views/modules/cabaseinfo/carental.vue @@ -0,0 +1,104 @@ + + + diff --git a/src/views/modules/cabaseinfo/caresident-add-or-update.vue b/src/views/modules/cabaseinfo/caresident-add-or-update.vue new file mode 100644 index 000000000..148cc82f2 --- /dev/null +++ b/src/views/modules/cabaseinfo/caresident-add-or-update.vue @@ -0,0 +1,440 @@ + + + diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue new file mode 100644 index 000000000..29324d614 --- /dev/null +++ b/src/views/modules/cabaseinfo/caresident.vue @@ -0,0 +1,118 @@ + + + diff --git a/src/views/modules/cabaseinfo/carotators-add-or-update.vue b/src/views/modules/cabaseinfo/carotators-add-or-update.vue new file mode 100644 index 000000000..6cc3ab123 --- /dev/null +++ b/src/views/modules/cabaseinfo/carotators-add-or-update.vue @@ -0,0 +1,461 @@ + + + diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue new file mode 100644 index 000000000..02ba324a5 --- /dev/null +++ b/src/views/modules/cabaseinfo/carotators.vue @@ -0,0 +1,121 @@ + + + From d116b386648c1581e231345f5c8a6f1983ea6c1a Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 31 May 2022 10:52:48 +0800 Subject: [PATCH 02/29] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/cabaseinfo/caloudong-add-or-update.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue index 52942152c..f2bd01e86 100644 --- a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue +++ b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue @@ -142,8 +142,8 @@ data () { return { visible: false, - dataForm: {; - buildingId: '',; + dataForm: { + buildingId: '', buildingType: '',; gridId: '',; buildingName: '',; From 927903967367d90a6aab9b3f1ffd5384a08751e9 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 31 May 2022 11:02:03 +0800 Subject: [PATCH 03/29] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cabaseinfo/caloudong-add-or-update.vue | 168 ++++---- src/views/modules/cabaseinfo/caloudong.vue | 2 +- .../cabaseinfo/capingfang-add-or-update.vue | 373 ++++++++++-------- src/views/modules/cabaseinfo/capingfang.vue | 2 +- .../cabaseinfo/carental-add-or-update.vue | 336 ++++++++-------- 5 files changed, 464 insertions(+), 417 deletions(-) diff --git a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue index f2bd01e86..56965ac66 100644 --- a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue +++ b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue @@ -144,177 +144,177 @@ visible: false, dataForm: { buildingId: '', - buildingType: '',; - gridId: '',; - buildingName: '',; - buildingUse: '',; - buildingStatus: '',; - buildingStructure: '',; - buildingUseage: '',; - constructionTime: '',; - buildingAddr: '',; - communityName: '',; - buildingLeader: '',; - layerCount: '',; - basementLayerCount: '',; - houseBeginLayer: '',; - unitCount: '',; - layerRoomCount: '',; - roomCount: '',; - elevatorCount: '',; - buildingArea: '',; - buildingPmc: '',; - buildingDesc: '',; - pointStatus: '',; - longitude: '',; - latitude: '',; - platCode: '',; - createBy: '',; - createDate: '',; - updateBy: '',; - updateDate: '',; - deleteFlag: '',; - versions: '',; - attribute1: '',; - attribute2: '',; - attribute3: '',; - attribute4: '',; - attribute5: '',; - attribute6: '',; - attribute7: '',; - attribute8: '',; - attribute9: '',; - attribute10: '',; + buildingType: '', + gridId: '', + buildingName: '', + buildingUse: '', + buildingStatus: '', + buildingStructure: '', + buildingUseage: '', + constructionTime: '', + buildingAddr: '', + communityName: '', + buildingLeader: '', + layerCount: '', + basementLayerCount: '', + houseBeginLayer: '', + unitCount: '', + layerRoomCount: '', + roomCount: '', + elevatorCount: '', + buildingArea: '', + buildingPmc: '', + buildingDesc: '', + pointStatus: '', + longitude: '', + latitude: '', + platCode: '', + createBy: '', + createDate: '', + updateBy: '', + updateDate: '', + deleteFlag: '', + versions: '', + attribute1: '', + attribute2: '', + attribute3: '', + attribute4: '', + attribute5: '', + attribute6: '', + attribute7: '', + attribute8: '', + attribute9: '', + attribute10: '', communityId: '' } } }, computed: { dataRule () { - return {; + return { buildingType: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], gridId: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingName: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingUse: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingStatus: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingStructure: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingUseage: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], constructionTime: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingAddr: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], communityName: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingLeader: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], layerCount: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], basementLayerCount: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], houseBeginLayer: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], unitCount: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], layerRoomCount: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], roomCount: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], elevatorCount: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingArea: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingPmc: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingDesc: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], pointStatus: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], longitude: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], latitude: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], platCode: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], createBy: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], createDate: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], updateBy: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], updateDate: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], deleteFlag: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], versions: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute1: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute2: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute3: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute4: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute5: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute6: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute7: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute8: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute9: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute10: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], communityId: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ] @@ -333,7 +333,7 @@ }, // 获取信息 getInfo () { - this.$http.get(]];#`/${moduleName}/${pathName}/#[[${this.dataForm.buildingId}`;).then(({ data: res }) => { + this.$http.get(]]#`/${moduleName}/${pathName}/#[[${this.dataForm.buildingId}`;).then(({ data: res }) => { if (res.code !== 0) { ;return this.$message.error(res.msg); } diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue index 378306ede..7ea7c63fa 100644 --- a/src/views/modules/cabaseinfo/caloudong.vue +++ b/src/views/modules/cabaseinfo/caloudong.vue @@ -96,7 +96,7 @@ deleteURL: '//caLoudong', deleteIsBatch: true }, - dataForm: {; + dataForm: { buildingId: '' } } diff --git a/src/views/modules/cabaseinfo/capingfang-add-or-update.vue b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue index 52942152c..d941575b7 100644 --- a/src/views/modules/cabaseinfo/capingfang-add-or-update.vue +++ b/src/views/modules/cabaseinfo/capingfang-add-or-update.vue @@ -1,136 +1,161 @@ @@ -142,179 +167,179 @@ data () { return { visible: false, - dataForm: {; - buildingId: '',; - buildingType: '',; - gridId: '',; - buildingName: '',; - buildingUse: '',; - buildingStatus: '',; - buildingStructure: '',; - buildingUseage: '',; - constructionTime: '',; - buildingAddr: '',; - communityName: '',; - buildingLeader: '',; - layerCount: '',; - basementLayerCount: '',; - houseBeginLayer: '',; - unitCount: '',; - layerRoomCount: '',; - roomCount: '',; - elevatorCount: '',; - buildingArea: '',; - buildingPmc: '',; - buildingDesc: '',; - pointStatus: '',; - longitude: '',; - latitude: '',; - platCode: '',; - createBy: '',; - createDate: '',; - updateBy: '',; - updateDate: '',; - deleteFlag: '',; - versions: '',; - attribute1: '',; - attribute2: '',; - attribute3: '',; - attribute4: '',; - attribute5: '',; - attribute6: '',; - attribute7: '',; - attribute8: '',; - attribute9: '',; - attribute10: '',; + dataForm: { + buildingId: '', + buildingType: '', + gridId: '', + buildingName: '', + buildingUse: '', + buildingStatus: '', + buildingStructure: '', + buildingUseage: '', + constructionTime: '', + buildingAddr: '', + communityName: '', + buildingLeader: '', + layerCount: '', + basementLayerCount: '', + houseBeginLayer: '', + unitCount: '', + layerRoomCount: '', + roomCount: '', + elevatorCount: '', + buildingArea: '', + buildingPmc: '', + buildingDesc: '', + pointStatus: '', + longitude: '', + latitude: '', + platCode: '', + createBy: '', + createDate: '', + updateBy: '', + updateDate: '', + deleteFlag: '', + versions: '', + attribute1: '', + attribute2: '', + attribute3: '', + attribute4: '', + attribute5: '', + attribute6: '', + attribute7: '', + attribute8: '', + attribute9: '', + attribute10: '', communityId: '' } } }, computed: { dataRule () { - return {; + return { buildingType: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], gridId: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingName: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingUse: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingStatus: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingStructure: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingUseage: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], constructionTime: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingAddr: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], communityName: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingLeader: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], layerCount: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], basementLayerCount: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], houseBeginLayer: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], unitCount: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], layerRoomCount: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], roomCount: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], elevatorCount: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingArea: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingPmc: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], buildingDesc: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], pointStatus: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], longitude: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], latitude: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], platCode: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], createBy: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], createDate: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], updateBy: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], updateDate: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], deleteFlag: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], versions: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute1: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute2: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute3: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute4: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute5: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute6: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute7: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute8: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute9: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute10: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], communityId: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ] diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue index 5792cb814..492ef8454 100644 --- a/src/views/modules/cabaseinfo/capingfang.vue +++ b/src/views/modules/cabaseinfo/capingfang.vue @@ -96,7 +96,7 @@ deleteURL: '//caPingfang', deleteIsBatch: true }, - dataForm: {; + dataForm: { buildingId: '' } } diff --git a/src/views/modules/cabaseinfo/carental-add-or-update.vue b/src/views/modules/cabaseinfo/carental-add-or-update.vue index 81e66bfb7..f008c00d4 100644 --- a/src/views/modules/cabaseinfo/carental-add-or-update.vue +++ b/src/views/modules/cabaseinfo/carental-add-or-update.vue @@ -1,124 +1,146 @@ @@ -130,45 +152,45 @@ data () { return { visible: false, - dataForm: {; - rentalId: '',; - gridId: '',; - houseId: '',; - houseName: '',; - houseAddress: '',; - houseUse: '',; - houseArea: '',; - idType: '',; - idCard: '',; - residentName: '',; - telephone: '',; - curliveAddress: '',; - rentUse: '',; - troubleType: '',; - renterId: '',; - renterCardNumber: '',; - renterCardType: '',; - renterName: '',; - renterPhone: '',; - longitude: '',; - latitude: '',; - pointStatus: '',; - platCode: '',; - createBy: '',; - createDate: '',; - updateBy: '',; - updateDate: '',; - deleteFlag: '',; - versions: '',; - attribute1: '',; - attribute2: '',; - attribute3: '',; - attribute4: '',; - attribute5: '',; - attribute6: '',; - attribute7: '',; - attribute8: '',; - attribute9: '',; + dataForm: { + rentalId: '', + gridId: '', + houseId: '', + houseName: '', + houseAddress: '', + houseUse: '', + houseArea: '', + idType: '', + idCard: '', + residentName: '', + telephone: '', + curliveAddress: '', + rentUse: '', + troubleType: '', + renterId: '', + renterCardNumber: '', + renterCardType: '', + renterName: '', + renterPhone: '', + longitude: '', + latitude: '', + pointStatus: '', + platCode: '', + createBy: '', + createDate: '', + updateBy: '', + updateDate: '', + deleteFlag: '', + versions: '', + attribute1: '', + attribute2: '', + attribute3: '', + attribute4: '', + attribute5: '', + attribute6: '', + attribute7: '', + attribute8: '', + attribute9: '', attribute10: '' } } @@ -178,115 +200,115 @@ return {; gridId: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], houseId: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], houseName: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], houseAddress: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], houseUse: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], houseArea: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], idType: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], idCard: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], residentName: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], telephone: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], curliveAddress: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], rentUse: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], troubleType: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], renterId: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], renterCardNumber: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], renterCardType: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], renterName: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], renterPhone: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], longitude: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], latitude: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], pointStatus: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], platCode: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], createBy: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], createDate: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], updateBy: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], updateDate: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], deleteFlag: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], versions: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute1: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute2: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute3: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute4: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute5: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute6: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute7: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute8: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute9: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ],; + ], attribute10: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ] From 72db0e165b20e3d63f880a21d36cb0325dbb9bab Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 31 May 2022 13:25:42 +0800 Subject: [PATCH 04/29] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cabaseinfo/caloudong-add-or-update.vue | 31 ++- src/views/modules/cabaseinfo/caloudong.vue | 23 +- .../cabaseinfo/capingfang-add-or-update.vue | 234 +++++++--------- src/views/modules/cabaseinfo/capingfang.vue | 23 +- .../cabaseinfo/carental-add-or-update.vue | 217 +++++++-------- src/views/modules/cabaseinfo/carental.vue | 25 +- .../cabaseinfo/caresident-add-or-update.vue | 241 +++++++++-------- src/views/modules/cabaseinfo/caresident.vue | 25 +- .../cabaseinfo/carotators-add-or-update.vue | 253 +++++++++--------- src/views/modules/cabaseinfo/carotators.vue | 25 +- 10 files changed, 520 insertions(+), 577 deletions(-) diff --git a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue index 56965ac66..df56c1e47 100644 --- a/src/views/modules/cabaseinfo/caloudong-add-or-update.vue +++ b/src/views/modules/cabaseinfo/caloudong-add-or-update.vue @@ -136,9 +136,8 @@ diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 4f87e3f31..c2fef85e4 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -102,7 +102,7 @@ width="90"> Date: Mon, 6 Jun 2022 14:47:45 +0800 Subject: [PATCH 11/29] el-radio__inner --- .../stats/factagencyuserhousedaily.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue index 917751d6e..ab7075173 100644 --- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue +++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue @@ -17,12 +17,12 @@ > --> - + @@ -114,9 +114,9 @@ export default { }, methods: { cascaderClick (nodeData) { - this.dataForm.agencyId = nodeData.agencyId; - this.dataForm.level = nodeData.level - this.$refs.cascaderUnit.checkedValue = nodeData.agencyId; + this.dataForm.objectId = nodeData.objectId; + this.dataForm.objectType = nodeData.objectType + this.$refs.cascaderUnit.checkedValue = nodeData.objectId; this.$refs.cascaderUnit.computePresentText(); this.$refs.cascaderUnit.toggleDropDownVisible(false); @@ -124,16 +124,17 @@ export default { getGridList() { const { user } = this.$store.state this.$http - .post('/gov/org/customeragency/agencygridtree') + .post('/gov/org/icServiceProject/service/serviceScopeTree') .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } else { console.log('获取查询详情成功', res.data) // this.optionsA = res.data + // console.log(this.optionsA); this.optionsA.push(res.data) - this.dataForm.agencyId = res.data.agencyId - this.dataForm.level = res.data.level + this.dataForm.objectId = res.data.objectId + this.dataForm.objectType = res.data.objectType } }) .catch(() => { From 30c0b1fa3214ce973fe424e30a04fb3770046c67 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 6 Jun 2022 15:14:26 +0800 Subject: [PATCH 12/29] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/community.vue | 4 +- .../visual/components/screen-map/index.vue | 40 +++++++++---------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 434728447..c19f811cf 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -269,7 +269,7 @@ export default { await this.loadOrgData() await this.loadTree() - await this.loadOpenNode() + // await this.loadOpenNode() await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) if (this.treeData.length > 0) { @@ -347,6 +347,8 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { + this.openNodes = [] + this.openNodes.push(data[0].id) this.treeData = data if (!isRefresh && data.length > 0) { diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index bf2870126..54d0204de 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -32,7 +32,7 @@ class="ol-popup-closer">
- 更多>>>> @@ -107,9 +107,9 @@ let polygonColorArray = [ 'rgba(183, 185, 0, 0.16)' ]; - //icon文字样式 +//icon文字样式 let createTextStyle = function (feature) { - + if (iconTextsStyle) { let iconTextsStyles = { ...iconTextsStyle } iconTextsStyles.text = feature.values_ && feature.values_.name || feature.name @@ -224,11 +224,11 @@ const vueGis = { // iconArrays.forEach(item => { // console.log(item.type, item.urlIndex, item.latitude, item.longitude) // }); - + //初始化地图 this.initMap() - + if (this.showPolIconLayer) { console.log('showPolIconLayer++++++++++++++++++++++', this.showPolIconLayer) //初始化多边形标注图层 @@ -242,7 +242,7 @@ const vueGis = { //加载当前园区的标注 this.loadPolygon() } - + if (this.showIconLayer) { //初始化icon图层 @@ -262,14 +262,14 @@ const vueGis = { //刷新地图 async refreshMap (mapInfo, polygonArray, iconArrays) { this.mapInfo = mapInfo - this.polygonArray = [] + this.polygonArray = [] this.polygonArray = polygonArray this.iconArrays = iconArrays iconSource.clear() polygonSource.clear() polIconSource.clear() this.initPolIconLayer() - + if (this.showPolygonLayer) { this.initPolygonLayer() //加载当前园区的标注 @@ -287,7 +287,7 @@ const vueGis = { } this.setMapLocation() // gaodeMapLayer.getSource().changed() - + }, //加载区域多边形 @@ -305,7 +305,7 @@ const vueGis = { oneData = { type: 'Feature', - + properties: { ...polygonItem }, geometry: { type: 'Polygon', @@ -345,7 +345,7 @@ const vueGis = { if (this.showPolIconLayer) { this.loadPolIcon(feature) } - + } @@ -549,9 +549,9 @@ const vueGis = { } mapView.setZoom(this.zoom); - + }, - firstCentermap() { + firstCentermap () { if (this.mapInfo.longitude && this.mapInfo.latitude) { this.centerPoint = [] this.centerPoint.push(this.mapInfo.longitude) @@ -743,14 +743,14 @@ const vueGis = { this.overlay.getElement().parentNode.parentNode.style.display = 'block' content.innerHTML = showData; this.overlay.setPosition(coordinate); - //把 overlay 显示到指定的 x,y坐标 - + //把 overlay 显示到指定的 x,y坐标 + }, // 关闭弹窗 - handleClosePopup() { - this.overlay.setPosition(undefined); - document.getElementById("popup-closer").blur(); - return false; + handleClosePopup () { + this.overlay.setPosition(undefined); + document.getElementById("popup-closer").blur(); + return false; }, //取随机数 @@ -895,7 +895,7 @@ export default vueGis; .popup-content { width: 300px; } -.popup-goMore{ +.popup-goMore { margin: 20px 0; } .ol-popup-closer:after { From 6ad7505d2ac8b51b9b4cde4851563b243cf87068 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Mon, 6 Jun 2022 15:21:54 +0800 Subject: [PATCH 13/29] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/communityTable.vue | 80 +++++++++++++++++-- 1 file changed, 75 insertions(+), 5 deletions(-) diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 5eb4596f7..147411a2f 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -66,7 +66,7 @@ 导出 + @click="handleExportOpen">导出 批量删除 - 导出一户一档 + @click="handleExportYihuyidang()">导出一户一档 --> @@ -183,6 +183,31 @@ @dialogOk="addFormOk"> + +
+ 导出房屋数据 + 导出一户一档 + 导出一户一码 +
+ + 取 消 + 确 定 + + + @@ -225,7 +250,9 @@ export default { fileName: "", uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import', yihuyidangDisabled: false, - + yihuyimaDisabled: false, + exportBtn: false, + dialogVisible: false // 导出 } }, components: { @@ -486,7 +513,11 @@ export default { // this.download(res.data, '1.png') }) }, - //导出表格 + // 导出按钮点击事件 + handleExportOpen () { + this.dialogVisible = true + }, + //导出表格 以前是导出 现在改成导出房屋数据 async handleExport () { let title = this.agencyObj.label title = title + '—小区列表' @@ -512,6 +543,10 @@ export default { }, + handleClose(done) { + this.dialogVisible = false + }, + // 下载文件 download (data, downFileName) { if (!data) { @@ -609,6 +644,41 @@ export default { }, + // 导出一户一码 + + handleExportYihuyima () { + this.exportBtn = true + this.yihuyimaDisabled = true + let title = this.agencyObj.label + title = title + '-一户一码' + let url = "/gov/org/house/downloadZip" + + + let params = { + level: this.agencyObj.level, + id: this.agencyObj.id + } + + + + app.ajax.exportFilePost( + url, + params, + (data, rspMsg) => { + + this.download(data, title + '.Zip') + this.exportBtn = false + this.yihuyimaDisabled = false + }, + (rspMsg, data) => { + this.exportBtn = false + this.yihuyimaDisabled = false + this.$message.error(rspMsg); + } + ); + }, + + // 上传文件之前的钩子 beforeUpload (file, type) { From e460c1ef1cca55e15f7c70798c66227b0ee07d81 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 7 Jun 2022 09:18:35 +0800 Subject: [PATCH 14/29] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/roomForm.vue | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue index 0c1f73415..4f5e75f81 100644 --- a/src/views/modules/base/community/roomForm.vue +++ b/src/views/modules/base/community/roomForm.vue @@ -40,6 +40,19 @@ + + + + +
+ + 下载 +
Date: Tue, 7 Jun 2022 09:36:57 +0800 Subject: [PATCH 15/29] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/roomForm.vue | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue index 4f5e75f81..6d0abc1fe 100644 --- a/src/views/modules/base/community/roomForm.vue +++ b/src/views/modules/base/community/roomForm.vue @@ -40,18 +40,20 @@ - - - - -
- - 下载 +
+ + + + +
+ + 下载 +
Date: Tue, 7 Jun 2022 11:05:28 +0800 Subject: [PATCH 16/29] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/stats/factagencyuserhousedaily.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue index 858c9eaf8..cdb0e4fff 100644 --- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue +++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue @@ -18,7 +18,7 @@ > --> - +