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

部分修改备个份

jly/task002
tianq 3 years ago
parent
dba2579561
commit
58ba2a2a39
7 changed files with 26 additions and 18 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. 7
      src/views/modules/census/census-accountActiveList.vue
  2. 3
      src/views/modules/census/census-accountList.vue
  3. 10
      src/views/modules/census/census-houseList.vue
  4. 1
      src/views/modules/census/census-nineList.vue
  5. 5
      src/views/modules/census/census-orgStatusList.vue
  6. 14
      src/views/modules/census/census-residentList.vue
  7. 4
      src/views/modules/communityParty/dyhx/party.vue

7
src/views/modules/census/census-accountActiveList.vue
View File

@ -67,10 +67,10 @@
:height="maxTableHeight" :height="maxTableHeight"
> >
<el-table-column label="序号" type="index" align="center" width="50" /> <el-table-column label="序号" 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="agencyName" align="center" width="200" label="组织名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="loginCount" label="登录次数" width="110" align="center" :show-overflow-tooltip="true" /> <el-table-column prop="loginCount" label="登录次数" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="accountActivityCount" label="活跃账号数" align="center" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="accountActivityCount" label="活跃账号数" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="accountCount" align="center" width="110" label="总账号数" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="accountCount" align="center" label="总账号数" :show-overflow-tooltip="true"></el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@ -228,6 +228,7 @@ export default {
if (typeof this.formData[n] == 'object') this.formData[n] = []; if (typeof this.formData[n] == 'object') this.formData[n] = [];
else this.formData[n] = ''; else this.formData[n] = '';
} }
this.handleSearch();
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.pageSize = val; this.pageSize = val;

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

@ -15,7 +15,7 @@
:show-all-levels="false" :show-all-levels="false"
/> />
</el-form-item> </el-form-item>
<el-form-item label="上报时间" prop="startDate"> <el-form-item label="登录时间" prop="startDate">
<el-date-picker <el-date-picker
v-model="formData.startDate" v-model="formData.startDate"
:picker-options="startPickerOptions" :picker-options="startPickerOptions"
@ -281,6 +281,7 @@ export default {
if (typeof this.formData[n] == 'object') this.formData[n] = []; if (typeof this.formData[n] == 'object') this.formData[n] = [];
else this.formData[n] = ''; else this.formData[n] = '';
} }
this.handleSearch();
}, },
async handleExport() { async handleExport() {
const url = '/gov/org/staffLoginLog/community-count-export'; const url = '/gov/org/staffLoginLog/community-count-export';

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

@ -65,7 +65,7 @@
<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)"> <div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
<div class="kuai" :style="{ backgroundColor: color1[index] }"></div> <div class="kuai" :style="{ backgroundColor: color1[index] }"></div>
<div class="content"> <div class="content">
<div class="name">{{ index }}{{ item.name }}</div> <div class="name">{{ item.name }}</div>
<div class="num">{{ item.value }}</div> <div class="num">{{ item.value }}</div>
<div class="unit" :style="{ color: color1[index] }">{{ item.radio }}%</div> <div class="unit" :style="{ color: color1[index] }">{{ item.radio }}%</div>
</div> </div>
@ -122,7 +122,7 @@
style="width: 100%;" style="width: 100%;"
:height="maxTableHeight" :height="maxTableHeight"
> >
<el-table-column label="序号" type="index" align="center" width="50" /> <el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column prop="streetName" width="110" label="镇街" align="center" :show-overflow-tooltip="true" /> <el-table-column prop="streetName" width="110" label="镇街" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="districtName" label="区县" width="110" align="center" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="districtName" label="区县" width="110" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="communityName" width="110" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="communityName" width="110" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column>
@ -276,6 +276,7 @@ export default {
this.orgId = this.optionData.agencyId; this.orgId = this.optionData.agencyId;
this.orgIdPath = this.optionData.orgIdPath; this.orgIdPath = this.optionData.orgIdPath;
this.orgType = this.optionData.level; this.orgType = this.optionData.level;
this.handleSearch();
}, },
show(row) { show(row) {
this.dialogVisible = true; this.dialogVisible = true;
@ -412,7 +413,7 @@ export default {
radio: item.count == 0 ? '0' : ((item.count / this.pieData.total) * 100).toFixed(2) radio: item.count == 0 ? '0' : ((item.count / this.pieData.total) * 100).toFixed(2)
}; };
}); });
this.$forceUpdate();
this.iniPieChart(this.chartData); this.iniPieChart(this.chartData);
}, },
setPieData2() { setPieData2() {
@ -432,7 +433,7 @@ export default {
radio: item.count == 0 ? '0' : ((item.count / this.pieData2.total) * 100).toFixed(2) radio: item.count == 0 ? '0' : ((item.count / this.pieData2.total) * 100).toFixed(2)
}; };
}); });
this.$forceUpdate();
this.iniPieChart2(this.chartData2); this.iniPieChart2(this.chartData2);
}, },
// 获取饼状图 // 获取饼状图
@ -954,5 +955,4 @@ export default {
} }
} }
} }
</style> </style>

1
src/views/modules/census/census-nineList.vue
View File

@ -218,6 +218,7 @@ export default {
else this.formData[n] = ''; else this.formData[n] = '';
} }
this.orgType = ''; this.orgType = '';
this.handleSearch();
}, },
show(row) { show(row) {
this.dialogVisible = true; this.dialogVisible = true;

5
src/views/modules/census/census-orgStatusList.vue
View File

@ -113,13 +113,13 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="30%" :before-close="handleClose"> <el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="50%" :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 :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%">
<el-table-column label="序号" type="index" align="center" width="50" /> <el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column prop="name" align="center" label="社区名称" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="name" align="center" label="社区名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="streeName" label="所属街道" align="center" :show-overflow-tooltip="true" /> <el-table-column prop="streeName" 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="districtName" label="所属区县" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="createTime" align="center" width="110" label="开通时间" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="createTime" align="center" width="200" label="开通时间" :show-overflow-tooltip="true"></el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
@ -260,6 +260,7 @@ export default {
if (typeof this.formData[n] == 'object') this.formData[n] = []; if (typeof this.formData[n] == 'object') this.formData[n] = [];
else this.formData[n] = ''; else this.formData[n] = '';
} }
this.handleSearch();
}, },
handleSearch(val) { handleSearch(val) {
this.getTableData(); this.getTableData();

14
src/views/modules/census/census-residentList.vue
View File

@ -97,7 +97,7 @@
style="width: 100%;" style="width: 100%;"
:height="maxTableHeight" :height="maxTableHeight"
> >
<el-table-column label="序号" type="index" align="center" width="50" /> <el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column prop="name" width="110" label="姓名" align="center" :show-overflow-tooltip="true" /> <el-table-column prop="name" width="110" label="姓名" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="mobile" label="手机号" width="210" align="center" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="mobile" label="手机号" width="210" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="idCard" align="center" label="证件号" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="idCard" align="center" label="证件号" :show-overflow-tooltip="true"></el-table-column>
@ -201,7 +201,7 @@ export default {
pieInitState2: false, pieInitState2: false,
pieOption: [], pieOption: [],
pieOption2: [], pieOption2: [],
color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], color: ['#3C94FE', '#F0D915', '#6FC364', '#FEB349', '#F44230', '#A17AFA', '#22C1C3', '#A19FFF', '#FE6252', '#5DC7F0'],
chartData: [], chartData: [],
chartData2: [], chartData2: [],
pieData: [], pieData: [],
@ -246,6 +246,7 @@ export default {
else this.formData[n] = ''; else this.formData[n] = '';
} }
this.orgType = ''; this.orgType = '';
this.handleSearch();
}, },
show(row) { show(row) {
this.dialogVisible = true; this.dialogVisible = true;
@ -758,8 +759,8 @@ export default {
cursor: pointer; cursor: pointer;
min-width: 100px; min-width: 100px;
display: flex; display: flex;
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
margin-right: 25px; margin-right: 25px;
width: 160px; width: 160px;
.kuai { .kuai {
@ -840,7 +841,9 @@ export default {
} }
.div_table { .div_table {
padding: 30px !important; padding: 30px !important;
.table{margin-top: 16px!important;} .table {
margin-top: 16px !important;
}
} }
.div_table_title { .div_table_title {
margin-top: -10px; margin-top: -10px;
@ -881,5 +884,4 @@ export default {
} }
} }
} }
</style> </style>

4
src/views/modules/communityParty/dyhx/party.vue
View File

@ -218,7 +218,8 @@ export default {
pieInitState2: false, pieInitState2: false,
pieOption: [], pieOption: [],
pieOption2: [], pieOption2: [],
color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], color: ['#3C94FE', '#F0D915', '#6FC364', '#FEB349', '#F44230', '#A17AFA', '#22C1C3', '#A19FFF', '#FE6252', '#5DC7F0'],
// color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
chartData: [], chartData: [],
chartData2: [], chartData2: [],
pieData: [], pieData: [],
@ -300,6 +301,7 @@ export default {
if (typeof this.formData[n] == 'object') this.formData[n] = []; if (typeof this.formData[n] == 'object') this.formData[n] = [];
else this.formData[n] = ''; else this.formData[n] = '';
} }
this.handleSearch();
}, },
handleChangeAgency(val) { handleChangeAgency(val) {
let obj = this.$refs['myCascader'].getCheckedNodes()[0].data; let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;

Write Preview
Loading…
Cancel
Save