elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch '消息提醒bug' into dev

feature
mk 1 year ago
parent
5e499a987d 02f29ef161
commit
de82f72de6
9 changed files with 73 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      src/assets/images/category/AIDS_FLAG.png
  2. BIN
      src/assets/images/category/LBC_FLAG.png
  3. BIN
      src/assets/images/category/NEG_FLAG.png
  4. BIN
      src/assets/images/category/Unemployed.png
  5. BIN
      src/assets/images/category/noYonth.png
  6. 5
      src/assets/scss/modules/management/classification.scss
  7. 72
      src/views/modules/base/classification/index.vue
  8. 2
      src/views/modules/base/resi.vue
  9. 2
      src/views/modules/base/virtualResi.vue

BIN
src/assets/images/category/AIDS_FLAG.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
src/assets/images/category/LBC_FLAG.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
src/assets/images/category/NEG_FLAG.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
src/assets/images/category/Unemployed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
src/assets/images/category/noYonth.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

5
src/assets/scss/modules/management/classification.scss
View File

@ -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;

72
src/views/modules/base/classification/index.vue
View File

@ -241,7 +241,7 @@
</div>
<div class="item">
<div class="item_category" >
<img src="@/assets/images/category/noYonth.png" alt />
<img src="@/assets/images/category/guarantee.png" alt />
<div class="item_content">
<div class="item_row1"@click="handelClickToResi('ENSURE_HOUSE_FLAG')">
<div class="row_left">保障房人员</div>
@ -249,7 +249,6 @@
<div class="text">{{ categoryList.ensureHouseFlagCount }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
</div>
<div class="item_row2" @click="handelClickTovirtualResi('ENSURE_HOUSE_FLAG')">
<div class="row_left">保障房人员(虚拟网格)</div>
@ -307,6 +306,52 @@
</div>
</div>
</div>
<div class="item">
<div class="item_category">
<img src="@/assets/images/category/LBC_FLAG.png" alt />
<div class="item_content">
<div class="item_row1" @click="handelClickToResi('LBC_FLAG')">
<div class="row_left">留守儿童</div>
<div class="row_right">
<div class="text">{{ categoryList.lbcFlagCount || '--' }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
</div>
<div class="item_row2" @click="handelClickTovirtualResi('LBC_FLAG')">
<div class="row_left">留守儿童(虚拟网格)</div>
<div class="row_right">
<div class="text">{{ categoryList.lbcFlagVirtualCount || '--' }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
</div>
</div>
</div>
</div>
<div class="item">
<div class="item_category">
<img src="@/assets/images/category/AIDS_FLAG.png" alt />
<div class="item_content">
<div class="item_row1" @click="handelClickToResi('AIDS_FLAG')">
<div class="row_left">艾滋病人员</div>
<div class="row_right">
<div class="text">{{ categoryList.aidsFlagCount || '--' }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
</div>
<div class="item_row2" @click="handelClickTovirtualResi('AIDS_FLAG')">
<div class="row_left">艾滋病人员(虚拟网格)</div>
<div class="row_right">
<div class="text">{{ categoryList.aidsFlagVirtualCount || '--' }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
</div>
</div>
</div>
</div>
<div class="item">
<div class="item_category" >
@ -329,8 +374,8 @@
</div>
</div>
</div>
</div>
<div class="item">
<div class="item_category" >
<img src="@/assets/images/category/Newclass.png" alt />
@ -352,7 +397,28 @@
</div>
</div>
</div>
</div>
<div class="item">
<div class="item_category">
<img src="@/assets/images/category/NEG_FLAG.png" alt />
<div class="item_content">
<div class="item_row1" @click="handelClickToResi('NEG_FLAG')">
<div class="row_left">新就业群体</div>
<div class="row_right">
<div class="text">{{ categoryList.negFlagCount || '--' }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
</div>
<div class="item_row2" @click="handelClickTovirtualResi('NEG_FLAG')">
<div class="row_left">新就业群体(虚拟网格)</div>
<div class="row_right">
<div class="text">{{ categoryList.negFlagVirtualCount || '--' }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
</div>
</div>
</div>
</div>
<div class="item">
<div class="item_category" >

2
src/views/modules/base/resi.vue
View File

@ -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
);

2
src/views/modules/base/virtualResi.vue
View File

@ -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
);

Write Preview
Loading…
Cancel
Save