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

全局替换网格长为网格员,居民分类如果为null展示为0

feature
mk 1 year ago
parent
787c0eb966
commit
999e1cb113
10 changed files with 34 additions and 25 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. 2
      src/views/components/resiSearch.vue
  2. 4
      src/views/components/selectStaff.vue
  3. 2
      src/views/dataBoard/organizational/jwTree/index.vue
  4. 20
      src/views/modules/base/classification/index.vue
  5. 11
      src/views/modules/base/resi.vue
  6. 8
      src/views/modules/home/index.vue
  7. 2
      src/views/modules/productConfig/autoTest/autoTestList copy.vue
  8. 6
      src/views/modules/productConfig/autoTest/autoTestList.vue
  9. 2
      src/views/modules/productConfig/topicConfig/TopicConfig copy.vue
  10. 2
      src/views/modules/productConfig/topicConfig/TopicConfig.vue

2
src/views/components/resiSearch.vue
View File

@ -601,7 +601,7 @@ export default {
form: {
name: '',
mobile: '',
// careerStatus:'',
updateCategory:'',
satisfactionNum:null,
idNum: '',
birthdayStart: '',

4
src/views/components/selectStaff.vue
View File

@ -655,7 +655,7 @@ export default {
} else {
let succ = false;
dItem.gridStaffList.forEach((item) => {
if (item.roleName == "网格长") {
if (item.roleName == "网格员") {
item.selected = true;
succ = true;
} else {
@ -663,7 +663,7 @@ export default {
}
});
if (!succ) {
return this.$message.error(dItem.gridName + "下无【网格长】");
return this.$message.error(dItem.gridName + "下无【网格员】");
} else {
dItem.selected = true;
}

2
src/views/dataBoard/organizational/jwTree/index.vue
View File

@ -138,7 +138,7 @@ export default {
["district", "区委"],
["street", "乡(镇、街道)"],
["community", "社区"],
["grid_manager", "网格长"],
["grid_manager", "网格员"],
["building_chief", "楼组长"],
["unit_chief", "单元长"],
["public_welfare_post", "志愿者"],

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

@ -314,7 +314,7 @@
<div class="item_row1" @click="handelClickToResi('LBC_FLAG')">
<div class="row_left">留守儿童</div>
<div class="row_right">
<div class="text">{{ categoryList.lbcFlagCount || '--' }}</div>
<div class="text">{{ categoryList.lbcFlagCount || 0 }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
@ -322,7 +322,7 @@
<div class="item_row2" @click="handelClickTovirtualResi('LBC_FLAG')">
<div class="row_left">留守儿童(虚拟网格)</div>
<div class="row_right">
<div class="text">{{ categoryList.lbcFlagVirtualCount || '--' }}</div>
<div class="text">{{ categoryList.lbcFlagVirtualCount || 0 }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
</div>
@ -337,7 +337,7 @@
<div class="item_row1" @click="handelClickToResi('AIDS_FLAG')">
<div class="row_left">艾滋病人员</div>
<div class="row_right">
<div class="text">{{ categoryList.aidsFlagCount || '--' }}</div>
<div class="text">{{ categoryList.aidsFlagCount || 0 }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
@ -345,7 +345,7 @@
<div class="item_row2" @click="handelClickTovirtualResi('AIDS_FLAG')">
<div class="row_left">艾滋病人员(虚拟网格)</div>
<div class="row_right">
<div class="text">{{ categoryList.aidsFlagVirtualCount || '--' }}</div>
<div class="text">{{ categoryList.aidsFlagVirtualCount || 0 }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
</div>
@ -405,7 +405,7 @@
<div class="item_row1" @click="handelClickToResi('NEG_FLAG')">
<div class="row_left">新就业群体</div>
<div class="row_right">
<div class="text">{{ categoryList.negFlagCount || '--' }}</div>
<div class="text">{{ categoryList.negFlagCount || 0 }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
@ -413,7 +413,7 @@
<div class="item_row2" @click="handelClickTovirtualResi('NEG_FLAG')">
<div class="row_left">新就业群体(虚拟网格)</div>
<div class="row_right">
<div class="text">{{ categoryList.negFlagVirtualCount || '--' }}</div>
<div class="text">{{ categoryList.negFlagVirtualCount || 0 }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
</div>
@ -632,17 +632,17 @@
<img src="@/assets/images/category/GRID_MANAGER_FLAG.png" alt />
<div class="item_content">
<div class="item_row1" @click="handelClickToResi('GRID_MANAGER_FLAG')">
<div class="row_left">网格长</div>
<div class="row_left">网格员</div>
<div class="row_right">
<div class="text">{{ categoryList.gridManagerFlagCount || '--' }}</div>
<div class="text">{{ categoryList.gridManagerFlagCount || 0 }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
</div>
<div class="item_row2" @click="handelClickTovirtualResi('GRID_MANAGER_FLAG')">
<div class="row_left">网格长(虚拟网格)</div>
<div class="row_left">网格员(虚拟网格)</div>
<div class="row_right">
<div class="text">{{ categoryList.gridManagerFlagVirtualCount || '--' }}</div>
<div class="text">{{ categoryList.gridManagerFlagVirtualCount || 0 }}</div>
<img src="@/assets/images/category/Enter.png" class="img" />
</div>
</div>

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

@ -1227,7 +1227,16 @@ export default {
watch: {
$route: {
handler: function (newVal, oldVal) {
if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home'||oldVal.name === 'base-classification'||oldVal.name === 'home-notice')) {
if((newVal.name == "base-resi" || oldVal.name === 'home') && newVal.query.type){
this.$nextTick(()=>{
this.$refs.myResiSearch.form.updateCategory = newVal.query.category;
this.handleSearchFrom();
})
return
}else{
this.$refs.myResiSearch.form.updateCategory ='';
}
if (newVal.name == "base-resi" && (oldVal.name === 'home'||oldVal.name === 'base-classification'||oldVal.name === 'home-notice')) {
this.$nextTick(() => {
this.$refs.myResiSearch.form.attentionCrowds = [];
this.$refs.myResiSearch.form.healthStatus = [];

8
src/views/modules/home/index.vue
View File

@ -179,7 +179,7 @@
</el-table-column>
<el-table-column label="更新人数" align="center" width="105">
<template slot-scope="scope">
<span style="color:#006fd6;" @click="handelCLickJump(scope.row,'updateResiList')">{{scope.row.updateResiNum}}</span><span style="color:#989898;">({{scope.row.updatePeriodName?scope.row.updatePeriodName:'--'}})</span>
<span style="color:#006fd6;cursor: pointer;" @click="handelCLickJump(scope.row,'updateResiList')">{{scope.row.updateResiNum}}</span><span style="color:#989898;">({{scope.row.updatePeriodName?scope.row.updatePeriodName:'--'}})</span>
</template>
</el-table-column>
</el-table>
@ -628,10 +628,10 @@ export default {
},
handelCLickJump(e,type){
this.$router.push({
path: "/main/base-nonIntResi",
path: "base-resi",
query: {
resiCategory: e.residentCategory,
type:type
category: e.residentCategory,
type:'updateResi'
}
});
},

2
src/views/modules/productConfig/autoTest/autoTestList copy.vue
View File

@ -29,7 +29,7 @@
header-align="center"
min-width="130"></el-table-column>
<el-table-column prop="dangjian"
label="工作人员（党建+管理员+网格长）"
label="工作人员（党建+管理员+网格员）"
header-align="center"
align="center"
min-width="110">

6
src/views/modules/productConfig/autoTest/autoTestList.vue
View File

@ -20,7 +20,7 @@
header-align="center"
min-width="140"></el-table-column>
<el-table-column prop="dangjian"
label="工作人员（党建+管理员+网格长）"
label="工作人员（党建+管理员+网格员）"
header-align="center"
align="center"
min-width="120">
@ -326,7 +326,7 @@ export default {
"type": "grid",
"staffList": [
{
"name": "W1网格长",
"name": "W1网格员",
"mobile": "13000000005"
}
],
@ -360,7 +360,7 @@ export default {
"type": "grid",
"staffList": [
{
"name": "W2网格长",
"name": "W2网格员",
"mobile": "13000000005"
}
],

2
src/views/modules/productConfig/topicConfig/TopicConfig copy.vue
View File

@ -191,7 +191,7 @@ export default {
"projectList": [
{
"personId": "J1-S1-W1",
"personName": "J1-S1-W1网格长",
"personName": "J1-S1-W1网格员",
"answer": "此问题的确存在，会尽快解决",
"reply": "希望工作人员可以帮助解决"
},

2
src/views/modules/productConfig/topicConfig/TopicConfig.vue
View File

@ -338,7 +338,7 @@ export default {
"isToProject": "1",
"localLevel": {
"staffId": "J1-S1-W1",
"staffName": "J1-S1-W1网格长",
"staffName": "J1-S1-W1网格员",
"answer": "此问题的确存在，会尽快解决",
"reply": "希望工作人员可以帮助解决"
},

Write Preview
Loading…
Cancel
Save