|
@@ -43,6 +43,26 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="开始日期">
|
|
|
+ <el-date-picker
|
|
|
+ size="small"
|
|
|
+ v-model="form.date1"
|
|
|
+ type="date"
|
|
|
+ format="yyyy 年 MM 月 dd日"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="时间">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="结束日期">
|
|
|
+ <el-date-picker
|
|
|
+ size="small"
|
|
|
+ v-model="form.date2"
|
|
|
+ type="date"
|
|
|
+ format="yyyy 年 MM 月 dd日"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="时间">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item class="btn-i">
|
|
|
<el-button @click="changeType">查询</el-button>
|
|
|
<el-button @click="downloadFile">导出</el-button>
|
|
@@ -150,7 +170,9 @@ export default {
|
|
|
form: {
|
|
|
unitName:'',
|
|
|
commitType:'',
|
|
|
- unitType:''
|
|
|
+ unitType:'',
|
|
|
+ date1:'',
|
|
|
+ date2:''
|
|
|
},
|
|
|
sortField:'',
|
|
|
groupField:'',
|
|
@@ -295,40 +317,64 @@ export default {
|
|
|
changeType(){
|
|
|
if(this.currentAnalysisId=='matterSituation'){ //事项
|
|
|
this.sortField ='NODE1';
|
|
|
- switch (this.form.commitType){
|
|
|
- case "UNIT":
|
|
|
- this.groupField = '1'
|
|
|
- this.currentTableHeader = this.analysisSituationUnitTableHeader;
|
|
|
- this.unitData();
|
|
|
- break;
|
|
|
- case "MATTER":
|
|
|
- this.groupField = '2'
|
|
|
- this.currentTableHeader = this.analysisSituationMatterTableHeader;
|
|
|
- this.matterData();
|
|
|
- break;
|
|
|
- case "SITUATION":
|
|
|
- this.groupField = '3'
|
|
|
- this.currentTableHeader = this.analysisSituationSituationTableHeader;
|
|
|
- this.basicData();
|
|
|
- break;
|
|
|
- }
|
|
|
+ switch (this.form.commitType){
|
|
|
+ case "UNIT":
|
|
|
+ this.groupField = '1'
|
|
|
+ this.currentTableHeader = this.analysisSituationUnitTableHeader;
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.unitData();
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case "MATTER":
|
|
|
+ this.groupField = '2'
|
|
|
+ this.currentTableHeader = this.analysisSituationMatterTableHeader;
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.matterData();
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case "SITUATION":
|
|
|
+ this.groupField = '3'
|
|
|
+ this.currentTableHeader = this.analysisSituationSituationTableHeader;
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.basicData();
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
}else if(this.currentAnalysisId=='remindUrge'){ //单位
|
|
|
this.sortField ='NODE1';
|
|
|
switch (this.form.commitType){
|
|
|
case "UNIT":
|
|
|
this.groupField = '1'
|
|
|
this.currentTableHeader = this.analysisRemindUrgeUnitTableHeader;
|
|
|
- this.unitData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.unitData();
|
|
|
+ }
|
|
|
break;
|
|
|
case "MATTER":
|
|
|
this.groupField = '2'
|
|
|
this.currentTableHeader = this.analysisRemindUrgeMatterTableHeader;
|
|
|
- this.matterData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.matterData();
|
|
|
+ }
|
|
|
break;
|
|
|
case "SITUATION":
|
|
|
this.groupField = '3'
|
|
|
this.currentTableHeader = this.analysisRemindUrgeSituationTableHeader;
|
|
|
- this.basicData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.basicData();
|
|
|
+ }
|
|
|
break;
|
|
|
}
|
|
|
}else{
|
|
@@ -337,17 +383,29 @@ export default {
|
|
|
case "UNIT":
|
|
|
this.groupField = '1'
|
|
|
this.currentTableHeader = this.analysisDataOptimizeUnitTableHeader;
|
|
|
- this.unitData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.unitData();
|
|
|
+ }
|
|
|
break;
|
|
|
case "MATTER":
|
|
|
this.groupField = '2'
|
|
|
this.currentTableHeader = this.analysisDataOptimizeMatterTableHeader;
|
|
|
- this.matterData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.matterData();
|
|
|
+ }
|
|
|
break;
|
|
|
case "SITUATION":
|
|
|
this.groupField = '3'
|
|
|
this.currentTableHeader = this.analysisDataOptimizeSituationTableHeader;
|
|
|
- this.basicData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.basicData();
|
|
|
+ }
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -359,17 +417,29 @@ export default {
|
|
|
case "UNIT":
|
|
|
this.groupField = '1'
|
|
|
this.currentTableHeader = this.analysisSituationUnitTableHeader;
|
|
|
- this.unitData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.unitData();
|
|
|
+ }
|
|
|
break;
|
|
|
case "MATTER":
|
|
|
this.groupField = '2'
|
|
|
this.currentTableHeader = this.analysisSituationMatterTableHeader;
|
|
|
- this.matterData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.matterData();
|
|
|
+ }
|
|
|
break;
|
|
|
case "SITUATION":
|
|
|
this.groupField = '3'
|
|
|
this.currentTableHeader = this.analysisSituationSituationTableHeader;
|
|
|
- this.basicData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.basicData();
|
|
|
+ }
|
|
|
break;
|
|
|
}
|
|
|
}else if(id=='remindUrge'){ //单位
|
|
@@ -378,17 +448,29 @@ export default {
|
|
|
case "UNIT":
|
|
|
this.groupField = '1'
|
|
|
this.currentTableHeader = this.analysisRemindUrgeUnitTableHeader;
|
|
|
- this.unitData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.unitData();
|
|
|
+ }
|
|
|
break;
|
|
|
case "MATTER":
|
|
|
this.groupField = '2'
|
|
|
this.currentTableHeader = this.analysisRemindUrgeMatterTableHeader;
|
|
|
- this.matterData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.matterData();
|
|
|
+ }
|
|
|
break;
|
|
|
case "SITUATION":
|
|
|
this.groupField = '3'
|
|
|
this.currentTableHeader = this.analysisRemindUrgeSituationTableHeader;
|
|
|
- this.basicData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.basicData();
|
|
|
+ }
|
|
|
break;
|
|
|
}
|
|
|
}else{
|
|
@@ -397,17 +479,29 @@ export default {
|
|
|
case "UNIT":
|
|
|
this.groupField = '1'
|
|
|
this.currentTableHeader = this.analysisDataOptimizeUnitTableHeader;
|
|
|
- this.unitData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.unitData();
|
|
|
+ }
|
|
|
break;
|
|
|
case "MATTER":
|
|
|
this.groupField = '2'
|
|
|
this.currentTableHeader = this.analysisDataOptimizeMatterTableHeader;
|
|
|
- this.matterData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.matterData();
|
|
|
+ }
|
|
|
break;
|
|
|
case "SITUATION":
|
|
|
this.groupField = '3'
|
|
|
this.currentTableHeader = this.analysisDataOptimizeSituationTableHeader;
|
|
|
- this.basicData();
|
|
|
+ if(this.form.date1!=''&&this.form.date2!=''){
|
|
|
+ this.timeData();
|
|
|
+ }else{
|
|
|
+ this.basicData();
|
|
|
+ }
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -494,6 +588,32 @@ export default {
|
|
|
this.totalCount =response.data.msg[0].TotalRowCount;
|
|
|
})
|
|
|
},
|
|
|
+ timeData(){
|
|
|
+ this.tableData = [];
|
|
|
+ this.$request({
|
|
|
+ url:'/YWTBApi/queryMatterBanjianCountTop',
|
|
|
+ method:'post',
|
|
|
+ data:{
|
|
|
+ "TYPE":this.groupField,
|
|
|
+ "S_TIME":this.form.date1,
|
|
|
+ "E_TIME": this.form.date2,
|
|
|
+ "appkey":localStorage.getItem("ywtb_userkeycode")
|
|
|
+ }
|
|
|
+ }).then(response => {
|
|
|
+ let dataArr = response.data.msg[0].Rows;
|
|
|
+ if(dataArr.length > 0){
|
|
|
+ for(let i=0;i<dataArr.length;i++){
|
|
|
+ dataArr[i].SITUATION_NAME = dataArr[i].SITUATION;
|
|
|
+ dataArr[i].MATTER_NAME = dataArr[i].NAME;
|
|
|
+ dataArr[i].NODE1 = dataArr[i].DATA_COUNT;
|
|
|
+ }
|
|
|
+ this.tableData = dataArr;
|
|
|
+ }else{
|
|
|
+ this.tableData = [];
|
|
|
+ }
|
|
|
+ this.totalCount =response.data.msg[0].TotalRowCount;
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
watch: {
|
|
|
dialogVisible:{
|
|
@@ -502,6 +622,8 @@ export default {
|
|
|
this.form.commitType = 'UNIT';
|
|
|
this.form.unitType = '';
|
|
|
this.sortField = 'NODE1';
|
|
|
+ this.form.date1 = '';
|
|
|
+ this.form.date2 = '';
|
|
|
this.changeTableHeader('matterSituation');
|
|
|
}
|
|
|
},
|