Browse Source

修改bug

feature
战立标 2 years ago
parent
commit
6bf2414b9a
  1. 5
      src/views/dataBoard/overview/components/EventAndFollowUp.vue
  2. 25
      src/views/dataBoard/overview/components/jdwgy.vue
  3. 2
      src/views/dataBoard/overview/index.vue
  4. 2
      src/views/dataBoard/renfang/resi/classNew.vue

5
src/views/dataBoard/overview/components/EventAndFollowUp.vue

@ -97,11 +97,15 @@ export default {
this.type this.type
) )
.then(({data: {data}}) => { .then(({data: {data}}) => {
if (data) {
this.sumNum = data.sumNum; this.sumNum = data.sumNum;
this.lastSumNum = data.lastSumNum; this.lastSumNum = data.lastSumNum;
this.processNum = data.processNum; this.processNum = data.processNum;
this.closedNum = data.closedNum; this.closedNum = data.closedNum;
this.closedRatio = data.closedRatio; this.closedRatio = data.closedRatio;
}
}); });
}, },
typeChange(val) { typeChange(val) {
@ -116,6 +120,7 @@ export default {
.event { .event {
padding: 10px 16px; padding: 10px 16px;
} }
.tabs { .tabs {
margin: 10px 0; margin: 10px 0;
} }

25
src/views/dataBoard/overview/components/jdwgy.vue

@ -1,7 +1,8 @@
<template> <template>
<div class="m-subbox m-jdwgy"> <div class="m-subbox m-jdwgy">
<div class="table"> <div class="table">
<el-table :data="list" v-if="currentLevelData.orgLevel != 'grid'" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.3)" max-height="190px" height="190px"> <el-table :data="list" v-if="currentLevelData.orgLevel != 'grid'" v-loading="loading"
element-loading-background="rgba(0, 0, 0, 0.3)" max-height="190px" height="190px">
<el-table-column label="序号" type="index" width="80"/> <el-table-column label="序号" type="index" width="80"/>
<el-table-column prop="orgName" width="120" label="组织名称"/> <el-table-column prop="orgName" width="120" label="组织名称"/>
<el-table-column prop="name" width="120" label="姓名"/> <el-table-column prop="name" width="120" label="姓名"/>
@ -22,7 +23,8 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table v-if="currentLevelData.orgLevel == 'grid'" :data="wglist" v-loading="loading" max-height="190px" height="190px"> <el-table v-if="currentLevelData.orgLevel == 'grid'" :data="wglist" v-loading="loading" max-height="190px"
height="190px">
<el-table-column label="序号" type="index" width="50"/> <el-table-column label="序号" type="index" width="50"/>
<el-table-column prop="name" width="140" label="微网格"/> <el-table-column prop="name" width="140" label="微网格"/>
<el-table-column prop="type" width="90" label="类型"> <el-table-column prop="type" width="90" label="类型">
@ -69,24 +71,27 @@ export default {
}, },
watch: { watch: {
peopleType(val) { peopleType(val) {
this.getData(val, this.currentLevelData.orgLevel, this.currentLevelData.orgId); this.getData();
}, },
currentLevelData(val) { currentLevelData(val) {
if (val.orgId) { if (val.orgId) {
this.getData(this.peopleType, val.orgLevel, val.orgId); this.getData();
} }
}, },
}, },
mounted() { mounted() {
if (this.currentLevelData.orgId) { if (this.currentLevelData.orgId) {
this.getData(this.peopleType, this.currentLevelData.orgLevel, this.currentLevelData.orgId); this.getData();
} }
}, },
methods: { methods: {
getData(peopleType, level = "", orgId = "") { getData(level = "", orgId = "") {
this.loading = true; this.loading = true;
if (level == "grid") { if (level == "grid") {
this.$http.get("/actual/base/streetOverview/queryPersonnelGridGroup?personnelType=" + peopleType + "&level=" + level + "&orgId=" + orgId).then(({ data: { data } }) => { this.$http.get("/actual/base/streetOverview/queryPersonnelGridGroup?personnelType=" +
this.peopleType +
"&level=" + this.currentLevelData.orgLevel +
"&orgId=" + this.currentLevelData.orgId).then(({data: {data}}) => {
this.loading = false; this.loading = false;
this.wglist = data; this.wglist = data;
this.$emit( this.$emit(
@ -95,7 +100,10 @@ export default {
); );
}); });
} else { } else {
this.$http.get("/actual/base/streetOverview/queryPersonnelGroup?level=" + level + "&orgId=" + orgId + "&personnelType=" + peopleType).then(({ data: { data } }) => { this.$http.get("/actual/base/streetOverview/queryPersonnelGroup?level=" +
this.currentLevelData.orgLevel + "&orgId=" +
this.currentLevelData.orgId + "&personnelType=" +
this.peopleType).then(({data: {data}}) => {
this.loading = false; this.loading = false;
this.list = data.personnelInfoVOList; this.list = data.personnelInfoVOList;
this.$emit("setNum", data.orgPersonnelVOList); this.$emit("setNum", data.orgPersonnelVOList);
@ -131,6 +139,7 @@ export default {
td { td {
padding: 0 !important; padding: 0 !important;
} }
th { th {
padding: 6px 0 4px !important; padding: 6px 0 4px !important;
} }

2
src/views/dataBoard/overview/index.vue

@ -443,7 +443,7 @@ export default {
orgId: this.orgId, orgId: this.orgId,
orgLevel: this.currentLevel, orgLevel: this.currentLevel,
}; };
this.peopleType = this.currentLevel === 'grid'?'unit':'staffAgency'; // this.peopleType = this.currentLevel === 'grid'?'unit':'staffAgency';
}); });
}, },

2
src/views/dataBoard/renfang/resi/classNew.vue

@ -543,7 +543,7 @@ export default {
}, },
watch: { watch: {
$route(to, from) { $route(to, from) {
this.$router.go(0); // this.$router.go(0);
}, },
oldVal: { oldVal: {
handler(newVal, oldVal) { handler(newVal, oldVal) {

Loading…
Cancel
Save