elink-star
/
epmet-oper-gov
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

改错的一个地方

dev
tianq 2 years ago
parent
624a7e9a4c
commit
cbdc6f0e73
2 changed files with 84 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      src/views/modules/census/census-accountList.vue
  2. 106
      src/views/modules/census/census-houseList.vue

33
src/views/modules/census/census-accountList.vue
View File

@ -122,16 +122,29 @@
</div>
<el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%">
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="streetName" label="镇街" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="districtName" label="区县" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="agencyName" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="agencyName" align="center" label="网格" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="agencyName" align="center" label="房屋名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="agencyName" align="center" label="房屋用途" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="agencyName" align="center" label="房屋状态" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true"></el-table-column>
<template v-if="orgType == 'district'">
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="agencyName" align="center" label="社区名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="streetName" label="所属街道" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="districtName" label="所属区县" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="count" align="center" width="110" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
</template>
<template v-if="orgType == 'street'">
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="streetName" label="镇街名称" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="districtName" label="所属区县" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="count" align="center" width="110" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
</template>
<template v-if="orgType == 'community'">
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="districtName" label="区县名称" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="count" align="center" width="110" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
</template>
<template v-if="orgType == 'sub'">
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="districtName" label="区县名称" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="count" align="center" width="110" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
</template>
</el-table>
<el-pagination

106
src/views/modules/census/census-houseList.vue
View File

@ -43,54 +43,70 @@
</div>
</el-form>
</div>
<el-row :gutter="20">
<el-col :span="12">
<div class="div_table">
<div class="div_table">
<el-row :gutter="20">
<el-col :span="12">
<div class="div_table_title">房屋用途统计</div>
</div>
</el-col>
<el-col :span="12">
<div class="div_table">
<div :style="'height:' + TableHeight + 'px;margin-top:20px'">
<screen-echarts-frame
@handelClickMyPei="handelClickMyPei"
:style="{ width: '100%', height: '100%' }"
@myChartMethod="pieInitOk"
ref="pieChart"
></screen-echarts-frame>
</div>
</el-col>
<el-col :span="12">
<div class="div_table_title">房屋状态统计</div>
</div>
</el-col>
</el-row>
<el-table
:data="tableData"
border
v-loading="tableLoading"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
class="table"
style="width: 100%"
:height="maxTableHeight"
>
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="agencyName" align="center" label="组织名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="streetName" label="登录次数" min-width="140" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="districtName" label="活跃账号数" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="count" align="center" width="110" label="总账号数" :show-overflow-tooltip="true"></el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total"
:total="total"
></el-pagination>
<div :style="'height:' + TableHeight + 'px;margin-top:20px'">
<screen-echarts-frame2
@handelClickMyPei2="handelClickMyPei"
:style="{ width: '100%', height: '100%' }"
@myChartMethod2="pieInitOk"
ref="pieChart2"
></screen-echarts-frame2>
</div>
</el-col>
<el-col :span="24">
<el-table
:data="tableData"
border
v-loading="tableLoading"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
class="table"
style="width: 100%"
:height="maxTableHeight"
>
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="streetName" label="镇街" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="districtName" label="区县" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="agencyName" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="agencyName" align="center" label="网格" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="agencyName" align="center" label="房屋名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="agencyName" align="center" label="房屋用途" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="agencyName" align="center" label="房屋状态" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true"></el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total"
:total="total"
></el-pagination>
</el-col>
</el-row>
</div>
</div>
</div>
</template>
<script>
import screenEchartsFrame from './chart';
import screenEchartsFrame2 from './chart';
import { requestPost } from '@/js/dai/request';
import nextTick from 'dai-js/tools/nextTick';
import { mapGetters } from 'vuex';
@ -98,7 +114,7 @@ import { mapGetters } from 'vuex';
import axios from 'axios';
export default {
components: {},
components: { screenEchartsFrame, screenEchartsFrame2 },
data() {
let endDisabledDate = time => {
@ -165,14 +181,15 @@ export default {
showVoice: false,
selVoiceUrl: '',
multipleSelection: []
multipleSelection: [],
TableHeight: ''
};
},
computed: {
maxTableHeight() {
return this.$store.state.inIframe ? this.clientHeight - 440 + this.iframeHeigh : this.clientHeight - 440;
},
...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {
@ -190,7 +207,6 @@ export default {
this.agencyId = this.user.agencyId;
this.getOrgTreeList();
this.getTableData();
},
methods: {
handleChangeAgency(val) {

Write Preview
Loading…
Cancel
Save