Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
a17c7dd3 by 杨威
Options

Merge remote-tracking branch 'origin/master' into master 

# Conflicts:
#	src/assets/iconfont/demo_index.html
#	src/assets/iconfont/iconfont.css
#	src/assets/iconfont/iconfont.eot
#	src/assets/iconfont/iconfont.js
#	src/assets/iconfont/iconfont.json
#	src/assets/iconfont/iconfont.svg
#	src/assets/iconfont/iconfont.ttf
#	src/assets/iconfont/iconfont.woff
#	src/assets/iconfont/iconfont.woff2
2 parents caed718b 898dbff4
Inline Side-by-side
Showing 42 changed files with 481 additions and 485 deletions
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
60 position: absolute; 60 position: absolute;
61 top: 0; 61 top: 0;
62 left: 0; 62 left: 0;
63 z-index: 1; 63 z-index: 1000;
64 .content{ 64 .content{
65 width: 240px; 65 width: 240px;
66 height: 160px; 66 height: 160px;
......
...@@ -126,3 +126,13 @@ export function cxlzZrzList(data) { ...@@ -126,3 +126,13 @@ export function cxlzZrzList(data) {
126 }) 126 })
127 } 127 }
128 128
129 /**
130 * 查询权籍_建筑物区分所有权业主共有部分调查表
131 */
132 export function getHCountByZrzbsm(id) {
133 return request({
134 url: '/fw/qjZrz/getHCountByZrzbsm',
135 method: 'get',
136 params: {id}
137 })
138 }
......
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#666666" d="M904.533333 311.466667c-17.066667-17.066667-42.666667-17.066667-59.733333 0L512 644.266667 179.2 311.466667c-17.066667-17.066667-42.666667-17.066667-59.733333 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l362.666666 362.666667c8.533333 8.533333 19.2 12.8 29.866667 12.8s21.333333-4.266667 29.866667-12.8l362.666666-362.666667c17.066667-17.066667 17.066667-42.666667 0-59.733333z" /></svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1610702907780" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3703" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M471.3472 826.368a51.2 51.2 0 0 0 65.3312 5.9392l7.168-5.9392 409.6-409.6a51.2 51.2 0 0 0-65.4336-78.336l-7.0656 5.9392-373.3504 373.3504L134.144 344.3712a51.2 51.2 0 0 0-65.3312-5.9392l-7.0656 5.9392A51.2 51.2 0 0 0 55.808 409.6l5.9392 7.0656 409.6 409.6z" fill="#6D7278" p-id="3704"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
......
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#666666" d="M384 512L731.733333 202.666667c17.066667-14.933333 19.2-42.666667 4.266667-59.733334-14.933333-17.066667-42.666667-19.2-59.733333-4.266666l-384 341.333333c-10.666667 8.533333-14.933333 19.2-14.933334 32s4.266667 23.466667 14.933334 32l384 341.333333c8.533333 6.4 19.2 10.666667 27.733333 10.666667 12.8 0 23.466667-4.266667 32-14.933333 14.933333-17.066667 14.933333-44.8-4.266667-59.733334L384 512z" /></svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1610702898690" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3569" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M211.1488 471.6544a51.2 51.2 0 0 0-5.9392 65.3312l5.9392 7.168 409.6 409.6a51.2 51.2 0 0 0 78.336-65.3312l-5.9392-7.168L319.7952 507.904l373.3504-373.3504a51.2 51.2 0 0 0 5.9392-65.3312L693.248 62.0544A51.2 51.2 0 0 0 627.8144 56.32l-7.0656 5.8368-409.6 409.6z" fill="#4A4A4A" p-id="3570"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
......

22.1 KB | W: | H:

314 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

9.82 KB | W: | H:

14.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

10.7 KB | W: | H:

16.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

6.83 KB | W: | H:

11.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

45.6 KB | W: | H:

73.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.87 KB | W: | H:

10.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

7.36 KB | W: | H:

16.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

7.02 KB | W: | H:

13.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

10 KB | W: | H:

15.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -101,6 +101,7 @@ ol, ul { list-style:none; } ...@@ -101,6 +101,7 @@ ol, ul { list-style:none; }
101 /deep/ .el-tabs--border-card{ 101 /deep/ .el-tabs--border-card{
102 border: 0; 102 border: 0;
103 } 103 }
104
104 //二级菜单样式 105 //二级菜单样式
105 .tabs{ 106 .tabs{
106 >.el-tabs__content{ 107 >.el-tabs__content{
...@@ -110,33 +111,29 @@ ol, ul { list-style:none; } ...@@ -110,33 +111,29 @@ ol, ul { list-style:none; }
110 >.is-top{ 111 >.is-top{
111 position: -webkit-fixed; 112 position: -webkit-fixed;
112 position: fixed; 113 position: fixed;
113 top: 66px; 114 top: 70px;
114 z-index: 999; 115 z-index: 999;
115 width: 100%; 116 width: 100%;
116 margin-bottom: 0; 117 margin-bottom: 0;
117 border-top: 1px solid #F4F9FF; 118 border-top: 1px solid #F4F9FF;
118 // >.is-top>.el-tabs__nav-scroll{ 119 }
119 // height: 50px; 120 }
120 // background-color: #ffffff; 121 .el-tabs{
121 // box-sizing: border-box; 122 height: calc(100% - 50px);
122 // padding-left: 20px; 123 /deep/.el-tabs__content{
123 // .el-tabs__active-bar{ 124 height: 100%;
124 // display: none; 125 position: unset;
125 // } 126 /deep/.el-tab-pane{
126 // >.el-tabs__nav{ 127 height: 100%;
127 // >.el-tabs__item{ 128 }
128 // border: 1px solid #DEDEDE; 129 background-color: #F4F9FF;
129 // height: 30px; 130 padding: 0;
130 // line-height: 28px; 131 }
131 // padding: 0 20px; 132 /deep/ .el-tabs__item {
132 // margin: 9px 10px 9px 0; 133 height: 48px;
133 // } 134 }
134 // .is-active{ 135 /deep/ .el-tabs__header{
135 // color: #006CFF; 136 background-color: #ffffff;
136 // background-color: #ffffff;
137 // }
138 // }
139 // }
140 } 137 }
141 } 138 }
142 .el-tabs__item{ 139 .el-tabs__item{
...@@ -156,7 +153,7 @@ ol, ul { list-style:none; } ...@@ -156,7 +153,7 @@ ol, ul { list-style:none; }
156 } 153 }
157 .el-dialog__header{ 154 .el-dialog__header{
158 border-bottom: 1px solid #F1F1F1; 155 border-bottom: 1px solid #F1F1F1;
159 background: #3FA2E1; 156 background: #0091FF;
160 } 157 }
161 .el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{ 158 .el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{
162 color: #fff; 159 color: #fff;
...@@ -308,16 +305,16 @@ ol, ul { list-style:none; } ...@@ -308,16 +305,16 @@ ol, ul { list-style:none; }
308 } 305 }
309 //实预测转换按钮样式 306 //实预测转换按钮样式
310 /deep/.el-radio-button__inner { 307 /deep/.el-radio-button__inner {
311 border: 1px solid #3fa2e1!important; 308 border: 1px solid #00cacd!important;
312 color: #3fa2e1; 309 color: #00cacd;
313 } 310 }
314 /deep/.el-radio-button__inner:hover { 311 /deep/.el-radio-button__inner:hover {
315 color: #3fa2e1; 312 color: #00cacd;
316 } 313 }
317 /deep/.is-active .el-radio-button__inner { 314 /deep/.is-active .el-radio-button__inner {
318 color: #fff; 315 color: #fff;
319 } 316 }
320 /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner { 317 /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
321 background-color: #3fa2e1; 318 background-color: #00cacd;
322 border-color: #3fa2e1; 319 border-color: #00cacd;
323 } 320 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -495,8 +495,10 @@ ...@@ -495,8 +495,10 @@
495 cancelButtonText: '取消', 495 cancelButtonText: '取消',
496 type: 'warning' 496 type: 'warning'
497 }).then(() => { 497 }).then(() => {
498 vm.loadingShow('业务办理中');
498 fwsxbgbl(params) 499 fwsxbgbl(params)
499 .then((res) => { 500 .then((res) => {
501 vm.loadingHide();
500 if (res.success) { 502 if (res.success) {
501 // this.$message({ 503 // this.$message({
502 // message: res.message, 504 // message: res.message,
...@@ -538,6 +540,7 @@ ...@@ -538,6 +540,7 @@
538 } 540 }
539 }) 541 })
540 .catch((error) => { 542 .catch((error) => {
543 vm.loadingHide();
541 this.$message({ 544 this.$message({
542 message: res.message, 545 message: res.message,
543 type: "error", 546 type: "error",
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 :data-zdbsm="item.zdbsm" 36 :data-zdbsm="item.zdbsm"
37 :title=item.mc 37 :title=item.mc
38 > 38 >
39 <i v-show="!item.qszt" class="iconfont iconshumulu" style="margin-right:6px"></i> 39 <i v-show="!item.qszt" class="iconfont iconguoyou" style="margin-right:6px"></i>
40 <span class="qsztImg" v-if="item.bblx == 1 || (item.bhqkbsm != ''&& item.bhqkbsm != null)"> 40 <span class="qsztImg" v-if="item.bblx == 1 || (item.bhqkbsm != ''&& item.bhqkbsm != null)">
41 <!-- <span class="qsztFont" style="color: #9e9b9b">变</span> --> 41 <!-- <span class="qsztFont" style="color: #9e9b9b">变</span> -->
42 <i :class="$route.query.bsm && $route.query.bsm==item.bsm ? 'iconfont iconbianing':'iconfont iconbian'"></i> 42 <i :class="$route.query.bsm && $route.query.bsm==item.bsm ? 'iconfont iconbianing':'iconfont iconbian'"></i>
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
65 v-if="item.children" 65 v-if="item.children"
66 class="reTree_icon" 66 class="reTree_icon"
67 :style="{ 67 :style="{
68 height: (size || 16 * 1.2) + 'px', 68 height: 12 + 'px',
69 width: (size || 16 * 1.2) + 'px', 69 width: 12 + 'px',
70 }" 70 }"
71 :class="{ 71 :class="{
72 reTree_default_icon: item.children.length === 0, 72 reTree_default_icon: item.children.length === 0,
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
84 reTree_expand_icon: item.dm == 'G' || item.dm == 'J' || item.dm == 'Z', 84 reTree_expand_icon: item.dm == 'G' || item.dm == 'J' || item.dm == 'Z',
85 }" 85 }"
86 :style="{ 86 :style="{
87 height: (size || 16 * 1.2) + 'px', 87 height: 12 + 'px',
88 width: (size || 16 * 1.2) + 'px', 88 width: 12 + 'px',
89 }" 89 }"
90 ></div> 90 ></div>
91 </div> 91 </div>
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
17 @click="itemClick(item)" 17 @click="itemClick(item)"
18 > 18 >
19 19
20 <div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)"><i class="iconfont iconshumulu"></i> {{ item.mc }}</div><div 20 <div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)"><i class="iconfont iconguoyou"></i> {{ item.mc }}</div><div
21 class="reTree_icon" 21 class="reTree_icon"
22 :style="{ 22 :style="{
23 height: (size || 16 * 1.2) + 'px', 23 height: 12 + 'px',
24 width: (size || 16 * 1.2) + 'px', 24 width: 12 + 'px',
25 }" 25 }"
26 :class="{ 26 :class="{
27 reTree_default_icon: item.children.length === 0, 27 reTree_default_icon: item.children.length === 0,
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
119 <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo> 119 <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
120 </el-dialog> 120 </el-dialog>
121 <!-- 添加定着物弹框 --> 121 <!-- 添加定着物弹框 -->
122 <el-dialog v-dialogDrag :close-on-click-modal="false" title="新建" :visible.sync="dialogVisible" width="48%"> 122 <el-dialog v-dialogDrag :close-on-click-modal="false" title="新建" :modal="false" :visible.sync="dialogVisible" width="48%">
123 <Create @closeDialog="closeDialog" :auth="true" :createZrz="createZrz" ></Create> 123 <Create @closeDialog="closeDialog" :auth="true" :createZrz="createZrz" ></Create>
124 </el-dialog> 124 </el-dialog>
125 <sxdr :sxdr-visible="sxdrVisible" @close="sxdrClose" :dylx="zdData.type" :bsm="zdData.bsm"></sxdr> 125 <sxdr :sxdr-visible="sxdrVisible" @close="sxdrClose" :dylx="zdData.type" :bsm="zdData.bsm"></sxdr>
......
...@@ -10,24 +10,25 @@ ...@@ -10,24 +10,25 @@
10 <div> 10 <div>
11 <table border="1"> 11 <table border="1">
12 <tr> 12 <tr>
13 <td>室号前缀</td> 13 <th>室号前缀</th>
14 <td>幢单元号</td> 14 <th>幢单元号</th>
15 <td>分割符A</td> 15 <th>分割符A</th>
16 <td>层号前自动补0</td> 16 <th>层号前自动补0</th>
17 <td>层</td> 17 <th>层号</th>
18 <td>分割符B</td> 18 <th>分割符B</th>
19 <td>户号</td> 19 <th>户号前自动补零</th>
20 <td>室号后缀</td> 20 <th>户号</th>
21 <th>室号后缀</th>
21 </tr> 22 </tr>
22 <tr> 23 <tr>
23 <td> 24 <td>
24 <input type="text" class="inputtitle" v-model="plshData.shqz"/> 25 <el-input v-model="plshData.shqz"></el-input>
25 </td> 26 </td>
26 <td> 27 <td>
27 <el-checkbox v-model="plshData.selectDyh"></el-checkbox> 28 <el-checkbox v-model="plshData.selectDyh"></el-checkbox>
28 </td> 29 </td>
29 <td> 30 <td>
30 <input type="text" class="inputtitle" v-model="plshData.fgfA"/> 31 <el-input v-model="plshData.fgfA"></el-input>
31 </td> 32 </td>
32 <td> 33 <td>
33 <el-checkbox v-model="plshData.chqbl"></el-checkbox> 34 <el-checkbox v-model="plshData.chqbl"></el-checkbox>
...@@ -43,13 +44,15 @@ ...@@ -43,13 +44,15 @@
43 </el-select> 44 </el-select>
44 </td> 45 </td>
45 <td> 46 <td>
46 <input type="text" class="inputtitle" v-model="plshData.fgfB"/> 47 <el-input v-model="plshData.fgfB"></el-input>
48 </td>
49 <td>
50 <el-checkbox v-model="plshData.hhqbl"></el-checkbox>
47 </td> 51 </td>
48 <td> 52 <td>
49
50 </td> 53 </td>
51 <td> 54 <td>
52 <input type="text" class="inputtitle" v-model="plshData.shhz"/> 55 <el-input v-model="plshData.shhz"></el-input>
53 </td> 56 </td>
54 </tr> 57 </tr>
55 </table> 58 </table>
...@@ -60,15 +63,15 @@ ...@@ -60,15 +63,15 @@
60 <span> 63 <span>
61 样例1：1011 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”) 64 样例1：1011 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
62 <br/> 65 <br/>
63 样例2：1131室<span>（1单元13层01室）</span>([单元号][层号][后缀]) 66 样例2：1131室<span>（1单元13层01室）</span>([单元号][层号][后缀],后缀填写'室')
64 <br/> 67 <br/>
65 样例3：11<span>(1层01室)</span>([层号]) 68 样例3：101<span>(1层01室)</span>([层号],勾选“户号自动补0”)
66 <br/> 69 <br/>
67 样例4：1-101<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”) 70 样例4：1-011<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号自动补0”)
68 <br/> 71 <br/>
69 样例5：1-13-1<span>(1单元13层01室)</span>([单元号][分隔符A][层号][分隔符B]) 72 样例5：1-12-1<span>(1单元12层01室)</span>([单元号][分隔符A][层号][分隔符B])
70 <br/> 73 <br/>
71 样例6：1-1<span>(1单元13层01室)</span>([单元号][分隔符]，勾选“室号之前增加分隔符”) 74 样例6：1-12<span>(1层12室)</span>([层号][分隔符B])
72 </span> 75 </span>
73 </div> 76 </div>
74 </div> 77 </div>
...@@ -106,6 +109,7 @@ ...@@ -106,6 +109,7 @@
106 chqbl: false, 109 chqbl: false,
107 c: '', 110 c: '',
108 fgfB: '', 111 fgfB: '',
112 hhqbl:false,
109 shhz: '' 113 shhz: ''
110 }, 114 },
111 cs: [ 115 cs: [
...@@ -128,8 +132,6 @@ ...@@ -128,8 +132,6 @@
128 methods: { 132 methods: {
129 test: function () { 133 test: function () {
130 for (let key in this.plshData) { 134 for (let key in this.plshData) {
131 console.log(key)
132 console.log(this.plshData[key])
133 if (key === 'chqbl') { 135 if (key === 'chqbl') {
134 continue; 136 continue;
135 } 137 }
...@@ -153,6 +155,7 @@ ...@@ -153,6 +155,7 @@
153 selectDyh: false, 155 selectDyh: false,
154 fgfA: '', 156 fgfA: '',
155 chqbl: false, 157 chqbl: false,
158 hhqbl:false,
156 c: '', 159 c: '',
157 fgfB: '', 160 fgfB: '',
158 shhz: '' 161 shhz: ''
...@@ -223,7 +226,9 @@ ...@@ -223,7 +226,9 @@
223 cursor: pointer; 226 cursor: pointer;
224 } 227 }
225 } 228 }
226 229 th{
230 height: 36px;
231 }
227 td { 232 td {
228 text-align: center; 233 text-align: center;
229 height: 36px; 234 height: 36px;
......
...@@ -9,26 +9,31 @@ const errorPage = [ ...@@ -9,26 +9,31 @@ const errorPage = [
9 { path: "*", redirect: "/404", hidden: true }, 9 { path: "*", redirect: "/404", hidden: true },
10 ]; 10 ];
11 11
12 const frameOut = [ 12 /*const frameOut = [
13 { 13 {
14 path: "/", 14 path: "/",
15 name: "login", 15 name: "login",
16 component: login, 16 component: login,
17 }, 17 },
18 ]; 18 ];*/
19 const constantRoutes = [ 19 const constantRoutes = [
20 { 20 {
21 path: "/panel", 21 path: "/",
22 code: "panel",
23 component: () => import("@/views/Home"), 22 component: () => import("@/views/Home"),
24 redirect: "/panel", 23 redirect: "/",
25 children: [ 24 children: [
26 { 25 {
27 path: "/panel", 26 path: "/",
28 name: "首页", 27 name: "首页",
29 code: "0-1", 28 code: "0-1",
30 component: () => import("@/views/panel/index"), 29 component: () => import("@/views/panel/index"),
31 }, 30 },
31 {
32 path: "/panel",
33 name: "首页",
34 code: "0-1",
35 component: () => import("@/views/panel/index"),
36 },
32 { 37 {
33 path: "/add", 38 path: "/add",
34 name: "添加", 39 name: "添加",
...@@ -105,4 +110,4 @@ const constantRoutes = [ ...@@ -105,4 +110,4 @@ const constantRoutes = [
105 ]; 110 ];
106 // 在这里面动态引入路由文件 达成权限处理得问题 111 // 在这里面动态引入路由文件 达成权限处理得问题
107 // 重新组织后导出 112 // 重新组织后导出
108 export default [...errorPage, ...frameOut, ...constantRoutes]; 113 export default [...errorPage, ...constantRoutes];
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
9 alt="" 9 alt=""
10 @click="toHome" 10 @click="toHome"
11 /> 11 />
12 <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span> 12 <img class="logo-word" src="@/assets/images/logo-word.png" alt="">
13 <!-- <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span> -->
13 </div> 14 </div>
14 15
15 <div class="wrap"> 16 <div class="wrap">
...@@ -54,6 +55,10 @@ ...@@ -54,6 +55,10 @@
54 <i class="iconfont icondiqiu" title="图形管理" v-if="!isMap" @click="goMap"></i> 55 <i class="iconfont icondiqiu" title="图形管理" v-if="!isMap" @click="goMap"></i>
55 <i class="iconfont iconxinxi" title="属性管理" v-else @click="goBack"></i> 56 <i class="iconfont iconxinxi" title="属性管理" v-else @click="goBack"></i>
56 </div> 57 </div>
58 <div class="user-info">
59 <span>admin</span>
60 <img src="https://himg.bdimg.com/sys/portraitn/item/a1b5badad3b61739" alt="">
61 </div>
57 </div> 62 </div>
58 <!-- <div class="header-bottom"> 63 <!-- <div class="header-bottom">
59 <Navigation ref="navigation"></Navigation> 64 <Navigation ref="navigation"></Navigation>
...@@ -271,7 +276,7 @@ export default { ...@@ -271,7 +276,7 @@ export default {
271 }) 276 })
272 } 277 }
273 this.$nextTick(()=>{ 278 this.$nextTick(()=>{
274 this.treeHeight = this.$el.clientHeight - 132; 279 this.treeHeight = this.$el.clientHeight - 136;
275 }); 280 });
276 }, 281 },
277 methods: { 282 methods: {
...@@ -470,14 +475,16 @@ export default { ...@@ -470,14 +475,16 @@ export default {
470 .el-header { 475 .el-header {
471 background-color: #fff; 476 background-color: #fff;
472 padding: 0 !important; 477 padding: 0 !important;
473 height: 66px!important; 478 height: 70px!important;
474 position: relative; 479 position: relative;
475 .header-top { 480 .header-top {
476 height: 66px; 481 height: 70px;
477 // border-bottom: 1px solid#EAEAEA; 482 // border-bottom: 1px solid#EAEAEA;
478 box-sizing: border-box; 483 box-sizing: border-box;
479 // background-image: url('../assets/images/banner.png'); 484 background: url('../assets/images/banner.png') no-repeat center center;
480 background-color: #006CFF; 485 background-size: cover;
486 // background-color: #006CFF;
487 // background: linear-gradient(270deg, #0091FF 5%, #006CFF 86%) ;
481 display: flex; 488 display: flex;
482 flex-grow: 1; 489 flex-grow: 1;
483 border-left: 1px solid #3E9FFF; 490 border-left: 1px solid #3E9FFF;
...@@ -485,10 +492,10 @@ export default { ...@@ -485,10 +492,10 @@ export default {
485 // align-items: center; 492 // align-items: center;
486 .top-items { 493 .top-items {
487 cursor: pointer; 494 cursor: pointer;
488 height: 66px; 495 height: 70px;
489 padding: 0 30px; 496 padding: 0 30px;
490 font-size: 18px; 497 font-size: 18px;
491 line-height: 66px; 498 line-height: 70px;
492 float: left; 499 float: left;
493 position: relative; 500 position: relative;
494 color: #ffffff; 501 color: #ffffff;
...@@ -525,10 +532,38 @@ export default { ...@@ -525,10 +532,38 @@ export default {
525 right: 18px; 532 right: 18px;
526 top: 20px; 533 top: 20px;
527 .tuOrShu{ 534 .tuOrShu{
535 float: left;
528 .iconfont{ 536 .iconfont{
529 cursor: pointer; 537 cursor: pointer;
530 color:#ffffff; 538 color:#ffffff;
531 font-size:30px 539 font-size:26px;
540 position: relative;
541 top: 2px;
542 }
543 }
544 .user-info{
545 float: left;
546 margin-left: 20px;
547 cursor: pointer;
548 span{
549 line-height: 30px;
550 vertical-align: middle;
551 color: #fff;
552 font-size: 14px;
553 }
554 img{
555 // padding: 2px;
556 width: 24px;
557 height: 24px;
558 margin-left: 6px;
559 border-radius: 50%;
560 border: 1px solid #fff;
561 vertical-align: middle;
562 }
563 }
564 .user-info:hover{
565 span{
566 color: #006CFF;
532 } 567 }
533 } 568 }
534 } 569 }
...@@ -546,25 +581,31 @@ export default { ...@@ -546,25 +581,31 @@ export default {
546 z-index: 1000; 581 z-index: 1000;
547 .logo-box { 582 .logo-box {
548 width: 100%; 583 width: 100%;
549 height: 66px; 584 height: 70px;
550 border-bottom: 1px solid rgba(255, 255, 255, 0.2); 585 border-bottom: 1px solid rgba(255, 255, 255, 0.2);
551 box-sizing: border-box; 586 box-sizing: border-box;
552 padding: 10px 20px; 587 padding: 10px 18px;
553 transition: width 0.3s; 588 transition: width 0.3s;
554 background-color: #006CFF; 589 background-color: #006CFF;
555 .logo-img { 590 .logo-img {
556 width: 44px; 591 width: 30px;
592 padding-top: 10px;
557 float: left; 593 float: left;
558 } 594 }
559 .logo-text { 595 .logo-word{
560 padding-left: 10px; 596 padding-left: 8px;
561 color: #ffffff; 597 padding-top: 15px;
562 line-height: 44px; 598 height: 20px;
563 font-size: 20px;
564 } 599 }
600 // .logo-text {
601 // padding-left: 10px;
602 // color: #ffffff;
603 // line-height: 44px;
604 // font-size: 20px;
605 // }
565 } 606 }
566 .wrap{ 607 .wrap{
567 height: calc(100% - 66px); 608 height: calc(100% - 70px);
568 overflow-x: hidden; 609 overflow-x: hidden;
569 .search-box{ 610 .search-box{
570 height: 65px; 611 height: 65px;
...@@ -589,6 +630,9 @@ export default { ...@@ -589,6 +630,9 @@ export default {
589 } 630 }
590 .logo-box-show { 631 .logo-box-show {
591 width: 64px; 632 width: 64px;
633 .logo-word{
634 width: 0;
635 }
592 } 636 }
593 .el-menu { 637 .el-menu {
594 border-right: 0; 638 border-right: 0;
......
...@@ -189,64 +189,45 @@ ...@@ -189,64 +189,45 @@
189 }; 189 };
190 </script> 190 </script>
191 <style scoped lang="less"> 191 <style scoped lang="less">
192 .el-tabs{ 192 .main {
193 height: calc(100% - 50px); 193 width: 100%;
194 /deep/.el-tabs__content{ 194 height: 100%;
195 height: 100%; 195 box-sizing: border-box;
196 /deep/.el-tab-pane{ 196 padding: 0 18px 0 0;
197 height: 100%; 197 display: flex;
198 } 198 flex-direction: column;
199 //background: #F4F9FF; 199 //background-color: #F4F9FF;
200 background-color: #F4F9FF; 200 background-color: #F4F9FF;
201 padding: 0; 201 .tips{
202 color: #9B9B9B;
203 margin-left: 2px;
204 margin-bottom: 10px;
205 }
206 .demo-form-inline {
207 margin-top: 18px;
208 .moreSearchBtn {
209 background-color: #1ad6e1;
210 border-color: #1ad6e1;
202 } 211 }
203 /deep/ .el-tabs__item { 212 .moreSearchBtn:focus,
204 height: 48px; 213 .moreSearchBtn:hover {
214 background-color: rgba(28, 200, 229, 0.6);
205 } 215 }
206 /deep/ .el-tabs__header{ 216 }
207 background-color: #ffffff; 217 .dataGrid {
208 margin: 0; 218 flex: 1;
219 .pagination {
220 padding: 18px 0;
209 } 221 }
210 .main { 222 }
211 width: 100%; 223 .hbjDialog{
212 height: 100%; 224 /deep/ .el-dialog{
213 box-sizing: border-box; 225 margin-top: 10vh!important;
214 padding: 0 18px 0 0;
215 display: flex;
216 flex-direction: column;
217 //background-color: #F4F9FF;
218 background-color: #F4F9FF;
219 .tips{
220 color: #9B9B9B;
221 margin-left: 2px;
222 margin-bottom: 10px;
223 }
224 .demo-form-inline {
225 margin-top: 18px;
226 .moreSearchBtn {
227 background-color: #1ad6e1;
228 border-color: #1ad6e1;
229 }
230 .moreSearchBtn:focus,
231 .moreSearchBtn:hover {
232 background-color: rgba(28, 200, 229, 0.6);
233 }
234 }
235 .dataGrid {
236 flex: 1;
237 .pagination {
238 padding: 18px 0;
239 }
240 }
241 .hbjDialog{
242 /deep/ .el-dialog{
243 margin-top: 10vh!important;
244 }
245 }
246 .btnGroup{
247 margin: 20px auto 0;
248 width: 230px;
249 }
250 } 226 }
251 } 227 }
228 .btnGroup{
229 margin: 20px auto 0;
230 width: 230px;
231 }
232 }
252 </style> 233 </style>
......
...@@ -72,65 +72,44 @@ ...@@ -72,65 +72,44 @@
72 }; 72 };
73 </script> 73 </script>
74 <style scoped lang="less"> 74 <style scoped lang="less">
75 .el-tabs{ 75 .main {
76 height: calc(100% - 50px); 76 width: 100%;
77 /deep/.el-tabs__content{ 77 height: 100%;
78 height: 100%; 78 box-sizing: border-box;
79 /deep/.el-tab-pane{ 79 padding: 0 18px 0 0;
80 height: 100%; 80 display: flex;
81 } 81 flex-direction: column;
82 //background: #F4F9FF; 82 background-color: #F4F9FF;
83 background-color: #F4F9FF; 83 .tips{
84 padding: 0; 84 color: #9B9B9B;
85 margin-left: 2px;
86 margin-bottom: 10px;
87 }
88 .demo-form-inline {
89 margin-top: 18px;
90 .moreSearchBtn {
91 background-color: #1ad6e1;
92 border-color: #1ad6e1;
85 } 93 }
86 /deep/ .el-tabs__item { 94 .moreSearchBtn:focus,
87 height: 48px; 95 .moreSearchBtn:hover {
96 background-color: rgba(28, 200, 229, 0.6);
88 } 97 }
89 /deep/ .el-tabs__header{ 98 }
90 background-color: #ffffff; 99 .dataGrid {
91 margin: 0; 100 flex: 1;
92 border-top: 1px solid #E4E7ED; 101 .pagination {
102 padding: 18px 0;
93 } 103 }
94 .main { 104 }
95 width: 100%; 105 .hbjDialog{
96 height: 100%; 106 /deep/ .el-dialog{
97 box-sizing: border-box; 107 margin-top: 10vh!important;
98 padding: 0 18px 0 0;
99 display: flex;
100 flex-direction: column;
101 //background-color: #F4F9FF;
102 background-color: #F4F9FF;
103 .tips{
104 color: #9B9B9B;
105 margin-left: 2px;
106 margin-bottom: 10px;
107 }
108 .demo-form-inline {
109 margin-top: 18px;
110 .moreSearchBtn {
111 background-color: #1ad6e1;
112 border-color: #1ad6e1;
113 }
114 .moreSearchBtn:focus,
115 .moreSearchBtn:hover {
116 background-color: rgba(28, 200, 229, 0.6);
117 }
118 }
119 .dataGrid {
120 flex: 1;
121 .pagination {
122 padding: 18px 0;
123 }
124 }
125 .hbjDialog{
126 /deep/ .el-dialog{
127 margin-top: 10vh!important;
128 }
129 }
130 .btnGroup{
131 margin: 20px auto 0;
132 width: 230px;
133 }
134 } 108 }
135 } 109 }
110 .btnGroup{
111 margin: 20px auto 0;
112 width: 230px;
113 }
114 }
136 </style> 115 </style>
......
...@@ -507,7 +507,9 @@ ...@@ -507,7 +507,9 @@
507 507
508 this.$nextTick(()=> { 508 this.$nextTick(()=> {
509 if (flag && this.$refs.qlxzModule.getRulesResult()) { 509 if (flag && this.$refs.qlxzModule.getRulesResult()) {
510 vm.loadingShow('请求发送中');
510 saveDzInfo(this.form).then((res)=>{ 511 saveDzInfo(this.form).then((res)=>{
512 vm.loadingHide();
511 if(res.code===200){ 513 if(res.code===200){
512 this.$message.success("保存完成！") 514 this.$message.success("保存完成！")
513 }else { 515 }else {
...@@ -517,6 +519,10 @@ ...@@ -517,6 +519,10 @@
517 }); 519 });
518 } 520 }
519 }) 521 })
522 .catch((error) => {
523 vm.loadingHide();
524 console.log(error);
525 });
520 }else { 526 }else {
521 this.$message({ 527 this.$message({
522 // message: item.name+'不能为空', 528 // message: item.name+'不能为空',
......
...@@ -63,22 +63,4 @@ ...@@ -63,22 +63,4 @@
63 }; 63 };
64 </script> 64 </script>
65 <style scoped lang="less"> 65 <style scoped lang="less">
66 .el-tabs{
67 height: calc(100% - 50px);
68 /deep/.el-tabs__content{
69 //height: 100%;
70 /deep/.el-tab-pane{
71 height: 100%;
72 }
73 //background: #F4F9FF;
74 background-color: #F4F9FF;
75 padding: 0;
76 }
77 /deep/ .el-tabs__item {
78 height: 48px;
79 }
80 /deep/ .el-tabs__header{
81 background-color: #ffffff;
82 }
83 }
84 </style> 66 </style>
......
...@@ -237,11 +237,17 @@ ...@@ -237,11 +237,17 @@
237 this.bsm=this.$route.query.bsm; 237 this.bsm=this.$route.query.bsm;
238 this.form.bsm=this.bsm; 238 this.form.bsm=this.bsm;
239 this.form.jgsj=this.form.jgrq; 239 this.form.jgsj=this.form.jgrq;
240 vm.loadingShow('请求发送中');
240 updateGzwjbxx(this.form).then((res)=>{ 241 updateGzwjbxx(this.form).then((res)=>{
242 vm.loadingHide();
241 if(res.code === 200){ 243 if(res.code === 200){
242 this.$message.success("保存完成!"); 244 this.$message.success("保存完成!");
243 } 245 }
244 }) 246 })
247 .catch((error) => {
248 vm.loadingHide();
249 console.log(error);
250 });
245 } 251 }
246 }) 252 })
247 253
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 ></i> 64 ></i>
65 <span class="remake_txt" @click="selectRemeber">记住账号密码</span> 65 <span class="remake_txt" @click="selectRemeber">记住账号密码</span>
66 </div> 66 </div>
67 <div class="login-btn" @click="goHome">登录</div> 67 <div id="loginBtn" class="login-btn" @click="goHome">登录</div>
68 </div> 68 </div>
69 <div class="reserved-con"> 69 <div class="reserved-con">
70 <div class="reserved-words">版权所有：2020©某某市自然资源和规划</div> 70 <div class="reserved-words">版权所有：2020©某某市自然资源和规划</div>
......
...@@ -30,19 +30,4 @@ ...@@ -30,19 +30,4 @@
30 </script> 30 </script>
31 31
32 <style scoped lang="less"> 32 <style scoped lang="less">
33 .el-tabs{
34 height: calc(100% - 50px);
35 /deep/.el-tabs__content{
36 height: 100%;
37 /deep/.el-tab-pane{
38 height: 100%;
39 }
40 //background: #F4F9FF;
41 background-color: #F4F9FF;
42 }
43 /deep/ .el-tabs__item {
44 height: 48px;
45 }
46 }
47
48 </style> 33 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -162,54 +162,35 @@ ...@@ -162,54 +162,35 @@
162 }; 162 };
163 </script> 163 </script>
164 <style scoped lang="less"> 164 <style scoped lang="less">
165 165 .main {
166 .el-tabs{ 166 width: 100%;
167 height: calc(100% - 50px); 167 height: 100%;
168 /deep/.el-tabs__content{ 168 box-sizing: border-box;
169 height: 100%; 169 padding: 0 18px;
170 /deep/.el-tab-pane{ 170 display: flex;
171 height: 100%; 171 flex-direction: column;
172 } 172 //background-color: #F4F9FF;
173 //background: #F4F9FF; 173 background-color: #F4F9FF;
174 background-color: #F4F9FF; 174 .tips{
175 padding: 0; 175 color: #9B9B9B;
176 } 176 margin-left: 2px;
177 /deep/ .el-tabs__item { 177 margin-bottom: 10px;
178 height: 48px;
179 } 178 }
180 /deep/ .el-tabs__header{ 179 .demo-form-inline {
181 background-color: #ffffff; 180 margin-top: 18px;
182 } 181 .moreSearchBtn {
183 .main { 182 background-color: #1ad6e1;
184 width: 100%; 183 border-color: #1ad6e1;
185 height: 100%;
186 box-sizing: border-box;
187 padding: 0 18px;
188 display: flex;
189 flex-direction: column;
190 //background-color: #F4F9FF;
191 background-color: #F4F9FF;
192 .tips{
193 color: #9B9B9B;
194 margin-left: 2px;
195 margin-bottom: 10px;
196 } 184 }
197 .demo-form-inline { 185 .moreSearchBtn:focus,
198 margin-top: 18px; 186 .moreSearchBtn:hover {
199 .moreSearchBtn { 187 background-color: rgba(28, 200, 229, 0.6);
200 background-color: #1ad6e1;
201 border-color: #1ad6e1;
202 }
203 .moreSearchBtn:focus,
204 .moreSearchBtn:hover {
205 background-color: rgba(28, 200, 229, 0.6);
206 }
207 } 188 }
208 .dataGrid { 189 }
209 flex: 1; 190 .dataGrid {
210 .pagination { 191 flex: 1;
211 padding: 18px 0; 192 .pagination {
212 } 193 padding: 18px 0;
213 } 194 }
214 } 195 }
215 } 196 }
......
...@@ -642,7 +642,9 @@ ...@@ -642,7 +642,9 @@
642 Message.info("请选择需要分割的多幢或者填写分割后多幢的基本信息！") 642 Message.info("请选择需要分割的多幢或者填写分割后多幢的基本信息！")
643 return 643 return
644 } 644 }
645 vm.loadingShow('正在保存中');
645 saveDzFg(this.dzFghData).then(res => { 646 saveDzFg(this.dzFghData).then(res => {
647 vm.loadingHide()
646 if (res.success) { 648 if (res.success) {
647 this.getRightTree(res.result,'0,1,2'); 649 this.getRightTree(res.result,'0,1,2');
648 this.$router.push({ 650 this.$router.push({
...@@ -655,6 +657,9 @@ ...@@ -655,6 +657,9 @@
655 } else { 657 } else {
656 Message.error("保存失败") 658 Message.error("保存失败")
657 } 659 }
660 }).catch((error)=>{
661 vm.loadingHide();
662 console.log(error);
658 }) 663 })
659 }, 664 },
660 saveH() { 665 saveH() {
...@@ -912,7 +917,7 @@ ...@@ -912,7 +917,7 @@
912 /deep/ .el-tabs__header { 917 /deep/ .el-tabs__header {
913 position: -webkit-fixed; 918 position: -webkit-fixed;
914 position: fixed; 919 position: fixed;
915 top: 114px; 920 top: 117px;
916 z-index: 999; 921 z-index: 999;
917 width: 100%; 922 width: 100%;
918 margin-bottom: 0; 923 margin-bottom: 0;
......
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
80 /deep/ .el-tabs__header { 80 /deep/ .el-tabs__header {
81 position: -webkit-fixed; 81 position: -webkit-fixed;
82 position: fixed; 82 position: fixed;
83 top: 114px; 83 top: 117px;
84 z-index: 999; 84 z-index: 999;
85 width: 100%; 85 width: 100%;
86 margin-bottom: 0; 86 margin-bottom: 0;
......
...@@ -305,8 +305,9 @@ ...@@ -305,8 +305,9 @@
305 newzdzdtzmbsm: this.zdhbhData.zdtzmbsm, 305 newzdzdtzmbsm: this.zdhbhData.zdtzmbsm,
306 oldzdbsms: oldBsm 306 oldzdbsms: oldBsm
307 } 307 }
308 console.log(data, '宗地合并数据') 308 vm.loadingShow('请求发送中');
309 ZdHb(data).then(res => { 309 ZdHb(data).then(res => {
310 vm.loadingHide();
310 if (res.success) { 311 if (res.success) {
311 this.$message.success("合并成功"); 312 this.$message.success("合并成功");
312 //更新目录树 313 //更新目录树
...@@ -322,6 +323,9 @@ ...@@ -322,6 +323,9 @@
322 } else { 323 } else {
323 this.$message.error("合并失败") 324 this.$message.error("合并失败")
324 } 325 }
326 }).catch((error)=>{
327 vm.loadingHide();
328 console.log(error);
325 }) 329 })
326 }, 330 },
327 dzHb() { 331 dzHb() {
...@@ -330,8 +334,9 @@ ...@@ -330,8 +334,9 @@
330 newdzxmmc: this.$refs.dzhb.dzhbhData.xmmc, 334 newdzxmmc: this.$refs.dzhb.dzhbhData.xmmc,
331 zdbsm: this.$refs.dzhb.zdbsm 335 zdbsm: this.$refs.dzhb.zdbsm
332 } 336 }
333 337 vm.loadingShow('请求发送中');
334 DzHb(data).then(res => { 338 DzHb(data).then(res => {
339 vm.loadingHide();
335 if (res.success) { 340 if (res.success) {
336 console.log(res) 341 console.log(res)
337 this.$message.success("多幢合并成功") 342 this.$message.success("多幢合并成功")
...@@ -343,7 +348,12 @@ ...@@ -343,7 +348,12 @@
343 bsm: res.result 348 bsm: res.result
344 } 349 }
345 }) 350 })
351 }else{
352 this.$message.error(res.message);
346 } 353 }
354 }).catch((error)=>{
355 vm.loadingHide();
356 console.log(error);
347 }) 357 })
348 }, 358 },
349 hHb() { 359 hHb() {
...@@ -584,7 +594,7 @@ ...@@ -584,7 +594,7 @@
584 /deep/ .el-tabs__header { 594 /deep/ .el-tabs__header {
585 position: -webkit-fixed; 595 position: -webkit-fixed;
586 position: fixed; 596 position: fixed;
587 top: 114px; 597 top: 117px;
588 z-index: 999; 598 z-index: 999;
589 width: 100%; 599 width: 100%;
590 margin-bottom: 0; 600 margin-bottom: 0;
......
...@@ -69,23 +69,4 @@ export default { ...@@ -69,23 +69,4 @@ export default {
69 }; 69 };
70 </script> 70 </script>
71 <style scoped lang="less"> 71 <style scoped lang="less">
72 .el-tabs{
73 height: calc(100% - 50px);
74 /deep/.el-tabs__content{
75 height: 100%;
76 position: unset;
77 /deep/.el-tab-pane{
78 height: calc(100% - 40px);
79 }
80 //background: #F4F9FF;
81 background-color: #F4F9FF;
82 padding: 0;
83 }
84 /deep/ .el-tabs__item {
85 height: 48px;
86 }
87 /deep/ .el-tabs__header{
88 background-color: #ffffff;
89 }
90 }
91 </style> 72 </style>
......
...@@ -493,11 +493,14 @@ export default { ...@@ -493,11 +493,14 @@ export default {
493 </script> 493 </script>
494 <style lang="less"> 494 <style lang="less">
495 .eltabs { 495 .eltabs {
496 height: 366px; 496 height: 366px!important;
497 width: 100%; 497 width: 100%;
498 position: relative; 498 position: relative;
499 margin-left: 20px; 499 margin-left: 20px;
500 margin-top: 20px; 500 margin-top: 20px;
501 /deep/.el-tabs__content{
502 position: relative!important;
503 }
501 .eltabspane { 504 .eltabspane {
502 height: 100%; 505 height: 100%;
503 width: 100%; 506 width: 100%;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <div class="panel content_box"> 3 <div class="panel content_box">
4 <el-card class="panel_left"> 4 <el-card class="panel_left">
5 <div slot="header" class="clearfix"> 5 <div slot="header" class="clearfix">
6 <span>工作箱</span> 6 <span><i class="iconfont icongongzuoxiang"></i>工作箱</span>
7 </div> 7 </div>
8 <div class="enter_box"> 8 <div class="enter_box">
9 <div 9 <div
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 </el-card> 21 </el-card>
22 <el-card class="panel_right"> 22 <el-card class="panel_right">
23 <div slot="header" class="clearfix"> 23 <div slot="header" class="clearfix">
24 <span>快捷入口</span> 24 <span><i class="iconfont iconkuaijierukou"></i>快捷入口</span>
25 <span class="edit" @click="isEdit = true" v-show="!isEdit">编辑</span> 25 <span class="edit" @click="isEdit = true" v-show="!isEdit">编辑</span>
26 <span class="edit" @click="isEdit = false" v-show="isEdit">完成</span> 26 <span class="edit" @click="isEdit = false" v-show="isEdit">完成</span>
27 </div> 27 </div>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 <div class="notice" ref="notice"> 44 <div class="notice" ref="notice">
45 <el-card class="news"> 45 <el-card class="news">
46 <div slot="header" class="clearfix"> 46 <div slot="header" class="clearfix">
47 <span>通知公告</span> 47 <span><i class="iconfont icontongzhigonggao"></i>通知公告</span>
48 <span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span> 48 <span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span>
49 </div> 49 </div>
50 <el-table 50 <el-table
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 </el-card> 64 </el-card>
65 <el-card class="download"> 65 <el-card class="download">
66 <div slot="header" class="clearfix"> 66 <div slot="header" class="clearfix">
67 <span>相关下载</span> 67 <span><i class="iconfont iconxiazai1"></i>相关下载</span>
68 <span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span> 68 <span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span>
69 </div> 69 </div>
70 <el-table 70 <el-table
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 <div class="tj"> 86 <div class="tj">
87 <el-card class="panel_right"> 87 <el-card class="panel_right">
88 <div slot="header" class="clearfix"> 88 <div slot="header" class="clearfix">
89 <span>成果类别占比</span> 89 <span><i class="iconfont iconbingtu"></i>成果类别占比</span>
90 </div> 90 </div>
91 <div class="enter_box" ref="enterBox"> 91 <div class="enter_box" ref="enterBox">
92 <img src="../../assets/images/cglbzb.png" :style="{'height':imgHeight + 'px'}" alt=""> 92 <img src="../../assets/images/cglbzb.png" :style="{'height':imgHeight + 'px'}" alt="">
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
94 </el-card> 94 </el-card>
95 <el-card class="cghj"> 95 <el-card class="cghj">
96 <div slot="header" class="clearfix"> 96 <div slot="header" class="clearfix">
97 <span>成果汇交数量</span> 97 <span><i class="iconfont icontizhuangshuju"></i>成果汇交数量</span>
98 <img src="../../assets/images/cghjsllegend.png" style="float: right;" alt=""> 98 <img src="../../assets/images/cghjsllegend.png" style="float: right;" alt="">
99 </div> 99 </div>
100 <div class="enter_box"> 100 <div class="enter_box">
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 </el-card> 103 </el-card>
104 <el-card class="cghj-pie"> 104 <el-card class="cghj-pie">
105 <div slot="header" class="clearfix"> 105 <div slot="header" class="clearfix">
106 <span>成果汇交数量</span> 106 <span><i class="iconfont iconhuijiaochengguo"></i>成果汇交数量</span>
107 </div> 107 </div>
108 <div class="enter_box"> 108 <div class="enter_box">
109 <img src="../../assets/images/cghjsl-pie.png" :style="{'height':imgHeight + 'px'}" alt=""> 109 <img src="../../assets/images/cghjsl-pie.png" :style="{'height':imgHeight + 'px'}" alt="">
...@@ -251,12 +251,17 @@ export default { ...@@ -251,12 +251,17 @@ export default {
251 .main { 251 .main {
252 display: flex; 252 display: flex;
253 flex-direction: column; 253 flex-direction: column;
254 overflow: scroll; 254 // overflow: scroll;
255 height: 100%; 255 height: 100%;
256 .clearfix { 256 .clearfix {
257 span { 257 span {
258 color: #6d7278; 258 color: #6d7278;
259 float: left; 259 float: left;
260 i{
261 padding-right: 6px;
262 position: relative;
263 top: 1px;
264 }
260 } 265 }
261 .edit { 266 .edit {
262 color: #9b9b9b; 267 color: #9b9b9b;
...@@ -288,8 +293,8 @@ export default { ...@@ -288,8 +293,8 @@ export default {
288 cursor: pointer; 293 cursor: pointer;
289 flex: 1; 294 flex: 1;
290 img { 295 img {
291 width: 68px; 296 width: 84px;
292 height: 68px; 297 height: 84px;
293 display: block; 298 display: block;
294 margin: 0 auto; 299 margin: 0 auto;
295 } 300 }
...@@ -303,38 +308,38 @@ export default { ...@@ -303,38 +308,38 @@ export default {
303 color: #fa6400; 308 color: #fa6400;
304 font-size: 24px; 309 font-size: 24px;
305 position: absolute; 310 position: absolute;
306 top: -4px; 311 top: 3px;
307 right: -10px; 312 right: -2px;
308 background: #fff; 313 background: #fff;
309 border-radius: 10px; 314 border-radius: 10px;
310 box-sizing: border-box; 315 box-sizing: border-box;
311 padding: 1px; 316 padding: 1px;
312 } 317 }
313 .el-badge{ 318 .el-badge{
314 width: 68px; 319 width: 84px;
315 height: 68px; 320 height: 84px;
316 display: block; 321 display: block;
317 margin: 0 auto; 322 margin: 0 auto;
318 /deep/.el-badge__content{ 323 /deep/.el-badge__content{
319 top: 10px; 324 top: 18px;
320 right: 14px; 325 right: 22px;
321 background-color: #fa6400; 326 background-color: #fa6400;
322 } 327 }
323 } 328 }
324 } 329 }
325 .psr { 330 .psr {
326 width: 68px; 331 width: 84px;
327 height: 68px; 332 height: 84px;
328 display: block; 333 display: block;
329 margin: 0 auto; 334 margin: 0 auto;
330 img { 335 img {
331 width: 68px; 336 width: 84px;
332 height: 68px; 337 height: 84px;
333 } 338 }
334 } 339 }
335 } 340 }
336 /deep/ .el-card__body { 341 /deep/ .el-card__body {
337 padding: 30px 20px; 342 padding: 14px 20px 22px 20px;
338 } 343 }
339 } 344 }
340 .notice { 345 .notice {
......
...@@ -243,53 +243,35 @@ ...@@ -243,53 +243,35 @@
243 }; 243 };
244 </script> 244 </script>
245 <style scoped lang="less"> 245 <style scoped lang="less">
246 .el-tabs{ 246 .main {
247 height: calc(100% - 50px); 247 width: 100%;
248 /deep/.el-tabs__content{ 248 height: 100%;
249 height: 100%; 249 box-sizing: border-box;
250 /deep/.el-tab-pane{ 250 padding: 0 18px;
251 height: 100%; 251 display: flex;
252 } 252 flex-direction: column;
253 //background: #F4F9FF; 253 //background-color: #F4F9FF;
254 background-color: #F4F9FF; 254 background-color: #F4F9FF;
255 padding: 0; 255 .tips{
256 } 256 color: #9B9B9B;
257 /deep/ .el-tabs__item { 257 margin-left: 2px;
258 height: 48px; 258 margin-bottom: 10px;
259 } 259 }
260 /deep/ .el-tabs__header{ 260 .demo-form-inline {
261 background-color: #ffffff; 261 margin-top: 18px;
262 } 262 .moreSearchBtn {
263 .main { 263 background-color: #1ad6e1;
264 width: 100%; 264 border-color: #1ad6e1;
265 height: 100%;
266 box-sizing: border-box;
267 padding: 0 18px;
268 display: flex;
269 flex-direction: column;
270 //background-color: #F4F9FF;
271 background-color: #F4F9FF;
272 .tips{
273 color: #9B9B9B;
274 margin-left: 2px;
275 margin-bottom: 10px;
276 } 265 }
277 .demo-form-inline { 266 .moreSearchBtn:focus,
278 margin-top: 18px; 267 .moreSearchBtn:hover {
279 .moreSearchBtn { 268 background-color: rgba(28, 200, 229, 0.6);
280 background-color: #1ad6e1;
281 border-color: #1ad6e1;
282 }
283 .moreSearchBtn:focus,
284 .moreSearchBtn:hover {
285 background-color: rgba(28, 200, 229, 0.6);
286 }
287 } 269 }
288 .dataGrid { 270 }
289 flex: 1; 271 .dataGrid {
290 .pagination { 272 flex: 1;
291 padding: 18px 0; 273 .pagination {
292 } 274 padding: 18px 0;
293 } 275 }
294 } 276 }
295 } 277 }
......
...@@ -193,63 +193,45 @@ ...@@ -193,63 +193,45 @@
193 }; 193 };
194 </script> 194 </script>
195 <style scoped lang="less"> 195 <style scoped lang="less">
196 .el-tabs{ 196 .main {
197 height: calc(100% - 50px); 197 width: 100%;
198 /deep/.el-tabs__content{ 198 height: 100%;
199 height: 100%; 199 box-sizing: border-box;
200 /deep/.el-tab-pane{ 200 padding: 0 18px 0 0;
201 height: 100%; 201 display: flex;
202 } 202 flex-direction: column;
203 //background: #F4F9FF; 203 //background-color: #F4F9FF;
204 background-color: #F4F9FF; 204 background-color: #F4F9FF;
205 padding: 0; 205 .tips{
206 } 206 color: #9B9B9B;
207 /deep/ .el-tabs__item { 207 margin-left: 2px;
208 height: 48px; 208 margin-bottom: 10px;
209 }
210 /deep/ .el-tabs__header{
211 background-color: #ffffff;
212 } 209 }
213 .main { 210 .demo-form-inline {
214 width: 100%; 211 margin-top: 18px;
215 height: 100%; 212 .moreSearchBtn {
216 box-sizing: border-box; 213 background-color: #1ad6e1;
217 padding: 0 18px 0 0; 214 border-color: #1ad6e1;
218 display: flex;
219 flex-direction: column;
220 //background-color: #F4F9FF;
221 background-color: #F4F9FF;
222 .tips{
223 color: #9B9B9B;
224 margin-left: 2px;
225 margin-bottom: 10px;
226 } 215 }
227 .demo-form-inline { 216 .moreSearchBtn:focus,
228 margin-top: 18px; 217 .moreSearchBtn:hover {
229 .moreSearchBtn { 218 background-color: rgba(28, 200, 229, 0.6);
230 background-color: #1ad6e1;
231 border-color: #1ad6e1;
232 }
233 .moreSearchBtn:focus,
234 .moreSearchBtn:hover {
235 background-color: rgba(28, 200, 229, 0.6);
236 }
237 } 219 }
238 .dataGrid { 220 }
239 flex: 1; 221 .dataGrid {
240 .pagination { 222 flex: 1;
241 padding: 18px 0; 223 .pagination {
242 } 224 padding: 18px 0;
243 }
244 .hbjDialog{
245 /deep/ .el-dialog{
246 margin-top: 10vh!important;
247 }
248 } 225 }
249 .btnGroup{ 226 }
250 margin: 20px auto 0; 227 .hbjDialog{
251 width: 230px; 228 /deep/ .el-dialog{
229 margin-top: 10vh!important;
252 } 230 }
253 } 231 }
232 .btnGroup{
233 margin: 20px auto 0;
234 width: 230px;
235 }
254 } 236 }
255 </style> 237 </style>
......
...@@ -103,23 +103,4 @@ export default { ...@@ -103,23 +103,4 @@ export default {
103 }; 103 };
104 </script> 104 </script>
105 <style scoped lang="less"> 105 <style scoped lang="less">
106 .el-tabs{
107 height: calc(100% - 50px);
108 /deep/.el-tabs__content{
109 //height: 100%;
110 /deep/.el-tab-pane{
111 height: 100%;
112 }
113 //background: #F4F9FF;
114 background-color: #F4F9FF;
115 padding: 0;
116 }
117 /deep/ .el-tabs__item {
118 height: 48px;
119 }
120 /deep/ .el-tabs__header{
121 background-color: #ffffff;
122 }
123 }
124
125 </style> 106 </style>
......
...@@ -72,41 +72,5 @@ export default { ...@@ -72,41 +72,5 @@ export default {
72 <style scoped lang="less"> 72 <style scoped lang="less">
73 .content_box{ 73 .content_box{
74 padding: 0 0 6px; 74 padding: 0 0 6px;
75 // padding: 0 20px;
76 // .el-tabs{
77 // width: 100%;
78 // height: 100%;
79 // display: flex;
80 // flex-direction: column;
81 // }
82 // /deep/.el-tabs__content{
83 // width: 100%;
84 // height: 100%;
85 // flex:1;
86 // position: unset;
87 // }
88 // .el-tab-pane{
89 // width: 100%;
90 // height: 100%;
91 // }
92
93 .el-tabs{
94 height: calc(100% - 50px);
95 /deep/ .el-tabs__content{
96 //height: 100%;
97 /deep/.el-tab-pane{
98 height: 100%;
99 }
100 //background: #F4F9FF;
101 background-color: #F4F9FF;
102 padding: 0;
103 }
104 /deep/ .el-tabs__item {
105 height: 48px;
106 }
107 /deep/ .el-tabs__header{
108 background-color: #ffffff;
109 }
110 }
111 } 75 }
112 </style> 76 </style>
......
...@@ -441,6 +441,10 @@ ...@@ -441,6 +441,10 @@
441 type: String, 441 type: String,
442 default: "1", 442 default: "1",
443 }, 443 },
444 lpbParent:{
445 type: String,
446 default: "",
447 },
444 }, 448 },
445 data () { 449 data () {
446 return { 450 return {
...@@ -588,6 +592,9 @@ ...@@ -588,6 +592,9 @@
588 registerCall(data).then(res=>{ 592 registerCall(data).then(res=>{
589 if (res.success) { 593 if (res.success) {
590 this.$message.success("登记成功") 594 this.$message.success("登记成功")
595 if(this.lpbParent === 'isLpb'){
596 this.$parent.$parent.loadingData(this.form.zrzbsm,this.form.scyclx);
597 }
591 this.getTreeByBsm(this.$store.state.zdbsm,'h','0,1,2') 598 this.getTreeByBsm(this.$store.state.zdbsm,'h','0,1,2')
592 } 599 }
593 }) 600 })
...@@ -897,13 +904,20 @@ ...@@ -897,13 +904,20 @@
897 this.form.qtjzmj=this.form.scqtjzmj; 904 this.form.qtjzmj=this.form.scqtjzmj;
898 this.form.ftxs=this.form.scftxs; 905 this.form.ftxs=this.form.scftxs;
899 } 906 }
907 vm.loadingShow('请求发送中');
900 updateQjH(this.form).then((res)=>{ 908 updateQjH(this.form).then((res)=>{
909 vm.loadingHide();
901 if(res.code===200){ 910 if(res.code===200){
902 this.$message.success("保存成功！") 911 this.$message.success("保存成功！")
912 console.log(this,"this")
903 }else { 913 }else {
904 this.$message.warning(res.message) 914 this.$message.warning(res.message)
905 } 915 }
906 }) 916 })
917 .catch((error) => {
918 vm.loadingHide();
919 console.log(error);
920 });
907 }else { 921 }else {
908 this.$message({ 922 this.$message({
909 // message: item.name+'不能为空', 923 // message: item.name+'不能为空',
...@@ -923,6 +937,10 @@ ...@@ -923,6 +937,10 @@
923 submit(data).then((res)=>{ 937 submit(data).then((res)=>{
924 if(res.code===200){ 938 if(res.code===200){
925 this.$message.success("提交完成！"); 939 this.$message.success("提交完成！");
940 console.log(this.lpbParent,"this.lpbparent")
941 if(this.lpbParent === 'isLpb'){
942 this.$parent.$parent.loadingData(this.form.zrzbsm,this.form.scyclx);
943 }
926 }else { 944 }else {
927 this.$message.warning(res.message) 945 this.$message.warning(res.message)
928 } 946 }
......
...@@ -377,7 +377,7 @@ ...@@ -377,7 +377,7 @@
377 ></move-h> 377 ></move-h>
378 <!-- 双击户的弹出框 --> 378 <!-- 双击户的弹出框 -->
379 <el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="80%" > 379 <el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="80%" >
380 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj> 380 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx" :lpbParent="lpbParent"></hbj>
381 </el-dialog> 381 </el-dialog>
382 <!-- 户重新落宗 --> 382 <!-- 户重新落宗 -->
383 <h-cxlz 383 <h-cxlz
...@@ -659,6 +659,8 @@ export default { ...@@ -659,6 +659,8 @@ export default {
659 } else { 659 } else {
660 //选中→未选中 660 //选中→未选中
661 e.className = ""; 661 e.className = "";
662 this.hbsmList = this.hbsmList.filter(i=>i!=bsm);
663 this.hqsztList = this.hqsztList.filter(i=>i!=hs.qszt);
662 switch (this.lpbParent) { 664 switch (this.lpbParent) {
663 case 'isHbfg': 665 case 'isHbfg':
664 self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs) 666 self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs)
...@@ -891,6 +893,7 @@ export default { ...@@ -891,6 +893,7 @@ export default {
891 //户合并 893 //户合并
892 handleHb(type){ 894 handleHb(type){
893 let olbBsms = ''; 895 let olbBsms = '';
896 console.log(this.fghbChoosedList,'fghbChoosedList');
894 this.hbsmList.forEach((item,index)=>{ 897 this.hbsmList.forEach((item,index)=>{
895 olbBsms+= index<this.hbsmList.length-1? item+',':item 898 olbBsms+= index<this.hbsmList.length-1? item+',':item
896 }) 899 })
...@@ -910,8 +913,9 @@ export default { ...@@ -910,8 +913,9 @@ export default {
910 "zdybsm": this.fghbChoosedList[0].zdybsm, 913 "zdybsm": this.fghbChoosedList[0].zdybsm,
911 "zrzbsm": this.fghbChoosedList[0].zrzbsm 914 "zrzbsm": this.fghbChoosedList[0].zrzbsm
912 } 915 }
913 // console.log(params,'params'); 916 vm.loadingShow('请求发送中');
914 hhb(params).then((res) => { 917 hhb(params).then((res) => {
918 vm.loadingHide();
915 if(res.code == 200){ 919 if(res.code == 200){
916 Message.success('合并成功'); 920 Message.success('合并成功');
917 // 清除选中户 921 // 清除选中户
...@@ -923,7 +927,10 @@ export default { ...@@ -923,7 +927,10 @@ export default {
923 Message.error(res.message); 927 Message.error(res.message);
924 } 928 }
925 }) 929 })
926 .catch(() => {}); 930 .catch((error) => {
931 vm.loadingHide();
932 console.log(error);
933 });
927 }) 934 })
928 .catch(() => {}); 935 .catch(() => {});
929 }else{ 936 }else{
...@@ -936,7 +943,9 @@ export default { ...@@ -936,7 +943,9 @@ export default {
936 }, 943 },
937 //户分割保存 944 //户分割保存
938 savefgData(){ 945 savefgData(){
946 vm.loadingShow('请求发送中');
939 hfg(this.fgData).then((res) => { 947 hfg(this.fgData).then((res) => {
948 vm.loadingHide();
940 if(res.code == 200){ 949 if(res.code == 200){
941 Message.success('分割成功'); 950 Message.success('分割成功');
942 // 清除选中户 951 // 清除选中户
...@@ -949,7 +958,10 @@ export default { ...@@ -949,7 +958,10 @@ export default {
949 Message.error(res.message); 958 Message.error(res.message);
950 } 959 }
951 }) 960 })
952 .catch(() => {}); 961 .catch((error) => {
962 vm.loadingHide();
963 console.log(error);
964 });
953 }, 965 },
954 //范围属性变更 966 //范围属性变更
955 handleFwsxbg(){ 967 handleFwsxbg(){
...@@ -1071,6 +1083,7 @@ export default { ...@@ -1071,6 +1083,7 @@ export default {
1071 }, 1083 },
1072 watch: { 1084 watch: {
1073 scyclx(n) { 1085 scyclx(n) {
1086 this.hqsztList = [];
1074 // this.getLpb(this.$store.state.zrzbsm, n); 1087 // this.getLpb(this.$store.state.zrzbsm, n);
1075 if(n == '0'){ 1088 if(n == '0'){
1076 this.lpbData = this.yclpbData; 1089 this.lpbData = this.yclpbData;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 </td> 14 </td>
15 <td colspan="2" class="tdright"><i class="requisite">*</i>自然幢号</td> 15 <td colspan="2" class="tdright"><i class="requisite">*</i>自然幢号</td>
16 <td colspan="4" class="psr"> 16 <td colspan="4" class="psr">
17 <input class="formInput percent80" ref="zrzh" @blur="inputBlur($event)" :disabled="disabled" maxlength="24" v-model="form.zrzh"> 17 <input class="formInput percent80" ref="zrzh" @blur="inputBlurZrzh($event)" :disabled="disabled" maxlength="24" v-model="form.zrzh">
18 <el-button @click.prevent="generatorCode" type="warning" :disabled="disabled" class="createBtn" size="mini">生成</el-button> 18 <el-button @click.prevent="generatorCode" type="warning" :disabled="disabled" class="createBtn" size="mini">生成</el-button>
19 </td> 19 </td>
20 </tr> 20 </tr>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 </td> 25 </td>
26 <td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td> 26 <td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td>
27 <td colspan="4"> 27 <td colspan="4">
28 <input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" :disabled="disabled" maxlength="28" v-model="form.bdcdyh"> 28 <input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" disabled maxlength="28" v-model="form.bdcdyh">
29 </td> 29 </td>
30 </tr> 30 </tr>
31 31
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
285 <script> 285 <script>
286 import Qlr from "@components/formMenu/qlr"; 286 import Qlr from "@components/formMenu/qlr";
287 import Qlxz from "@components/formMenu/qlxz"; 287 import Qlxz from "@components/formMenu/qlxz";
288 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "@api/zrz" 288 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm,getHCountByZrzbsm} from "@api/zrz"
289 import {getQjZdjbxxDetailById} from "@api/zd" 289 import {getQjZdjbxxDetailById} from "@api/zd"
290 import {submit,registerCall} from "@api/common" 290 import {submit,registerCall} from "@api/common"
291 import geoUtils from "@components/lineTree/tx/js/geoUtils"; 291 import geoUtils from "@components/lineTree/tx/js/geoUtils";
...@@ -315,6 +315,12 @@ ...@@ -315,6 +315,12 @@
315 315
316 lx:"zrz", 316 lx:"zrz",
317 bsm:'', 317 bsm:'',
318
319 initZrzh:'',
320 finishZrzh:'',
321 hcount:0,
322 booleanUpdateH:false,
323
318 form:{ 324 form:{
319 zrzbsm:'', //自然幢标识码 325 zrzbsm:'', //自然幢标识码
320 zdbsm:'', //宗地标识码 326 zdbsm:'', //宗地标识码
...@@ -360,6 +366,7 @@ ...@@ -360,6 +366,7 @@
360 glbsm:'', //关联标识码 366 glbsm:'', //关联标识码
361 sx:'', //顺序 367 sx:'', //顺序
362 }], 368 }],
369 booleanUpdateH:false,
363 }, 370 },
364 value: '', 371 value: '',
365 ytTitleRowspan:1, //用途的单元格垂直合并数量 372 ytTitleRowspan:1, //用途的单元格垂直合并数量
...@@ -467,6 +474,10 @@ ...@@ -467,6 +474,10 @@
467 } 474 }
468 }, 475 },
469 onSave(){ 476 onSave(){
477
478 //保存之前的自然幢号，用于判断该自然幢的不动产单元号是否更改，是否更改其下户的不动产单元号
479 this.finishZrzh = this.form.zrzh;
480 this.form.booleanUpdateH =this.booleanUpdateH;
470 //判断自然幢号和不动产单元号是否手动修改过（自然幢号和不动产单元号的前19位是否和宗地代码一致） 481 //判断自然幢号和不动产单元号是否手动修改过（自然幢号和不动产单元号的前19位是否和宗地代码一致）
471 console.log(this.form,'this.form'); 482 console.log(this.form,'this.form');
472 //给校验项赋值 483 //给校验项赋值
...@@ -554,7 +565,9 @@ ...@@ -554,7 +565,9 @@
554 type: "warning", 565 type: "warning",
555 }); 566 });
556 }else{ 567 }else{
568 vm.loadingShow('请求发送中');
557 saveZrzInfo(this.form).then((res)=>{ 569 saveZrzInfo(this.form).then((res)=>{
570 vm.loadingHide();
558 if(res.code===200){ 571 if(res.code===200){
559 this.$message.success("保存完成！") 572 this.$message.success("保存完成！")
560 this.getZrzDetailByBsm(this.$route.query.bsm) 573 this.getZrzDetailByBsm(this.$route.query.bsm)
...@@ -566,6 +579,10 @@ ...@@ -566,6 +579,10 @@
566 } 579 }
567 this.loading=false; 580 this.loading=false;
568 }) 581 })
582 .catch((error) => {
583 vm.loadingHide();
584 console.log(error);
585 });
569 this.loading=false; 586 this.loading=false;
570 this.saveGraphicAttributes(); } 587 this.saveGraphicAttributes(); }
571 }else{ 588 }else{
...@@ -614,6 +631,7 @@ ...@@ -614,6 +631,7 @@
614 }) 631 })
615 }, 632 },
616 open() { 633 open() {
634 const self = this;
617 this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', { 635 this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', {
618 confirmButtonText: '确定', 636 confirmButtonText: '确定',
619 cancelButtonText: '取消', 637 cancelButtonText: '取消',
...@@ -623,6 +641,16 @@ ...@@ -623,6 +641,16 @@
623 .then((res)=>{ 641 .then((res)=>{
624 this.form.zrzh=res.result.substring(0,24); 642 this.form.zrzh=res.result.substring(0,24);
625 this.form.bdcdyh=res.result; 643 this.form.bdcdyh=res.result;
644 console.log(self.initZrzh,self.hcount,"self")
645 if(self.initZrzh != null && self.initZrzh !== '' && self.hcount>0){
646 self.booleanUpdateH =true;
647 self.$notify({
648 title: '提示',
649 message: '修改自然幢号，可能会影响该自然幢下户的不动产单元号的重新生成！',
650 duration: 0,
651 type: 'warning'
652 });
653 }
626 }); 654 });
627 this.$message({ 655 this.$message({
628 type: 'success', 656 type: 'success',
...@@ -636,6 +664,7 @@ ...@@ -636,6 +664,7 @@
636 }); 664 });
637 }, 665 },
638 generatorCode(){ 666 generatorCode(){
667 const self = this;
639 console.log(this.form,'this.form'); 668 console.log(this.form,'this.form');
640 if((this.form.zrzh!=null&&this.form.zrzh!=='')||(this.form.bdcdyh!=null&&this.form.bdcdyh!=='')){ 669 if((this.form.zrzh!=null&&this.form.zrzh!=='')||(this.form.bdcdyh!=null&&this.form.bdcdyh!=='')){
641 this.open(); 670 this.open();
...@@ -643,8 +672,18 @@ ...@@ -643,8 +672,18 @@
643 } 672 }
644 getBdcdyh(this.form.zddm,"zrz") 673 getBdcdyh(this.form.zddm,"zrz")
645 .then((res)=>{ 674 .then((res)=>{
646 this.form.zrzh=res.result.substring(0,24); 675 self.form.zrzh=res.result.substring(0,24);
647 this.form.bdcdyh=res.result; 676 self.form.bdcdyh=res.result;
677 console.log(self.initZrzh,self.hcount,"self")
678 if(self.initZrzh != null && self.initZrzh !== '' && self.hcount>0){
679 self.booleanUpdateH =true;
680 self.$notify({
681 title: '提示',
682 message: '修改自然幢号，可能会影响该自然幢下户的不动产单元号的重新生成！',
683 duration: 0,
684 type: 'warning'
685 });
686 }
648 }) 687 })
649 }, 688 },
650 689
...@@ -681,6 +720,8 @@ ...@@ -681,6 +720,8 @@
681 }else { 720 }else {
682 this.disabled = true 721 this.disabled = true
683 } 722 }
723 //初始化的自然幢号，用于判断该自然幢的不动产单元号是否更改，是否更改其下户的不动产单元号
724 this.initZrzh = res.result.zrzh;
684 this.$store.state.zrzh = res.result.zrzh; 725 this.$store.state.zrzh = res.result.zrzh;
685 if(this.form.fwjgList.length===0){ 726 if(this.form.fwjgList.length===0){
686 this.form.fwjgList.push({ 727 this.form.fwjgList.push({
...@@ -734,6 +775,27 @@ ...@@ -734,6 +775,27 @@
734 e.target.style.boxSizing = 'border-box'; 775 e.target.style.boxSizing = 'border-box';
735 } 776 }
736 }, 777 },
778 inputBlurZrzh(e){
779 if(this.initZrzh != null && this.initZrzh !== ''&& e.target.value !==''&& this.hcount>0){
780 if(this.initZrzh !== e.target.value){
781 this.booleanUpdateH =true;
782 this.$notify({
783 title: '提示',
784 message: '修改自然幢号，可能会影响该自然幢下户的不动产单元号的重新生成！',
785 duration: 0,
786 type: 'warning'
787 });
788 }else {
789 this.booleanUpdateH =false;
790 }
791 }
792 if(e.target.value!=''){
793 e.target.style.border=""
794 }else{
795 e.target.style.border="1px solid red";
796 e.target.style.boxSizing = 'border-box';
797 }
798 }
737 }, 799 },
738 created(){ 800 created(){
739 //todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来； 801 //todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来；
...@@ -753,6 +815,11 @@ ...@@ -753,6 +815,11 @@
753 } 815 }
754 }, 816 },
755 mounted() { 817 mounted() {
818 getHCountByZrzbsm(this.$route.query.bsm).then((res)=>{
819 if(res.code === 200){
820 this.hcount = res.result;
821 }
822 });
756 this.$nextTick(() => { 823 this.$nextTick(() => {
757 this.mainBoxWidth = this.$refs.mainBox.clientWidth; 824 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
758 }) 825 })
...@@ -773,8 +840,9 @@ ...@@ -773,8 +840,9 @@
773 } 840 }
774 }, 841 },
775 "form.zrzh":function (val) { 842 "form.zrzh":function (val) {
776 if (val != '') { 843 if (val != ''&&val != null) {
777 this.$refs.zrzh.style.border = ''; 844 this.$refs.zrzh.style.border = '';
845 this.form.bdcdyh = val+"0000";
778 } 846 }
779 }, 847 },
780 "form.fwxzbsm":{ 848 "form.fwxzbsm":{
......