diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index e483d38f0..535577a6d 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -367,19 +367,19 @@ export default { }); } this.treeLoading = false; - if (this.$route.query.param1 === 'zizhuM') { - this.rentFlag = '0'; - } else if (this.$route.query.param1 === 'chuzuM') { - this.rentFlag = '1'; - } else if (this.$route.query.param1 === 'xianzhiM') { - this.rentFlag = '2'; - } - if (this.rentFlag !== '') { - this.handleSearch() - // console.log("this.rentFlag", this.rentFlag) - } - + 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() + } }, computed: { @@ -412,6 +412,22 @@ export default { // filterText (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() { } }, methods: { @@ -419,7 +435,6 @@ export default { var target = event.target; let textLength = target.clientWidth; let containerLength = target.scrollWidth; - if (textLength < containerLength) { this.tooltipTitle = event.target.innerText; this.isShowTooltip = false; @@ -476,7 +491,6 @@ export default { isPage: false, }; const { data, code, msg } = await requestPost(url, params); - if (code === 0) { this.optionsV = data; this.neighborHoodId = ""; @@ -693,6 +707,7 @@ export default { }, 200); return false } + this.treeIsOk = false this.ownerName = ""; this.ownerPhone = ""; @@ -708,7 +723,6 @@ export default { this.vDisabled = false; this.bDisabled = false; console.log(obj); - if (obj.level === "building") { //点击楼栋 diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 8003634da..59b97b81c 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -30,7 +30,10 @@
- {{ pandectData.totalResidents }} + + {{ pandectData.totalResidents }} + +
居民总数
@@ -50,7 +53,7 @@
-
+
{{ pandectData.homeCount }}
房屋总数 @@ -76,7 +79,6 @@
闲置房屋
-
@@ -153,30 +155,33 @@ style="margin-top: 10px;" v-show="showAll" @click="jumpToJuMin()">更新设置 - - + + - + - + - + - + @@ -223,16 +228,6 @@ export default { list: [], }, 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: { loading: false, @@ -257,7 +252,7 @@ export default { noticeData: [], activeName: "resi", myChart: {}, - myBarchart:{}, + myBarchart: {}, agencyLevel: '', yData: [ // { @@ -291,8 +286,8 @@ export default { }, computed: { maxTableHeight() { - const _h = this.clientHeight - 610 ; - return _h; + const _h = this.clientHeight - 610; + return _h; }, ...mapGetters(["clientHeight"]), }, @@ -311,6 +306,7 @@ export default { deep: true, immediate: true, }, + }, created() { }, @@ -332,6 +328,13 @@ export default { ); }, methods: { + formatNumber(number) { + if (typeof number === 'string') { + // 如果是字符串，去除非数字字符并转为数字类型 + number = parseInt(number.replace(/\D/g, ''), 10); + } + return number.toLocaleString(); + }, initChart() { this.$http.get("/governance/satisfactionOverview/notSatisfactionTrend").then(({ data: { data } }) => { this.myChart = echarts.init(document.getElementById("my_chart")); @@ -395,9 +398,9 @@ export default { }, columnbackgroundStyle({ row, column, rowIndex, columnIndex }) { - if (columnIndex == 3||columnIndex == 4||columnIndex == 5) { - return 'background:#fffcf3;' - } + if (columnIndex == 3 || columnIndex == 4 || columnIndex == 5) { + return 'background:#fffcf3;' + } }, borderH() { @@ -456,7 +459,7 @@ export default { this.readClearOne(item); if (item.msgType == "community_house") { 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.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { if (item.name === "house-huaxiang") { @@ -483,7 +486,7 @@ export default { gender, homeId, homeName, - name:'居民详情', + name: '居民详情', resiId: targetId, }); this.$router.push({ name: "jumin-huaxiang" }); @@ -527,6 +530,7 @@ export default { }, // jumpToHouse(e) { + this.$router.push({ path: "/main/base-community-community", query: { @@ -642,7 +646,7 @@ export default { } }); }, - + //加载组织数据 async getWarningList() { const url = "/actual/base/resiCategory/categoryCountList"; @@ -713,13 +717,14 @@ export default { // let nonIntegratedNum = data.categoryStatsDatas.map(item => item.nonIntegratedNum) let option = { backgroundColor: '#fff', - color: ['#448cf6', '#f7ca60', ], + color: ['#448cf6', '#f7ca60',], tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, + legend: { x: 'center', bottom: '8%', @@ -754,18 +759,18 @@ export default { stack: '总量', barWidth: '30px', data: data.categoryStatsDatas.map((item, index) => ({ - value: item.integratedNum, - extraProperty: item.resiCategory - })), + value: item.integratedNum, + extraProperty: item.resiCategory + })), }, { name: '分类信息不完整数', type: 'bar', stack: '总量', data: data.categoryStatsDatas.map((item, index) => ({ - value: item.nonIntegratedNum, - extraProperty: item.resiCategory - })), + value: item.nonIntegratedNum, + extraProperty: item.resiCategory + })), } ] }; @@ -779,6 +784,7 @@ export default { resiCategory: e.data.extraProperty, } }); + // }); });