Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
2 changed files
with
7 additions
and
7 deletions
... | @@ -84,14 +84,14 @@ | ... | @@ -84,14 +84,14 @@ |
84 | </el-form-item> | 84 | </el-form-item> |
85 | </el-form> | 85 | </el-form> |
86 | <div class="handleBtn"> | 86 | <div class="handleBtn"> |
87 | <el-button type="primary" class="w98 import">导入图形</el-button> | 87 | <!-- <el-button type="primary" class="w98 import">导入图形</el-button> --> |
88 | <el-button type="primary" class="w98 creat" @click="newZd">创建</el-button> | 88 | <el-button type="primary" class="w98 creat" @click="newZd">创建</el-button> |
89 | <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> | 89 | <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> |
90 | </div> | 90 | </div> |
91 | </el-tab-pane> | 91 | </el-tab-pane> |
92 | <el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh"> | 92 | <el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh"> |
93 | <div class="handleBtn"> | 93 | <div class="handleBtn"> |
94 | <el-button type="primary" class="w98 import">导入图形</el-button> | 94 | <!-- <el-button type="primary" class="w98 import">导入图形</el-button> --> |
95 | <el-button type="primary" class="w98 creat" @click="todo">创建</el-button> | 95 | <el-button type="primary" class="w98 creat" @click="todo">创建</el-button> |
96 | <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> | 96 | <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> |
97 | </div> | 97 | </div> |
... | @@ -106,7 +106,7 @@ | ... | @@ -106,7 +106,7 @@ |
106 | </el-form-item> | 106 | </el-form-item> |
107 | </el-form> | 107 | </el-form> |
108 | <div class="handleBtn"> | 108 | <div class="handleBtn"> |
109 | <el-button type="primary" class="w98 import">导入图形</el-button> | 109 | <!-- <el-button type="primary" class="w98 import">导入图形</el-button> --> |
110 | <el-button type="primary" class="w98 creat" @click="newZrz">创建</el-button> | 110 | <el-button type="primary" class="w98 creat" @click="newZrz">创建</el-button> |
111 | <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> | 111 | <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> |
112 | </div> | 112 | </div> |
... | @@ -121,14 +121,14 @@ | ... | @@ -121,14 +121,14 @@ |
121 | </el-form-item> | 121 | </el-form-item> |
122 | </el-form> | 122 | </el-form> |
123 | <div class="handleBtn"> | 123 | <div class="handleBtn"> |
124 | <el-button type="primary" class="w98 import">导入图形</el-button> | 124 | <!-- <el-button type="primary" class="w98 import">导入图形</el-button> --> |
125 | <el-button type="primary" class="w98 creat" @click="newDz">创建</el-button> | 125 | <el-button type="primary" class="w98 creat" @click="newDz">创建</el-button> |
126 | <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> | 126 | <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> |
127 | </div> | 127 | </div> |
128 | </el-tab-pane> | 128 | </el-tab-pane> |
129 | <el-tab-pane class="eltabspane" v-if="!createZrz" label="林权" name="lq"> | 129 | <el-tab-pane class="eltabspane" v-if="!createZrz" label="林权" name="lq"> |
130 | <div class="handleBtn"> | 130 | <div class="handleBtn"> |
131 | <el-button type="primary" class="w98 import">导入图形</el-button> | 131 | <!-- <el-button type="primary" class="w98 import">导入图形</el-button> --> |
132 | <el-button type="primary" class="w98 creat" @click="todo">创建</el-button> | 132 | <el-button type="primary" class="w98 creat" @click="todo">创建</el-button> |
133 | <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> | 133 | <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> |
134 | </div> | 134 | </div> |
... | @@ -143,7 +143,7 @@ | ... | @@ -143,7 +143,7 @@ |
143 | </el-form-item> | 143 | </el-form-item> |
144 | </el-form> | 144 | </el-form> |
145 | <div class="handleBtn"> | 145 | <div class="handleBtn"> |
146 | <el-button type="primary" class="w98 import">导入图形</el-button> | 146 | <!-- <el-button type="primary" class="w98 import">导入图形</el-button> --> |
147 | <el-button type="primary" class="w98 creat" @click="newGzw">创建</el-button> | 147 | <el-button type="primary" class="w98 creat" @click="newGzw">创建</el-button> |
148 | <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> | 148 | <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> |
149 | </div> | 149 | </div> |
... | @@ -673,7 +673,7 @@ export default { | ... | @@ -673,7 +673,7 @@ export default { |
673 | position: absolute; | 673 | position: absolute; |
674 | bottom: 0; | 674 | bottom: 0; |
675 | left: 50%; | 675 | left: 50%; |
676 | margin-left: -250px; | 676 | // margin-left: -250px; |
677 | .w98{ | 677 | .w98{ |
678 | width: 98px; | 678 | width: 98px; |
679 | } | 679 | } | ... | ... |
This diff is collapsed.
Click to expand it.
-
Please register or sign in to post a comment