diff --git a/src/assets/img/yanjing1.png b/src/assets/img/yanjing1.png new file mode 100644 index 000000000..a5a14daa1 Binary files /dev/null and b/src/assets/img/yanjing1.png differ diff --git a/src/assets/img/yanjing2.png b/src/assets/img/yanjing2.png new file mode 100644 index 000000000..ca591cb38 Binary files /dev/null and b/src/assets/img/yanjing2.png differ diff --git a/src/views/business/resi-category-map.js b/src/views/business/resi-category-map.js index 7a125a8a0..5e239c62d 100644 --- a/src/views/business/resi-category-map.js +++ b/src/views/business/resi-category-map.js @@ -1,8 +1,8 @@ export default { PARTY_FLAG: "党员", - SUBSISTENCE_ALLOWANCE_FLAG: "低保户", - ENSURE_HOUSE_FLAG: "保障房", - UNEMPLOYED_FLAG: "失业", + SUBSISTENCE_ALLOWANCE_FLAG: "低保人员", + ENSURE_HOUSE_FLAG: "保障房人员", + UNEMPLOYED_FLAG: "失业人员", FERTILE_WOMAN_FLAG: "育龄妇女", VETERAN_FLAG: "退役军人", UNITED_FRONT_FLAG: "统战人员", diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue index 5018b20aa..5f4f32abf 100644 --- a/src/views/components/resiChangeTransfer.vue +++ b/src/views/components/resiChangeTransfer.vue @@ -157,11 +157,10 @@
- 取 消 + 取 消 保 存 + label-width="100px" + :required="true" + >
联系电话:
{{resiDetailObj.showMobile?resiDetailObj.showMobile:resiDetailObj.mobile?`${resiDetailObj.mobile.substr(0,3)}`+ "****" +`${resiDetailObj.mobile.substr(7,5)}`:'--'}}
+ + 显示 + @click="handleTuomin('mobile')">{{showFlagMobileBtn?'显示':'隐藏'}}
证件号:
{{resiDetailObj.showIdNum?resiDetailObj.showIdNum:resiDetailObj.idNum?`${resiDetailObj.idNum.substr(0, 11)}` +"******" +`${resiDetailObj.idNum.substr(16, 2)}`:'--'}}
+ + 显示 + @click="handleTuomin('idCard')">{{showFlagIdCardBtn?'显示':'隐藏'}} @@ -69,7 +70,7 @@
居民分类:
- 失独老人 + 特扶人员 慢病 失智老人 残疾 @@ -84,10 +85,10 @@ 信访人员 大病 特殊人群 - 低保 + 低保人员 统战人员 租户 - 失业 + 失业人员 退役军人 志愿者 @@ -924,7 +925,9 @@ export default { specialDtoArr:[], spouseArr:[], relationshipArr:[], - categoryDictArr:[] + categoryDictArr:[], + showFlagIdCardBtn:true, + showFlagMobileBtn:true } }, computed: { @@ -1740,14 +1743,21 @@ export default { }, async handleTuomin (type) { const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`; - const { data, code, msg } = await requestPost(url); if (code === 0) { if (type === 'mobile') { this.$set(this.resiDetailObj, 'showMobile', data.mobile) + this.showFlagMobileBtn = !this.showFlagMobileBtn + if(this.showFlagMobileBtn){ + this.$set(this.resiDetailObj, 'showMobile', data.mobile.substr(0,3) +'****'+ data.mobile.substr(7,4) ) + } } if (type === 'idCard') { this.$set(this.resiDetailObj, 'showIdNum', data.idNum) + this.showFlagIdCardBtn = !this.showFlagIdCardBtn + if(this.showFlagIdCardBtn){ + this.$set(this.resiDetailObj, 'showIdNum', data.idNum.substr(0,11) +'****'+ data.idNum.substr(16,2) ) + } } diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 3a240f1af..8c562f8f2 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -313,6 +313,9 @@ export default { if (data.unreadNum > 0 && this.unreadMsgNum < data.unreadNum) { this.getNoticeList(); this.displayedNoticeList = true; + setTimeout(()=>{ + this.displayedNoticeList = false; + },5000) } this.unreadMsgNum = data.unreadNum; } else { @@ -383,6 +386,7 @@ export default { box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12); border-radius: 4px; + .title { margin-bottom: 16px; height: 22px; @@ -435,8 +439,11 @@ export default { font-size: 14px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: rgba(0, 0, 0, 0.85); line-height: 22px; + cursor: pointer; + &:hover{ + color: #0056d6 !important; + } } } diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue index c253e8e2b..d5f80200e 100644 --- a/src/views/modules/base/collect.vue +++ b/src/views/modules/base/collect.vue @@ -59,18 +59,18 @@ -
- + + + 重置 查询 - -
- - + +
@@ -421,8 +421,8 @@ export default { computed: { ...mapGetters(["clientHeight", "iframeHeight"]), tableHeight () { - const h = this.clientHeight - 360 + this.iframeHeigh; - const _h = this.clientHeight - 360; + const h = this.clientHeight - 400 + this.iframeHeigh; + const _h = this.clientHeight - 400; return this.$store.state.inIframe ? h : _h; }, dialogTableHeight () { diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 403e435fb..6f3f31ad1 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -26,7 +26,7 @@ > {{ ' ' }} --> - {{ data.label + "(" }} {{ data.showNum }} {{ ")" }} - - {{ data.showName }} + --> + {{ data.showName }} @@ -70,13 +70,13 @@ > - + @@ -243,7 +243,7 @@ 查询 @@ -476,8 +476,20 @@ export default { ? this.clientHeight - 245 + this.iframeHeight + "px" : this.clientHeight - 245 + "px"; }, - ...mapGetters(["clientHeight", "iframeHeight"]), + showIcons(){ + return function(data){ + if(data.level=='building'){ + let arr = data.showNum.split('/') + console.log(arr); + if(arr[0] !== arr[1]){ + return true + }else{ + return false + } + } + } + }, }, watch: { // filterText (val) { @@ -682,8 +694,10 @@ export default { this.pageSize = 10; this.pageNo = 1; // this.handleNodeClick(this.selObj) - // this.loadTable() - }, + this.$nextTick(()=>{ + this.$refs.ref_buildingTable.loadTable('search',this.selObj) + }) + }, async loadOpenNode() { const url = "/gov/org/building/tree-ids"; diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index f07b7b56d..f6fe14242 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -5,7 +5,7 @@ 新增小区下载房屋模板
-
补全小程序小区码 -
+
-->
智能填报
-
@@ -227,7 +227,7 @@ @click="handleDownQr(agencyObj, 'community')" >社区二维码 -
+ --> --> - -
+ + + 查询 -
- + +
@@ -547,13 +548,16 @@ export default { importLoading: false, searchH: 0, - tableHeight: 0, changeRecordShow: false, }; }, computed: { ...mapGetters(["clientHeight", "iframeHeight"]), - + tableHeight(){ + const h = this.clientHeight - 450 + this.iframeHeigh; + const _h = this.clientHeight - 450; + return this.$store.state.inIframe ? h : _h; + }, changeVDisabled() { return !this.fmData.villageId; }, @@ -563,6 +567,7 @@ export default { changeDDisabled() { return !this.fmData.unitId; }, + }, watch: { rangeTime: function (val) { @@ -575,15 +580,6 @@ export default { this.fmData.endTime = ""; } }, - searchH() { - const h = this.clientHeight - this.searchH + this.iframeHeight; - const _h = this.clientHeight - this.searchH; - console.log("computed-searchH---_h", _h); - - this.$nextTick(() => { - this.tableHeight = this.$store.state.inIframe ? h : _h; - }); - }, }, mounted() { this.getGridList(); diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index ff0ba434f..8ff6492bb 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -241,7 +241,7 @@ }} {{ scope.row.categoryInfo.ensureHouseFlag == 1 - ? "保障房 " + ? "保障房人员 " : "" }} {{ @@ -289,7 +289,7 @@ {{ scope.row.categoryInfo .subsistenceAllowanceFlag == 1 - ? "低保 " + ? "低保人员 " : "" }} {{ @@ -2003,4 +2003,11 @@ export default { margin-left: auto; } } +.el-dropdown-menu { + ::v-deep .el-dropdown-menu__item{ + &:hover{ + color: #0056d6; + } + } +} diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index b78ea8387..0c3e4b9d4 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -51,7 +51,7 @@
- 智能搜索 + 智能查询
diff --git a/src/views/modules/home/notice.vue b/src/views/modules/home/notice.vue index 3bfaeeb8b..9dbf7b2da 100644 --- a/src/views/modules/home/notice.vue +++ b/src/views/modules/home/notice.vue @@ -201,6 +201,7 @@ export default { &:hover { .item-title { color: #0056d6; + cursor: pointer; } .item-btn-clear { display: block; diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue index 86a05754c..4a2159a12 100644 --- a/src/views/modules/plugins/change/changedeath.vue +++ b/src/views/modules/plugins/change/changedeath.vue @@ -69,8 +69,11 @@ --> -
- + + + 重置 查询 -
- + +
@@ -96,6 +99,7 @@ class="m-table-item" v-loading="dataListLoading" :data="dataList" + :height="tableHeight" border > @@ -277,7 +281,7 @@ import nextTick from "dai-js/tools/nextTick"; import resiChangeRecord from "@/views/components/resiChangeRecord.vue"; import { requestPost } from "@/js/dai/request"; import resiInfo from "@/views/components/resiInfo.vue"; - +import { mapGetters } from "vuex"; export default { mixins: [mixinViewModule], data() { @@ -328,6 +332,14 @@ export default { resiInfo, resiChangeRecord, }, + computed:{ + ...mapGetters(["clientHeight", "iframeHeight"]), + tableHeight(){ + const h = this.clientHeight - 410 + this.iframeHeigh; + const _h = this.clientHeight - 410; + return this.$store.state.inIframe ? h : _h; + }, + }, methods: { async handleRecovery(rowData) { console.log("11111"); diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue index 56097448c..88c1e9ca7 100644 --- a/src/views/modules/plugins/change/changerelocation.vue +++ b/src/views/modules/plugins/change/changerelocation.vue @@ -164,7 +164,7 @@ 查询 @@ -321,7 +321,6 @@ slot="reference" type="text" size="small" - class="div-table-button--blue" >恢复 @@ -442,7 +441,6 @@ export default { changeRecordShow: false, searchH: 0, - tableHeight: 0, }; }, components: { @@ -452,6 +450,11 @@ export default { }, computed: { ...mapGetters(["clientHeight", "iframeHeight"]), + tableHeight(){ + const h = this.clientHeight - 420 + this.iframeHeigh; + const _h = this.clientHeight - 420; + return this.$store.state.inIframe ? h : _h; + }, changeVDisabled() { return !this.dataForm.villageId; }, @@ -480,15 +483,6 @@ export default { this.dataForm.endTime = ""; } }, - searchH() { - const h = this.clientHeight - this.searchH + this.iframeHeight; - const _h = this.clientHeight - this.searchH; - console.log("computed-searchH---_h", _h); - - this.$nextTick(() => { - this.tableHeight = this.$store.state.inIframe ? h : _h; - }); - }, }, methods: { async handleRecovery(rowData) { diff --git a/src/views/modules/plugins/change/resideathAdd.vue b/src/views/modules/plugins/change/resideathAdd.vue index 91342318a..c3d1453b0 100644 --- a/src/views/modules/plugins/change/resideathAdd.vue +++ b/src/views/modules/plugins/change/resideathAdd.vue @@ -56,10 +56,10 @@
- 取 消 + 取 消 保 存