diff --git a/src/assets/img/caiji-bc.png b/src/assets/img/caiji-bc.png new file mode 100644 index 00000000..49d73683 Binary files /dev/null and b/src/assets/img/caiji-bc.png differ diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png new file mode 100644 index 00000000..3c3aa0fb Binary files /dev/null and b/src/assets/img/logo.png differ diff --git a/src/assets/scss/modules/visual/communityManage.scss b/src/assets/scss/modules/visual/communityManage.scss index 9137229d..a1323dab 100644 --- a/src/assets/scss/modules/visual/communityManage.scss +++ b/src/assets/scss/modules/visual/communityManage.scss @@ -18,7 +18,7 @@ } } -.div_table { +.div_table_item { margin-top: 20px; position: relative; } diff --git a/src/assets/scss/pages/caiji.scss b/src/assets/scss/pages/caiji.scss index 8dafd6eb..c6cf8a73 100644 --- a/src/assets/scss/pages/caiji.scss +++ b/src/assets/scss/pages/caiji.scss @@ -1,4 +1,5 @@ .bg-caiji { + background-color: rgba(189, 214, 255, 0.89); height: 100%; width: 100vw; @@ -50,15 +51,66 @@ } .bg-caiji-success { + background: url("../../assets/img/caiji-bc.png") no-repeat; + background-size: 100% 100%; height: 100vh; width: 100vw; - text-align: center; + .title { - background-color: rgba(189, 214, 255, 0.89); - padding: 20px; + // background-color: rgba(189, 214, 255, 0.89); + padding-top:30px; + font-size: 18px; + font-family: PingFang SC; + font-weight: 800; + color: #333333; + display: flex; + height:25px; + align-items: center; + justify-content: center; + + >img{ + width:27px; + height:25px; + } + .title_name{ + margin-left:5px; + margin-top:5px; + } + } + + .div_tip{ text-align: center; - font-size: 20px; + margin-top:35px; + font-size: 18px; + font-family: PingFang SC; + font-weight: 800; + color: #2E78E2; + line-height: 26px; + } + + .div_content{ + + margin:20px 10px 30px 10px; + padding:20px 16px; + background: #FFFFFF; + border-radius: 10px; + font-size: 16px; + font-family: Source Han Serif SC; + font-weight: 400; + color: #333333; + line-height: 30px; + text-align: left; + + .content_long{ + display: flex; + justify-content: left; + align-items: flex-start; + + .content_title{ + flex:0 0 80px; + } + } } .main { diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 82e44a93..680a8920 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -54,7 +54,7 @@ @click="deleteBatch">批量删除 -
+
@@ -123,6 +123,7 @@ export default { filterText: '', treeLoading: true, treeData: [], + openNodes: [], defaultProps: { children: 'children', label: 'showName' @@ -160,8 +161,10 @@ export default { }, async mounted () { this.treeLoading = true + await this.loadOrgData() await this.loadTree() + await this.loadOpenNode() await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) if (this.treeData.length > 0) { @@ -213,6 +216,20 @@ export default { // this.loadTable() }, + async loadOpenNode () { + const url = "/gov/org/building/tree-ids" + let params = {} + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + this.openNodes = data + + + } else { + this.$message.error(msg) + } + }, async loadTree (isRefresh) { const url = "/gov/org/building/treelist" let params = {} diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 2b2cd15f..1ead26d0 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -78,7 +78,7 @@
-
+
批量删除
-
+
+ + +
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + { + if (!item.allName) { + item.allName = '--' + } + item.roomShow = '' + if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) { + item.roomShow = '--' + } else { + if (item.villageName) { + item.roomShow = item.roomShow + item.villageName + } + if (item.buildName) { + item.roomShow = item.roomShow + item.buildName + } + if (item.unitName) { + item.roomShow = item.roomShow + item.unitName + } + if (item.villageName) { + item.roomShow = item.roomShow + item.homeName + } + } - // this.tableData.forEach(item => { - // if (item.time) { - // let timeArray = item.time.split(' ') - // item.time = timeArray[0] - // } - // }); + }); } else { this.$message.error(msg) } this.tableLoading = false }, + handleChangeV (val) { + console.log('val', val) + this.formData.buildId = '' + this.formData.unitId = '' + this.formData.homeId = '' + this.getBuildList() + this.getUniList() + this.getHouseList() + }, + handleChangeB (val) { + console.log('val', val) + this.formData.unitId = '' + this.formData.homeId = '' + this.getUniList() + this.getHouseList() + }, + handleChangeD () { + this.formData.homeId = '' + this.getHouseList() + }, + + getValiheList () { + const { user } = this.$store.state + this.$http + .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.GRID_ID, agencyId: user.agencyId }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsV = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + + getBuildList () { + this.$http + .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.villageId }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsB = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + getUniList () { + this.$http + .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildId }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsD = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + getHouseList () { + this.$http + .post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsH = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + handleSelectTable (selection, row) { row.isSel = !row.isSel @@ -771,7 +954,7 @@ export default { }, computed: { tableHeight () { - return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360 + return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415 }, diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue index 1543274a..fee1798f 100644 --- a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue +++ b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue @@ -46,6 +46,18 @@ v-model="formData1.idCard"> + + + + + + + + + + + + + --> + + + + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + min-width="200"> { - // if (item.time) { - // let timeArray = item.time.split(' ') - // item.time = timeArray[0] - // } + this.tableData.forEach(item => { + if (!item.allName) { + item.allName = '--' + } + item.roomShow = '' + if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) { + item.roomShow = '--' + } else { + if (item.villageName) { + item.roomShow = item.roomShow + item.villageName + } + if (item.buildName) { + item.roomShow = item.roomShow + item.buildName + } + if (item.unitName) { + item.roomShow = item.roomShow + item.unitName + } + if (item.villageName) { + item.roomShow = item.roomShow + item.homeName + } + } - // }); + + }); } else { this.$message.error(msg) } this.tableLoading = false }, + handleChangeV (val) { + console.log('val', val) + this.formData.buildId = '' + this.formData.unitId = '' + this.formData.homeId = '' + this.getBuildList() + this.getUniList() + this.getHouseList() + }, + handleChangeB (val) { + console.log('val', val) + this.formData.unitId = '' + this.formData.homeId = '' + this.getUniList() + this.getHouseList() + }, + handleChangeD () { + this.formData.homeId = '' + this.getHouseList() + }, + + getValiheList () { + const { user } = this.$store.state + this.$http + .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.GRID_ID, agencyId: user.agencyId }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsV = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + + getBuildList () { + this.$http + .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.villageId }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsB = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + getUniList () { + this.$http + .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildId }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsD = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + getHouseList () { + this.$http + .post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + this.optionsH = res.data + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, + + handleSelectTable (selection, row) { row.isSel = !row.isSel @@ -761,7 +954,7 @@ export default { }, computed: { tableHeight () { - return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360 + return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415 }, diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue index 3aeac0a6..fccc7806 100644 --- a/src/views/modules/communityParty/regionalParty/activitys.vue +++ b/src/views/modules/communityParty/regionalParty/activitys.vue @@ -139,10 +139,10 @@ label="单位名称" width="180"> -
+ +
+ +
- 居民信息填报 + +
居民信息填报
-
+
+
提交成功
+
请截图保存，方便核验人员查看
+
+
+
+
所属房屋：
+
{{formData.address}}
+
+
+ 房主姓名： + {{formData.houseHolderName}} +
+
+
+ 成员{{index+1}}： + {{item.name}} +
+
+ 身份证号： + {{item.idNum}} +
+
+ 手机号： + {{item.mobile}} +
+ +
+ +
+ +