|
|
@@ -13,7 +13,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
- <div class="see">
|
|
|
+ <div class="see" :style="styleObject">
|
|
|
<el-row :gutter="10">
|
|
|
<el-col :span="10">
|
|
|
<div class="train">
|
|
|
@@ -31,7 +31,6 @@
|
|
|
:row-style="rowStyle"
|
|
|
:cell-style="cellStyle"
|
|
|
class="elTable table-fixed"
|
|
|
- height="700"
|
|
|
@row-click="rowClick"
|
|
|
>
|
|
|
<el-table-column label="序号" align="center" type="index" width="50" />
|
|
|
@@ -59,7 +58,6 @@
|
|
|
:row-style="rowStyle"
|
|
|
:cell-style="cellStyle"
|
|
|
class="elTable table-fixed"
|
|
|
- height="150"
|
|
|
>
|
|
|
<el-table-column label="操作编号" min-width="50px" align="center" prop="sort" />
|
|
|
<el-table-column label="饲料名称" min-width="50px" align="center" prop="fname" />
|
|
|
@@ -90,7 +88,6 @@
|
|
|
:row-style="rowStyle"
|
|
|
:cell-style="cellStyle"
|
|
|
class="elTable table-fixed"
|
|
|
- height="150"
|
|
|
>
|
|
|
<el-table-column label="操作编号" min-width="50px" align="center" prop="sort" />
|
|
|
<el-table-column label="饲料名称" min-width="50px" align="center" prop="fname" />
|
|
|
@@ -112,9 +109,9 @@
|
|
|
</div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
- <el-button class="cancelClose cancelClose1" @click="closeDialog()">关闭</el-button>
|
|
|
- </div>
|
|
|
+ </div>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button class="cancelClose cancelClose1" @click="closeDialog()">关闭</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
@@ -179,7 +176,11 @@ export default {
|
|
|
chartLine: null, chartLine_data: {}, chartName: '',
|
|
|
// rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
|
|
|
cellStyle: { padding: 0 + 'px' },
|
|
|
- myHeight: document.documentElement.clientHeight - 85 - 200
|
|
|
+ myHeight: document.documentElement.clientHeight - 85 - 200,
|
|
|
+ styleObject:{
|
|
|
+ maxHeight: document.documentElement.clientHeight - 85 - 200-800,
|
|
|
+ overflowY: 'auto','overflowX': 'hidden'
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -252,6 +253,7 @@ export default {
|
|
|
},
|
|
|
// TMR设备列表
|
|
|
getList1() {
|
|
|
+ console.log(document.documentElement.clientHeight - 85 - 200-300,'777')
|
|
|
this.table1.listLoading = true
|
|
|
this.table1.getdataListParm.name = this.methodname
|
|
|
this.table1.getdataListParm.parammaps.optdevice = this.optdevice
|
