From 2573c1c123a8464c312d27e380ac16d7e0ac2f11 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 23:22:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/equipmentmaintain.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/view/equipmentmaintain.vue b/src/components/view/equipmentmaintain.vue
index 7ed148f..e4f9bd3 100644
--- a/src/components/view/equipmentmaintain.vue
+++ b/src/components/view/equipmentmaintain.vue
@@ -114,7 +114,7 @@
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="form.type" placeholder="璇烽�夋嫨" @change="edittype" style="width: 480px;">
+ <el-select v-model="form.type" placeholder="璇烽�夋嫨" @change="edittype" style="width: 100%;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
@@ -202,7 +202,7 @@
<el-col :span="11" :offset="2">
<el-form-item label="鍗曚綅">
<template>
- <el-input v-model="unitrow" :disabled="true" placeholder="璇疯緭鍏ュ崟浣�" style="width: 200px;"></el-input>
+ <el-input v-model="unitrow" :disabled="true" placeholder="璇疯緭鍏ュ崟浣�" style="width: 100%;"></el-input>
</template>
</el-form-item>
</el-col>
@@ -261,8 +261,8 @@
<!-- 涓讳綋鍙� -->
<div class="right">
<el-table
+ height="calc(90vh - 200px)"
:data="tableData"
- style="width: 100%;margin-bottom: 20px;height: 600px;overflow: auto;"
row-key="rowId"
border
@select-all="selectAll"
@@ -776,7 +776,9 @@
.thing .right {
width: calc(100% - 305px);
height: calc(100% - 25px);
- overflow: hidden;
+ /* overflow: hidden; */
+ overflow-y: scroll;
+ overflow-x: scroll;
padding: 10px;
}
--
Gitblit v1.9.3