From bf399dc65aa67c4355b0fdc516f8da5ca7234c82 Mon Sep 17 00:00:00 2001
From: mark <mark18340872469@163.com>
Date: 星期日, 09 十月 2022 16:34:22 +0800
Subject: [PATCH] Merge branch 'shandong' of http://192.168.5.5:10010/r/web/saas-web into shandong
---
src/views/equipmentManagement/equipmentList/components/FormList.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/equipmentManagement/equipmentList/components/FormList.vue b/src/views/equipmentManagement/equipmentList/components/FormList.vue
index 84f9ee9..7bce9b9 100644
--- a/src/views/equipmentManagement/equipmentList/components/FormList.vue
+++ b/src/views/equipmentManagement/equipmentList/components/FormList.vue
@@ -53,7 +53,7 @@
<el-table-column label="搴忓彿" width="80" class-name="index">
<template slot-scope="scope">{{ scope.$index + 1 + (page - 1) * size }}</template>
</el-table-column>
- <el-table-column prop="devId" label="璁惧ID" min-width="185" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="devId" label="璁惧ID" min-width="210" show-overflow-tooltip></el-table-column>
<el-table-column prop="devName" label="璁惧鍚嶇О" min-width="140" show-overflow-tooltip></el-table-column>
<el-table-column prop="devIp" label="IP鍦板潃" min-width="150"></el-table-column>
<el-table-column label="瀹夎鏃堕棿" min-width="159">
@@ -393,10 +393,6 @@
Temp = document.createElement("a")
Temp.href = window.URL.createObjectURL(blob)
-
- console.log(result)
- console.log(result.fileName)
-
Temp.download = window.decodeURI(result.fileName)
Temp.setAttribute("download", result.fileName)
@@ -421,7 +417,7 @@
.search {
display: flex;
justify-content: space-between;
- padding: 60px 0 30px 0;
+ padding: 20px 0 30px 0;
font-size: 14px;
border-bottom: 1px solid #e9ebee;
background-color: #fff;
@@ -531,6 +527,10 @@
}
}
+ .table-area {
+ min-height: 600px;
+ }
+
.btns {
display: flex;
margin: 30px 0;
--
Gitblit v1.8.0