|
|
@@ -204,7 +204,9 @@
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
- echartsCurrentChange(){
|
|
|
+ echartsCurrentChange(val){
|
|
|
+ this.page = val
|
|
|
+ // console.log('CurrentChange');
|
|
|
if(this.radio == this.$t('ren-yuan')){
|
|
|
this.gtff()
|
|
|
}else{
|
|
|
@@ -269,10 +271,10 @@
|
|
|
},
|
|
|
|
|
|
showExportDialog() {
|
|
|
- console.log(12345)
|
|
|
+ // console.log(12345)
|
|
|
this.exportDialog = true;
|
|
|
this.exportParam.dateRange = this.dateRange;
|
|
|
- console.log(this.hasReportUserList)
|
|
|
+ // console.log(this.hasReportUserList)
|
|
|
if (this.radio == this.$t('ren-yuan')) {
|
|
|
// this.exportParam.userIds = [];
|
|
|
}
|
|
|
@@ -309,7 +311,7 @@
|
|
|
var url = "/project/exportTimeCost";
|
|
|
var fileName = this.$t('projectmanhourcoststatistics')+ '.xls';
|
|
|
if (this.radio == this.$t('ren-yuan') ) {
|
|
|
- console.log(this.exportParam.userIds);
|
|
|
+ // console.log(this.exportParam.userIds);
|
|
|
fileName = this.$t('labortimecoststatistics')+ '.xls';
|
|
|
url = '/department/exportUserStatistic';
|
|
|
if (this.exportParam.userIds != null && this.exportParam.userIds.length > 0) {
|
|
|
@@ -409,9 +411,9 @@
|
|
|
//获取人员成本统计列表
|
|
|
getUserCostList() {
|
|
|
this.listLoading = true;
|
|
|
- console.log(this.port.project.userCost, '获取人员成本统计列表')
|
|
|
- console.log(this.user.timeType.fixMonthcost)
|
|
|
- console.log(Boolean(this.dateRange))
|
|
|
+ // console.log(this.port.project.userCost, '获取人员成本统计列表')
|
|
|
+ // console.log(this.user.timeType.fixMonthcost)
|
|
|
+ // console.log(Boolean(this.dateRange))
|
|
|
let startDateNum = ''
|
|
|
let endDateNum = ''
|
|
|
if(this.dateRange) {
|
|
|
@@ -468,7 +470,7 @@
|
|
|
}
|
|
|
if (list.length > 0) {
|
|
|
var num = list.length==0?0:list[0].project.length;
|
|
|
- console.log('for 1');
|
|
|
+ // console.log('for 1');
|
|
|
for(var i in list) {
|
|
|
xList.push(list[i].name);
|
|
|
var pro = list[i].project;
|
|
|
@@ -478,15 +480,15 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- console.log('for 2');
|
|
|
+ // console.log('for 2');
|
|
|
for(var i in array) {
|
|
|
yList.push(array[i]);
|
|
|
var dataList = [];
|
|
|
- console.log('for 2 1');
|
|
|
+ // console.log('for 2 1');
|
|
|
for(var j in list) {
|
|
|
var project = list[j].project , num = 0;
|
|
|
if(project.length != 0) {
|
|
|
- console.log('for 2 1 1');
|
|
|
+ // console.log('for 2 1 1');
|
|
|
for(var k in project) {
|
|
|
if(project[k].project == array[i]) {
|
|
|
let item = {
|
|
|
@@ -537,7 +539,7 @@
|
|
|
myChart.resize({
|
|
|
width: this.widthHtval
|
|
|
})
|
|
|
- console.log('设置宽度');
|
|
|
+ // console.log('设置宽度');
|
|
|
// 设置宽度
|
|
|
_this.myChart = myChart;
|
|
|
var option = {
|
|
|
@@ -622,11 +624,11 @@
|
|
|
}],
|
|
|
series: series,
|
|
|
};
|
|
|
- console.log('setoption');
|
|
|
+ // console.log('setoption');
|
|
|
myChart.setOption(option,{notMerge:true});
|
|
|
},
|
|
|
yanjiu() {
|
|
|
- console.log('触发')
|
|
|
+ // console.log('触发')
|
|
|
},
|
|
|
getEchart(e){
|
|
|
var that = this
|
|
|
@@ -734,7 +736,7 @@
|
|
|
// param.subCustomName = this.customName
|
|
|
param.customId = this.theCustomListId
|
|
|
param.fieldName = this.theCustomListPlant
|
|
|
- console.log(param, '要传的数据')
|
|
|
+ // console.log(param, '要传的数据')
|
|
|
}
|
|
|
this.http.post(url, param,
|
|
|
res => {
|
|
|
@@ -924,7 +926,7 @@
|
|
|
((_this.permissions.countCost) ? _this.$t('workcost')+" : " + params[0].data.money
|
|
|
+ _this.$t('yuan')+"<br/>" : '') +
|
|
|
((_this.permissions.countHours) ? _this.$t('screening.workTime')+" : " + params[0].data.cost + _this.$t('time.hour') : '');
|
|
|
- console.log(res, '将要渲染的数据')
|
|
|
+ // console.log(res, '将要渲染的数据')
|
|
|
return res;
|
|
|
}
|
|
|
// trigger:'axis',
|
|
|
@@ -1013,7 +1015,7 @@
|
|
|
myChart.getZr().on('click', params => {
|
|
|
const pointInPixel = [params.offsetX, params.offsetY];
|
|
|
if (myChart.containPixel('grid', pointInPixel)) {
|
|
|
- console.log(_this.params)
|
|
|
+ // console.log(_this.params)
|
|
|
if(_this.radio==this.$t('other.project')) {
|
|
|
if (_this.dateRange != null) {
|
|
|
if (this.user.timeType.fixMonthcost == 0) {
|
|
|
@@ -1072,7 +1074,7 @@
|
|
|
getZDY() {
|
|
|
this.http.post('/user-custom/getUserCustomTitle',{},res => {
|
|
|
if(res.code == 'ok'){
|
|
|
- console.log(res, '数据来源')
|
|
|
+ // console.log(res, '数据来源')
|
|
|
this.theCustomList = res.data.result
|
|
|
this.theCustomListPlantLIst = res.data.field
|
|
|
}else {
|
ggooalice