From 52b3b54470ecc3c80d816a9891b651ce7f5a0eaa Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 11 十月 2025 13:39:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW' into dev_NEW
---
src/views/inspectionUpload/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/inspectionUpload/index.vue b/src/views/inspectionUpload/index.vue
index 560fc01..29f6c38 100644
--- a/src/views/inspectionUpload/index.vue
+++ b/src/views/inspectionUpload/index.vue
@@ -54,10 +54,10 @@
</div>
</div>
<div>
- <el-table ref="table" :data="tableData" height="480" v-loading="tableLoading" v-if="activeTab !== 'qrCode'">
+ <el-table ref="table" :data="tableData" height="480" v-loading="tableLoading" v-if="activeTab !== 'qrCode'" border style="width: 100%;height: calc(100vh - 20em)">
<el-table-column label="搴忓彿" type="index" width="60" align="center" />
<el-table-column prop="taskName" label="宸℃浠诲姟鍚嶇О" :show-overflow-tooltip="true"></el-table-column>
- <el-table-column prop="port" label="鍦扮偣" :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column prop="inspectionLocation" label="鍦扮偣" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="remarks" label="澶囨敞"></el-table-column>
<el-table-column prop="inspector" label="鎵ц宸℃浜�"></el-table-column>
<el-table-column fixed="right" label="鎿嶄綔">
@@ -66,7 +66,7 @@
</template>
</el-table-column>
</el-table>
- <el-table ref="table" :data="tableData" height="480" v-loading="tableLoading" v-if="activeTab === 'qrCode'">
+ <el-table ref="table" :data="tableData" height="480" v-loading="tableLoading" v-if="activeTab === 'qrCode'" border style="width: 100%;height: calc(100vh - 23em)">
<el-table-column label="搴忓彿" type="index" width="60" align="center" />
<el-table-column prop="deviceName" label="璁惧鍚嶇О" :show-overflow-tooltip="true">
<template #default="scope">
--
Gitblit v1.9.3