From 12e26ca45149414930deecfef9e8f7ba3ae6d929 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 20 九月 2023 15:57:17 +0800
Subject: [PATCH] modified: src/components/view/equipmentmaintain.vue modified: src/components/view/standard-table/material.vue modified: src/components/view/standard-table/product.vue modified: src/components/view/standard-table/target.vue modified: src/components/view/standard-table/technology.vue
---
src/components/view/equipmentmaintain.vue | 5 +++--
src/components/view/standard-table/target.vue | 4 ++--
src/components/view/standard-table/technology.vue | 2 +-
src/components/view/standard-table/material.vue | 2 +-
src/components/view/standard-table/product.vue | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/components/view/equipmentmaintain.vue b/src/components/view/equipmentmaintain.vue
index 52def64..55c2f5b 100644
--- a/src/components/view/equipmentmaintain.vue
+++ b/src/components/view/equipmentmaintain.vue
@@ -262,7 +262,6 @@
<div class="right">
<el-table
:data="tableData"
- style="width: 100%;margin-bottom: 20px;height: 600px;overflow: auto;"
row-key="rowId"
border
@select-all="selectAll"
@@ -776,7 +775,9 @@
.thing .right {
width: calc(100% - 305px);
height: calc(100% - 25px);
- overflow: hidden;
+ /* overflow: hidden; */
+ overflow-y: auto;
+ overflow-x: auto;
padding: 10px;
}
diff --git a/src/components/view/standard-table/material.vue b/src/components/view/standard-table/material.vue
index fc7f17b..ceee553 100644
--- a/src/components/view/standard-table/material.vue
+++ b/src/components/view/standard-table/material.vue
@@ -1,6 +1,6 @@
<template>
<div class="standard">
- <div style="width: 100%;height: 68vh;overflow-x: auto;overflow-y: auto;">
+ <div style="width: 100%;height: 68vh;overflow-x: auto;">
<el-table :data="tableData" row-key="rowId" border
@select-all="selectAll" @select="selectTr" ref="multipleTable"
@selection-change="handleSelectionChange" default-expand-all
diff --git a/src/components/view/standard-table/product.vue b/src/components/view/standard-table/product.vue
index 2950115..fd4f56a 100644
--- a/src/components/view/standard-table/product.vue
+++ b/src/components/view/standard-table/product.vue
@@ -37,7 +37,7 @@
}
</style>
<template>
- <div class="standard" style="width: 100%;height: 68vh;overflow-x: auto;overflow-y: auto;">
+ <div class="standard" style="width: 100%;height: 68vh;overflow-x: auto;">
<el-table ref="multipleTable" :data="tableData" row-key="rowId" border
@select-all="selectAll" @select="selectTr"
@selection-change="handleSelectionChange" default-expand-all
diff --git a/src/components/view/standard-table/target.vue b/src/components/view/standard-table/target.vue
index f4a9036..eec4893 100644
--- a/src/components/view/standard-table/target.vue
+++ b/src/components/view/standard-table/target.vue
@@ -1,6 +1,6 @@
<template>
- <div class="standard" style="overflow-x: auto;">
- <div style="width: 100%;height: 68vh;overflow-y: auto;">
+ <div class="standard">
+ <div style="width: 100%;height: 68vh;overflow-x: auto;">
<el-table ref="multipleTable" :data="tableData" row-key="rowId" border
@select-all="selectAll" @select="selectTr"
@selection-change="handleSelectionChange" default-expand-all
diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index 6ec64fe..7d42993 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -1,6 +1,6 @@
<template>
<div class="standard">
- <div style="width: 100%;height: 68vh;overflow-x: auto;overflow-y: auto;">
+ <div style="width: 100%;height: 68vh;overflow-x: auto;">
<el-table :data="tableData" row-key="rowId" border
@select-all="selectAll" @select="selectTr" ref="multipleTable"
:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
--
Gitblit v1.9.3