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

Merge branch 'jw_feature_dev' into jw_feature_zhangruochen

V1.0
张若晨 2 years ago
parent
26d67d7a00 8a9285087d
commit
2f159ea55f
8 changed files with 183 additions and 116 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. 6
      src/router/index.js
  2. 2
      src/views/components/fixed1920.vue
  3. 47
      src/views/dataBoard/cpts/family/modules/BusinessRecords.vue
  4. 35
      src/views/dataBoard/cpts/family/modules/EnjoyService.vue
  5. 135
      src/views/dataBoard/cpts/homeDetails/index.vue
  6. 2
      src/views/dataBoard/cpts/map/index.vue
  7. 70
      src/views/dataBoard/overview/familyPortrait/index.vue
  8. 2
      src/views/dataBoardMain/main-content.vue

6
src/router/index.js
View File

@ -258,7 +258,8 @@ export const dataBoardRoutes = {
title: "居民画像", title: "居民画像",
isTab: false, isTab: false,
}, },
},, },
,
{ {
path: "overview/familyPortrait", path: "overview/familyPortrait",
props: true, props: true,
@ -455,10 +456,11 @@ export const dataBoardRoutes = {
path: "/homeDetails/index", path: "/homeDetails/index",
props: true, props: true,
component: () => import("@/views/dataBoard/cpts/homeDetails/index"), component: () => import("@/views/dataBoard/cpts/homeDetails/index"),
name: "homeDetails", name: "HomeDetails",
meta: { meta: {
title: "单元", title: "单元",
isTab: false, isTab: false,
keepAlive: false,
}, },
}, },
{ {

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

@ -18,7 +18,7 @@ export default {
computed: { computed: {
bdStyle() { bdStyle() {
const { clientHeight, clientWidth } = this; const { clientHeight, clientWidth } = this;
console.log("clientHeight", clientHeight); // console.log("clientHeight", clientHeight);
const scale = clientWidth / 1920; const scale = clientWidth / 1920;
const height = clientHeight / scale; const height = clientHeight / scale;
const top = (clientHeight - height) / 2; const top = (clientHeight - height) / 2;

47
src/views/dataBoard/cpts/family/modules/BusinessRecords.vue
View File

@ -1,36 +1,12 @@
<template> <template>
<div class="business-records"> <div class="business-records">
<Tabs v-model="type" :list="typeList" @changeVal="typeChange" /> <Tabs v-model="type" :list="typeList" @changeVal="typeChange" />
<complaint <complaint @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 1" />
@changeTotal="changeTotal" <economize @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 2" />
:juminArr="juminArr" <community @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 3" />
v-show="type == 1" <reporting-events @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 4" />
/> <resident @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 5" />
<economize <giveService @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 6" />
@changeTotal="changeTotal"
:juminArr="juminArr"
v-show="type == 2"
/>
<community
@changeTotal="changeTotal"
:juminArr="juminArr"
v-show="type == 3"
/>
<reporting-events
@changeTotal="changeTotal"
:juminArr="juminArr"
v-show="type == 4"
/>
<resident
@changeTotal="changeTotal"
:juminArr="juminArr"
v-show="type == 5"
/>
<giveService
@changeTotal="changeTotal"
:juminArr="juminArr"
v-show="type == 6"
/>
</div> </div>
</template> </template>
@ -123,9 +99,7 @@ export default {
this.type = e; this.type = e;
}, },
changeTotal(item) { changeTotal(item) {
this.typeList[item.name].label = item.total this.typeList[item.name].label = item.total ? `${this.typeLists[item.name].label}（${item.total}）` : this.typeLists[item.name].label;
? `${this.typeLists[item.name].label}（${item.total}）`
: this.typeLists[item.name].label;
}, },
}, },
}; };
@ -139,15 +113,14 @@ export default {
} }
.table { .table {
/deep/ .el-table td, /deep/ .el-table td,
/deep/ .el-table th,
/deep/ .el-table tr { /deep/ .el-table tr {
padding: 14px !important; padding: 3px 14px !important;
border: none !important; border: none !important;
min-height: 52px;
} }
/deep/ .el-table td,
/deep/ .el-table th { /deep/ .el-table th {
background: none !important; background: none !important;
padding: 6px 14px !important;
border: none !important;
} }
/deep/ .el-table td { /deep/ .el-table td {
font-size: 14px; font-size: 14px;

35
src/views/dataBoard/cpts/family/modules/EnjoyService.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="table"> <div class="table">
<el-table :data="list" max-height="390px" height="390px"> <el-table v-if="list.length > 0" :data="list" max-height="390px" height="390px">
<el-table-column label="序号" type="index" width="80" /> <el-table-column label="序号" type="index" width="80" />
<el-table-column label="变更人" prop="resiName" width="140" /> <el-table-column label="变更人" prop="resiName" width="140" />
<el-table-column label="变更类型" prop="typeName" width="" /> <el-table-column label="变更类型" prop="typeName" width="" />
@ -9,8 +9,13 @@
<el-table-column label="操作人" prop="operatorName" width="120" /> <el-table-column label="操作人" prop="operatorName" width="120" />
<el-table-column label="调整时间" prop="changeTime" width="190" /> <el-table-column label="调整时间" prop="changeTime" width="190" />
</el-table> </el-table>
<div v-else style="width: 100%; height: 100%; text-align: center; padding-top: 20px">
<img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
<div style="color: #fff">暂无数据</div>
</div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
@ -38,8 +43,8 @@ export default {
}, },
methods: { methods: {
getList() { getList() {
const query = this.$route.query; const query = this.$route.query;
this.houseId = query.houseId; this.houseId = query.houseId;
// 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访) // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访)
const completeFlags = { const completeFlags = {
"-2": "未知", "-2": "未知",
@ -48,21 +53,15 @@ export default {
1: "已回访", 1: "已回访",
}; };
// 省满意度列表 // 省满意度列表
this.$http this.$http.get("/actual/base/peopleRoomOverview/houseResidentChangeRecord?houseId=" + this.houseId).then(({ data: res }) => {
.get( this.list = res.data.map((item) => {
"/actual/base/peopleRoomOverview/houseResidentChangeRecord?houseId=" + return {
this.houseId ...item,
) completeFlag: completeFlags[item.completeFlag],
.then(({ data: res }) => { };
console.log('res::',res);
this.list = res.data.map((item) => {
return {
...item,
completeFlag: completeFlags[item.completeFlag],
};
});
this.total = res.data.length;
}); });
this.total = res.data.length;
});
}, },
}, },
}; };

135
src/views/dataBoard/cpts/homeDetails/index.vue
View File

@ -12,6 +12,9 @@
}, },
]" /> ]" />
</div> </div>
<div class="top-nav-list" v-if="$route.query.typeB !== building">
<div v-for="item in buildingList" :key="item.id" :class="[item.ifActive ? 'top-nav-itemAC' : 'top-nav-item']" @click="chooseNav(item)">{{ item.buildingName }}{{ item.unitName }}</div>
</div>
<el-row :gutter="48"> <el-row :gutter="48">
<el-col :span="8"> <el-col :span="8">
<div class="bg"> <div class="bg">
@ -45,9 +48,9 @@
<el-table :data="list" v-loading="loading" height="500" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)"> <el-table :data="list" v-loading="loading" height="500" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
<el-table-column label="序号" type="index" width="80" /> <el-table-column label="序号" type="index" width="80" />
<el-table-column prop="doorName" label="门牌号" /> <el-table-column prop="doorName" label="门牌号" />
<el-table-column prop="fullName" label="所属小区" /> <el-table-column prop="fullName" show-overflow-tooltip label="所属小区" />
<el-table-column prop="buildingId" label="所属楼栋" /> <el-table-column prop="buildingId" show-overflow-tooltip label="所属楼栋" />
<el-table-column prop="houseName" label="所属单元" /> <el-table-column prop="houseName" show-overflow-tooltip label="所属单元" />
<el-table-column prop="houseCode" label="房屋编码" /> <el-table-column prop="houseCode" label="房屋编码" />
<el-table-column prop="rentFlag" label="房屋状态"> <el-table-column prop="rentFlag" label="房屋状态">
<template slot-scope="scope"> <template slot-scope="scope">
@ -69,7 +72,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="90" align="center"> <el-table-column label="操作" width="90" align="center">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" @click="$router.push('/dataBoard/overview/familyPortrait/?name=' + row.doorName + '&houseId=' + row.id + '&id=' + $route.query.id + '&name2=' + (homeText ? homeText : ''))">查看</el-button> <el-button type="text" @click="$router.push(`/dataBoard/overview/familyPortrait/?name=${row.doorName}&houseId=${row.id}&id=${row.buildingId}&buId=${row.buildingUnitId}&type=${$route.query.typeB}&name2=${row.houseName}`)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -104,16 +107,32 @@ export default {
homeMsg: {}, homeMsg: {},
list: [], list: [],
homeText: "", homeText: "",
buildingList: [],
houseMountArr: [], houseMountArr: [],
}; };
}, },
watch: { watch: {
"$route.query.id"() { // "$route.query.buIding": {
this.getList(); // handler(val) {
}, // if (val) {
// this.getList(val);
// }
// },
// immediate: true,
// },
// "$route.query.typeB": {
// handler(val) {
// console.log("jhjkbhkjhkjhkjhkjhkj");
// if (val) {
// this.getList();
// }
// },
// immediate: true,
// },
}, },
mounted() { mounted() {
this.getList(); const buId = this.$route.query.buId || null;
this.getList(buId);
}, },
methods: { methods: {
getDoorNameList(list) { getDoorNameList(list) {
@ -147,15 +166,8 @@ export default {
return doorNameList; return doorNameList;
}, },
getList() { getUnitList(id) {
this.loading = true; this.$http.get(`/actual/base/streetOverview/getUnitHouseList?unitId=` + id).then((res) => {
const homeType = this.$route.query.type;
// if (homeType === "building") {
// this.$http.get(`/actual/base/streetOverview/getUnitHouseOverviewList?unitId=` + this.$route.query.id).then((res) => {
// console.log(res);
// });
// } else {
this.$http.get(`/actual/base/streetOverview/getUnitHouseList?unitId=` + this.$route.query.id).then((res) => {
const { const {
code, code,
data: { houseList, unitInfo }, data: { houseList, unitInfo },
@ -165,12 +177,7 @@ export default {
this.list = houseList; this.list = houseList;
this.homeMsg = unitInfos; this.homeMsg = unitInfos;
this.homeText = (unitInfos.quartersName ? unitInfos.quartersName : "") + (unitInfos.buildingName ? unitInfos.buildingName : "") + (unitInfos.unitNum ? unitInfos.unitNum + "单元" : ""); this.homeText = (unitInfos.quartersName ? unitInfos.quartersName : "") + (unitInfos.buildingName ? unitInfos.buildingName : "") + (unitInfos.unitNum ? unitInfos.unitNum + "单元" : "");
console.log(this.homeText, " this.homeText");
this.houseMountArr = this.getDoorNameList(this.list); this.houseMountArr = this.getDoorNameList(this.list);
// this.houseMountArr = [
// [{ doorName: 101 }, { doorName: 102 }, { doorName: 103 }, { doorName: 104 }, { doorName: 105 }, { doorName: 106 }, { doorName: 107 }, { doorName: 108 }, { doorName: 109 }],
// [{ doorName: 201 }, { doorName: 202 }, { doorName: 203 }, { doorName: 204 }, { doorName: 205 }, { doorName: 206 }, { doorName: 207 }, { doorName: 208 }, { doorName: 209 }],
// ];
if (this.houseMountArr.length > 0) { if (this.houseMountArr.length > 0) {
this.flexWidth = this.houseMountArr[0].length * 58; this.flexWidth = this.houseMountArr[0].length * 58;
} }
@ -179,7 +186,46 @@ export default {
this.loading = false; this.loading = false;
} }
}); });
// } },
getList(buid) {
this.loading = true;
const homeType = this.$route.query.typeB;
if (homeType === "building") {
this.$http.get(`/actual/base/streetOverview/getUnitListByBuilding?buildingId=` + "1514914015259979777").then((res) => {
const { code, data } = res.data;
if (code === 0) {
this.buildingList = data;
this.homeText = this.buildingList[0].buildingName + this.buildingList[0].unitName;
if (buid) {
this.buildingList.forEach((item, i) => {
console.log(item);
if (item.id === buid) {
item.ifActive = true;
this.getUnitList(item.id);
} else {
item.ifActive = false;
}
});
} else {
this.buildingList.forEach((item, i) => {
if (i === 0) {
item.ifActive = true;
this.getUnitList(item.id);
} else {
item.ifActive = false;
}
});
}
this.loading = false;
} else {
this.loading = false;
}
});
} else {
this.getUnitList(this.$route.query.id);
}
}, },
getRentFlag(type) { getRentFlag(type) {
@ -200,6 +246,20 @@ export default {
]); ]);
return houseTypeMap.get(type); return houseTypeMap.get(type);
}, },
chooseNav(item) {
let buildList = [...this.buildingList];
this.homeText = item.buildingName + item.unitName;
buildList.forEach((d) => {
if (item.id === d.id) {
d.ifActive = true;
this.getUnitList(item.id);
} else {
d.ifActive = false;
}
});
this.buildingList = buildList;
},
}, },
}; };
</script> </script>
@ -221,9 +281,36 @@ export default {
font-weight: 500; font-weight: 500;
} }
@mixin navListCommon {
min-width: 120px;
height: 36px;
font-size: 14px;
font-family: PingFang SC;
font-weight: 500;
margin-right: 4px;
text-align: center;
line-height: 36px;
cursor: pointer;
}
.top-nav-list {
display: flex;
margin-bottom: 16px;
.top-nav-item {
@include navListCommon;
background-image: url("~@/assets/images/home/noChooseMain.png");
color: #96b1ce;
}
.top-nav-itemAC {
@include navListCommon;
background-image: url("~@/assets/images/home/chooseMain.png");
color: #fff;
}
}
.homeWrap { .homeWrap {
.bread { .bread {
margin-bottom: 25px; margin-bottom: 16px;
} }
.apar_top { .apar_top {

2
src/views/dataBoard/cpts/map/index.vue
View File

@ -841,7 +841,7 @@ export default {
popup.remove(); popup.remove();
}); });
pointMarkerItem.on("click", () => { pointMarkerItem.on("click", () => {
this.$router.push(`/homeDetails/index?id=${data[i].id}&type=${peopleType}`); this.$router.push(`/homeDetails/index?id=${data[i].id}&typeB=${peopleType}`);
}); });
pointMarker.addMarker(pointMarkerItem); pointMarker.addMarker(pointMarkerItem);

70
src/views/dataBoard/overview/familyPortrait/index.vue
View File

@ -1,50 +1,56 @@
<template> <template>
<div> <div>
<div class="breadcrumb"> <div class="breadcrumb">
<Breadcrumb :list="breadcrumbList"/> <Breadcrumb :list="breadcrumbList" />
</div> </div>
<Family/> <Family />
</div> </div>
</template> </template>
<script> <script>
import Breadcrumb from '@/views/dataBoard/satisfactionEval/components/Breadcrumb' import Breadcrumb from "@/views/dataBoard/satisfactionEval/components/Breadcrumb";
import Family from '@/views/dataBoard/cpts/family' import Family from "@/views/dataBoard/cpts/family";
export default { export default {
name: "dissatisfiedPersonnelDetail", name: "dissatisfiedPersonnelDetail",
components: { components: {
Breadcrumb, Breadcrumb,
Family Family,
}, },
data() { data() {
return { return {
breadcrumbList: [{ breadcrumbList: [
path: '/dataBoard/overview/index', {
name: '概览' path: "/dataBoard/overview/index",
}, { name: "概览",
path: '/homeDetails/index', },
name: '画像匹配同类潜在不满意人员 ' {
}, { path: "/homeDetails/index",
path: '', name: "",
name: '' },
}], {
} path: "",
name: "",
},
],
};
}, },
watch: { // watch: {
'$route.query'() { // "$route.query.name"() {
this.$set(this.breadcrumbList[1], 'name', this.$route.query.name2) // this.breadcrumbList[1].name = this.$route.query.name2;
this.$set(this.breadcrumbList[1], 'path', this.breadcrumbList[1].path + '?id=' +this.$route.query.id) // },
this.$set(this.breadcrumbList[2], 'name', this.$route.query.name) // "$route.query.name2"() {
this.breadcrumbList[2].name = this.$route.query.name // this.breadcrumbList[2].name = this.$route.query.name;
} // },
// },
activated() {
// console.log(this.$route.query);
const { name, name2, id, buId, type } = this.$route.query;
this.breadcrumbList[1].name = name2;
this.breadcrumbList[2].name = name;
const url = type === "building" ? `/homeDetails/index?id=${id}&buId=${buId}&typeB=${type}` : `/homeDetails/index?id=${buId}&buId=${buId}&typeB=${type}`;
this.breadcrumbList[1].path = url;
}, },
mounted() { };
this.$set(this.breadcrumbList[1], 'name', this.$route.query.name2)
this.$set(this.breadcrumbList[1], 'path', this.breadcrumbList[1].path + '?id=' +this.$route.query.id)
this.$set(this.breadcrumbList[2], 'name', this.$route.query.name)
this.breadcrumbList[2].name = this.$route.query.name
}
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@ -52,7 +58,7 @@ export default {
background: url("@/assets/images/manyidu/icon_fk.png") no-repeat left center; background: url("@/assets/images/manyidu/icon_fk.png") no-repeat left center;
font-size: 18px; font-size: 18px;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #ffffff;
line-height: 22px; line-height: 22px;
padding-left: 26px; padding-left: 26px;
margin-bottom: 20px; margin-bottom: 20px;
@ -60,4 +66,4 @@ export default {
.breadcrumb { .breadcrumb {
margin-bottom: 25px; margin-bottom: 25px;
} }
</style> </style>

2
src/views/dataBoardMain/main-content.vue
View File

@ -5,7 +5,7 @@
<template v-if="tabIsIframe($router.currentRoute.meta.iframeURL)"> <template v-if="tabIsIframe($router.currentRoute.meta.iframeURL)">
<iframe :src="$router.currentRoute.meta.iframeURL + '?token=' + token + '&customerId=' + customerId" ref="iframe" class="m-iframe" id="iframe" width="100%" height="100%" frameborder="0" scrolling="yes" :style="{ height: $store.state.fixed1920.height - 100 + 'px' }" /> <iframe :src="$router.currentRoute.meta.iframeURL + '?token=' + token + '&customerId=' + customerId" ref="iframe" class="m-iframe" id="iframe" width="100%" height="100%" frameborder="0" scrolling="yes" :style="{ height: $store.state.fixed1920.height - 100 + 'px' }" />
</template> </template>
<keep-alive v-show="!tabIsIframe($router.currentRoute.meta.iframeURL)"> <keep-alive v-show="!tabIsIframe($router.currentRoute.meta.iframeURL)" :exclude="['homeDetails']">
<router-view ref="reloadPage" @changeCustomerName="changeCustomerName" /> <router-view ref="reloadPage" @changeCustomerName="changeCustomerName" />
</keep-alive> </keep-alive>
</template> </template>

Write Preview
Loading…
Cancel
Save