From 726f5da27afc22ea1d8bd5fe730a0722ab8a97c9 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 29 七月 2024 09:06:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/ReportWork/reportWork.vue | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index f28dac1..3630f05 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -1,29 +1,33 @@
<template>
<div style="height: 600px;">
- <span class="demonstration">鐢熶骇鏃堕棿</span>
- <el-date-picker v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
- start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" :default-time="defaultTime" />
- <el-select v-model="report.type" placeholder="娓呴�夋嫨绫诲瀷">
+ <div style="display: flex; flex-direction: row; align-items: center; margin-top: 20px;">
+ <span style="margin-left: 10px;" class="demonstration">{{ $t('reportmanage.productiontime') }}</span>
+ <el-date-picker style="margin-left: 10px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
+ :start-placeholder="$t('reportmanage.starttime')" :end-placeholder="$t('reportmanage.endtime')" :default-time="defaultTime" />
+ <el-select v-model="report.type" placeholder="娓呴�夋嫨绫诲瀷" style="margin-left: 10px;" >
<el-option label="鍏ㄩ儴" value="0"></el-option>
<el-option label="瀹屽伐" value="1"></el-option>
<el-option label="鐮存崯" value="2"></el-option>
<el-option label="鎷胯蛋" value="3"></el-option>
</el-select>
- <el-select v-model="report.status" placeholder="娓呴�夋嫨鐘舵��">
+ <el-select v-model="report.status" placeholder="娓呴�夋嫨鐘舵��" style="margin-left: 10px;" >
<el-option label="鍏ㄩ儴" value="0"></el-option>
<el-option label="鏈姤宸�" value="1"></el-option>
<el-option label="寰呮姤宸�" value="2"></el-option>
<el-option label="宸叉姤宸�" value="3"></el-option>
</el-select>
- <el-select v-model="report.workingProcedure" placeholder="娓呴�夋嫨宸ュ簭">
+ <el-select v-model="report.workingProcedure" placeholder="娓呴�夋嫨宸ュ簭" style="margin-left: 10px;" >
<el-option label="鍏ㄩ儴" value="0"></el-option>
<el-option label="鍒囧壊" value="1"></el-option>
<el-option label="纾ㄨ竟" value="2"></el-option>
<el-option label="閽㈠寲" value="3"></el-option>
</el-select>
- <el-button type="primary" @click="selectReportData()">鏌ヨ</el-button>
- <el-button type="success">鎶ュ伐</el-button>
- <el-table height="100%" ref="table" :data="reportData"
+ <el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">鏌ヨ</el-button>
+ <el-button type="success" style="margin-left: 10px;" >鎶ュ伐</el-button>
+ </div>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
+ <el-table height="550" ref="table" :data="reportData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="teamsGroupsName" align="center" label="鎶ュ伐鐝粍" min-width="120" />
<el-table-column prop="deviceName" align="center" label="鎶ュ伐璁惧" min-width="120" />
@@ -46,6 +50,8 @@
<el-table-column prop="responsibleEquipment" align="center" label="璐ｄ换璁惧" min-width="120" />
<el-table-column prop="remark" align="center" label="澶囨敞" min-width="120" />
</el-table>
+ </div>
+ </el-card>
</div>
</template>
<script setup>
--
Gitblit v1.8.0