diff --git a/src/assets/images/category/Community.png b/src/assets/images/category/Community.png new file mode 100644 index 000000000..ec79df2ce Binary files /dev/null and b/src/assets/images/category/Community.png differ diff --git a/src/assets/images/category/Disability.png b/src/assets/images/category/Disability.png new file mode 100644 index 000000000..9f0762b16 Binary files /dev/null and b/src/assets/images/category/Disability.png differ diff --git a/src/assets/images/category/Druguse.png b/src/assets/images/category/Druguse.png new file mode 100644 index 000000000..275bdaa63 Binary files /dev/null and b/src/assets/images/category/Druguse.png differ diff --git a/src/assets/images/category/Enter.png b/src/assets/images/category/Enter.png new file mode 100644 index 000000000..ff65077ed Binary files /dev/null and b/src/assets/images/category/Enter.png differ diff --git a/src/assets/images/category/NCD.png b/src/assets/images/category/NCD.png new file mode 100644 index 000000000..a70e3f47a Binary files /dev/null and b/src/assets/images/category/NCD.png differ diff --git a/src/assets/images/category/Newclass.png b/src/assets/images/category/Newclass.png new file mode 100644 index 000000000..16593cd98 Binary files /dev/null and b/src/assets/images/category/Newclass.png differ diff --git a/src/assets/images/category/Petition.png b/src/assets/images/category/Petition.png new file mode 100644 index 000000000..a467a517f Binary files /dev/null and b/src/assets/images/category/Petition.png differ diff --git a/src/assets/images/category/Placement.png b/src/assets/images/category/Placement.png new file mode 100644 index 000000000..b6e6f493a Binary files /dev/null and b/src/assets/images/category/Placement.png differ diff --git a/src/assets/images/category/Special .png b/src/assets/images/category/Special .png new file mode 100644 index 000000000..265aff815 Binary files /dev/null and b/src/assets/images/category/Special .png differ diff --git a/src/assets/images/category/Unemployed.png b/src/assets/images/category/Unemployed.png new file mode 100644 index 000000000..12f79cdfc Binary files /dev/null and b/src/assets/images/category/Unemployed.png differ diff --git a/src/assets/images/category/Women.png b/src/assets/images/category/Women.png new file mode 100644 index 000000000..990ddc57e Binary files /dev/null and b/src/assets/images/category/Women.png differ diff --git a/src/assets/images/category/Youth.png b/src/assets/images/category/Youth.png new file mode 100644 index 000000000..32b8559db Binary files /dev/null and b/src/assets/images/category/Youth.png differ diff --git a/src/assets/images/category/allowance.png b/src/assets/images/category/allowance.png new file mode 100644 index 000000000..eed9a3c6b Binary files /dev/null and b/src/assets/images/category/allowance.png differ diff --git a/src/assets/images/category/cult.png b/src/assets/images/category/cult.png new file mode 100644 index 000000000..c6ca57a0a Binary files /dev/null and b/src/assets/images/category/cult.png differ diff --git a/src/assets/images/category/disorders.png b/src/assets/images/category/disorders.png new file mode 100644 index 000000000..b1cb7ef2f Binary files /dev/null and b/src/assets/images/category/disorders.png differ diff --git a/src/assets/images/category/guarantee.png b/src/assets/images/category/guarantee.png new file mode 100644 index 000000000..b07d44048 Binary files /dev/null and b/src/assets/images/category/guarantee.png differ diff --git a/src/assets/images/category/housemaster.png b/src/assets/images/category/housemaster.png new file mode 100644 index 000000000..89717db6b Binary files /dev/null and b/src/assets/images/category/housemaster.png differ diff --git a/src/assets/images/category/illness.png b/src/assets/images/category/illness.png new file mode 100644 index 000000000..629626534 Binary files /dev/null and b/src/assets/images/category/illness.png differ diff --git a/src/assets/images/category/member.png b/src/assets/images/category/member.png new file mode 100644 index 000000000..9fb47a0bc Binary files /dev/null and b/src/assets/images/category/member.png differ diff --git a/src/assets/images/category/noYonth.png b/src/assets/images/category/noYonth.png new file mode 100644 index 000000000..69a61b447 Binary files /dev/null and b/src/assets/images/category/noYonth.png differ diff --git a/src/assets/images/category/old.png b/src/assets/images/category/old.png new file mode 100644 index 000000000..c977bd179 Binary files /dev/null and b/src/assets/images/category/old.png differ diff --git a/src/assets/images/category/perpon.png b/src/assets/images/category/perpon.png new file mode 100644 index 000000000..95a280102 Binary files /dev/null and b/src/assets/images/category/perpon.png differ diff --git a/src/assets/images/category/population.png b/src/assets/images/category/population.png new file mode 100644 index 000000000..6800586ee Binary files /dev/null and b/src/assets/images/category/population.png differ diff --git a/src/assets/images/category/soldier.png b/src/assets/images/category/soldier.png new file mode 100644 index 000000000..7826f3c0b Binary files /dev/null and b/src/assets/images/category/soldier.png differ diff --git a/src/assets/images/category/unit.png b/src/assets/images/category/unit.png new file mode 100644 index 000000000..ee49a3a04 Binary files /dev/null and b/src/assets/images/category/unit.png differ diff --git a/src/assets/images/category/united.png b/src/assets/images/category/united.png new file mode 100644 index 000000000..661d0fce8 Binary files /dev/null and b/src/assets/images/category/united.png differ diff --git a/src/assets/images/category/volunteer.png b/src/assets/images/category/volunteer.png new file mode 100644 index 000000000..707e6d4a8 Binary files /dev/null and b/src/assets/images/category/volunteer.png differ diff --git a/src/assets/images/category/welfare.png b/src/assets/images/category/welfare.png new file mode 100644 index 000000000..4ae406106 Binary files /dev/null and b/src/assets/images/category/welfare.png differ diff --git a/src/assets/scss/modules/management/classification.scss b/src/assets/scss/modules/management/classification.scss new file mode 100644 index 000000000..8e2d78f7a --- /dev/null +++ b/src/assets/scss/modules/management/classification.scss @@ -0,0 +1,211 @@ +.g-main { + box-sizing: border-box; + height: 100%; + width: 100%; + background: #ffffff; + border-radius: 5px; + padding: 35px 0 15px; +} +.div_tip { + font-size: 24px; + font-family: PingFang SC; + font-weight: bold; + color: #333333; + margin-left: 42px; +} +.div_list { + box-sizing: border-box; + margin-top: 5px; + height: calc(100vh - 210px); +} + +.div_all_list { + height: calc(100vh - 260px); +} + +.div_room { + // height: calc(88vh - 40px); + // margin-top: 9px; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + margin-left: 42px; + // margin: 0 21px 0 21px; + + .item { + width: 282px; + height: 86px; + background: #ffffff; + box-shadow: 0px 0px 17px 3px #eaeaea; + border-radius: 6px; + margin: 15px 25px 15px 0; + display: flex; + position: relative; + + + .item_category { + width: 100%; + display: flex; + align-items: center; + padding: 8px; + > img { + width: 66px; + height: 66px; + } + .item_content { + margin-left: 5px; + width: 100%; + text-align: left; + display: flex; + flex-direction: column; + justify-content: flex-start; + + .item_count { + font-size: 28px; + font-family: PingFang SC; + font-weight: bold; + color: #333333; + } + .item_row1 { + border-radius: 4px; + background-color: #E1E9F5; + display: flex; + justify-content: space-between; + align-items: center; + height: 23px; + + .row_left { + font-size: 14px; + font-family: PingFang SC; + font-weight: 500; + color: #666666; + text-align: center; + margin-left: 5px; + } + + .row_right { + margin: 0px 5px 0 0; + + cursor: pointer; + display: flex; + flex-direction: row; + .img{ + width: 16px; + height: 16px; + margin-top: 2px; + } + .text{ + font-size: 20px; + font-family: PingFang SC; + color: #333333; + margin-right: 5px; + } + + } + } + + .item_row2 { + border-radius: 4px; + background-color: #E1E9F5; + display: flex; + justify-content: space-between; + align-items: center; + height: 23px; + margin-top: 10px; + .row_left { + font-size: 14px; + font-family: PingFang SC; + font-weight: 500; + color: #666666; + text-align: center; + margin-left: 5px; + } + + .row_right { + margin: 0px 5px 0 0; + + cursor: pointer; + display: flex; + flex-direction: row; + .img{ + width: 16px; + height: 16px; + margin-top: 2px + } + .text{ + font-size: 18px; + font-family: PingFang SC; + color: #666666; + margin-right: 5px; + } + + } + } + } + + > span { + margin-left: 16px; + font-size: 24px; + } + } + + .item_add { + cursor: pointer; + font-size: 24px; + font-family: PingFang SC; + font-weight: 500; + color: #333333; + display: flex; + align-items: center; + padding: 17px 16px; + + > img { + width: 86px; + height: 86px; + } + + > span { + font-size: 24px; + font-family: PingFang SC; + font-weight: 500; + color: #333333; + + margin-left: 16px; + } + } + + .icon_circle { + cursor: pointer; + position: absolute; + top: -10px; + right: -10px; + height: 23px; + width: 23px; + background-color: #ffffff; + border-radius: 50%; + border: 1px solid #a5a5a5; + } + + .icon_sel { + cursor: pointer; + background-color: #6bb9f8; + border: 1px solid #6bb9f8; + } + } +} + +.div_room::after { + content: ''; + flex: 1; +} + +.div_btn { + margin-top: 15px; + display: flex; + width: 100%; + justify-content: center; + + .btn_right { + margin-left: 50px; + } +} diff --git a/src/views/modules/base/classification/index.vue b/src/views/modules/base/classification/index.vue new file mode 100644 index 000000000..132ac65b3 --- /dev/null +++ b/src/views/modules/base/classification/index.vue @@ -0,0 +1,705 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index ab858b3e8..a4a0ae462 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -1151,7 +1151,7 @@ export default { watch: { $route: { handler: function (newVal, oldVal) { - if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home')) { + if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home'||oldVal.name === 'base-classification')) { this.$nextTick(() => { this.$refs.myResiSearch.form.attentionCrowds = []; this.$refs.myResiSearch.form.healthStatus = []; @@ -1192,6 +1192,7 @@ export default { this.handleSearchFrom(); }); } + }, deep: true, immediate: true, diff --git a/src/views/modules/base/virtualResi.vue b/src/views/modules/base/virtualResi.vue index a41fa6c87..9f824753c 100644 --- a/src/views/modules/base/virtualResi.vue +++ b/src/views/modules/base/virtualResi.vue @@ -1219,26 +1219,56 @@ export default { }, }, watch: { - $route: { - handler: function (newVal, oldVal) { - // console.log(newVal, oldVal) - if (newVal.name == "base-resi") { - this.$nextTick(() => { - if (newVal.params.category) { - this.$refs.myResiSearch.form.categoryKey = [] - this.$refs.myResiSearch.form.categoryKey.push(newVal.params.category) - this.handleSearchFrom() - } else { - // this.$refs.myResiSearch.form.categoryKey = [] - // this.handleSearchFrom() - } - }) - } - }, - deep: true, - immediate: true + $route: { + handler: function (newVal, oldVal) { + if (newVal.name == "base-virtualResi" && (!oldVal || oldVal.name === 'base-classification')) { + console.log(oldVal); + this.$nextTick(() => { + this.$refs.myResiSearch.form.attentionCrowds = []; + this.$refs.myResiSearch.form.healthStatus = []; + this.$refs.myResiSearch.form.specialCategoryCodes = []; + this.$refs.myResiSearch.form.partyFlag=null; + if (newVal.query.category === 'SPECIAL_SUPPORT_FLAG' ||newVal.query.category === 'SUBSISTENCE_ALLOWANCE_FLAG'|| newVal.query.category === 'VETERAN_FLAG'|| newVal.query.category === 'ENSURE_HOUSE_FLAG'|| newVal.query.category === 'OLD_PEOPLE_FLAG'|| newVal.query.category === 'FERTILE_WOMAN_FLAG' || newVal.query.category === 'FLOATING_FLAG' || newVal.query.category === 'NEW_STRATUM_FLAG' || newVal.query.category === 'permanentFlag') { + this.$refs.myResiSearch.form.attentionCrowds.push( + newVal.query.category + ); + } else if(newVal.query.category === 'CHRONIC_DISEASE_FLAG' ||newVal.query.category === 'SERIOUS_ILLNESS_FLAG'||newVal.query.category === 'DISABILITY_FLAG'){ + this.$refs.myResiSearch.form.healthStatus.push( + newVal.query.category + ); + }else if(newVal.query.category === 'SQJZ_FLAG' || newVal.query.category === 'AZBJ_FLAG' || newVal.query.category === 'DRUG_FLAG' || newVal.query.category === 'XJRY_FLAG' || newVal.query.category === 'ZSZHJSB_FLAG' || newVal.query.category === 'UNITED_FRONT_FLAG'|| newVal.query.category === 'PETITION_OFFICER_FLAG' || newVal.query.category === 'BLQSN_FLAG'){ + let obj = { + SQJZ_FLAG:'shequjiaozheng', + AZBJ_FLAG:'anzhibangjiao', + DRUG_FLAG:'xidurenyuan', + XJRY_FLAG:'xiejiaorenyuan', + ZSZHJSB_FLAG:'zhaoshizhaohuojingshenbing', + UNITED_FRONT_FLAG:'tongzhanrenyuan', + PETITION_OFFICER_FLAG:'xinfangrenyaun', + BLQSN_FLAG:'buliangqingshaonian' + } + this.$refs.myResiSearch.form.specialCategoryCodes = [obj[newVal.query.category]]; + }else if(newVal.query.category === 'PARTY_FLAG'){ + this.$refs.myResiSearch.form.partyFlag =1; + }else if(newVal.query.category === 'BUILDING_CHIEF_FLAG' || newVal.query.category === 'VOLUNTEER_FLAG' || newVal.query.category === 'UNIT_CHIEF_FLAG' || newVal.query.category ==='PUBLIC_WELFARE_FLAG'){ + console.log(newVal.query.category); + this.$refs.myResiSearch.form.identity = newVal.query.category; + }else if(newVal.query.category === 'MASS_FLAG'){ + this.$refs.myResiSearch.form.partyFlag = 0; + }else if(newVal.query.category === 'LEAGUE_FLAG'){ + this.$refs.myResiSearch.form.partyFlag = 2; + } else if(newVal.query.category === 'UNEMPLOYED_FLAG'){ + this.$refs.myResiSearch.form.careerStatus = '0'; + } + this.handleSearchFrom(); + }); } + + }, + deep: true, + immediate: true, }, + }, };