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

修改bug

feature
战立标 2 years ago
parent
76e74ab245
commit
6bf2414b9a
4 changed files with 63 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 49
      src/views/dataBoard/overview/components/EventAndFollowUp.vue
  2. 59
      src/views/dataBoard/overview/components/jdwgy.vue
  3. 2
      src/views/dataBoard/overview/index.vue
  4. 2
      src/views/dataBoard/renfang/resi/classNew.vue

49
src/views/dataBoard/overview/components/EventAndFollowUp.vue
View File

@ -36,7 +36,7 @@ import Tabs from "@/views/dataBoard/satisfactionEval/components/Tabs/index.vue";
export default { export default {
name: "EventAndFollowUp", name: "EventAndFollowUp",
components: { Tabs }, components: {Tabs},
props: { props: {
date: { date: {
type: String, type: String,
@ -86,23 +86,27 @@ export default {
methods: { methods: {
getData(item) { getData(item) {
this.$http this.$http
.get( .get(
"/actual/base/streetOverview/eventAndFollowGroup?month=" + "/actual/base/streetOverview/eventAndFollowGroup?month=" +
this.date + this.date +
"&level=" + "&level=" +
item.orgLevel + item.orgLevel +
"&orgId=" + "&orgId=" +
item.orgId + item.orgId +
"&queryType=" + "&queryType=" +
this.type this.type
) )
.then(({ data: { data } }) => { .then(({data: {data}}) => {
this.sumNum = data.sumNum; if (data) {
this.lastSumNum = data.lastSumNum;
this.processNum = data.processNum; this.sumNum = data.sumNum;
this.closedNum = data.closedNum; this.lastSumNum = data.lastSumNum;
this.closedRatio = data.closedRatio; this.processNum = data.processNum;
}); this.closedNum = data.closedNum;
this.closedRatio = data.closedRatio;
}
});
}, },
typeChange(val) { typeChange(val) {
this.type = val; this.type = val;
@ -116,16 +120,17 @@ export default {
.event { .event {
padding: 10px 16px; padding: 10px 16px;
} }
.tabs { .tabs {
margin: 10px 0; margin: 10px 0;
} }
.content { .content {
background: linear-gradient( background: linear-gradient(
90deg, 90deg,
rgba(1, 94, 234, 0.1) 0%, rgba(1, 94, 234, 0.1) 0%,
rgba(16, 50, 103, 0) 50%, rgba(16, 50, 103, 0) 50%,
rgba(1, 94, 234, 0.1) 100% rgba(1, 94, 234, 0.1) 100%
); );
padding: 20px 19px; padding: 20px 19px;
display: flex; display: flex;

59
src/views/dataBoard/overview/components/jdwgy.vue
View File

@ -1,16 +1,17 @@
<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"
<el-table-column label="序号" type="index" width="80" /> element-loading-background="rgba(0, 0, 0, 0.3)" max-height="190px" height="190px">
<el-table-column prop="orgName" width="120" label="组织名称" /> <el-table-column label="序号" type="index" width="80"/>
<el-table-column prop="name" width="120" label="姓名" /> <el-table-column prop="orgName" width="120" label="组织名称"/>
<el-table-column prop="name" width="120" label="姓名"/>
<el-table-column prop="gender" width="120" label="性别"> <el-table-column prop="gender" width="120" label="性别">
<template slot-scope="scope"> <template slot-scope="scope">
{{ genders[scope.row.gender] }} {{ genders[scope.row.gender] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="age" width="120" label="年龄" /> <el-table-column prop="age" width="120" label="年龄"/>
<el-table-column prop="mobile" label="电话"> <el-table-column prop="mobile" label="电话">
<template slot-scope="scope"> <template slot-scope="scope">
{{ $sensitive(scope.row.mobile, 3, 7) }} {{ $sensitive(scope.row.mobile, 3, 7) }}
@ -18,26 +19,27 @@
</el-table-column> </el-table-column>
<el-table-column prop="operate" width="80" label="操作"> <el-table-column prop="operate" width="80" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"> 查看 </el-button> <el-button @click="handleClick(scope.row)" type="text" size="small"> 查看</el-button>
</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"
<el-table-column label="序号" type="index" width="50" /> height="190px">
<el-table-column prop="name" width="140" label="微网格" /> <el-table-column label="序号" type="index" width="50"/>
<el-table-column prop="name" width="140" label="微网格"/>
<el-table-column prop="type" width="90" label="类型"> <el-table-column prop="type" width="90" label="类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="'color:' + scope.row.type">{{ types[scope.row.type] }}</span> <span :style="'color:' + scope.row.type">{{ types[scope.row.type] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="houseNum" width="90" label="户数" /> <el-table-column prop="houseNum" width="90" label="户数"/>
<el-table-column prop="demandNum" width="90" label="需求" /> <el-table-column prop="demandNum" width="90" label="需求"/>
<el-table-column prop="eventNum" width="90" label="事件" /> <el-table-column prop="eventNum" width="90" label="事件"/>
<el-table-column prop="importanceNum" label="重点人群" /> <el-table-column prop="importanceNum" label="重点人群"/>
<el-table-column prop="safetyNum" label="安全隐患" /> <el-table-column prop="safetyNum" label="安全隐患"/>
<el-table-column prop="operate" width="80" label="操作"> <el-table-column prop="operate" width="80" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"> 查看 </el-button> <el-button @click="handleClick(scope.row)" type="text" size="small"> 查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -62,40 +64,46 @@ export default {
list: [], list: [],
wglist: [], wglist: [],
genders: ["未知", "男", "女"], genders: ["未知", "男", "女"],
types: { red: "红", yellow: "黄", green: "绿色" }, types: {red: "红", yellow: "黄", green: "绿色"},
chooseName: {}, chooseName: {},
loading: false, loading: false,
}; };
}, },
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(
"setPoint", "setPoint",
data.filter((item) => item.longitude && item.latitude) data.filter((item) => item.longitude && item.latitude)
); );
}); });
} 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);
@ -126,11 +134,12 @@ export default {
<style lang="scss" src="@/assets/scss/dataBoard/overview/index.scss" scoped></style> <style lang="scss" src="@/assets/scss/dataBoard/overview/index.scss" scoped></style>
<style lang="scss" src="@/assets/scss/dataBoard/table.scss" scoped></style> <style lang="scss" src="@/assets/scss/dataBoard/table.scss" scoped></style>
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/.table { /deep/ .table {
.el-table { .el-table {
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
View File

@ -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
View File

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

Write Preview
Loading…
Cancel
Save