Commit a333b4f1 by liushikai

Layout布局调整

parent f5e4295f
...@@ -125,8 +125,8 @@ export default { ...@@ -125,8 +125,8 @@ export default {
flex-wrap: nowrap; flex-wrap: nowrap;
justify-content: space-between; justify-content: space-between;
align-items: flex-start; align-items: flex-start;
height: 29px; height: 24px;
/* margin-bottom: 1px; */ margin-bottom: 5px;
} }
.m-funcBtn-eContainer { .m-funcBtn-eContainer {
order: 1; order: 1;
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<el-select <el-select
clearable clearable
v-model="sourceModel" v-model="sourceModel"
style="width: 70%" style="width: 100%"
placeholder="请选择来源" placeholder="请选择来源"
multiple multiple
collapse-tags collapse-tags
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
> >
<c-select <c-select
v-model="model.dflg" v-model="model.dflg"
style="width: 70%" style="width: 100%"
placeholder="请选择国内国际标志" placeholder="请选择国内国际标志"
> >
<el-option label="All" value="1"></el-option> <el-option label="All" value="1"></el-option>
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
</c-col> --> </c-col> -->
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table :list="stmData.data" :columns="stmData.columns">
<el-table-column fixed="right" prop="op" label="OP" width="140px"> <el-table-column fixed="right" prop="op" label="操作" width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small" :validate-on-rule-change="false"> <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small" :validate-on-rule-change="false">
<!-- <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick"> --> <!-- <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick"> -->
<!-- <el-tab-pane :value="tabVal" label="待办任务查询" name="menu"> --> <!-- <el-tab-pane :value="tabVal" label="待办任务查询" name="menu"> -->
<c-content> <!-- <c-content> -->
<m-menu :model="model" :codes="codes" ref="Menu" :isDraftBox="isDraftBox"/> <m-menu :model="model" :codes="codes" ref="Menu" :isDraftBox="isDraftBox"/>
</c-content> <!-- </c-content> -->
<!-- </el-tab-pane> --> <!-- </el-tab-pane> -->
<!-- </c-tabs> --> <!-- </c-tabs> -->
</el-form> </el-form>
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
> >
<!-- <el-tabs ref="elment" type="card" @tab-click="tabClick"> <!-- <el-tabs ref="elment" type="card" @tab-click="tabClick">
<el-tab-pane label="复核夹查询"> --> <el-tab-pane label="复核夹查询"> -->
<c-content> <!-- <c-content> -->
<m-inftrnps :model="model" :codes="codes" ref="inftrnps" /> <m-inftrnps :model="model" :codes="codes" ref="inftrnps" />
</c-content> <!-- </c-content> -->
<!-- </el-tab-pane> <!-- </el-tab-pane>
</el-tabs> --> </el-tabs> -->
</el-form> </el-form>
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
<c-search-input v-show="menuOpen"></c-search-input> <c-search-input v-show="menuOpen"></c-search-input>
</div> </div>
<c-content :height="250"> <c-content :height="250">
<img <!-- <img
src="../../assets/menu_bottom.png" src="../../assets/menu_bottom.png"
style="position: fixed; width: 200px; bottom: 0" style="position: fixed; width: 200px; bottom: 0"
/> /> -->
<el-menu <el-menu
:default-active="activeMenu" :default-active="activeMenu"
class="el-menu-vertical-demo" class="el-menu-vertical-demo"
......
...@@ -219,14 +219,14 @@ export default { ...@@ -219,14 +219,14 @@ export default {
<style scoped> <style scoped>
.tags-view-container { .tags-view-container {
height: 34px; height: 28px;
width: 100%; width: 100%;
background: #f5f4f9; background: #f5f4f9;
border-bottom: 1px solid #d8dce5; border-bottom: 1px solid #d8dce5;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04); box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
/* box-sizing: inherit; */ /* box-sizing: inherit; */
/* padding-top: 5px; */ padding-top: 5px;
padding-bottom: 1px; padding-bottom: 5px;
} }
.tags-view-container .tags-view-wrapper .tags-view-item { .tags-view-container .tags-view-wrapper .tags-view-item {
...@@ -240,8 +240,9 @@ export default { ...@@ -240,8 +240,9 @@ export default {
background: #fff; background: #fff;
padding: 0 8px; padding: 0 8px;
font-size: 12px; font-size: 12px;
margin-left: 5px; /* margin-left: 4px; */
margin-top: 4px; /* margin-top: 4px; */
margin:0 4px 0 0;
} }
.tags-view-container .tags-view-wrapper .tags-view-item:first-of-type { .tags-view-container .tags-view-wrapper .tags-view-item:first-of-type {
margin-left: 10px; margin-left: 10px;
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
<el-aside width="240px" style="background-color: white"> <el-aside width="240px" style="background-color: white">
<sideMenu></sideMenu> <sideMenu></sideMenu>
</el-aside> </el-aside>
<div style="width: 8px"></div> <div style="width: 2px"></div>
<el-main class="m-app-main"> <el-main class="m-app-main">
<tagViews></tagViews> <tagViews></tagViews>
<!-- <div style="height: 10px"></div> --> <div style="height: 2px"></div>
<business style="background-color: var(--bgcolor)"></business> <business style="background-color: var(--bgcolor)"></business>
<toolbars></toolbars> <toolbars></toolbars>
</el-main> </el-main>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment