53e4f2f1 by 任超

Merge branch 'master' into dev

2 parents 434393fe 58c584f4
1 <template> 1 <template>
2 <div class="breadcrumb-con">
3 <el-breadcrumb class="breadcrumb" separator-class="el-icon-arrow-right"> 2 <el-breadcrumb class="breadcrumb" separator-class="el-icon-arrow-right">
4 <span class="fl">当前页面:</span> 3 <span class="fl">当前页面:</span>
5 <transition-group name="breadcrumb"> 4 <transition-group name="breadcrumb">
...@@ -8,7 +7,6 @@ ...@@ -8,7 +7,6 @@
8 </el-breadcrumb-item> 7 </el-breadcrumb-item>
9 </transition-group> 8 </transition-group>
10 </el-breadcrumb> 9 </el-breadcrumb>
11 </div>
12 </template> 10 </template>
13 11
14 <script> 12 <script>
...@@ -57,16 +55,14 @@ export default { ...@@ -57,16 +55,14 @@ export default {
57 </script> 55 </script>
58 56
59 <style lang="scss" scoped> 57 <style lang="scss" scoped>
60 .breadcrumb-con {
61 padding-bottom: 5px;
62 border-bottom: 1px solid #458ACF;
63 margin: 8px 0;
64 }
65
66 .breadcrumb { 58 .breadcrumb {
67 text-indent: 10px; 59 text-indent: 10px;
68 background: linear-gradient(90deg, #0047B8 0%, rgba(0, 26, 95, 0.1) 100%); 60 background: url("~@/image/breadcrumb.png") no-repeat;
61 background-size: 100% 100%;
69 line-height: 32px; 62 line-height: 32px;
63 height: 32px;
64 padding-left: 35px;
65 margin: 8px 0 8px 6px;
70 color: #02D9FD; 66 color: #02D9FD;
71 } 67 }
72 68
......
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
110 margin-top: 15px; 110 margin-top: 15px;
111 background: url("~@/image/formContent.png") no-repeat; 111 background: url("~@/image/formContent.png") no-repeat;
112 background-size: 100% 100%; 112 background-size: 100% 100%;
113 padding: 20px 30px 20px 30px; 113 padding: 22px 42px 20px;
114 //修改表头的背景颜色横向渐变色 114 //修改表头的背景颜色横向渐变色
115 @extend .tableClass; 115 @extend .tableClass;
116 116
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
37 </el-row> 37 </el-row>
38 <el-row class="mt-10"> 38 <el-row class="mt-10">
39 <el-col :span="6"> 39 <el-col :span="6">
40 <el-form-item label="业务流水号" prop="ywh"> 40 <el-form-item label="业务流水号" prop="ywh">
41 <el-input v-model.trim="form.ywh" clearable class="width100" placeholder="业务流水号"></el-input> 41 <el-input v-model.trim="form.ywh" clearable class="width100" placeholder="业务流水号"></el-input>
42 </el-form-item> 42 </el-form-item>
43 </el-col> 43 </el-col>
44 <el-col :span="3"> 44 <el-col :span="3">
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
41 </el-row> 41 </el-row>
42 <el-row class="mt-10"> 42 <el-row class="mt-10">
43 <el-col :span="6"> 43 <el-col :span="6">
44 <el-form-item label="业务流水号" prop="ywh"> 44 <el-form-item label="业务流水号" prop="ywh">
45 <el-input v-model.trim="form.ywh" class="width100" clearable placeholder="业务流水号"></el-input> 45 <el-input v-model.trim="form.ywh" class="width100" clearable placeholder="业务流水号"></el-input>
46 </el-form-item> 46 </el-form-item>
47 </el-col> 47 </el-col>
48 <el-col :span="6"> 48 <el-col :span="6">
......