Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
70b2a021 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents b71cedad ba1d9447
Inline Side-by-side
Showing 4 changed files with 17 additions and 10 deletions
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 9
10 .iconfont { 10 .iconfont {
11 font-family: "iconfont" !important; 11 font-family: "iconfont" !important;
12 font-size: 16px; 12 font-size: 18px;
13 font-style: normal; 13 font-style: normal;
14 -webkit-font-smoothing: antialiased; 14 -webkit-font-smoothing: antialiased;
15 -moz-osx-font-smoothing: grayscale; 15 -moz-osx-font-smoothing: grayscale;
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 width: 100%; 11 width: 100%;
12 height: 100%; 12 height: 100%;
13 box-sizing: border-box; 13 box-sizing: border-box;
14 padding: 18px 18px 0!important; 14 padding: 18px 10px 0!important;
15 } 15 }
16 .pagination { 16 .pagination {
17 padding: 18px; 17 padding: 18px;
......
...@@ -13,24 +13,24 @@ ...@@ -13,24 +13,24 @@
13 </el-col> 13 </el-col>
14 <el-col :span="10" class="fr"> 14 <el-col :span="10" class="fr">
15 <div v-show="qszt=='0'" class="fr" style="margin-right:20px"> 15 <div v-show="qszt=='0'" class="fr" style="margin-right:20px">
16 <el-button size="mini" @click="addRow"> 16 <el-button class="qlrBtn" size="mini" @click="addRow">
17 <i class="iconfont iconxinzeng"></i> 新增 17 <i class="iconfont iconxinzeng"></i> 新增
18 </el-button> 18 </el-button>
19 <el-button size="mini" @click="changeRow"> 19 <el-button class="qlrBtn" size="mini" @click="changeRow">
20 <i class="iconfont iconbianji"></i> 编辑 20 <i class="iconfont iconbianji"></i> 编辑
21 </el-button> 21 </el-button>
22 <el-button size="mini" @click="delRow"> 22 <el-button class="qlrBtn" size="mini" @click="delRow">
23 <i class="iconfont iconshanchu"></i> 删除 23 <i class="iconfont iconshanchu"></i> 删除
24 </el-button> 24 </el-button>
25 </div> 25 </div>
26 <div v-show="qszt!='0'" class="fr" style="margin-right:20px"> 26 <div v-show="qszt!='0'" class="fr" style="margin-right:20px">
27 <el-button size="mini" disabled> 27 <el-button class="qlrBtn" size="mini" disabled>
28 <i class="iconfont iconxinzeng"></i> 新增 28 <i class="iconfont iconxinzeng"></i> 新增
29 </el-button> 29 </el-button>
30 <el-button size="mini" disabled> 30 <el-button class="qlrBtn" size="mini" disabled>
31 <i class="iconfont iconbianji"></i> 编辑 31 <i class="iconfont iconbianji"></i> 编辑
32 </el-button> 32 </el-button>
33 <el-button size="mini" disabled> 33 <el-button class="qlrBtn" size="mini" disabled>
34 <i class="iconfont iconshanchu"></i> 删除 34 <i class="iconfont iconshanchu"></i> 删除
35 </el-button> 35 </el-button>
36 </div> 36 </div>
...@@ -648,6 +648,12 @@ ...@@ -648,6 +648,12 @@
648 font-size: 14px; 648 font-size: 14px;
649 width: 100%; 649 width: 100%;
650 table-layout: fixed; 650 table-layout: fixed;
651 .qlrBtn{
652 border: 0;
653 }
654 .qlrBtn:hover{
655 background-color: none!important;
656 }
651 .iconfont{ 657 .iconfont{
652 font-size: 14px!important; 658 font-size: 14px!important;
653 } 659 }
......
...@@ -796,8 +796,9 @@ export default { ...@@ -796,8 +796,9 @@ export default {
796 } 796 }
797 } 797 }
798 .radioBtn { 798 .radioBtn {
799 margin-left: 16px; 799 margin-left: 10px;
800 padding:12px 14px; 800 padding: 12px 10px;
801 border: 0;
801 i{ 802 i{
802 font-size: 13px; 803 font-size: 13px;
803 padding-right: 4px; 804 padding-right: 4px;
......