From dbdc40f3b084afdb3737d29c5d7a1a53a1327ea1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 24 七月 2024 16:54:54 +0800
Subject: [PATCH] 完善温升、热循环检验
---
src/components/do/b3-work-time-management/work-time-statistics.vue | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-statistics.vue b/src/components/do/b3-work-time-management/work-time-statistics.vue
index 710d6f7..d7d6d4c 100644
--- a/src/components/do/b3-work-time-management/work-time-statistics.vue
+++ b/src/components/do/b3-work-time-management/work-time-statistics.vue
@@ -44,21 +44,24 @@
<el-button size="small" type="primary" @click="handleUp" v-show="currentTable == 'value1'&&up">瀵� 鍏�</el-button>
</div>
</div>
- <el-radio-group v-model="currentTable" size="small" :key="'111'" style="margin-top: 10px;">
- <el-radio-button label="value0">
- 鍘熷宸ユ椂
- </el-radio-button>
- <el-radio-button label="value1">
- 淇宸ユ椂
- </el-radio-button>
- </el-radio-group>
+ <div style="text-align: left">
+ <el-radio-group v-model="currentTable" size="small" :key="'111'" style="margin-top: 10px;">
+ <el-radio-button label="value0">
+ 鍘熷宸ユ椂
+ </el-radio-button>
+ <el-radio-button label="value1">
+ 淇宸ユ椂
+ </el-radio-button>
+ </el-radio-group>
+ </div>
<div class="table">
<ValueTable ref="ValueTable0"
- v-if="currentTable == 'value0'"
+ v-if="currentTable == 'value0'" :isColumnWidth="true"
+ :isShowZero="true"
:url="$api.auxiliaryOriginalHours.selectAuxiliaryOriginalHours"
:componentData="componentData" :key="upIndex" />
- <ValueTable ref="ValueTable1"
- v-if="currentTable == 'value1'"
+ <ValueTable ref="ValueTable1" :isShowZero="true"
+ v-if="currentTable == 'value1'" :isColumnWidth="true"
:url="$api.auxiliaryCorrectionHours.selectAuxiliaryCorrectionHours"
:inputUrl="$api.auxiliaryCorrectionHours.upload"
:componentData="componentData0"
@@ -96,6 +99,7 @@
requiredAdd: [],
requiredUp: [],
accept:聽'.xlsx',
+ sort: false,
inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
cellSpecialStyle:{
redColorByKey:'Hours'
@@ -111,6 +115,7 @@
order: 'desc'
}
},
+ sort: false,
isIndex: true,
showSelect: false,
select: false,
@@ -125,7 +130,9 @@
inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
},
entity:{
- month:getYearAndMonthAndDays()
+ month:getYearAndMonthAndDays(),
+ name:'',
+ departLims:''
},
entityCopy:{},
entityCopy0:{},
@@ -194,13 +201,13 @@
let entity = {...this.entity}
entity.month = entity.month.split('-')[0]+'-'+entity.month.split('-')[1]
this.outLoading = true
- this.$axios.get(this.$api.auxiliaryOriginalHours.exportOriginalHours,{
- params:entity,
+ this.$axios.post(this.$api.auxiliaryOriginalHours.exportOriginalHours,{
+ ...entity
+ // params:entity,
},{responseType: "blob"}).then(res => {
this.outLoading = false
this.$message.success('瀵煎嚭鎴愬姛')
const blob = new Blob([res],{ type: 'application/octet-stream' });
- console.log(blob)
const url = URL.createObjectURL(blob);
const link = document.createElement('a');
link.href = url;
--
Gitblit v1.9.3