|
@@ -29,7 +29,7 @@
|
|
|
v-if="user.timeType.mainProjectState"></el-radio-button>
|
|
|
<el-radio-button :label="$t('projectclassification')"
|
|
|
v-if="user.companyId != '1071'"></el-radio-button>
|
|
|
- <el-radio-button :label="'设备'"></el-radio-button>
|
|
|
+ <el-radio-button :label="'设备'" v-if="devicePermissions"></el-radio-button>
|
|
|
<el-radio-button :label="$t('lable.department')"
|
|
|
v-if="(permissions.viewAllSummary || permissions.viewMagDeptSummary)"></el-radio-button>
|
|
|
<el-radio-button :label="$t('ren-yuan')" v-if="permissions.countPersonnel"></el-radio-button>
|
|
@@ -157,7 +157,6 @@ export default {
|
|
|
const { timeType: { fixMonthcost } } = this.user;
|
|
|
sessionStorage.radio = this.singleChoiceType;
|
|
|
this.radioLoading = true;
|
|
|
-
|
|
|
const param = this.chartDate ? {
|
|
|
startDate: fixMonthcost === 0 ? this.chartDate[0] : this.chartDate,
|
|
|
endDate: fixMonthcost === 0 ? this.chartDate[1] : this.chartDate
|
|
@@ -960,11 +959,11 @@ export default {
|
|
|
|
|
|
const { query } = this.$route;
|
|
|
const today = this.dayjs();
|
|
|
-
|
|
|
+
|
|
|
if (fixMonthcost === 0) {
|
|
|
this.chartDate = query.startDate
|
|
|
? [query.startDate, query.endDate]
|
|
|
- : [today.format('YYYY-MM-DD'), today.startOf('month').format('YYYY-MM-DD')];
|
|
|
+ : [today.startOf('month').format('YYYY-MM-DD'), today.format('YYYY-MM-DD')];
|
|
|
} else if (fixMonthcost === 1) {
|
|
|
this.chartDate = query.startDate || today.format('YYYY-MM');
|
|
|
}
|