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

bug

dev
tianq 2 years ago
parent
70139efd3e
commit
fad93205eb
3 changed files with 86 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
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/modules/census/census-accountActiveList.vue
  2. 30
      src/views/modules/census/census-accountList.vue
  3. 106
      src/views/modules/census/census-orgStatusList.vue

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

@ -89,7 +89,7 @@
<el-button size="small" class="diy-button--output" @click="handleExport(0)">导出</el-button>
</div>
<el-table
:data="tableData"
:data="tableData2"
border
v-loading="tableLoading"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"

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

@ -451,14 +451,14 @@ export default {
this.showNext();
},
deepTree(arr) {
if (Array.isArray(arr)) {
return arr.map(item => {
return {
...item,
subAgencyList: item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList) || null
}
})
}
if (Array.isArray(arr)) {
return arr.map(item => {
return {
...item,
subAgencyList: (item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList)) || null
};
});
}
},
pieInitOk() {
this.pieInitState = true;
@ -493,7 +493,19 @@ export default {
},
xAxis: {
type: 'category',
data: chartData.name
data: chartData.name,
axisLabel: {
interval: 0,
interval: 0, //设置横坐标为斜
rotate: 30, //文字倾斜角度
formatter: function(value) {
if (value.length > 10) {
value = value.substring(0, 9) + '..';
}
return value;
}
},
triggerEvent: true
},
yAxis: {
type: 'value',

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

@ -17,35 +17,12 @@
@change="handleChangeAgency"
></el-cascader>
</el-form-item>
<el-form-item label="上报时间" prop="startDate">
<el-date-picker
v-model="formData.startDate"
:picker-options="startPickerOptions"
class="item_width_2"
size="small"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd"
placeholder="开始时间"
></el-date-picker>
<span class="data-tag">至</span>
<el-date-picker
v-model="formData.endDate"
:picker-options="endPickerOptions"
class="item_width_2 data-tag"
size="small"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd"
placeholder="结束时间"
></el-date-picker>
</el-form-item>
<el-button class="btnSearch" size="small" @click="handleSearch">查询</el-button>
</div>
</el-form>
<div class="flex">
<div class="census_searchcensus" v-if="level=='city'">
<div class="census_searchcensus" v-if="level == 'city'">
<div class="census_searchcensus_box">
<img src="../../../assets/img/census/区级.png" />
<div>
@ -54,7 +31,7 @@
</div>
</div>
</div>
<div class="census_searchcensus" v-if="level=='city'||level=='district'">
<div class="census_searchcensus" v-if="level == 'city' || level == 'district'">
<div class="census_searchcensus_box">
<img src="../../../assets/img/census/镇街.png" />
<div>
@ -64,7 +41,7 @@
</div>
</div>
<div class="census_searchcensus" v-if="level=='city'||level=='district'||level=='street'">
<div class="census_searchcensus" v-if="level == 'city' || level == 'district' || level == 'street'">
<div class="census_searchcensus_box">
<img src="../../../assets/img/census/社区.png" />
<div>
@ -74,7 +51,7 @@
</div>
</div>
<div class="census_searchcensus" >
<div class="census_searchcensus">
<div class="census_searchcensus_box">
<img src="../../../assets/img/census/网格数.png" />
<div>
@ -97,7 +74,39 @@
<el-row :gutter="20">
<el-col :span="24">
<div class="div_table">
<div class="div_table_title">下级社区数量统计</div>
<div class="div_table_title">下级社区数量统计
<el-form :inline="true" :model="formData2" ref="ref_searchform2" :label-width="'80px'" style="display: inline-block;margin-left: 20px;">
<div>
<el-form-item label="" prop="startDate" >
<el-date-picker
v-model="formData2.startDate"
:picker-options="startPickerOptions"
class="item_width_2"
size="small"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd"
placeholder="开始时间"
@change="handleSearch"
></el-date-picker>
<span class="data-tag">至</span>
<el-date-picker
v-model="formData2.endDate"
:picker-options="endPickerOptions"
class="item_width_2 data-tag"
size="small"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd"
placeholder="结束时间"
@change="handleSearch"
></el-date-picker>
</el-form-item>
</div>
</el-form>
</div>
<div :style="'height:' + TableHeight + 'px;margin-top:20px'" :h="maxTableHeight">
<screen-echarts-frame
@handelClickMyPei="handelClickMyPei"
@ -148,8 +157,8 @@ export default {
let endDisabledDate = time => {
//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now();
if (this.formData.startDate) {
let startDate = new Date(this.formData.startDate);
if (this.formData2.startDate) {
let startDate = new Date(this.formData2.startDate);
return time.getTime() > nowData || time.getTime() < startDate || time.getTime() === startDate;
} else {
return time.getTime() > nowData;
@ -187,7 +196,9 @@ export default {
censusData: { district: '', street: '', community: '', grid: '', staff: '' },
formData: {
orgId: '',
level: '',
level: ''
},
formData2: {
startDate: '',
endDate: ''
},
@ -219,7 +230,7 @@ export default {
},
computed: {
maxTableHeight() {
this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeigh : this.clientHeight - 420;
this.TableHeight = this.$store.state.inIframe ? this.clientHeight - 450 + this.iframeHeigh : this.clientHeight - 450;
console.log('this.TableHeight', this.TableHeight);
return this.TableHeight;
},
@ -227,10 +238,10 @@ export default {
...mapGetters(['clientHeight', 'iframeHeight'])
},
watch: {
'formData.endDate': function(val) {
'formData2.endDate': function(val) {
if (val && val != '') {
let arrayTemp = val.split(' ');
this.formData.endDate = arrayTemp[0] + ' 23:59:59';
this.formData2.endDate = arrayTemp[0] + ' 23:59:59';
}
}
},
@ -238,7 +249,7 @@ export default {
console.log(this.$store.state);
this.user = this.$store.state.user;
this.agencyId = this.user.agencyId;
console.log(this.user)
console.log(this.user);
this.getOrgTreeList();
this.getTableData();
@ -271,8 +282,8 @@ export default {
url = '/gov/org/customeragency/getCommunityList';
param = {
agencyId: this.orgId,
timeStart: this.formData.startDate,
timeEnd: this.formData.endDate,
timeStart: this.formData2.startDate,
timeEnd: this.formData2.endDate,
pageNum: this.pageNo,
pageSize: this.pageSize
};
@ -342,10 +353,10 @@ export default {
let agencyId = '';
if (this.formData.orgId == '') {
agencyId = this.agencyId;
this.level=this.user.level
this.level = this.user.level;
} else {
agencyId = this.formData.orgId;
this.level=this.formData.level
this.level = this.formData.level;
}
const url = '/gov/org/customeragency/getAgencyCountList';
let params = { agencyId: agencyId };
@ -394,7 +405,7 @@ export default {
} else {
agencyId = this.formData.orgId;
}
const { data, code, msg } = await requestPost(url, { agencyId: agencyId });
const { data, code, msg } = await requestPost(url, { agencyId: agencyId, timeStart: this.formData2.startDate, timeEnd: this.formData2.endDate });
this.$refs.pieChart.hideLoading();
@ -458,7 +469,18 @@ export default {
},
xAxis: {
type: 'category',
data: chartData.name
data: chartData.name,
axisLabel: {
interval: 0,
interval: 0, //设置横坐标为斜
rotate: 30, //文字倾斜角度
formatter: function(value) {
if (value.length > 10) {
value = value.substring(0, 9) + '..';
}
return value;
}
}
},
yAxis: {
type: 'value',

Write Preview
Loading…
Cancel
Save