diff --git a/src/assets/images/category/AIDS_FLAG.png b/src/assets/images/category/AIDS_FLAG.png new file mode 100644 index 000000000..fb98a9d8f Binary files /dev/null and b/src/assets/images/category/AIDS_FLAG.png differ diff --git a/src/assets/images/category/LBC_FLAG.png b/src/assets/images/category/LBC_FLAG.png new file mode 100644 index 000000000..1f895f1db Binary files /dev/null and b/src/assets/images/category/LBC_FLAG.png differ diff --git a/src/assets/images/category/NEG_FLAG.png b/src/assets/images/category/NEG_FLAG.png new file mode 100644 index 000000000..f2239a799 Binary files /dev/null and b/src/assets/images/category/NEG_FLAG.png differ diff --git a/src/assets/images/category/Unemployed.png b/src/assets/images/category/Unemployed.png index 12f79cdfc..0358403bf 100644 Binary files a/src/assets/images/category/Unemployed.png and b/src/assets/images/category/Unemployed.png differ diff --git a/src/assets/images/category/noYonth.png b/src/assets/images/category/noYonth.png index 69a61b447..f9516a8b4 100644 Binary files a/src/assets/images/category/noYonth.png and b/src/assets/images/category/noYonth.png differ diff --git a/src/assets/scss/modules/management/classification.scss b/src/assets/scss/modules/management/classification.scss index 8e2d78f7a..6a4364e58 100644 --- a/src/assets/scss/modules/management/classification.scss +++ b/src/assets/scss/modules/management/classification.scss @@ -68,7 +68,7 @@ } .item_row1 { border-radius: 4px; - background-color: #E1E9F5; + background-color: #f3f6fb; display: flex; justify-content: space-between; align-items: center; @@ -103,10 +103,9 @@ } } - .item_row2 { border-radius: 4px; - background-color: #E1E9F5; + background-color: #f3f6fb; display: flex; justify-content: space-between; align-items: center; diff --git a/src/views/modules/base/classification/index.vue b/src/views/modules/base/classification/index.vue index 132ac65b3..73863a8b0 100644 --- a/src/views/modules/base/classification/index.vue +++ b/src/views/modules/base/classification/index.vue @@ -241,7 +241,7 @@
- +
保障房人员
@@ -249,7 +249,6 @@
{{ categoryList.ensureHouseFlagCount }}
-
保障房人员(虚拟网格)
@@ -307,6 +306,52 @@
+
+
+
+ +
+
+
留守儿童
+
+
{{ categoryList.lbcFlagCount || '--' }}
+ +
+ +
+
+
留守儿童(虚拟网格)
+
+
{{ categoryList.lbcFlagVirtualCount || '--' }}
+ +
+
+
+
+ +
+
+
+ +
+
+
艾滋病人员
+
+
{{ categoryList.aidsFlagCount || '--' }}
+ +
+ +
+
+
艾滋病人员(虚拟网格)
+
+
{{ categoryList.aidsFlagVirtualCount || '--' }}
+ +
+
+
+
+
@@ -329,8 +374,8 @@
- +
@@ -352,7 +397,28 @@
+ +
+
+ +
+
+
新就业群体
+
+
{{ categoryList.negFlagCount || '--' }}
+ +
+
+
+
新就业群体(虚拟网格)
+
+
{{ categoryList.negFlagVirtualCount || '--' }}
+ +
+
+
+
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 207ad6152..8b5a7ae15 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -1158,7 +1158,7 @@ export default { 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' || newVal.query.category === 'UNEMPLOYED_FLAG' ) { + 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' || newVal.query.category === 'UNEMPLOYED_FLAG' || newVal.query.category === 'LBC_FLAG' || newVal.query.category === 'AIDS_FLAG' || newVal.query.category === 'NEG_FLAG' ) { this.$refs.myResiSearch.form.attentionCrowds.push( newVal.query.category ); diff --git a/src/views/modules/base/virtualResi.vue b/src/views/modules/base/virtualResi.vue index 9f824753c..089a579f5 100644 --- a/src/views/modules/base/virtualResi.vue +++ b/src/views/modules/base/virtualResi.vue @@ -1228,7 +1228,7 @@ export default { 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') { + 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'||newVal.query.category === 'UNEMPLOYED_FLAG'|| newVal.query.category === 'LBC_FLAG' || newVal.query.category === 'AIDS_FLAG' || newVal.query.category === 'NEG_FLAG' ) { this.$refs.myResiSearch.form.attentionCrowds.push( newVal.query.category );