Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
73058327 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 54efdc3e 03f2535e
Inline Side-by-side
Showing 21 changed files with 45 additions and 58 deletions

25.4 KB | W: | H:

25.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 > 9 >
10 <div class="search"> 10 <div class="search">
11 <el-button type="primary" @click="search">查询</el-button> 11 <el-button type="primary" @click="search" icon="el-icon-search">查询</el-button>
12 <el-button type="primary" @click="result">重置</el-button> 12 <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
13 <el-row :gutter="10" class="shop"> 13 <el-row :gutter="10" class="shop">
14 <el-col :span="4" class="inputtitle"> 14 <el-col :span="4" class="inputtitle">
15 宗地编码: 15 宗地编码:
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 </div> 18 </div>
19 <div slot="footer" class="dialog_footer"> 19 <div slot="footer" class="dialog_footer">
20 <el-button type="primary" size="small" @click="submitForm('ruleForm')">保存</el-button> 20 <el-button type="primary" size="small" @click="submitForm('ruleForm')">保存</el-button>
21 <el-button size="small" @click="resetForm('ruleForm')">重置</el-button> 21 <el-button size="small" @click="resetForm('ruleForm')" icon="el-icon-refresh">重置</el-button>
22 <el-button size="small" @click="closeDialog('ruleForm')">关闭</el-button> 22 <el-button size="small" @click="closeDialog('ruleForm')">关闭</el-button>
23 </div> 23 </div>
24 </el-dialog> 24 </el-dialog>
......
...@@ -12,30 +12,17 @@ ...@@ -12,30 +12,17 @@
12 :header-cell-style="{'text-align':'center'}" 12 :header-cell-style="{'text-align':'center'}"
13 :cell-style="{'text-align':'center'}"> 13 :cell-style="{'text-align':'center'}">
14 <el-table-column 14 <el-table-column
15 width="300"> 15 width="200">
16 <template slot="header"> 16 <template slot="header">
17 多幢: 17 <el-button style="border:0;padding:0 10px" @click="newAddDz">
18 <el-button 18 <i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>多幢
19 type="primary"
20 class="changeBtn outAdd addMinus"
21 @click="newAddDz"
22 >+
23 </el-button> 19 </el-button>
24 自然幢: 20 <el-button style="border:0;padding:0 10px" @click="newAddDz">
25 <el-button 21 <i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>自然幢
26 type="primary"
27 class="changeBtn outAdd addMinus"
28 @click="newAddZrz"
29 >+
30 </el-button> 22 </el-button>
31 </template> 23 </template>
32 <template slot-scope="scope"> 24 <template slot-scope="scope">
33 <el-button 25 <i class="iconfont icon-" style="color:#FA6400;font-size:26px;position: relative;top:2px;cursor: pointer;" @click="deleteData(scope.$index)"></i>
34 type="primary"
35 class="changeBtn outMinus addMinus"
36 @click="deleteData(scope.$index)"
37 >-
38 </el-button>
39 </template> 26 </template>
40 </el-table-column> 27 </el-table-column>
41 <el-table-column 28 <el-table-column
...@@ -209,8 +196,8 @@ ...@@ -209,8 +196,8 @@
209 placeholder="输入不动产单元号" 196 placeholder="输入不动产单元号"
210 ></el-input> 197 ></el-input>
211 </el-form-item> 198 </el-form-item>
212 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 199 <el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
213 <el-button type="warning" @click="reset">重置</el-button> 200 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
214 </el-form> 201 </el-form>
215 </el-col> 202 </el-col>
216 </el-row> 203 </el-row>
...@@ -307,8 +294,8 @@ ...@@ -307,8 +294,8 @@
307 placeholder="输入不动产单元号" 294 placeholder="输入不动产单元号"
308 ></el-input> 295 ></el-input>
309 </el-form-item> 296 </el-form-item>
310 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 297 <el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
311 <el-button type="warning" @click="reset">重置</el-button> 298 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
312 </el-form> 299 </el-form>
313 </el-col> 300 </el-col>
314 </el-row> 301 </el-row>
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
30 placeholder="输入不动产单元号" 30 placeholder="输入不动产单元号"
31 ></el-input> 31 ></el-input>
32 </el-form-item> 32 </el-form-item>
33 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 33 <el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
34 <el-button type="warning" @click="reset">重置</el-button> 34 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
35 </el-form> 35 </el-form>
36 </el-col> 36 </el-col>
37 </el-row> 37 </el-row>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 </div> 61 </div>
62 <div class="shop"> 62 <div class="shop">
63 <el-button type="primary" @click="save">保存</el-button> 63 <el-button type="primary" @click="save">保存</el-button>
64 <el-button type="primary" @click="result">重置</el-button> 64 <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
65 <el-button type="primary" @click="cancel">取消</el-button> 65 <el-button type="primary" @click="cancel">取消</el-button>
66 </div> 66 </div>
67 </el-dialog> 67 </el-dialog>
......
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
211 </div> 211 </div>
212 <div class="shop"> 212 <div class="shop">
213 <el-button type="primary" @click="save">保存</el-button> 213 <el-button type="primary" @click="save">保存</el-button>
214 <el-button type="primary" @click="reset">重置</el-button> 214 <el-button type="primary" @click="reset" icon="el-icon-refresh">重置</el-button>
215 <el-button type="primary" @click="cancel">取消</el-button> 215 <el-button type="primary" @click="cancel">取消</el-button>
216 </div> 216 </div>
217 </el-dialog> 217 </el-dialog>
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
74 </div> 74 </div>
75 <div class="shop"> 75 <div class="shop">
76 <el-button type="primary" @click="save">保存</el-button> 76 <el-button type="primary" @click="save">保存</el-button>
77 <el-button type="primary" @click="result">重置</el-button> 77 <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
78 <el-button type="primary" @click="cancel">取消</el-button> 78 <el-button type="primary" @click="cancel">取消</el-button>
79 </div> 79 </div>
80 </el-dialog> 80 </el-dialog>
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
94 </div> 94 </div>
95 <div class="shop"> 95 <div class="shop">
96 <el-button type="primary" @click="save">保存</el-button> 96 <el-button type="primary" @click="save">保存</el-button>
97 <el-button type="primary" @click="result">重置</el-button> 97 <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
98 <el-button type="primary" @click="close">取消</el-button> 98 <el-button type="primary" @click="close">取消</el-button>
99 </div> 99 </div>
100 </el-dialog> 100 </el-dialog>
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <div class="search"> 3 <div class="search">
4 <el-button type="primary" @click="search">查询</el-button> 4 <el-button type="primary" @click="search" icon="el-icon-search">查询</el-button>
5 <el-button type="primary" @click="result">重置</el-button> 5 <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
6 <el-row :gutter="10" class="shop"> 6 <el-row :gutter="10" class="shop">
7 <el-col :span="4" class="inputtitle"> 7 <el-col :span="4" class="inputtitle">
8 宗地编码: 8 宗地编码:
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 > 9 >
10 <div class="search"> 10 <div class="search">
11 <!-- <el-button type="primary" @click="search">查询</el-button> 11 <!-- <el-button type="primary" @click="search">查询</el-button>
12 <el-button type="primary" @click="result">重置</el-button> --> 12 <el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button> -->
13 13
14 <el-row> 14 <el-row>
15 <el-col :span="24"> 15 <el-col :span="24">
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
33 placeholder="输入不动产单元号" 33 placeholder="输入不动产单元号"
34 ></el-input> 34 ></el-input>
35 </el-form-item> 35 </el-form-item>
36 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 36 <el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
37 <el-button type="warning" @click="reset">重置</el-button> 37 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
38 </el-form> 38 </el-form>
39 </el-col> 39 </el-col>
40 </el-row> 40 </el-row>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 ></el-input> 27 ></el-input>
28 </el-form-item> 28 </el-form-item>
29 <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button> 29 <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
30 <el-button type="warning" @click="reset">重置</el-button> 30 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
31 <el-button 31 <el-button
32 type="primary" 32 type="primary"
33 @click="moreSearch" 33 @click="moreSearch"
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
30 placeholder="输入不动产单元号" 30 placeholder="输入不动产单元号"
31 ></el-input> 31 ></el-input>
32 </el-form-item> 32 </el-form-item>
33 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 33 <el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
34 <el-button type="warning" @click="reset">重置</el-button> 34 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
35 </el-form> 35 </el-form>
36 </el-col> 36 </el-col>
37 </el-row> 37 </el-row>
......
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
33 <span>{{ item.name }}</span> 33 <span>{{ item.name }}</span>
34 </div> 34 </div>
35 35
36 <div class="top-items tuOrShu" > 36 <div class="top-items tuOrShu" >
37 <i class="iconfont iconiconset0403" style="color:#006CFF;font-size:30px" title="图形管理" v-if="!isMap" @click="goMap"></i> 37 <i class="iconfont iconiconset0403" style="color:#006CFF;font-size:30px" title="图形管理" v-if="!isMap" @click="goMap"></i>
38 <i class="iconfont iconxinxi" style="color:#006CFF;font-size:30px" title="属性管理" v-else @click="goBack"></i> 38 <i class="iconfont iconxinxi" style="color:#006CFF;font-size:30px" title="属性管理" v-else @click="goBack"></i>
39 </div> 39 </div>
40 </div> 40 </div>
41 <!-- <div class="header-bottom"> 41 <!-- <div class="header-bottom">
42 <Navigation ref="navigation"></Navigation> 42 <Navigation ref="navigation"></Navigation>
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
3 <div class="log-search"> 3 <div class="log-search">
4 字典名称： 4 字典名称：
5 <el-input v-model="searchKey" style="border: 1px solid #C0C4CC;width: 230px;border-radius: 4px" placeholder="请输入内容"></el-input> 5 <el-input v-model="searchKey" style="border: 1px solid #C0C4CC;width: 230px;border-radius: 4px" placeholder="请输入内容"></el-input>
6 <el-button type="primary" @click="query">查询</el-button> 6 <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
7 <el-button type="warning" @click="reset">重置</el-button> 7 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
8 </div> 8 </div>
9 <div class="log-detail"> 9 <div class="log-detail">
10 <div class="log-menu"> 10 <div class="log-menu">
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
19 value-format="yyyy-MM-dd HH:mm:ss" 19 value-format="yyyy-MM-dd HH:mm:ss"
20 :picker-options="pickerOptions"> 20 :picker-options="pickerOptions">
21 </el-date-picker> 21 </el-date-picker>
22 <el-button type="primary" @click="query">查询</el-button> 22 <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
23 <el-button type="warning" @click="reset">重置</el-button> 23 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
24 <el-button type="info" @click="getError">错误日志</el-button> 24 <el-button type="info" @click="getError">错误日志</el-button>
25 </div> 25 </div>
26 26
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
25 placeholder="输入不动产单元号" 25 placeholder="输入不动产单元号"
26 ></el-input> 26 ></el-input>
27 </el-form-item> 27 </el-form-item>
28 <el-button type="primary" @click="search">查询</el-button> 28 <el-button type="primary" @click="search" icon="el-icon-search">查询</el-button>
29 <el-button type="warning" style="margin-left:10px" @click="result">重置</el-button> 29 <el-button type="warning" style="margin-left:10px" @click="result" icon="el-icon-refresh">重置</el-button>
30 </el-form> 30 </el-form>
31 </el-col> 31 </el-col>
32 </el-row> 32 </el-row>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <el-tab-pane label="宗地分割" name="zd"> 4 <el-tab-pane label="宗地分割" name="zd">
5 <div class="fg-tabs top20"> 5 <div class="fg-tabs top20">
6 <span class="tips">分割前宗地信息</span> 6 <span class="tips">分割前宗地信息</span>
7 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 7 <el-button type="primary" class="addBtn" @click="newAdd" icon="el-icon-plus">新增</el-button>
8 <div class="fgq"> 8 <div class="fgq">
9 <el-card class="data"> 9 <el-card class="data">
10 <div slot="header" class="clearfix"> 10 <div slot="header" class="clearfix">
...@@ -1212,13 +1212,14 @@ ...@@ -1212,13 +1212,14 @@
1212 } 1212 }
1213 1213
1214 .cz, .xh { 1214 .cz, .xh {
1215 width: 100px; 1215 width: 80px;
1216 } 1216 }
1217 1217
1218 .xzq, .djq, .djzq { 1218 .xzq, .djq, .djzq {
1219 width: 150px; 1219 width: 150px;
1220 } 1220 }
1221 1221
1222
1222 .search { 1223 .search {
1223 color: #BBB !important; 1224 color: #BBB !important;
1224 } 1225 }
...@@ -1227,6 +1228,7 @@ ...@@ -1227,6 +1228,7 @@
1227 width: 210px; 1228 width: 210px;
1228 display: block; 1229 display: block;
1229 margin: 10px auto; 1230 margin: 10px auto;
1231 border: 1px solid #F2F2F2;
1230 } 1232 }
1231 /deep/ .el-select{ 1233 /deep/ .el-select{
1232 width: 100%; 1234 width: 100%;
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
22 placeholder="输入不动产单元号" 22 placeholder="输入不动产单元号"
23 ></el-input> 23 ></el-input>
24 </el-form-item> 24 </el-form-item>
25 <el-button type="primary" style="margin-left:30px" @click="search">查询</el-button> 25 <el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
26 <el-button type="warning" @click="reset">重置</el-button> 26 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
27 </el-form> 27 </el-form>
28 </el-col> 28 </el-col>
29 </el-row> 29 </el-row>
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
3 <el-tabs v-model="activeName" @tab-click="handleClick" type="card">
4 <el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane> 3 <el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane>
5 <el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane> 4 <el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane>
6 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane> 5 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
7 <el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane> 6 <el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane>
8 </el-tabs> 7 </el-tabs>
9 </div>
10 </template> 8 </template>
11 9
12 <script> 10 <script>
......
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
241 </div> 241 </div>
242 <div class="btnGroup"> 242 <div class="btnGroup">
243 <el-button type="primary" @click="saveInfo">保存</el-button> 243 <el-button type="primary" @click="saveInfo">保存</el-button>
244 <el-button type="primary" @click="resetInfo">重置</el-button> 244 <el-button type="primary" @click="resetInfo" icon="el-icon-refresh">重置</el-button>
245 <el-button type="primary" @click="dialogVisible = false" 245 <el-button type="primary" @click="dialogVisible = false"
246 >取消</el-button 246 >取消</el-button
247 > 247 >
......