11.20
This commit is contained in:
parent
587187b8fe
commit
1369e972ef
@ -1309,7 +1309,7 @@ export default {
|
|||||||
}
|
}
|
||||||
.box-der {
|
.box-der {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 15px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.kar {
|
.kar {
|
||||||
|
@ -1,26 +1,14 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container" style="padding: 0px">
|
<div class="app-container" style="padding: 0px">
|
||||||
|
|
||||||
<!--<<<<<<< HEAD-->
|
|
||||||
<div class="tab-box">
|
<div class="tab-box">
|
||||||
<div class="f-box" v-for="(item,index) in tablist" :key="index" @click="activeindex=index,handleClick2()" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
|
<div class="f-box" v-for="(item,index) in tablist" :key="index" @click="activeindex=index,handleClick2()" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="card-change" style="margin: 20px">
|
<div class="card-change" style="margin: 10px;margin-bottom: 0px">
|
||||||
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
|
|
||||||
<!-- <el-tab-pane label="中台系统" name="first"></el-tab-pane>-->
|
|
||||||
<!-- <el-tab-pane label="油站系统" name="second"></el-tab-pane>-->
|
|
||||||
<!-- </el-tabs>-->
|
|
||||||
|
|
||||||
<!--=======-->
|
|
||||||
<!-- <el-card >-->
|
|
||||||
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
|
|
||||||
<!-- <el-tab-pane label="中台系统" name="first"></el-tab-pane>-->
|
|
||||||
<!-- <el-tab-pane label="油站系统" name="second"></el-tab-pane>-->
|
|
||||||
<!-- </el-tabs>-->
|
|
||||||
<!-->>>>>>> d25f5b521c8a75cc04591397604acc7d4a5eb604-->
|
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
|
||||||
<el-form-item label="" prop="createName">
|
<el-form-item label="" prop="createName">
|
||||||
<el-input
|
<el-input
|
||||||
@ -85,7 +73,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<div style="height: 65vh;overflow: auto">
|
<div style="height: 70vh;overflow: auto;scrollbar-width:none; ">
|
||||||
<el-table :data="tableData" style="width: 100%" border>
|
<el-table :data="tableData" style="width: 100%" border>
|
||||||
<el-table-column type="index" label="序号"></el-table-column>
|
<el-table-column type="index" label="序号"></el-table-column>
|
||||||
<el-table-column prop="createAccount" label="登录账号"></el-table-column>
|
<el-table-column prop="createAccount" label="登录账号"></el-table-column>
|
||||||
|
@ -311,6 +311,7 @@ export default {
|
|||||||
}
|
}
|
||||||
.app-container{
|
.app-container{
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
|
padding-bottom: 0px;
|
||||||
}
|
}
|
||||||
.table-box{
|
.table-box{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container" style="padding: 10px">
|
<div class="app-container" style="padding: 10px;padding-bottom: 0px">
|
||||||
<div class="card-change" style="min-height: 80vh;">
|
<div class="card-change" >
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
|
||||||
<el-form-item label="" prop="notificationName">
|
<el-form-item label="" prop="notificationName">
|
||||||
<el-input
|
<el-input
|
||||||
@ -74,7 +74,6 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
|
||||||
<pagination
|
<pagination
|
||||||
v-show="total>0"
|
v-show="total>0"
|
||||||
:total="total"
|
:total="total"
|
||||||
@ -82,6 +81,8 @@
|
|||||||
:limit.sync="queryParams.pageSize"
|
:limit.sync="queryParams.pageSize"
|
||||||
@pagination="getList"
|
@pagination="getList"
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -489,7 +490,7 @@ export default {
|
|||||||
}
|
}
|
||||||
.table_box{
|
.table_box{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 70vh;
|
height: 74vh;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container" style="padding: 10px">
|
<div class="app-container" style="padding: 10px;padding-bottom: 0px">
|
||||||
<div class="card-change" >
|
<div class="card-change" >
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
|
||||||
<el-form-item label="" prop="deptName">
|
<el-form-item label="" prop="deptName">
|
||||||
|
Loading…
Reference in New Issue
Block a user