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

Merge branch 'fax' into dev 

# Conflicts:
#	src/views/modules/home/index.vue
feature
mk 2 years ago
parent
7d140e8c05 9e609ba0a5
commit
aa8049259a
2 changed files with 72 additions and 52 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. 44
      src/views/modules/base/community/community.vue
  2. 80
      src/views/modules/home/index.vue

44
src/views/modules/base/community/community.vue
View File

@ -367,19 +367,19 @@ export default {
}); });
} }
this.treeLoading = false; this.treeLoading = false;
if (this.$route.query.param1 === 'zizhuM') { if (this.$route.query.param1 === 'zizhuM') {
this.rentFlag = '0'; this.rentFlag = '0';
} else if (this.$route.query.param1 === 'chuzuM') { this.handleSearch()
this.rentFlag = '1'; } else if (this.$route.query.param1 === 'chuzuM') {
} else if (this.$route.query.param1 === 'xianzhiM') { this.rentFlag = '1';
this.rentFlag = '2'; this.handleSearch()
} } else if (this.$route.query.param1 === 'xianzhiM') {
if (this.rentFlag !== '') { this.rentFlag = '2';
this.handleSearch() this.handleSearch()
// console.log("this.rentFlag", this.rentFlag) } else if (this.$route.query.param1 === 'zongshu') {
} this.rentFlag = '';
this.handleSearch()
}
}, },
computed: { computed: {
@ -412,6 +412,22 @@ export default {
// filterText (val) { // filterText (val) {
// this.$refs.ref_tree.filter(val); // this.$refs.ref_tree.filter(val);
// }, // },
'$route.query.param1': function (newVal, oldVal) {
if (this.$route.query.param1 === 'zizhuM') {
this.rentFlag = '0';
this.handleSearch()
} else if (this.$route.query.param1 === 'chuzuM') {
this.rentFlag = '1';
this.handleSearch()
} else if (this.$route.query.param1 === 'xianzhiM') {
this.rentFlag = '2';
this.handleSearch()
} else if (this.$route.query.param1 === 'zongshu') {
this.rentFlag = '';
this.handleSearch()
// this.getValiheList()
}
},
updateStartDate() { } updateStartDate() { }
}, },
methods: { methods: {
@ -419,7 +435,6 @@ export default {
var target = event.target; var target = event.target;
let textLength = target.clientWidth; let textLength = target.clientWidth;
let containerLength = target.scrollWidth; let containerLength = target.scrollWidth;
if (textLength < containerLength) { if (textLength < containerLength) {
this.tooltipTitle = event.target.innerText; this.tooltipTitle = event.target.innerText;
this.isShowTooltip = false; this.isShowTooltip = false;
@ -476,7 +491,6 @@ export default {
isPage: false, isPage: false,
}; };
const { data, code, msg } = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
this.optionsV = data; this.optionsV = data;
this.neighborHoodId = ""; this.neighborHoodId = "";
@ -693,6 +707,7 @@ export default {
}, 200); }, 200);
return false return false
} }
this.treeIsOk = false this.treeIsOk = false
this.ownerName = ""; this.ownerName = "";
this.ownerPhone = ""; this.ownerPhone = "";
@ -708,7 +723,6 @@ export default {
this.vDisabled = false; this.vDisabled = false;
this.bDisabled = false; this.bDisabled = false;
console.log(obj); console.log(obj);
if (obj.level === "building") { if (obj.level === "building") {
//点击楼栋 //点击楼栋

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

@ -30,7 +30,10 @@
<div class="mewq"> <div class="mewq">
<div class="boxss"> <div class="boxss">
<div style="margin-top: 10px;" @click="handelClickToResi"> <div style="margin-top: 10px;" @click="handelClickToResi">
<span style="color: #2683DB; font-size: 25px;">{{ pandectData.totalResidents }}</span> <span style="color: #2683DB; font-size: 25px;">
{{ pandectData.totalResidents }}
</span>
<br> <br>
<span style="color: #858585; font-size: 12px;">居民总数</span> <span style="color: #858585; font-size: 12px;">居民总数</span>
</div> </div>
@ -50,7 +53,7 @@
</div> </div>
</div> </div>
<div class="boxss"> <div class="boxss">
<div style="margin-top: 10px;" @click="jumpToHouse()"> <div style="margin-top: 10px;" @click="jumpToHouse('zongshu')">
<span style="color: #2683DB; font-size: 25px;">{{ pandectData.homeCount }}</span> <span style="color: #2683DB; font-size: 25px;">{{ pandectData.homeCount }}</span>
<br> <br>
<span style="color: #858585; font-size: 12px;">房屋总数</span> <span style="color: #858585; font-size: 12px;">房屋总数</span>
@ -76,7 +79,6 @@
<br> <br>
<span style="color: #858585; font-size: 12px;">闲置房屋</span> <span style="color: #858585; font-size: 12px;">闲置房屋</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -153,30 +155,33 @@
style="margin-top: 10px;" v-show="showAll" @click="jumpToJuMin()"><img referrerpolicy="no-referrer" style="margin-top: 10px;" v-show="showAll" @click="jumpToJuMin()"><img referrerpolicy="no-referrer"
src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置</span> src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置</span>
</div> </div>
<el-table :data="tableList" style="width: 100%;margin-top:26px;overflow-y: scroll;" :height="maxTableHeight" border :cell-style="columnbackgroundStyle" class="m-table-item"> <el-table :data="tableList" style="width: 100%;margin-top:26px;overflow-y: scroll;" :height="maxTableHeight"
<el-table-column label="居民类别" align="center" width="105"> border :cell-style="columnbackgroundStyle" class="m-table-item">
<el-table-column label="居民类别" align="center" width="105">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color:#989898">{{scope.row.residentCategoryName}}</span> <span style="color:#989898">{{ scope.row.residentCategoryName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总人数" width="105" align="center"> <el-table-column label="总人数" width="105" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color:#006fd6" @click="handelClickToResi(scope.row)">{{scope.row.total}}</span> <span style="color:#006fd6" @click="handelClickToResi(scope.row)">{{scope.row.total}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="分类信息不完整数" align="center" :show-overflow-tooltip="true"> <el-table-column label="分类信息不完整数" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color:#ff1200;cursor: pointer;" @click="handelCLickJump(scope.row,'nonIntegrity')">{{scope.row.nonIntegratedNum}}</span> <span style="color:#ff1200;cursor: pointer;" @click="handelCLickJump(scope.row,'nonIntegrity')">{{scope.row.nonIntegratedNum}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="更新负责人" :show-overflow-tooltip="true" align="center" v-if="showAll"> <el-table-column label="更新负责人" :show-overflow-tooltip="true" align="center" v-if="showAll">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color:#989898;">{{scope.row.userName}}</span> <span style="color:#989898;">{{scope.row.userName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="更新周期" align="center" width="105"> <el-table-column label="更新周期" align="center" width="105">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color:#989898;">{{scope.row.updatePeriod?scope.row.updatePeriod =='month'?'每自然月':scope.row.updatePeriod =='halfMonth'?'每半自然月':scope.row.updatePeriod =='week'?'每周':'':''}}</span> <span style="color:#989898;">{{ scope.row.updatePeriod ? scope.row.updatePeriod
== 'month' ? '每自然月' : scope.row.updatePeriod == 'halfMonth' ? '每半自然月' : scope.row.updatePeriod
== 'week' ? '每周' : '' : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="更新人数" align="center" width="105"> <el-table-column label="更新人数" align="center" width="105">
@ -223,16 +228,6 @@ export default {
list: [], list: [],
}, },
tableList: [ tableList: [
// { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
// { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
// { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
// { shenfen: '保障房人员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
// { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
// { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
// { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
// { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
// { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
// { shenfen: '党员', zongNumber: '10', noAllNuber: '1', fuzeren: '王五', zhouqi: '1', addNum: '1' },
], ],
znycCategory: { znycCategory: {
loading: false, loading: false,
@ -257,7 +252,7 @@ export default {
noticeData: [], noticeData: [],
activeName: "resi", activeName: "resi",
myChart: {}, myChart: {},
myBarchart:{}, myBarchart: {},
agencyLevel: '', agencyLevel: '',
yData: [ yData: [
// { // {
@ -291,8 +286,8 @@ export default {
}, },
computed: { computed: {
maxTableHeight() { maxTableHeight() {
const _h = this.clientHeight - 610 ; const _h = this.clientHeight - 610;
return _h; return _h;
}, },
...mapGetters(["clientHeight"]), ...mapGetters(["clientHeight"]),
}, },
@ -311,6 +306,7 @@ export default {
deep: true, deep: true,
immediate: true, immediate: true,
}, },
}, },
created() { created() {
}, },
@ -332,6 +328,13 @@ export default {
); );
}, },
methods: { methods: {
formatNumber(number) {
if (typeof number === 'string') {
// 如果是字符串，去除非数字字符并转为数字类型
number = parseInt(number.replace(/\D/g, ''), 10);
}
return number.toLocaleString();
},
initChart() { initChart() {
this.$http.get("/governance/satisfactionOverview/notSatisfactionTrend").then(({ data: { data } }) => { this.$http.get("/governance/satisfactionOverview/notSatisfactionTrend").then(({ data: { data } }) => {
this.myChart = echarts.init(document.getElementById("my_chart")); this.myChart = echarts.init(document.getElementById("my_chart"));
@ -395,9 +398,9 @@ export default {
}, },
columnbackgroundStyle({ row, column, rowIndex, columnIndex }) { columnbackgroundStyle({ row, column, rowIndex, columnIndex }) {
if (columnIndex == 3||columnIndex == 4||columnIndex == 5) { if (columnIndex == 3 || columnIndex == 4 || columnIndex == 5) {
return 'background:#fffcf3;' return 'background:#fffcf3;'
} }
}, },
borderH() { borderH() {
@ -456,7 +459,7 @@ export default {
this.readClearOne(item); this.readClearOne(item);
if (item.msgType == "community_house") { if (item.msgType == "community_house") {
let { agencyId, gridId, gridName, houseId, houseName, targetId } = item let { agencyId, gridId, gridName, houseId, houseName, targetId } = item
this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName:'房屋详情' }); this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName: '房屋详情' });
this.$router.push({ name: 'house-huaxiang' }); this.$router.push({ name: 'house-huaxiang' });
this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
if (item.name === "house-huaxiang") { if (item.name === "house-huaxiang") {
@ -483,7 +486,7 @@ export default {
gender, gender,
homeId, homeId,
homeName, homeName,
name:'居民详情', name: '居民详情',
resiId: targetId, resiId: targetId,
}); });
this.$router.push({ name: "jumin-huaxiang" }); this.$router.push({ name: "jumin-huaxiang" });
@ -527,6 +530,7 @@ export default {
}, },
// //
jumpToHouse(e) { jumpToHouse(e) {
this.$router.push({ this.$router.push({
path: "/main/base-community-community", path: "/main/base-community-community",
query: { query: {
@ -642,7 +646,7 @@ export default {
} }
}); });
}, },
//加载组织数据 //加载组织数据
async getWarningList() { async getWarningList() {
const url = "/actual/base/resiCategory/categoryCountList"; const url = "/actual/base/resiCategory/categoryCountList";
@ -713,13 +717,14 @@ export default {
// let nonIntegratedNum = data.categoryStatsDatas.map(item => item.nonIntegratedNum) // let nonIntegratedNum = data.categoryStatsDatas.map(item => item.nonIntegratedNum)
let option = { let option = {
backgroundColor: '#fff', backgroundColor: '#fff',
color: ['#448cf6', '#f7ca60', ], color: ['#448cf6', '#f7ca60',],
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
type: 'shadow' type: 'shadow'
} }
}, },
legend: { legend: {
x: 'center', x: 'center',
bottom: '8%', bottom: '8%',
@ -754,18 +759,18 @@ export default {
stack: '总量', stack: '总量',
barWidth: '30px', barWidth: '30px',
data: data.categoryStatsDatas.map((item, index) => ({ data: data.categoryStatsDatas.map((item, index) => ({
value: item.integratedNum, value: item.integratedNum,
extraProperty: item.resiCategory extraProperty: item.resiCategory
})), })),
}, },
{ {
name: '分类信息不完整数', name: '分类信息不完整数',
type: 'bar', type: 'bar',
stack: '总量', stack: '总量',
data: data.categoryStatsDatas.map((item, index) => ({ data: data.categoryStatsDatas.map((item, index) => ({
value: item.nonIntegratedNum, value: item.nonIntegratedNum,
extraProperty: item.resiCategory extraProperty: item.resiCategory
})), })),
} }
] ]
}; };
@ -779,6 +784,7 @@ export default {
resiCategory: e.data.extraProperty, resiCategory: e.data.extraProperty,
} }
}); });
//
}); });
}); });

Write Preview
Loading…
Cancel
Save