Merge remote-tracking branch 'origin/master'
Showing
28 changed files
with
356 additions
and
46 deletions
... | @@ -63,4 +63,9 @@ | ... | @@ -63,4 +63,9 @@ |
63 | } | 63 | } |
64 | .el-table th { | 64 | .el-table th { |
65 | background-color: #f3f5fa; | 65 | background-color: #f3f5fa; |
66 | } | ||
67 | //操作提示样式 | ||
68 | .el-message{ | ||
69 | min-width: 200px!important; | ||
70 | top: 50px!important; | ||
66 | } | 71 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -161,7 +161,7 @@ | ... | @@ -161,7 +161,7 @@ |
161 | <div class="header-button"> | 161 | <div class="header-button"> |
162 | <el-button type="primary" class="saveBtn" @click="save">保存</el-button> | 162 | <el-button type="primary" class="saveBtn" @click="save">保存</el-button> |
163 | </div> | 163 | </div> |
164 | <el-dialog | 164 | <el-dialog v-dialogDrag :close-on-click-modal="false" |
165 | title="新增多幢" | 165 | title="新增多幢" |
166 | :visible.sync="dzIsVisible" | 166 | :visible.sync="dzIsVisible" |
167 | width="70%" | 167 | width="70%" |
... | @@ -259,7 +259,7 @@ | ... | @@ -259,7 +259,7 @@ |
259 | </el-pagination> | 259 | </el-pagination> |
260 | </div> | 260 | </div> |
261 | </el-dialog> | 261 | </el-dialog> |
262 | <el-dialog | 262 | <el-dialog v-dialogDrag :close-on-click-modal="false" |
263 | title="新增自然幢" | 263 | title="新增自然幢" |
264 | :visible.sync="zrzIsVisible" | 264 | :visible.sync="zrzIsVisible" |
265 | width="70%" | 265 | width="70%" | ... | ... |
... | @@ -49,7 +49,7 @@ | ... | @@ -49,7 +49,7 @@ |
49 | <el-table-column prop="dh" label="联系电话" align="center"> | 49 | <el-table-column prop="dh" label="联系电话" align="center"> |
50 | </el-table-column> | 50 | </el-table-column> |
51 | </el-table> | 51 | </el-table> |
52 | <el-dialog | 52 | <el-dialog v-dialogDrag :close-on-click-modal="false" |
53 | title="权利人信息" | 53 | title="权利人信息" |
54 | :visible.sync="dialogVisible" | 54 | :visible.sync="dialogVisible" |
55 | custom-class="insetDialog" | 55 | custom-class="insetDialog" | ... | ... |
... | @@ -103,11 +103,11 @@ | ... | @@ -103,11 +103,11 @@ |
103 | </ul> | 103 | </ul> |
104 | 104 | ||
105 | <!--@close="closeImportDialog"--> | 105 | <!--@close="closeImportDialog"--> |
106 | <el-dialog title="导入图形" :modal="false" :close-on-click-modal="false" custom-class="importDialog" :visible.sync="improtDialog" width="30%" @close="closeImportDialog"> | 106 | <el-dialog v-dialogDrag :close-on-click-modal="false" title="导入图形" :modal="false" custom-class="importDialog" :visible.sync="improtDialog" width="30%" @close="closeImportDialog"> |
107 | <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo> | 107 | <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo> |
108 | </el-dialog> | 108 | </el-dialog> |
109 | <!-- 添加定着物弹框 --> | 109 | <!-- 添加定着物弹框 --> |
110 | <el-dialog title="新建" :visible.sync="dialogVisible" width="48%"> | 110 | <el-dialog v-dialogDrag :close-on-click-modal="false" title="新建" :visible.sync="dialogVisible" width="48%"> |
111 | <Create @closeDialog="closeDialog" :auth="true"></Create> | 111 | <Create @closeDialog="closeDialog" :auth="true"></Create> |
112 | </el-dialog> | 112 | </el-dialog> |
113 | <sxdr :sxdr-visible="sxdrVisible" @close="sxdrClose" :dylx="zdData.type" :bsm="zdData.bsm"></sxdr> | 113 | <sxdr :sxdr-visible="sxdrVisible" @close="sxdrClose" :dylx="zdData.type" :bsm="zdData.bsm"></sxdr> | ... | ... |
1 | <template> | 1 | <template> |
2 | <div> | 2 | <div> |
3 | <el-dialog | 3 | <el-dialog v-dialogDrag :close-on-click-modal="false" |
4 | title="新增" | 4 | title="新增" |
5 | :visible.sync="isVisible" | 5 | :visible.sync="isVisible" |
6 | width="70%" | 6 | width="70%" |
7 | @close="close" | 7 | @close="close" |
8 | :modal-append-to-body="false" | 8 | :modal-append-to-body="false" |
9 | :close-on-click-modal="false" | ||
10 | > | 9 | > |
11 | <div class="search"> | 10 | <div class="search"> |
12 | <el-row> | 11 | <el-row> | ... | ... |
src/libs/dragDialog.js
0 → 100644
1 | import Vue from "vue"; | ||
2 | |||
3 | /* | ||
4 | |||
5 | * 使用方法 | ||
6 | |||
7 | * 将以下代码复制到一个js文件中,然后在入口文件main.js中import引入即可; | ||
8 | |||
9 | * 给elementUI的dialog上加上 v-dialogDrag 指令就可以实现弹窗的全屏和拉伸了。 | ||
10 | |||
11 | * 给dialog设置 :close-on-click-modal="false" , 禁止点击遮罩层关闭弹出层 | ||
12 | |||
13 | * 如果是form表单,不要将提交等按钮放置el-form-item,以免在上下拉伸时被隐藏 | ||
14 | |||
15 | */ | ||
16 | |||
17 | // v-dialogDrag: 弹窗拖拽+水平方向伸缩 | ||
18 | |||
19 | Vue.directive("dialogDrag", { | ||
20 | bind(el, binding, vnode, oldVnode) { | ||
21 | //弹框可拉伸最小宽高 | ||
22 | |||
23 | let minWidth = 400; | ||
24 | |||
25 | let minHeight = 300; | ||
26 | |||
27 | //初始非全屏 | ||
28 | |||
29 | let isFullScreen = false; | ||
30 | |||
31 | //当前宽高 | ||
32 | |||
33 | let nowWidth = 0; | ||
34 | |||
35 | let nowHight = 0; | ||
36 | |||
37 | //当前顶部高度 | ||
38 | |||
39 | let nowMarginTop = 0; | ||
40 | |||
41 | //获取弹框头部(这部分可双击全屏) | ||
42 | |||
43 | const dialogHeaderEl = el.querySelector(".el-dialog__header"); | ||
44 | |||
45 | //弹窗 | ||
46 | |||
47 | const dragDom = el.querySelector(".el-dialog"); | ||
48 | |||
49 | //给弹窗加上overflow auto;不然缩小时框内的标签可能超出dialog; | ||
50 | |||
51 | dragDom.style.overflow = "auto"; | ||
52 | |||
53 | //清除选择头部文字效果 | ||
54 | |||
55 | //dialogHeaderEl.onselectstart = new Function("return false"); | ||
56 | |||
57 | //头部加上可拖动cursor | ||
58 | |||
59 | dialogHeaderEl.style.cursor = "move"; | ||
60 | |||
61 | // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null); | ||
62 | |||
63 | const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null); | ||
64 | |||
65 | let moveDown = (e) => { | ||
66 | // 鼠标按下,计算当前元素距离可视区的距离 | ||
67 | |||
68 | const disX = e.clientX - dialogHeaderEl.offsetLeft; | ||
69 | |||
70 | const disY = e.clientY - dialogHeaderEl.offsetTop; | ||
71 | |||
72 | // 获取到的值带px 正则匹配替换 | ||
73 | |||
74 | let styL, styT; | ||
75 | |||
76 | // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px | ||
77 | |||
78 | if (sty.left.includes("%")) { | ||
79 | styL = | ||
80 | +document.body.clientWidth * (+sty.left.replace(/\%/g, "") / 100); | ||
81 | |||
82 | styT = | ||
83 | +document.body.clientHeight * (+sty.top.replace(/\%/g, "") / 100); | ||
84 | } else { | ||
85 | styL = +sty.left.replace(/\px/g, ""); | ||
86 | |||
87 | styT = +sty.top.replace(/\px/g, ""); | ||
88 | } | ||
89 | |||
90 | document.onmousemove = function(e) { | ||
91 | // 通过事件委托,计算移动的距离 | ||
92 | |||
93 | const l = e.clientX - disX; | ||
94 | |||
95 | const t = e.clientY - disY; | ||
96 | |||
97 | // 移动当前元素 | ||
98 | |||
99 | dragDom.style.left = `${l + styL}px`; | ||
100 | |||
101 | dragDom.style.top = `${t + styT}px`; | ||
102 | |||
103 | //将此时的位置传出去 | ||
104 | |||
105 | //binding.value({x:e.pageX,y:e.pageY}) | ||
106 | }; | ||
107 | |||
108 | document.onmouseup = function(e) { | ||
109 | document.onmousemove = null; | ||
110 | |||
111 | document.onmouseup = null; | ||
112 | }; | ||
113 | }; | ||
114 | |||
115 | dialogHeaderEl.onmousedown = moveDown; | ||
116 | |||
117 | //双击头部全屏效果 | ||
118 | |||
119 | dialogHeaderEl.ondblclick = (e) => { | ||
120 | if (isFullScreen == false) { | ||
121 | nowHight = dragDom.clientHeight; | ||
122 | |||
123 | nowWidth = dragDom.clientWidth; | ||
124 | |||
125 | nowMarginTop = dragDom.style.marginTop; | ||
126 | |||
127 | dragDom.style.left = 0; | ||
128 | |||
129 | dragDom.style.top = 0; | ||
130 | |||
131 | dragDom.style.height = "100VH"; | ||
132 | |||
133 | dragDom.style.width = "100VW"; | ||
134 | |||
135 | dragDom.style.marginTop = 0; | ||
136 | |||
137 | isFullScreen = true; | ||
138 | |||
139 | dialogHeaderEl.style.cursor = "initial"; | ||
140 | |||
141 | dialogHeaderEl.onmousedown = null; | ||
142 | } else { | ||
143 | dragDom.style.height = "auto"; | ||
144 | |||
145 | dragDom.style.width = nowWidth + "px"; | ||
146 | |||
147 | dragDom.style.marginTop = nowMarginTop; | ||
148 | |||
149 | isFullScreen = false; | ||
150 | |||
151 | dialogHeaderEl.style.cursor = "move"; | ||
152 | |||
153 | dialogHeaderEl.onmousedown = moveDown; | ||
154 | } | ||
155 | }; | ||
156 | |||
157 | dragDom.onmousemove = function(e) { | ||
158 | let moveE = e; | ||
159 | |||
160 | if ( | ||
161 | e.clientX > dragDom.offsetLeft + dragDom.clientWidth - 10 || | ||
162 | dragDom.offsetLeft + 10 > e.clientX | ||
163 | ) { | ||
164 | dragDom.style.cursor = "w-resize"; | ||
165 | } else if ( | ||
166 | el.scrollTop + e.clientY > | ||
167 | dragDom.offsetTop + dragDom.clientHeight - 10 | ||
168 | ) { | ||
169 | dragDom.style.cursor = "s-resize"; | ||
170 | } else { | ||
171 | dragDom.style.cursor = "default"; | ||
172 | |||
173 | dragDom.onmousedown = null; | ||
174 | } | ||
175 | |||
176 | dragDom.onmousedown = (e) => { | ||
177 | const clientX = e.clientX; | ||
178 | |||
179 | const clientY = e.clientY; | ||
180 | |||
181 | let elW = dragDom.clientWidth; | ||
182 | |||
183 | let elH = dragDom.clientHeight; | ||
184 | |||
185 | let EloffsetLeft = dragDom.offsetLeft; | ||
186 | |||
187 | let EloffsetTop = dragDom.offsetTop; | ||
188 | |||
189 | dragDom.style.userSelect = "none"; | ||
190 | |||
191 | let ELscrollTop = el.scrollTop; | ||
192 | |||
193 | //判断点击的位置是不是为头部 | ||
194 | |||
195 | if ( | ||
196 | clientX > EloffsetLeft && | ||
197 | clientX < EloffsetLeft + elW && | ||
198 | clientY > EloffsetTop && | ||
199 | clientY < EloffsetTop + 100 | ||
200 | ) { | ||
201 | //如果是头部在此就不做任何动作,以上有绑定dialogHeaderEl.onmousedown = moveDown; | ||
202 | } else { | ||
203 | document.onmousemove = function(e) { | ||
204 | e.preventDefault(); // 移动时禁用默认事件 | ||
205 | |||
206 | //左侧鼠标拖拽位置 | ||
207 | |||
208 | if (clientX > EloffsetLeft && clientX < EloffsetLeft + 10) { | ||
209 | //往左拖拽 | ||
210 | |||
211 | if (clientX > e.clientX) { | ||
212 | dragDom.style.width = elW + (clientX - e.clientX) * 2 + "px"; | ||
213 | } | ||
214 | |||
215 | //往右拖拽 | ||
216 | |||
217 | if (clientX < e.clientX) { | ||
218 | if (dragDom.clientWidth < minWidth) { | ||
219 | } else { | ||
220 | dragDom.style.width = elW - (e.clientX - clientX) * 2 + "px"; | ||
221 | } | ||
222 | } | ||
223 | } | ||
224 | |||
225 | //右侧鼠标拖拽位置 | ||
226 | |||
227 | if ( | ||
228 | clientX > EloffsetLeft + elW - 10 && | ||
229 | clientX < EloffsetLeft + elW | ||
230 | ) { | ||
231 | //往左拖拽 | ||
232 | |||
233 | if (clientX > e.clientX) { | ||
234 | if (dragDom.clientWidth < minWidth) { | ||
235 | } else { | ||
236 | dragDom.style.width = elW - (clientX - e.clientX) * 2 + "px"; | ||
237 | } | ||
238 | } | ||
239 | |||
240 | //往右拖拽 | ||
241 | |||
242 | if (clientX < e.clientX) { | ||
243 | dragDom.style.width = elW + (e.clientX - clientX) * 2 + "px"; | ||
244 | } | ||
245 | } | ||
246 | |||
247 | //底部鼠标拖拽位置 | ||
248 | |||
249 | if ( | ||
250 | ELscrollTop + clientY > EloffsetTop + elH - 20 && | ||
251 | ELscrollTop + clientY < EloffsetTop + elH | ||
252 | ) { | ||
253 | //往上拖拽 | ||
254 | |||
255 | if (clientY > e.clientY) { | ||
256 | if (dragDom.clientHeight < minHeight) { | ||
257 | } else { | ||
258 | dragDom.style.height = elH - (clientY - e.clientY) * 2 + "px"; | ||
259 | } | ||
260 | } | ||
261 | |||
262 | //往下拖拽 | ||
263 | |||
264 | if (clientY < e.clientY) { | ||
265 | dragDom.style.height = elH + (e.clientY - clientY) * 2 + "px"; | ||
266 | } | ||
267 | } | ||
268 | }; | ||
269 | |||
270 | //拉伸结束 | ||
271 | |||
272 | document.onmouseup = function(e) { | ||
273 | document.onmousemove = null; | ||
274 | |||
275 | document.onmouseup = null; | ||
276 | }; | ||
277 | } | ||
278 | }; | ||
279 | }; | ||
280 | }, | ||
281 | }); |
... | @@ -8,6 +8,7 @@ import '../mock/index.js' | ... | @@ -8,6 +8,7 @@ import '../mock/index.js' |
8 | 8 | ||
9 | //引入arcgis Api | 9 | //引入arcgis Api |
10 | import './libs/map/mapApi' | 10 | import './libs/map/mapApi' |
11 | import './libs/dragDialog'; //引入弹框拖拽方法 | ||
11 | 12 | ||
12 | import './assets/iconfont/iconfont.js' | 13 | import './assets/iconfont/iconfont.js' |
13 | 14 | ... | ... |
... | @@ -40,7 +40,7 @@ | ... | @@ -40,7 +40,7 @@ |
40 | <!-- <div class="header-bottom"> | 40 | <!-- <div class="header-bottom"> |
41 | <Navigation ref="navigation"></Navigation> | 41 | <Navigation ref="navigation"></Navigation> |
42 | </div> --> | 42 | </div> --> |
43 | <el-dialog title="新建" :visible.sync="dialogVisible" width="48%"> | 43 | <el-dialog v-dialogDrag :close-on-click-modal="false" title="新建" :visible.sync="dialogVisible" width="48%"> |
44 | <Create @closeDialog="closeDialog" :auth="false"></Create> | 44 | <Create @closeDialog="closeDialog" :auth="false"></Create> |
45 | </el-dialog> | 45 | </el-dialog> |
46 | </el-header> | 46 | </el-header> |
... | @@ -69,7 +69,10 @@ export default { | ... | @@ -69,7 +69,10 @@ export default { |
69 | provide(){ | 69 | provide(){ |
70 | return{ | 70 | return{ |
71 | getRightTree: this.getRightTree, | 71 | getRightTree: this.getRightTree, |
72 | getRightTreeByZrzbsm:this.getRightTreeByZrzbsm | 72 | getRightTreeByZrzbsm:this.getRightTreeByZrzbsm, |
73 | getTreeByS:this.getTreeByS, | ||
74 | getRightTreeByDzbsm:this.getRightTreeByDzbsm, | ||
75 | getRightTreeByHbsm:this.getRightTreeByHbsm | ||
73 | } | 76 | } |
74 | }, | 77 | }, |
75 | data() { | 78 | data() { |
... | @@ -143,24 +146,19 @@ export default { | ... | @@ -143,24 +146,19 @@ export default { |
143 | }); | 146 | }); |
144 | if (newPath == "/zd") { | 147 | if (newPath == "/zd") { |
145 | //source为3时代表时分割后的宗地信息 | 148 | //source为3时代表时分割后的宗地信息 |
146 | if(this.$route.query.source == '3'){ | 149 | // if(this.$route.query.source == '3'){ |
147 | this.getTreeByS(this.$store.state.zdbsms); | 150 | // this.getTreeByS(this.$store.state.zdbsms); |
148 | }else{ | 151 | // }else{ |
149 | this.getRightTree(this.$store.state.zdbsm); | 152 | // this.getRightTree(this.$store.state.zdbsm); |
150 | } | 153 | // } |
151 | }else if (newPath == "/zrz") { | 154 | }else if (newPath == "/zrz") { |
152 | this.getRightTreeByZrzbsm(this.$store.state.zrzbsm); | 155 | // this.getRightTreeByZrzbsm(this.$store.state.zrzbsm); |
153 | }else if(newPath == "/dz"){ | 156 | }else if(newPath == "/dz"){ |
154 | this.getRightTreeByDzbsm(this.$store.state.dzbsm); | 157 | // this.getRightTreeByDzbsm(this.$store.state.dzbsm); |
155 | }else if(newPath == "/h"){ | 158 | }else if(newPath == "/h"){ |
156 | this.getRightTreeByHbsm(this.$store.state.hbsm); | 159 | // this.getRightTreeByHbsm(this.$store.state.hbsm); |
157 | } else if(newPath == "/viewMap"){ | 160 | } else if(newPath == "/viewMap"){ |
158 | this.isMap = true; | 161 | this.isMap = true; |
159 | if(this.$route.query.type == "zd"){ | ||
160 | this.getRightTree(this.$route.query.bsm); | ||
161 | }else if(this.$route.query.type == "/zrz"){ | ||
162 | this.getRightTreeByZrzbsm(this.$route.query.bsm); | ||
163 | } | ||
164 | } else { | 162 | } else { |
165 | this.getTreeList(); | 163 | this.getTreeList(); |
166 | } | 164 | } |
... | @@ -254,7 +252,7 @@ export default { | ... | @@ -254,7 +252,7 @@ export default { |
254 | getTreeByS(zdbsms){ | 252 | getTreeByS(zdbsms){ |
255 | getListMenu(zdbsms).then(res=>{ | 253 | getListMenu(zdbsms).then(res=>{ |
256 | if (res.success) { | 254 | if (res.success) { |
257 | this.pd=res.result | 255 | this.pd=res.result; |
258 | } | 256 | } |
259 | }) | 257 | }) |
260 | }, | 258 | }, |
... | @@ -307,6 +305,7 @@ export default { | ... | @@ -307,6 +305,7 @@ export default { |
307 | if (res.success) { | 305 | if (res.success) { |
308 | this.pd = res.result; | 306 | this.pd = res.result; |
309 | this.$store.state.treeData = res.result; | 307 | this.$store.state.treeData = res.result; |
308 | this.$store.state.newZdbsm = ''; | ||
310 | } | 309 | } |
311 | }); | 310 | }); |
312 | }else{ | 311 | }else{ |
... | @@ -320,6 +319,7 @@ export default { | ... | @@ -320,6 +319,7 @@ export default { |
320 | if (res.success) { | 319 | if (res.success) { |
321 | this.pd = res.result; | 320 | this.pd = res.result; |
322 | this.$store.state.treeData = res.result; | 321 | this.$store.state.treeData = res.result; |
322 | this.$store.state.newZdbsm = ''; | ||
323 | } | 323 | } |
324 | }); | 324 | }); |
325 | }else{ | 325 | }else{ |
... | @@ -331,6 +331,7 @@ export default { | ... | @@ -331,6 +331,7 @@ export default { |
331 | getTreeByBsm(bsm,"h").then((res) => { | 331 | getTreeByBsm(bsm,"h").then((res) => { |
332 | if (res.success) { | 332 | if (res.success) { |
333 | this.pd = res.result; | 333 | this.pd = res.result; |
334 | this.$store.state.newZdbsm = ''; | ||
334 | } | 335 | } |
335 | }); | 336 | }); |
336 | }, | 337 | }, |
... | @@ -426,7 +427,7 @@ export default { | ... | @@ -426,7 +427,7 @@ export default { |
426 | routerQuery = { | 427 | routerQuery = { |
427 | bsm:this.$route.query.bsm, | 428 | bsm:this.$route.query.bsm, |
428 | type:"zd" | 429 | type:"zd" |
429 | } | 430 | }; |
430 | }else if(path == "/zrz"){ | 431 | }else if(path == "/zrz"){ |
431 | routerQuery = { | 432 | routerQuery = { |
432 | bsm:this.$route.query.bsm, | 433 | bsm:this.$route.query.bsm, | ... | ... |
... | @@ -331,6 +331,7 @@ | ... | @@ -331,6 +331,7 @@ |
331 | 331 | ||
332 | export default { | 332 | export default { |
333 | name: "", | 333 | name: "", |
334 | inject: ['getTreeByS'], | ||
334 | components: {zdQueryData,dzQueryData,hfghb}, | 335 | components: {zdQueryData,dzQueryData,hfghb}, |
335 | props: {}, | 336 | props: {}, |
336 | data() { | 337 | data() { |
... | @@ -619,6 +620,8 @@ | ... | @@ -619,6 +620,8 @@ |
619 | zdfg(this.zdFghData).then(res => { | 620 | zdfg(this.zdFghData).then(res => { |
620 | if (res.success) { | 621 | if (res.success) { |
621 | this.$store.state.zdbsms = res.result; | 622 | this.$store.state.zdbsms = res.result; |
623 | //更新目录树 | ||
624 | this.getTreeByS(res.result); | ||
622 | this.$router.push({ | 625 | this.$router.push({ |
623 | path: '/zd', | 626 | path: '/zd', |
624 | query: { | 627 | query: { | ... | ... |
... | @@ -189,6 +189,7 @@ | ... | @@ -189,6 +189,7 @@ |
189 | import dzHb from './../../../../components/dzHb/dzHb' | 189 | import dzHb from './../../../../components/dzHb/dzHb' |
190 | export default { | 190 | export default { |
191 | name: "", | 191 | name: "", |
192 | inject: ['getRightTree'], | ||
192 | components: { zdQueryData, hfghb,dzHb}, | 193 | components: { zdQueryData, hfghb,dzHb}, |
193 | props: {}, | 194 | props: {}, |
194 | data() { | 195 | data() { |
... | @@ -280,7 +281,9 @@ | ... | @@ -280,7 +281,9 @@ |
280 | console.log(data, '宗地合并数据') | 281 | console.log(data, '宗地合并数据') |
281 | ZdHb(data).then(res => { | 282 | ZdHb(data).then(res => { |
282 | if (res.success) { | 283 | if (res.success) { |
283 | this.$message.success("合并成功") | 284 | this.$message.success("合并成功"); |
285 | //更新目录树 | ||
286 | this.getRightTree(res.result); | ||
284 | this.$router.push({ | 287 | this.$router.push({ |
285 | path: '/zd', | 288 | path: '/zd', |
286 | query: { | 289 | query: { | ... | ... |
... | @@ -156,7 +156,7 @@ import { insertDzjbxx } from "../../../api/dz"; | ... | @@ -156,7 +156,7 @@ import { insertDzjbxx } from "../../../api/dz"; |
156 | export default { | 156 | export default { |
157 | name: "", | 157 | name: "", |
158 | components: {}, | 158 | components: {}, |
159 | inject:['getRightTree','getRightTreeByZrzbsm'], | 159 | inject:['getRightTree','getRightTreeByZrzbsm','getRightTreeByDzbsm'], |
160 | props: ['auth'], | 160 | props: ['auth'], |
161 | data() { | 161 | data() { |
162 | return { | 162 | return { |
... | @@ -263,6 +263,7 @@ export default { | ... | @@ -263,6 +263,7 @@ export default { |
263 | .then((res) => { | 263 | .then((res) => { |
264 | console.log(res.result); | 264 | console.log(res.result); |
265 | if (res.code == "200") { | 265 | if (res.code == "200") { |
266 | this.getRightTree(this.$store.state.zdbsm); | ||
266 | this.$message({ | 267 | this.$message({ |
267 | message: "创建成功!", | 268 | message: "创建成功!", |
268 | type: "success", | 269 | type: "success", |
... | @@ -270,7 +271,6 @@ export default { | ... | @@ -270,7 +271,6 @@ export default { |
270 | this.$store.state.zdbsm = res.result; | 271 | this.$store.state.zdbsm = res.result; |
271 | //todo 跳转到宗地基本信息内容表页面 (预留) | 272 | //todo 跳转到宗地基本信息内容表页面 (预留) |
272 | this.close(); | 273 | this.close(); |
273 | this.getRightTree(this.$store.state.zdbsm); | ||
274 | this.$router.push({ | 274 | this.$router.push({ |
275 | path: '/zd', query:{ | 275 | path: '/zd', query:{ |
276 | source: 2, | 276 | source: 2, |
... | @@ -297,6 +297,8 @@ export default { | ... | @@ -297,6 +297,8 @@ export default { |
297 | insertZrzjbxx(this.ruleForm1) | 297 | insertZrzjbxx(this.ruleForm1) |
298 | .then((res) => { | 298 | .then((res) => { |
299 | if (res.code == "200") { | 299 | if (res.code == "200") { |
300 | //获取左侧树数据 | ||
301 | this.getRightTreeByZrzbsm(res.result.bsm); | ||
300 | this.$message({ | 302 | this.$message({ |
301 | message: "创建成功!", | 303 | message: "创建成功!", |
302 | type: "success", | 304 | type: "success", |
... | @@ -307,8 +309,6 @@ export default { | ... | @@ -307,8 +309,6 @@ export default { |
307 | this.$store.state.xmmc=res.result.xmmc; | 309 | this.$store.state.xmmc=res.result.xmmc; |
308 | this.$store.state.newZdbsm = res.result.zdbsm; | 310 | this.$store.state.newZdbsm = res.result.zdbsm; |
309 | this.close(); | 311 | this.close(); |
310 | //获取左侧树数据 | ||
311 | this.getRightTreeByZrzbsm(this.$store.state.zdbsm); | ||
312 | this.$router.push({ | 312 | this.$router.push({ |
313 | path: '/zrz', query:{ | 313 | path: '/zrz', query:{ |
314 | source: 1, | 314 | source: 1, |
... | @@ -335,6 +335,7 @@ export default { | ... | @@ -335,6 +335,7 @@ export default { |
335 | insertDzjbxx(this.ruleForm2) | 335 | insertDzjbxx(this.ruleForm2) |
336 | .then((res) => { | 336 | .then((res) => { |
337 | if (res.code == "200") { | 337 | if (res.code == "200") { |
338 | this.getRightTreeByDzbsm(res.result.bsm); | ||
338 | this.$message({ | 339 | this.$message({ |
339 | message: "创建成功!", | 340 | message: "创建成功!", |
340 | type: "success", | 341 | type: "success", | ... | ... |
... | @@ -205,6 +205,17 @@ export default { | ... | @@ -205,6 +205,17 @@ export default { |
205 | box-sizing: border-box; | 205 | box-sizing: border-box; |
206 | padding: 1px; | 206 | padding: 1px; |
207 | } | 207 | } |
208 | .el-badge{ | ||
209 | width: 68px; | ||
210 | height: 68px; | ||
211 | display: block; | ||
212 | margin: 0 auto; | ||
213 | /deep/.el-badge__content{ | ||
214 | top: 10px; | ||
215 | right: 14px; | ||
216 | background-color: #fa6400; | ||
217 | } | ||
218 | } | ||
208 | } | 219 | } |
209 | .psr { | 220 | .psr { |
210 | width: 68px; | 221 | width: 68px; | ... | ... |
... | @@ -60,6 +60,7 @@ | ... | @@ -60,6 +60,7 @@ |
60 | 60 | ||
61 | export default { | 61 | export default { |
62 | name: "", | 62 | name: "", |
63 | inject:['getRightTree','getRightTreeByZrzbsm','getRightTreeByDzbsm','getRightTreeByHbsm'], | ||
63 | components: {SearchHead}, | 64 | components: {SearchHead}, |
64 | props: {}, | 65 | props: {}, |
65 | data() { | 66 | data() { |
... | @@ -122,14 +123,17 @@ | ... | @@ -122,14 +123,17 @@ |
122 | switch (row.dylx) { | 123 | switch (row.dylx) { |
123 | case "zrz": | 124 | case "zrz": |
124 | this.$store.state.zrzbsm = row.glbsm; | 125 | this.$store.state.zrzbsm = row.glbsm; |
126 | this.getRightTreeByZrzbsm(row.glbsm); | ||
125 | path = "/zrz"; | 127 | path = "/zrz"; |
126 | break; | 128 | break; |
127 | case "zd": | 129 | case "zd": |
128 | this.$store.state.zdbsm = row.glbsm; | 130 | this.$store.state.zdbsm = row.glbsm; |
131 | this.getRightTree(row.glbsm); | ||
129 | path = "/zd"; | 132 | path = "/zd"; |
130 | break; | 133 | break; |
131 | case "dz": | 134 | case "dz": |
132 | this.$store.state.dzbsm = row.glbsm; | 135 | this.$store.state.dzbsm = row.glbsm; |
136 | this.getRightTreeByDzbsm(row.glbsm); | ||
133 | path = "/dz"; | 137 | path = "/dz"; |
134 | break; | 138 | break; |
135 | case "h": | 139 | case "h": |
... | @@ -137,6 +141,7 @@ | ... | @@ -137,6 +141,7 @@ |
137 | case "h1": | 141 | case "h1": |
138 | path="/h"; | 142 | path="/h"; |
139 | this.$store.state.hbsm=row.glbsm | 143 | this.$store.state.hbsm=row.glbsm |
144 | this.getRightTreeByHbsm(row.glbsm); | ||
140 | break; | 145 | break; |
141 | default: | 146 | default: |
142 | break; | 147 | break; | ... | ... |
... | @@ -51,7 +51,7 @@ | ... | @@ -51,7 +51,7 @@ |
51 | </table> | 51 | </table> |
52 | </div> | 52 | </div> |
53 | <div> | 53 | <div> |
54 | <el-dialog | 54 | <el-dialog v-dialogDrag :close-on-click-modal="false" |
55 | title="批量修改" | 55 | title="批量修改" |
56 | :visible.sync="centerDialogVisible" | 56 | :visible.sync="centerDialogVisible" |
57 | width="30%" | 57 | width="30%" | ... | ... |
... | @@ -63,7 +63,7 @@ | ... | @@ -63,7 +63,7 @@ |
63 | </table> | 63 | </table> |
64 | </div> | 64 | </div> |
65 | <div> | 65 | <div> |
66 | <el-dialog | 66 | <el-dialog v-dialogDrag :close-on-click-modal="false" |
67 | title="批量修改" | 67 | title="批量修改" |
68 | :visible.sync="centerDialogVisible" | 68 | :visible.sync="centerDialogVisible" |
69 | width="30%" | 69 | width="30%" | ... | ... |
... | @@ -223,7 +223,7 @@ | ... | @@ -223,7 +223,7 @@ |
223 | </div> | 223 | </div> |
224 | 224 | ||
225 | <!-- 右键菜单弹出框 --> | 225 | <!-- 右键菜单弹出框 --> |
226 | <el-dialog title="添加" :visible.sync="dialogVisible" width="50%" > | 226 | <el-dialog v-dialogDrag :close-on-click-modal="false" title="添加" :visible.sync="dialogVisible" width="50%" > |
227 | <!-- 根据菜单类型(menuType)和右键点击的楼盘类型(treeData.type)来区分弹框内容 --> | 227 | <!-- 根据菜单类型(menuType)和右键点击的楼盘类型(treeData.type)来区分弹框内容 --> |
228 | <div class="addCh" v-show="menuType == 'ljz'"> | 228 | <div class="addCh" v-show="menuType == 'ljz'"> |
229 | <addLjz ref="ljz"></addLjz> | 229 | <addLjz ref="ljz"></addLjz> |
... | @@ -258,7 +258,7 @@ | ... | @@ -258,7 +258,7 @@ |
258 | @close="hcxlzClose" | 258 | @close="hcxlzClose" |
259 | ></h-cxlz> | 259 | ></h-cxlz> |
260 | <!-- 双击户的弹出框 --> | 260 | <!-- 双击户的弹出框 --> |
261 | <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" > | 261 | <el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" > |
262 | <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj> | 262 | <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj> |
263 | </el-dialog> | 263 | </el-dialog> |
264 | </div> | 264 | </div> | ... | ... |
... | @@ -306,7 +306,7 @@ | ... | @@ -306,7 +306,7 @@ |
306 | 306 | ||
307 | </ul> | 307 | </ul> |
308 | <!-- 层操作弹框 --> | 308 | <!-- 层操作弹框 --> |
309 | <el-dialog | 309 | <el-dialog v-dialogDrag :close-on-click-modal="false" |
310 | :title="addCData.title" | 310 | :title="addCData.title" |
311 | :visible.sync="addCVisible" | 311 | :visible.sync="addCVisible" |
312 | width="50%" | 312 | width="50%" |
... | @@ -336,7 +336,7 @@ | ... | @@ -336,7 +336,7 @@ |
336 | </div> | 336 | </div> |
337 | </el-dialog > | 337 | </el-dialog > |
338 | <!-- 户分割弹框 --> | 338 | <!-- 户分割弹框 --> |
339 | <el-dialog | 339 | <el-dialog v-dialogDrag :close-on-click-modal="false" |
340 | title = "户分割" | 340 | title = "户分割" |
341 | :visible.sync="hfgDialogVisible" | 341 | :visible.sync="hfgDialogVisible" |
342 | width="800px" | 342 | width="800px" | ... | ... |
-
Please register or sign in to post a comment