|
|
@@ -1149,14 +1149,6 @@ import { error } from 'dingtalk-jsapi';
|
|
|
this.http.post('/finance/getTimeCost', {yearMonth: this.date, assignNoProUser: this.assignNoProUser},
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
- // 待会删除
|
|
|
- // var lll = res.data.costList
|
|
|
- // var arrLists = []
|
|
|
- // for(var i = 0; i < 50; i++) {
|
|
|
- // arrLists.push(lll[1])
|
|
|
- // }
|
|
|
- // res.data.costList = arrLists
|
|
|
- // 待会删除
|
|
|
|
|
|
for(var i in res.data.costList) {
|
|
|
if(i>20) {
|
|
|
@@ -1197,9 +1189,9 @@ import { error } from 'dingtalk-jsapi';
|
|
|
_this.myChart = myChart;
|
|
|
var option = {
|
|
|
title: {
|
|
|
- text: this.assignNoProUser?this.$t('costintotal') + totalMoneyCost + this.$t('yuan')
|
|
|
- +(this.hasNoProjectUsers?"，"+$t('projectpersonnelcostincluded') + nopCost+this.$t('yuan'):"")
|
|
|
- :this.$t('costintotal') + totalMoneyCost + this.$t('yuan'),
|
|
|
+ text: _this.assignNoProUser ? _this.$t('costintotal') + totalMoneyCost + _this.$t('yuan')
|
|
|
+ +(_this.hasNoProjectUsers?"，"+ _this.$t('projectpersonnelcostincluded') + nopCost + _this.$t('yuan'):"")
|
|
|
+ : _this.$t('costintotal') + totalMoneyCost + _this.$t('yuan'),
|
|
|
left:'left',
|
|
|
},
|
|
|
grid : {
|
|
|
@@ -1228,8 +1220,8 @@ import { error } from 'dingtalk-jsapi';
|
|
|
tooltip:{
|
|
|
trigger:'axis',
|
|
|
formatter: function (params,ticket,callback) {
|
|
|
- var res = params[0].name + "<br/>"+this.$t('workcost')+" : " + params[0].data.value
|
|
|
- + this.$t('yuan')+"<br/>"+this.$t('screening.workTime')+" : " + params[0].data.time + this.$t('time.hour');
|
|
|
+ var res = params[0].name + "<br/>"+ _this.$t('workcost')+" : " + params[0].data.value
|
|
|
+ + _this.$t('yuan')+"<br/>"+ _this.$t('screening.workTime')+" : " + params[0].data.time + _this.$t('time.hour');
|
|
|
_this.params = params;
|
|
|
return res;
|
|
|
}
|
|
|
@@ -1243,11 +1235,11 @@ import { error } from 'dingtalk-jsapi';
|
|
|
yAxis: [{
|
|
|
type : 'value',
|
|
|
axisLabel: {
|
|
|
- formatter:'{value} ('+this.$t('yuan')+')'
|
|
|
+ formatter:'{value} ('+ _this.$t('yuan')+')'
|
|
|
}
|
|
|
}],
|
|
|
series: [{
|
|
|
- name: this.$t('screening.workTime')+'（h）',
|
|
|
+ name: _this.$t('screening.workTime')+'（h）',
|
|
|
type: 'bar',
|
|
|
barMaxWidth: 30,
|
|
|
data: yList,
|
