Skip to content

任超 / js.CadastralSystem

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

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

# Conflicts:
#	src/views/zd/zddcb/index.vue
2 parents 1fdac3f5 09e91025
Expand all
Inline Side-by-side
Showing 25 changed files with 535 additions and 171 deletions
...@@ -175,6 +175,18 @@ export function loadFile(url) { ...@@ -175,6 +175,18 @@ export function loadFile(url) {
175 } 175 }
176 }) 176 })
177 } 177 }
178 /**
179 * 删除文件
180 */
181 export function deleteFile(id) {
182 return request({
183 url:"/file/delete",
184 method:'delete',
185 params:{
186 id
187 }
188 })
189 }
178 190
179 /** 191 /**
180 * 多个宗地代码获取树的数据信息 192 * 多个宗地代码获取树的数据信息
...@@ -186,3 +198,13 @@ export function getListMenu(data) { ...@@ -186,3 +198,13 @@ export function getListMenu(data) {
186 data:data 198 data:data
187 }) 199 })
188 } 200 }
201 /**
202 * 登记调用
203 */
204 export function registerCall(data) {
205 return request({
206 url:'/system/basiccommon/registerCall',
207 method:'post',
208 data:data
209 })
210 }
......
...@@ -168,3 +168,14 @@ export function deleteZdy(id) { ...@@ -168,3 +168,14 @@ export function deleteZdy(id) {
168 } 168 }
169 }) 169 })
170 } 170 }
171
172 /**
173 * 批量提交
174 */
175 export function batchCommit(data) {
176 return request({
177 url:'/fw/lpbbatch/batchCommit',
178 method:'post',
179 data:data
180 })
181 }
......
...@@ -160,9 +160,22 @@ ol, ul { list-style:none; } ...@@ -160,9 +160,22 @@ ol, ul { list-style:none; }
160 margin: 0; 160 margin: 0;
161 padding: 7px 16px; 161 padding: 7px 16px;
162 cursor: pointer; 162 cursor: pointer;
163 position: relative;
164 .childUl{
165 display: none;
166 position: absolute;
167 left: 92px !important;
168 top: 0!important;
169 li{
170 width: 76px;
171 }
172 }
163 } 173 }
164 li:hover { 174 li:hover {
165 background: #eee; 175 background: #eee;
176 >.childUl{
177 display: block;
178 }
166 } 179 }
167 .noEdit{ 180 .noEdit{
168 color: #E6E6E6; 181 color: #E6E6E6;
......
...@@ -105,9 +105,10 @@ ...@@ -105,9 +105,10 @@
105 :disabled="formData.qszt!='0'" 105 :disabled="formData.qszt!='0'"
106 v-model="childItem.tdsyqssj" 106 v-model="childItem.tdsyqssj"
107 type="date" 107 type="date"
108 108 :picker-options="childItem.pickerStart"
109 value-format="yyyy-MM-dd" 109 value-format="yyyy-MM-dd"
110 placeholder="选择日期" 110 placeholder="选择日期"
111 @input="startTime(index,childIndex)"
111 > 112 >
112 </el-date-picker> 113 </el-date-picker>
113 </li> 114 </li>
...@@ -150,7 +151,7 @@ ...@@ -150,7 +151,7 @@
150 <li> 151 <li>
151 <input 152 <input
152 type="text" 153 type="text"
153 154
154 :disabled="formData.qszt!='0'" 155 :disabled="formData.qszt!='0'"
155 v-model="childItem.syqx" 156 v-model="childItem.syqx"
156 class="formInput" 157 class="formInput"
...@@ -211,7 +212,8 @@ ...@@ -211,7 +212,8 @@
211 :disabled="formData.qszt!='0'" 212 :disabled="formData.qszt!='0'"
212 v-model="childItem.tdsyjssj" 213 v-model="childItem.tdsyjssj"
213 type="date" 214 type="date"
214 215 :picker-options="childItem.pickerEnd"
216 @input="endTime(index,childIndex)"
215 value-format="yyyy-MM-dd" 217 value-format="yyyy-MM-dd"
216 placeholder="选择日期" 218 placeholder="选择日期"
217 > 219 >
...@@ -290,6 +292,8 @@ export default { ...@@ -290,6 +292,8 @@ export default {
290 sjytmj: 0, 292 sjytmj: 0,
291 syqx: "", 293 syqx: "",
292 tdsyjssj: "", 294 tdsyjssj: "",
295 pickerStart:{},
296 pickerEnd:{},
293 tdsyqssj: "", 297 tdsyqssj: "",
294 tdzh: "", 298 tdzh: "",
295 }, 299 },
...@@ -304,6 +308,42 @@ export default { ...@@ -304,6 +308,42 @@ export default {
304 console.log(this.formData,'formData'); 308 console.log(this.formData,'formData');
305 }, 309 },
306 methods: { 310 methods: {
311 startTime(index,childIndex){
312 let startTime= this.countList[index].list[childIndex].tdsyqssj;
313 let endTime=this.countList[index].list[childIndex].tdsyjssj;
314 this.countList[index].list[childIndex].pickerEnd={
315 disabledDate: (time) => {
316 if (Object.keys(startTime).length>0) {
317 return new Date(startTime).getTime()>time.getTime();
318 }else {
319 return time.getTime()< Date.now();
320 }
321 }
322 }
323 if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) {
324 let startYear= new Date(startTime).getFullYear();
325 let endYear=new Date(endTime).getFullYear();
326 this.countList[index].list[childIndex].syqx=endYear-startYear;
327 }
328 },
329 endTime(index,childIndex){
330 let startTime = this.countList[index].list[childIndex].tdsyqssj;
331 let endTime = this.countList[index].list[childIndex].tdsyjssj;
332 this.countList[index].list[childIndex].pickerStart={
333 disabledDate: (time) => {
334 if (Object.keys(endTime).length>0) {
335 return new Date(endTime).getTime()<time.getTime();
336 }else {
337 return time.getTime() > Date.now();
338 }
339 }
340 }
341 if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) {
342 let startYear= new Date(startTime).getFullYear();
343 let endYear=new Date(endTime).getFullYear();
344 this.countList[index].list[childIndex].syqx=endYear-startYear;
345 }
346 },
307 //外层操作 347 //外层操作
308 handleClick(ind, type) { 348 handleClick(ind, type) {
309 let outsideObj = { 349 let outsideObj = {
...@@ -325,6 +365,8 @@ export default { ...@@ -325,6 +365,8 @@ export default {
325 sjdjbsm: "", 365 sjdjbsm: "",
326 sjdjmc: "", 366 sjdjmc: "",
327 sjytdm: "", 367 sjytdm: "",
368 pickerStart:{},
369 pickerEnd:{},
328 sjytmc: "", 370 sjytmc: "",
329 sjytmj: 0, 371 sjytmj: 0,
330 syqx: "", 372 syqx: "",
...@@ -360,6 +402,8 @@ export default { ...@@ -360,6 +402,8 @@ export default {
360 sjytdm: "", 402 sjytdm: "",
361 sjytmc: "", 403 sjytmc: "",
362 sjytmj: 0, 404 sjytmj: 0,
405 pickerStart:{},
406 pickerEnd:{},
363 syqx: "", 407 syqx: "",
364 tdsyjssj: "", 408 tdsyjssj: "",
365 tdsyqssj: "", 409 tdsyqssj: "",
...@@ -402,7 +446,7 @@ export default { ...@@ -402,7 +446,7 @@ export default {
402 border-bottom: 1px solid #E6E6E6; 446 border-bottom: 1px solid #E6E6E6;
403 .el-col { 447 .el-col {
404 // height: 100%; 448 // height: 100%;
405 border-right: 1px solid grey; 449 border-right: 1px solid #E6E6E6;
406 position: relative; 450 position: relative;
407 .qlxz { 451 .qlxz {
408 line-height: 34px; 452 line-height: 34px;
...@@ -448,7 +492,7 @@ export default { ...@@ -448,7 +492,7 @@ export default {
448 } 492 }
449 .childYT { 493 .childYT {
450 height: 114px; 494 height: 114px;
451 border-top: 1px solid grey; 495 border-top: 1px solid #E6E6E6;
452 ul { 496 ul {
453 margin-top: 0; 497 margin-top: 0;
454 li { 498 li {
...@@ -478,7 +522,7 @@ export default { ...@@ -478,7 +522,7 @@ export default {
478 height: 34px; 522 height: 34px;
479 line-height: 34px; 523 line-height: 34px;
480 background-color: #fff; 524 background-color: #fff;
481 border-bottom: 1px solid grey; 525 border-bottom: 1px solid #E6E6E6;
482 position: absolute; 526 position: absolute;
483 right: 0; 527 right: 0;
484 top: 0; 528 top: 0;
...@@ -516,7 +560,9 @@ export default { ...@@ -516,7 +560,9 @@ export default {
516 /deep/.el-select-tree{ 560 /deep/.el-select-tree{
517 width: 100%; 561 width: 100%;
518 .el-input__inner{ 562 .el-input__inner{
519 height: 30px !important; 563 height: 34px !important;
564 position: relative;
565 top: -1px;
520 } 566 }
521 } 567 }
522 } 568 }
......
...@@ -329,7 +329,7 @@ export default { ...@@ -329,7 +329,7 @@ export default {
329 border-bottom: 1px solid #e6e6e6; 329 border-bottom: 1px solid #e6e6e6;
330 .el-col { 330 .el-col {
331 // height: 100%; 331 // height: 100%;
332 border-right: 1px solid grey; 332 border-right: 1px solid #E6E6E6;
333 position: relative; 333 position: relative;
334 .qlxz { 334 .qlxz {
335 line-height: 34px; 335 line-height: 34px;
...@@ -375,7 +375,7 @@ export default { ...@@ -375,7 +375,7 @@ export default {
375 } 375 }
376 .childYT { 376 .childYT {
377 height: 114px; 377 height: 114px;
378 border-top: 1px solid grey; 378 border-top: 1px solid #E6E6E6;
379 ul { 379 ul {
380 margin-top: 0; 380 margin-top: 0;
381 li { 381 li {
...@@ -405,7 +405,7 @@ export default { ...@@ -405,7 +405,7 @@ export default {
405 height: 34px; 405 height: 34px;
406 line-height: 34px; 406 line-height: 34px;
407 background-color: #fff; 407 background-color: #fff;
408 border-bottom: 1px solid grey; 408 border-bottom: 1px solid #E6E6E6;
409 position: absolute; 409 position: absolute;
410 right: 0; 410 right: 0;
411 top: 0; 411 top: 0;
......
...@@ -58,7 +58,15 @@ ...@@ -58,7 +58,15 @@
58 > 58 >
59 <li @click="postionToMap">定位</li> 59 <li @click="postionToMap">定位</li>
60 <li @click="importGeo">导入图形</li> 60 <li @click="importGeo">导入图形</li>
61 <li @click="exportToShp">导出图形</li> 61 <li @click="exportToShp">
62 导出图形
63 <ul class="contextmenu childUl">
64 <li>文本</li>
65 <li>CAD</li>
66 <li>Excel</li>
67 <li>ESRI Shape</li>
68 </ul>
69 </li>
62 <li v-show="isZD">导入属性</li> 70 <li v-show="isZD">导入属性</li>
63 <li v-show="!isZD">导入楼盘</li> 71 <li v-show="!isZD">导入楼盘</li>
64 <li>重叠分析</li> 72 <li>重叠分析</li>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <el-dialog 3 <el-dialog
4 title="新增" 4 title="新增"
5 :visible.sync="isVisible" 5 :visible.sync="isVisible"
6 width="50%" 6 width="70%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 center> 9 center>
......
...@@ -66,6 +66,11 @@ export default { ...@@ -66,6 +66,11 @@ export default {
66 LineTree, 66 LineTree,
67 Create, 67 Create,
68 }, 68 },
69 provide(){
70 return{
71 getRightTree: this.getRightTree
72 }
73 },
69 data() { 74 data() {
70 return { 75 return {
71 navigationList: [], 76 navigationList: [],
...@@ -180,7 +185,7 @@ export default { ...@@ -180,7 +185,7 @@ export default {
180 "$store.state.zrzbsm": function(bsm) { 185 "$store.state.zrzbsm": function(bsm) {
181 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm); 186 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
182 }, 187 },
183 188
184 "$store.state.treeData":function (val) { 189 "$store.state.treeData":function (val) {
185 console.log(val,'val'); 190 console.log(val,'val');
186 this.pd = val; 191 this.pd = val;
...@@ -557,10 +562,8 @@ export default { ...@@ -557,10 +562,8 @@ export default {
557 -webkit-box-shadow: inset -14px 0px 16px red; 562 -webkit-box-shadow: inset -14px 0px 16px red;
558 box-shadow: inset -23px 0px 16px #1d50dd; 563 box-shadow: inset -23px 0px 16px #1d50dd;
559 transition: 0.3s; 564 transition: 0.3s;
560 display: none;
561 } 565 }
562 .w0{ 566 .w0{
563 display: block;
564 width: 64px; 567 width: 64px;
565 } 568 }
566 } 569 }
......
...@@ -199,6 +199,7 @@ ...@@ -199,6 +199,7 @@
199 <div style="min-height: 40px;text-align: center;margin-top: 10px"> 199 <div style="min-height: 40px;text-align: center;margin-top: 10px">
200 <el-button type="success" @click="onSave">保存</el-button> 200 <el-button type="success" @click="onSave">保存</el-button>
201 <el-button type="primary" @click="onSubmit">提交</el-button> 201 <el-button type="primary" @click="onSubmit">提交</el-button>
202 <el-button type="primary" @click="registerCall">登记调用</el-button>
202 </div> 203 </div>
203 </div> 204 </div>
204 205
...@@ -209,13 +210,14 @@ ...@@ -209,13 +210,14 @@
209 import Qlxz from "../../../components/formMenu/qlxz_simple"; 210 import Qlxz from "../../../components/formMenu/qlxz_simple";
210 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz"; 211 import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz";
211 import {getQjZdjbxxDetailById} from "../../../api/zd" 212 import {getQjZdjbxxDetailById} from "../../../api/zd"
212 import {submit} from "../../../api/common" 213 import {submit,registerCall} from "../../../api/common"
213 export default { 214 export default {
214 name:'zrz', 215 name:'zrz',
215 components:{ 216 components:{
216 Qlr, 217 Qlr,
217 Qlxz, 218 Qlxz,
218 }, 219 },
220 inject:['getRightTree'],
219 data () { 221 data () {
220 return { 222 return {
221 223
...@@ -289,6 +291,18 @@ ...@@ -289,6 +291,18 @@
289 } 291 }
290 }, 292 },
291 methods: { 293 methods: {
294 registerCall(){
295 let data={
296 type:'dz',
297 bsm:this.$route.query.bsm
298 }
299 registerCall(data).then(res=>{
300 if (res.success) {
301 this.$message.success("登记成功")
302 this.getRightTree(this.$store.state.zdbsm)
303 }
304 })
305 },
292 addYtInfo(){ 306 addYtInfo(){
293 this.form.fwytList.push({ 307 this.form.fwytList.push({
294 glbsm:'', 308 glbsm:'',
...@@ -533,4 +547,4 @@ ...@@ -533,4 +547,4 @@
533 } 547 }
534 } 548 }
535 } 549 }
536 </style>
...\ No newline at end of file ...\ No newline at end of file
550 </style>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 <td>操作</td> 18 <td>操作</td>
19 </tr> 19 </tr>
20 <tr v-if="zdhbqData.length==0"> 20 <tr v-if="zdhbqData.length==0">
21 <td colspan="7"> 21 <td colspan="8">
22 <span class="noData">暂无数据</span> 22 <span class="noData">暂无数据</span>
23 </td> 23 </td>
24 </tr> 24 </tr>
...@@ -134,9 +134,10 @@ ...@@ -134,9 +134,10 @@
134 <td class="bdcqzh">不动产权证号</td> 134 <td class="bdcqzh">不动产权证号</td>
135 <td class="qlr">权利人</td> 135 <td class="qlr">权利人</td>
136 <td class="zl">坐落</td> 136 <td class="zl">坐落</td>
137 <td class="">操作</td>
137 </tr> 138 </tr>
138 <tr v-if="dzhbqData.length==0"> 139 <tr v-if="dzhbqData.length==0">
139 <td colspan="7"> 140 <td colspan="8">
140 <span class="noData">暂无数据</span> 141 <span class="noData">暂无数据</span>
141 </td> 142 </td>
142 </tr> 143 </tr>
...@@ -154,6 +155,7 @@ ...@@ -154,6 +155,7 @@
154 readonly="readonly"/></td> 155 readonly="readonly"/></td>
155 <td class="zl"><input type="text" class="formInput" v-model="item.zl" 156 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
156 readonly="readonly"/></td> 157 readonly="readonly"/></td>
158 <td class="cz" @click="deleteData(index)"><span>删除</span></td>
157 </tr> 159 </tr>
158 </table> 160 </table>
159 </div> 161 </div>
...@@ -250,9 +252,10 @@ ...@@ -250,9 +252,10 @@
250 <td class="bdcqzh">不动产权证号</td> 252 <td class="bdcqzh">不动产权证号</td>
251 <td class="qlr">权利人</td> 253 <td class="qlr">权利人</td>
252 <td class="zl">坐落</td> 254 <td class="zl">坐落</td>
255 <td class="">操作</td>
253 </tr> 256 </tr>
254 <tr v-if="hhbqData.length==0"> 257 <tr v-if="hhbqData.length==0">
255 <td colspan="7"> 258 <td colspan="8">
256 <span class="noData">暂无数据</span> 259 <span class="noData">暂无数据</span>
257 </td> 260 </td>
258 </tr> 261 </tr>
...@@ -270,6 +273,7 @@ ...@@ -270,6 +273,7 @@
270 readonly="readonly"/></td> 273 readonly="readonly"/></td>
271 <td class="zl"><input type="text" class="formInput" v-model="item.zl" 274 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
272 readonly="readonly"/></td> 275 readonly="readonly"/></td>
276 <td class="cz" @click="deleteData(index)"><span>删除</span></td>
273 </tr> 277 </tr>
274 </table> 278 </table>
275 </div> 279 </div>
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
8 @tab-click="handleClick"> 8 @tab-click="handleClick">
9 <el-tab-pane class="eltabspane" v-if="!auth" label="宗地" name="zd"> 9 <el-tab-pane class="eltabspane" v-if="!auth" label="宗地" name="zd">
10 <el-form :inline="true" :rules="rules" :model="ruleForm" ref="ruleForm" class="demo-form-inline"> 10 <el-form :inline="true" :rules="rules" :model="ruleForm" ref="ruleForm" class="demo-form-inline">
11 <el-form-item label="行政区划" class="w100" required prop="xmmc"> 11 <el-form-item label="行政区划" class="w100" prop="xzqbsm">
12 <el-col :span="7"> 12 <el-col :span="7">
13 <el-form-item required prop="xzqbsm"> 13 <el-form-item prop="xzqbsm">
14 <el-select v-model="ruleForm.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(ruleForm.xzqbsm)"> 14 <el-select v-model="ruleForm.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(ruleForm.xzqbsm)">
15 <el-option 15 <el-option
16 v-for="item in xzq" 16 v-for="item in xzq"
...@@ -48,13 +48,13 @@ ...@@ -48,13 +48,13 @@
48 </el-form-item> 48 </el-form-item>
49 </el-col> 49 </el-col>
50 </el-form-item> 50 </el-form-item>
51 <el-form-item label="项目名称" class="w100" required prop="xmmc"> 51 <el-form-item label="项目名称" class="w100" prop="xmmc">
52 <el-input 52 <el-input
53 v-model="ruleForm.xmmc" 53 v-model="ruleForm.xmmc"
54 placeholder="项目名称" 54 placeholder="项目名称"
55 ></el-input> 55 ></el-input>
56 </el-form-item> 56 </el-form-item>
57 <el-form-item label="所有权类型" class="w100" required prop="syqlxbsm"> 57 <el-form-item label="所有权类型" class="w100" prop="syqlxbsm">
58 <el-select 58 <el-select
59 v-model="ruleForm.syqlxbsm" 59 v-model="ruleForm.syqlxbsm"
60 placeholder="所有权类型" 60 placeholder="所有权类型"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
68 </el-option> 68 </el-option>
69 </el-select> 69 </el-select>
70 </el-form-item> 70 </el-form-item>
71 <el-form-item label="特征码" class="w100" required prop="zdtzmbsm"> 71 <el-form-item label="特征码" class="w100" prop="zdtzmbsm">
72 <el-select 72 <el-select
73 v-model="ruleForm.zdtzmbsm" 73 v-model="ruleForm.zdtzmbsm"
74 placeholder="宗地特征码" 74 placeholder="宗地特征码"
......
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
56 <hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj> 56 <hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
57 <div class="btnGroup"> 57 <div class="btnGroup">
58 <el-button type="primary" @click="hbjSaveInfo">保存</el-button> 58 <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
59 <el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
59 <el-button type="primary" @click="hbjResetInfo">重置</el-button> 60 <el-button type="primary" @click="hbjResetInfo">重置</el-button>
60 <el-button type="primary" @click="hbjVisible = false">取消</el-button> 61 <el-button type="primary" @click="hbjVisible = false">取消</el-button>
61 </div> 62 </div>
...@@ -110,6 +111,11 @@ ...@@ -110,6 +111,11 @@
110 this.$refs.hbj.onSave(this.hbsm, this.tabPosition); 111 this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
111 this.getData({pageSize:15}); 112 this.getData({pageSize:15});
112 }, 113 },
114 //户提交
115 hbjSubmitInfo() {
116 this.$refs.hbj.onSubmit(this.hbsm, this.tabPosition);
117 this.getData({pageSize:15});
118 },
113 //户编辑表单重置 119 //户编辑表单重置
114 hbjResetInfo() { 120 hbjResetInfo() {
115 this.$refs.hbj.onReset(); 121 this.$refs.hbj.onReset();
......
...@@ -33,7 +33,10 @@ ...@@ -33,7 +33,10 @@
33 <td class="lx">{{item.filepostfix}}</td> 33 <td class="lx">{{item.filepostfix}}</td>
34 <td class="cz"> 34 <td class="cz">
35 <span @click="downloadFile(item.fileurl)">下载</span> 35 <span @click="downloadFile(item.fileurl)">下载</span>
36 <span>/</span>
36 <span @click="loadFile(item.fileurl)">预览</span> 37 <span @click="loadFile(item.fileurl)">预览</span>
38 <span>/</span>
39 <span @click="deleteFile(item.bsm)">删除</span>
37 </td> 40 </td>
38 </tr> 41 </tr>
39 </table> 42 </table>
...@@ -41,7 +44,7 @@ ...@@ -41,7 +44,7 @@
41 </template> 44 </template>
42 45
43 <script> 46 <script>
44 import {insertFile, getFileLis, downloadFile,loadFile} from "./../../../api/common" 47 import {insertFile, getFileLis, downloadFile,loadFile,deleteFile} from "./../../../api/common"
45 import {Message} from "element-ui" 48 import {Message} from "element-ui"
46 49
47 export default { 50 export default {
...@@ -69,21 +72,29 @@ ...@@ -69,21 +72,29 @@
69 } 72 }
70 }, 73 },
71 mounted() { 74 mounted() {
72 switch (this.$route.name) { 75 this.getFileList()
73 case "宗地":
74 this.filesData.dylx = 'zd';
75 this.filesData.glbsm = this.$store.state.zdbsm
76 break;
77 case "自然幢":
78 this.filesData.dylx = 'zrz';
79 this.filesData.glbsm = this.$store.state.zrzbsm
80 break
81 default:
82 break
83 }
84 this.getFileList(this.filesData.glbsm)
85 }, 76 },
86 methods: { 77 methods: {
78 deleteFile(bsm){
79 this.$confirm('将删除该文件, 是否继续?', '提示', {
80 confirmButtonText: '确定',
81 cancelButtonText: '取消',
82 type: 'warning'
83 }).then(() => {
84 deleteFile(bsm).then(res=>{
85 if (res.success) {
86 this.getFileList();
87 }else {
88 this.$message.error("删除失败")
89 }
90 })
91 }).catch(() => {
92 this.$message({
93 type: 'info',
94 message: '已取消'
95 });
96 });
97 },
87 loadFile(url){ 98 loadFile(url){
88 loadFile(url).then(res=>{ 99 loadFile(url).then(res=>{
89 if (res.success) { 100 if (res.success) {
...@@ -94,8 +105,20 @@ ...@@ -94,8 +105,20 @@
94 downloadFile(url) { 105 downloadFile(url) {
95 window.open(`/api/file/download?url=`+url); 106 window.open(`/api/file/download?url=`+url);
96 }, 107 },
97 getFileList(bsm) { 108 getFileList() {
98 getFileLis(bsm).then(res => { 109 switch (this.$route.name) {
110 case "宗地":
111 this.filesData.dylx = 'zd';
112 this.filesData.glbsm = this.$store.state.zdbsm
113 break;
114 case "自然幢":
115 this.filesData.dylx = 'zrz';
116 this.filesData.glbsm = this.$store.state.zrzbsm
117 break
118 default:
119 break
120 }
121 getFileLis(this.filesData.glbsm ).then(res => {
99 if (res.success) { 122 if (res.success) {
100 this.list = res.result; 123 this.list = res.result;
101 } else { 124 } else {
...@@ -140,7 +163,7 @@ ...@@ -140,7 +163,7 @@
140 box-sizing: border-box; 163 box-sizing: border-box;
141 padding: 18px; 164 padding: 18px;
142 height: auto; 165 height: auto;
143 width: 80%; 166 width: 100%;
144 } 167 }
145 168
146 table { 169 table {
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane> 4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
5 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb></mjftb></el-tab-pane> 5 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible"></mjftb></el-tab-pane>
6 <el-tab-pane label="界址点" name="jzd"><jzd></jzd></el-tab-pane> 6 <el-tab-pane label="界址点" name="jzd"><jzd v-if="jzdVisible"></jzd></el-tab-pane>
7 <el-tab-pane label="界址线" name="jzx"><jzx></jzx></el-tab-pane> 7 <el-tab-pane label="界址线" name="jzx"><jzx v-if="jzxVisible"></jzx></el-tab-pane>
8 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> 8 <el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane>
9 <el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane> 9 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
10 <el-tab-pane label="附件材料" name="fjcl"><fjcl></fjcl></el-tab-pane> 10 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
11 </el-tabs> 11 </el-tabs>
12 </div> 12 </div>
13 </template> 13 </template>
...@@ -29,11 +29,40 @@ export default { ...@@ -29,11 +29,40 @@ export default {
29 data() { 29 data() {
30 return { 30 return {
31 activeName: "djdcb", 31 activeName: "djdcb",
32 mjftbVisible:false,
33 jzdVisible:false,
34 jzxVisible:false,
35 djbVisible:false,
36 lshsVisible:false,
37 fjclVisible:false,
32 }; 38 };
33 }, 39 },
34 methods: { 40 methods: {
35 handleClick(tab, event) { 41 handleClick(tab, event) {
36 // console.log(tab, event); 42 // console.log(tab, event);
43 switch (tab.name) {
44 case 'mjftb':
45 this.mjftbVisible = true;
46 break;
47 case 'jzd':
48 this.jzdVisible = true;
49 break;
50 case 'jzx':
51 this.jzxVisible = true;
52 break;
53 case 'djb':
54 this.djbVisible = true;
55 break;
56 case 'lshs':
57 this.lshsVisible = true;
58 break;
59 case 'fjcl':
60 this.fjclVisible = true;
61 break;
62
63 default:
64 break;
65 }
37 }, 66 },
38 }, 67 },
39 created() {}, 68 created() {},
......
...@@ -87,6 +87,14 @@ ...@@ -87,6 +87,14 @@
87 </span> 87 </span>
88 </el-dialog> 88 </el-dialog>
89 </div> 89 </div>
90 <!--
91 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
92
93 <el-button type="primary" @click="oneExit">编辑</el-button>
94 <el-button type="primary" @click="save">保存</el-button>
95 <el-button type="primary" @click="batchExit">批量修改</el-button>
96 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
97 </div> -->
90 </div> 98 </div>
91 </template> 99 </template>
92 100
...@@ -276,7 +284,25 @@ ...@@ -276,7 +284,25 @@
276 box-sizing: border-box; 284 box-sizing: border-box;
277 padding: 18px; 285 padding: 18px;
278 height: auto; 286 height: auto;
279 width: 80%; 287 width: 100%;
288 .header-button {
289 height: 50px;
290 position: fixed;
291 bottom: 0;
292 right: ;
293 text-align: center;
294 background-color: #ffffff;
295 .saveBtn {
296 background-color: #00CACD;
297 border-color: #00CACD;
298 padding: 10px 30px;
299 margin-top: 8px;
300 }
301 .saveBtn:hover {
302 background-color: rgba(0, 202, 205, .8);
303 border-color: rgba(0, 202, 205, .8);
304 }
305 }
280 table { 306 table {
281 margin-top: 10px; 307 margin-top: 10px;
282 background-color: #fff; 308 background-color: #fff;
......
...@@ -344,7 +344,7 @@ ...@@ -344,7 +344,7 @@
344 box-sizing: border-box; 344 box-sizing: border-box;
345 padding: 18px; 345 padding: 18px;
346 height: auto; 346 height: auto;
347 width: 80%; 347 width: 100%;
348 table { 348 table {
349 margin-top: 10px; 349 margin-top: 10px;
350 background-color: #fff; 350 background-color: #fff;
......
1 <template> 1 <template>
2 <div class="lshs-content"> 2 <div class="lshs-content">
3 <div class="slot"> 3 <!-- <div class="slot">-->
4 <div><span class="tip-title">范围属性变更：</span></div> 4 <!-- <div><span class="tip-title">范围属性变更：</span></div>-->
5 <div><span class="tip-title">宗地分割：</span></div> 5 <!-- <div><span class="tip-title">宗地分割：</span></div>-->
6 <div><span class="tip-title">宗地合并：</span></div> 6 <!-- <div><span class="tip-title">宗地合并：</span></div>-->
7 </div> 7 <!-- </div>-->
8 <div id="mountNode" ref="containerWidth"></div> 8 <div id="mountNode" ref="containerWidth"></div>
9 <div id="mountNodeRight"></div>
9 </div> 10 </div>
10 </template> 11 </template>
11 12
...@@ -43,17 +44,17 @@ export default { ...@@ -43,17 +44,17 @@ export default {
43 methods: { 44 methods: {
44 initG6() { 45 initG6() {
45 const data = this.data; 46 const data = this.data;
46 const eWidth = this.$refs.containerWidth.clientWidth 47 const eWidth = this.$refs.containerWidth.clientWidth
47 console.log(eWidth+":width") 48 console.log(eWidth+":width")
48 G6.registerNode( 49 G6.registerNode(
49 'sql', 50 'sql',
50 { 51 {
51 drawShape(cfg, group) { 52 drawShape(cfg, group) {
52 const rect = group.addShape('rect', { 53 const rect = group.addShape('rect', {
53 attrs: { 54 attrs: {
54 x: -75, 55 x: -100,
55 y: -25, 56 y: -25,
56 width: 150, 57 width: 200,
57 height: 50, 58 height: 50,
58 radius: 10, 59 radius: 10,
59 stroke: '#5B8FF9', 60 stroke: '#5B8FF9',
...@@ -83,43 +84,19 @@ export default { ...@@ -83,43 +84,19 @@ export default {
83 'single-node', 84 'single-node',
84 ); 85 );
85 G6.registerEdge( 86 G6.registerEdge(
86 'circle-running', 87 'polyline1',
87 { 88 {
88 afterDraw(cfg, group) { 89 afterDraw(cfg, group) {
89 const shape = group.get('children')[0]; 90 console.log(cfg.data+":cfg")
90 const startPoint = shape.getPoint(0); 91 console.log(group.toString()+"group")
91 92 },
92 const circle = group.addShape('circle', {
93 attrs: {
94 x: startPoint.x,
95 y: startPoint.y,
96 fill: '#1890ff',
97 r: 3,
98 },
99 name: 'circle-shape',
100 });
101
102 circle.animate(
103 (ratio) => {
104 const tmpPoint = shape.getPoint(ratio);
105 return {
106 x: tmpPoint.x,
107 y: tmpPoint.y,
108 };
109 },
110 {
111 repeat: true,
112 duration: 3000,
113 },
114 );
115 },
116 }, 93 },
117 'line', 94 'polyline',
118 ); 95 );
119 96
120 const tooltip = new G6.Tooltip({ 97 const tooltip = new G6.Tooltip({
121 offsetX: 10 + 10, 98 offsetX: 210,
122 offsetY: 10 + 10, 99 offsetY: 210,
123 itemTypes: ['node', 'edge'], 100 itemTypes: ['node', 'edge'],
124 getContent: (e) => { 101 getContent: (e) => {
125 const outDiv = document.createElement('div'); 102 const outDiv = document.createElement('div');
...@@ -141,28 +118,25 @@ export default { ...@@ -141,28 +118,25 @@ export default {
141 console.log(container) 118 console.log(container)
142 const graph = new G6.Graph({ 119 const graph = new G6.Graph({
143 container: 'mountNode', 120 container: 'mountNode',
144 width:1000, 121 width:eWidth,
145 height:1000, 122 height:1000,
146 layout: { 123 layout: {
147 type: 'dagre', 124 type: 'dagre',
148 nodesepFunc: (d) => { 125 nodesepFunc: (d) => {
149 if (d.id === '3') { 126 return 100;
150 return 500;
151 }
152 return 50;
153 }, 127 },
154 ranksep: 70, 128 ranksep: 30,
155 controlPoints: true, 129 controlPoints: true,
156 }, 130 },
157 defaultNode: { 131 defaultNode: {
158 type: 'sql', 132 type: 'sql',
159 }, 133 },
160 defaultEdge: { 134 defaultEdge: {
161 type: 'polyline', 135 type: 'polyline1',
162 style: { 136 style: {
163 radius: 20, 137 radius: 10,
164 offset: 45, 138 offset: 10,
165 endArrow: true, 139 // endArrow: true,
166 lineWidth: 2, 140 lineWidth: 2,
167 stroke: 'rgba(78,142,230,0.45)', 141 stroke: 'rgba(78,142,230,0.45)',
168 }, 142 },
...@@ -184,25 +158,6 @@ export default { ...@@ -184,25 +158,6 @@ export default {
184 ], 158 ],
185 }, 159 },
186 160
187 // modes: {
188 // default: [
189 // 'drag-canvas',
190 // 'zoom-canvas',
191 // 'click-select',
192 // {
193 // type: 'tooltip',
194 // formatText(model) {
195 // const cfg = model.conf;
196 // const text = [];
197 // cfg.forEach((row) => {
198 // text.push(row.label + ':' + row.value + '<br>');
199 // });
200 // return text.join('\n');
201 // },
202 // offset: -30,
203 // },
204 // ],
205 // },
206 fitView: true, 161 fitView: true,
207 }); 162 });
208 163
...@@ -234,7 +189,7 @@ export default { ...@@ -234,7 +189,7 @@ export default {
234 getLshsData(){ 189 getLshsData(){
235 let _this = this; 190 let _this = this;
236 const data = { 191 const data = {
237 "bsm": "c0818d9e4286b35b8ee9b96d90b522aa", 192 "bsm": "d85a274a332ad2d35c922a3a95eb154f",
238 "type": "zd" 193 "type": "zd"
239 }; 194 };
240 getLshs(data).then((res)=>{ 195 getLshs(data).then((res)=>{
...@@ -253,10 +208,21 @@ export default { ...@@ -253,10 +208,21 @@ export default {
253 208
254 .lshs-content{ 209 .lshs-content{
255 width: 100%; 210 width: 100%;
211 height: 100%;
256 } 212 }
257 213
258 #mountNode{ 214 #mountNode{
259 width: 100%; 215 /*height: calc(100% - 68px);*/
216 margin-top: -60px;
217 width: 60%;
218 float: left;
219 }
220
221 #mountNodeRight{
222 width: 38%;
223 float: right;
224 height: 1000px;
225 border: 0 solid #5ebbff;
260 } 226 }
261 227
262 .slot{ 228 .slot{
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main" ref="mainBox">
3 <table border="1"> 3 <table border="1">
4 <tr> 4 <tr>
5 <td colspan="2">土地坐落</td> 5 <td colspan="2">土地坐落</td>
...@@ -67,8 +67,12 @@ ...@@ -67,8 +67,12 @@
67 <td class="fttjmj">{{sumFttdmj}}</td> 67 <td class="fttjmj">{{sumFttdmj}}</td>
68 </tr> 68 </tr>
69 </table> 69 </table>
70 <div class="pers"> 70 <!-- <div class="pers">
71 <el-button @click="save" type="primary">保存</el-button> 71 <el-button @click="save" type="primary">保存</el-button>
72 </div> -->
73
74 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
75 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
72 </div> 76 </div>
73 </div> 77 </div>
74 </template> 78 </template>
...@@ -100,7 +104,8 @@ ...@@ -100,7 +104,8 @@
100 tdsyqsyqmj: '' // 土地所有权/使用权面积 104 tdsyqsyqmj: '' // 土地所有权/使用权面积
101 } 105 }
102 ] 106 ]
103 } 107 },
108 mainBoxWidth:0
104 } 109 }
105 }, 110 },
106 111
...@@ -198,7 +203,6 @@ ...@@ -198,7 +203,6 @@
198 console.log("create init...") 203 console.log("create init...")
199 }, 204 },
200 mounted() { 205 mounted() {
201 console.log("mounted init...")
202 this.mjftData.zdbsm = this.$store.state.zdbsm 206 this.mjftData.zdbsm = this.$store.state.zdbsm
203 this.zdmj = this.$store.state.zdmj 207 this.zdmj = this.$store.state.zdmj
204 this.tdzl = this.$store.state.zdzl 208 this.tdzl = this.$store.state.zdzl
...@@ -206,6 +210,9 @@ ...@@ -206,6 +210,9 @@
206 if (this.mjftData.zdbsm) { 210 if (this.mjftData.zdbsm) {
207 this.getData(this.mjftData.zdbsm) 211 this.getData(this.mjftData.zdbsm)
208 } 212 }
213 this.$nextTick(() => {
214 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
215 })
209 }, 216 },
210 watch: { 217 watch: {
211 "$store.state.zdbsm": function (bsm) { 218 "$store.state.zdbsm": function (bsm) {
...@@ -229,33 +236,49 @@ ...@@ -229,33 +236,49 @@
229 box-sizing: border-box; 236 box-sizing: border-box;
230 padding: 18px; 237 padding: 18px;
231 height: auto; 238 height: auto;
232 width: 80%;
233 }
234
235 table {
236 margin-top: 10px;
237 background-color: #fff;
238 font-size: 14px;
239 width: 100%; 239 width: 100%;
240 cursor: pointer; 240
241 td { 241 table {
242 margin-top: 10px;
243 background-color: #fff;
244 font-size: 14px;
245 width: 100%;
246 cursor: pointer;
247 .formInput {
248 margin: 0;
249 height: 36px;
250 outline: none;
251 border: none;
252 color: #606764;
253 overflow: visible;
254 text-align: center;
255 cursor: text;
256 }
257 td {
258 text-align: center;
259 height: 36px;
260 min-width: 50px;
261 }
262 }
263 .header-button {
264 height: 50px;
265 position: fixed;
266 bottom: 0;
267 right: 0;
242 text-align: center; 268 text-align: center;
243 height: 36px; 269 background-color: #ffffff;
244 min-width: 50px; 270 .saveBtn {
271 background-color: #00CACD;
272 border-color: #00CACD;
273 padding: 10px 30px;
274 margin-top: 8px;
275 }
276 .saveBtn:hover {
277 background-color: rgba(0, 202, 205, .8);
278 border-color: rgba(0, 202, 205, .8);
279 }
245 } 280 }
246 } 281 }
247
248 table .formInput {
249 margin: 0;
250 height: 36px;
251 outline: none;
252 border: none;
253 color: #606764;
254 overflow: visible;
255 text-align: center;
256 cursor: text;
257 }
258
259 .pers { 282 .pers {
260 text-align: center; 283 text-align: center;
261 margin-top: 10px; 284 margin-top: 10px;
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main" ref="mainBox">
3 <div class="formMenu"> 3 <div class="formMenu">
4 <Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt"></Qlr> 4 <Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt"></Qlr>
5 <!-- <el-button 5 <!-- <el-button
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
207 </td> 207 </td>
208 <td colspan="2">容积说明</td> 208 <td colspan="2">容积说明</td>
209 <td colspan="4" class="psr"> 209 <td colspan="4" class="psr">
210 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.rjsm" /> 210 <input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.rjlsm" />
211 </td> 211 </td>
212 </tr> 212 </tr>
213 <tr> 213 <tr>
...@@ -338,9 +338,18 @@ ...@@ -338,9 +338,18 @@
338 </tr> 338 </tr>
339 </table> 339 </table>
340 340
341 <div style="min-height: 40px;text-align: center;margin-top: 10px"> 341 <!-- <div style="min-height: 40px;text-align: center;margin-top: 10px">
342 <el-button type="success" @click="updateZDxx">保存</el-button> 342 <el-button type="success" class="saveBtn" @click="updateZDxx">保存</el-button>
343 <el-button type="primary" @click="submitZDxx">提交</el-button> 343 <el-button type="primary" @click="submitZDxx">提交</el-button>
344 <el-button type="primary" @click="registerCall">登记调用</el-button>
345 </div> -->
346
347 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
348
349 <el-button type="primary" class="saveBtn" @click="updateZDxx">保存</el-button>
350 <el-button type="primary" @click="submitZDxx">提交</el-button>
351 <el-button type="primary" @click="registerCall">登记调用</el-button>
352 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
344 </div> 353 </div>
345 </div> 354 </div>
346 </div> 355 </div>
...@@ -356,7 +365,8 @@ import { ...@@ -356,7 +365,8 @@ import {
356 getListByXzqbsm, 365 getListByXzqbsm,
357 getListByPbsm, 366 getListByPbsm,
358 submit, 367 submit,
359 getTree 368 getTree,
369 registerCall
360 } from "../../../api/common"; 370 } from "../../../api/common";
361 import { 371 import {
362 getBdcdyh, 372 getBdcdyh,
...@@ -365,6 +375,7 @@ import { ...@@ -365,6 +375,7 @@ import {
365 } from "../../../api/zd"; 375 } from "../../../api/zd";
366 376
367 export default { 377 export default {
378 inject:['getRightTree'],
368 name: "", 379 name: "",
369 components: { 380 components: {
370 Qlr, 381 Qlr,
...@@ -411,6 +422,7 @@ export default { ...@@ -411,6 +422,7 @@ export default {
411 formData: {}, 422 formData: {},
412 dpdm:'', //宗地底盘代码 423 dpdm:'', //宗地底盘代码
413 curZdbsm:'', 424 curZdbsm:'',
425 mainBoxWidth:0,
414 geoAttributes:{ 426 geoAttributes:{
415 OBJECTID:"", 427 OBJECTID:"",
416 BSM:"", 428 BSM:"",
...@@ -464,8 +476,23 @@ export default { ...@@ -464,8 +476,23 @@ export default {
464 }, 476 },
465 mounted() { 477 mounted() {
466 this.getZdjbxxData(this.$store.state.zdbsm); 478 this.getZdjbxxData(this.$store.state.zdbsm);
479 this.$nextTick(() => {
480 this.mainBoxWidth = this.$refs.mainBox.clientWidth;
481 })
467 }, 482 },
468 methods: { 483 methods: {
484 registerCall(){
485 let data={
486 type:'zd',
487 bsm:this.$store.state.zdbsm
488 }
489 registerCall(data).then(res=>{
490 if (res.success) {
491 this.$message.success("登记成功")
492 this.getRightTree(this.$store.state.zdbsm)
493 }
494 })
495 },
469 //根据zdbsm查询基本信息 496 //根据zdbsm查询基本信息
470 getZdjbxxData(bsm) { 497 getZdjbxxData(bsm) {
471 getQjZdjbxxDetailById(bsm) 498 getQjZdjbxxDetailById(bsm)
...@@ -815,6 +842,7 @@ export default { ...@@ -815,6 +842,7 @@ export default {
815 td { 842 td {
816 text-align: center; 843 text-align: center;
817 height: 36px; 844 height: 36px;
845 border-color: #E6E6E6;
818 } 846 }
819 /deep/ .el-input__inner { 847 /deep/ .el-input__inner {
820 margin: 0; 848 margin: 0;
...@@ -852,5 +880,26 @@ export default { ...@@ -852,5 +880,26 @@ export default {
852 width: 100%; 880 width: 100%;
853 } 881 }
854 } 882 }
883
884 .header-button {
885 height: 50px;
886 position: fixed;
887 bottom: 0;
888 right: 6px;
889 text-align: center;
890 background-color: #ffffff;
891 .el-button{
892 padding: 10px 30px;
893 margin-top: 8px;
894 }
895 .saveBtn {
896 background-color: #00CACD;
897 border-color: #00CACD;
898 }
899 .saveBtn:hover {
900 background-color: rgba(0, 202, 205, .8);
901 border-color: rgba(0, 202, 205, .8);
902 }
903 }
855 } 904 }
856 </style> 905 </style>
......
...@@ -46,8 +46,8 @@ export default { ...@@ -46,8 +46,8 @@ export default {
46 }; 46 };
47 </script> 47 </script>
48 <style scoped lang="less"> 48 <style scoped lang="less">
49 // .content_box{ 49 .content_box{
50 // box-sizing: border-box; 50 padding: 0 0 16px;
51 // padding: 0 20px; 51 // padding: 0 20px;
52 // .el-tabs{ 52 // .el-tabs{
53 // width: 100%; 53 // width: 100%;
...@@ -65,5 +65,5 @@ export default { ...@@ -65,5 +65,5 @@ export default {
65 // width: 100%; 65 // width: 100%;
66 // height: 100%; 66 // height: 100%;
67 // } 67 // }
68 // } 68 }
69 </style> 69 </style>
......
...@@ -403,7 +403,8 @@ ...@@ -403,7 +403,8 @@
403 import Qlr from "./../../../../../components/formMenu/qlr"; 403 import Qlr from "./../../../../../components/formMenu/qlr";
404 import Qlxz from "./../../../../../components/formMenu/qlxz_simple"; 404 import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
405 import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h"; 405 import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
406 import {getBdcdyh} from "./../../../../../api/zrz" 406 import {getBdcdyh} from "./../../../../../api/zrz";
407 import {submit} from "./../../../../../api/common"
407 export default { 408 export default {
408 name:'zrz', 409 name:'zrz',
409 components:{ 410 components:{
...@@ -697,6 +698,18 @@ ...@@ -697,6 +698,18 @@
697 } 698 }
698 }) 699 })
699 }, 700 },
701 onSubmit(bsm,yclx){
702 let data={
703 glbsm:bsm,
704 status:1,
705 type:"h"
706 }
707 submit(data).then((res)=>{
708 if(res.code===200){
709 this.$message.success("提交完成！");
710 }
711 })
712 },
700 onReset(){ 713 onReset(){
701 this.form.bdcdyh='', //不动产单元号 714 this.form.bdcdyh='', //不动产单元号
702 this.form.mjdwbsm='', //面积单位编号 715 this.form.mjdwbsm='', //面积单位编号
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="edit"> 2 <div class="edit">
3 <div class="tab-header"> 3 <div class="tab-header">
4 <el-row class="searchContent"> 4 <el-row class="searchContent">
5 <el-col :span="8"> 5 <el-col :span="6">
6 <el-radio-group v-model="scyclx" @change="scyclxChange"> 6 <el-radio-group v-model="scyclx" @change="scyclxChange">
7 <el-radio-button label="1">实测</el-radio-button> 7 <el-radio-button label="1">实测</el-radio-button>
8 <el-radio-button label="0">预测</el-radio-button> 8 <el-radio-button label="0">预测</el-radio-button>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 ></i 23 ></i
24 ></el-input> 24 ></el-input>
25 </el-col> 25 </el-col>
26 <el-col :span="16"> 26 <el-col :span="18">
27 <div class="fr"> 27 <div class="fr">
28 <el-button class="radioBtn" label="1" border @click="create" 28 <el-button class="radioBtn" label="1" border @click="create"
29 ><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button 29 ><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button
...@@ -66,9 +66,16 @@ ...@@ -66,9 +66,16 @@
66 class="radioBtn" 66 class="radioBtn"
67 label="7" 67 label="7"
68 border 68 border
69 @click="hcxlzVisible = true" 69 @click="hcxlz"
70 ><i class="iconfont iconhuzhongxinlazong"></i>户重新落宗</el-button 70 ><i class="iconfont iconhuzhongxinlazong"></i>户重新落宗</el-button
71 > 71 >
72 <el-button
73 class="radioBtn"
74 label="7"
75 border
76 @click="batchCommit"
77 ><i class="iconfont iconhuzhongxinlazong"></i>批量提交</el-button
78 >
72 </div> 79 </div>
73 </el-col> 80 </el-col>
74 </el-row> 81 </el-row>
...@@ -252,8 +259,10 @@ ...@@ -252,8 +259,10 @@
252 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj> 259 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
253 <div class="btnGroup"> 260 <div class="btnGroup">
254 <el-button type="primary" @click="hbjSaveInfo">保存</el-button> 261 <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
262 <el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
255 <el-button type="primary" @click="hbjResetInfo">重置</el-button> 263 <el-button type="primary" @click="hbjResetInfo">重置</el-button>
256 <el-button type="primary" @click="hbjVisible = false">取消</el-button> 264 <el-button type="primary" @click="hbjVisible = false">取消</el-button>
265 <el-button type="primary" @click="registerCall">登记调用</el-button>
257 </div> 266 </div>
258 </el-dialog> 267 </el-dialog>
259 </div> 268 </div>
...@@ -272,7 +281,8 @@ import addZdy from "./zdy/index"; ...@@ -272,7 +281,8 @@ import addZdy from "./zdy/index";
272 import addCh from "./ch/index"; 281 import addCh from "./ch/index";
273 import hbj from "./hbj/index"; 282 import hbj from "./hbj/index";
274 import lpbContent from "./lpbContent/index"; 283 import lpbContent from "./lpbContent/index";
275 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz } from "../../../../api/lpb"; 284 import {registerCall} from "../../../../api/common";
285 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "../../../../api/lpb";
276 286
277 export default { 287 export default {
278 name: "", 288 name: "",
...@@ -289,6 +299,7 @@ export default { ...@@ -289,6 +299,7 @@ export default {
289 hbj, 299 hbj,
290 HCxlz, 300 HCxlz,
291 }, 301 },
302 inject:['getRightTree'],
292 props: {}, 303 props: {},
293 data() { 304 data() {
294 return { 305 return {
...@@ -395,6 +406,29 @@ export default { ...@@ -395,6 +406,29 @@ export default {
395 }, 100); 406 }, 100);
396 }, 407 },
397 methods: { 408 methods: {
409 registerCall(){
410 let data={
411 type:'h',
412 bsm:this.hbsm
413 }
414 registerCall(data).then(res=>{
415 if (res.success) {
416 this.$message.success("登记成功")
417 this.getRightTree(this.$store.state.zdbsm)
418 }
419 })
420 },
421 batchCommit(){
422 if (this.bsms.length <= 0) {
423 Message.warning("请选择操作户")
424 return
425 }
426 batchCommit(this.bsms).then(res=>{
427 if (res.success) {
428 Message.success("提交成功")
429 }
430 })
431 },
398 hcxlz(){ 432 hcxlz(){
399 if (this.bsms.length <= 0) { 433 if (this.bsms.length <= 0) {
400 Message.warning("请选择操作户") 434 Message.warning("请选择操作户")
...@@ -454,13 +488,15 @@ export default { ...@@ -454,13 +488,15 @@ export default {
454 //清空已选中层户 488 //清空已选中层户
455 this.cbsmList = []; 489 this.cbsmList = [];
456 this.bsms = []; 490 this.bsms = [];
457 console.log(this.$refs.lpbContent.$refs.cBsm,'this.$refs.lpbContent.$refs.cBsm');
458 this.$nextTick(()=>{ 491 this.$nextTick(()=>{
492 //户
459 this.$refs.lpbContent.$refs.hBsm.forEach(item=>{ 493 this.$refs.lpbContent.$refs.hBsm.forEach(item=>{
494 item.style.borderColor = 'rgb(230, 230, 230)';
460 if (item.className == "tdSelect") { 495 if (item.className == "tdSelect") {
461 item.className = ""; 496 item.className = "";
462 } 497 }
463 }); 498 });
499 //层
464 this.$refs.lpbContent.$refs.cBsm.forEach(item=>{ 500 this.$refs.lpbContent.$refs.cBsm.forEach(item=>{
465 console.log(item.className,'item.className'); 501 console.log(item.className,'item.className');
466 item.className = "floor"; 502 item.className = "floor";
...@@ -545,12 +581,10 @@ export default { ...@@ -545,12 +581,10 @@ export default {
545 } else { 581 } else {
546 //单击 TO DO 582 //单击 TO DO
547 } 583 }
548 console.log(this.bsms);
549 }, 584 },
550 //获取选中层bsmlist 585 //获取选中层bsmlist
551 getCbsm(data){ 586 getCbsm(data){
552 this.cbsmList = data; 587 this.cbsmList = data;
553 console.log(this.cbsmList);
554 }, 588 },
555 //不动产单元号输入框事件 589 //不动产单元号输入框事件
556 inputFocus() { 590 inputFocus() {
...@@ -574,6 +608,10 @@ export default { ...@@ -574,6 +608,10 @@ export default {
574 hbjSaveInfo() { 608 hbjSaveInfo() {
575 this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition); 609 this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
576 }, 610 },
611 //户保存
612 hbjSubmitInfo() {
613 this.$refs.hbj.onSubmit(this.bsms[this.bsms.length - 1], this.tabPosition);
614 },
577 //户编辑表单重置 615 //户编辑表单重置
578 hbjResetInfo() { 616 hbjResetInfo() {
579 this.$refs.hbj.onReset(); 617 this.$refs.hbj.onReset();
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
21 ref="ljz" 21 ref="ljz"
22 v-for="(ljzs, ljzIndex) in lpbData.ljzs" 22 v-for="(ljzs, ljzIndex) in lpbData.ljzs"
23 :key="ljzIndex" 23 :key="ljzIndex"
24 :style="{'marginTop':ljzs.zdys.length > 0 ? '-30px':0}"
24 > 25 >
25 <!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> --> 26 <!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
26 <!-- 循环逻辑幢下的幢单元 --> 27 <!-- 循环逻辑幢下的幢单元 -->
...@@ -65,6 +66,9 @@ ...@@ -65,6 +66,9 @@
65 @contextmenu.prevent="openMenu($event, hs, 'h')" 66 @contextmenu.prevent="openMenu($event, hs, 'h')"
66 > 67 >
67 {{ hs.shbw }} 68 {{ hs.shbw }}
69 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
70 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
71 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
68 </td> 72 </td>
69 </tr> 73 </tr>
70 </table> 74 </table>
...@@ -116,6 +120,9 @@ ...@@ -116,6 +120,9 @@
116 @contextmenu.prevent="openMenu($event, hs, 'h')" 120 @contextmenu.prevent="openMenu($event, hs, 'h')"
117 > 121 >
118 {{ hs.shbw }} 122 {{ hs.shbw }}
123 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
124 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
125 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
119 </td> 126 </td>
120 </tr> 127 </tr>
121 </table> 128 </table>
...@@ -172,6 +179,9 @@ ...@@ -172,6 +179,9 @@
172 @contextmenu.prevent="openMenu($event, hs, 'h')" 179 @contextmenu.prevent="openMenu($event, hs, 'h')"
173 > 180 >
174 {{ hs.shbw }} 181 {{ hs.shbw }}
182 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
183 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
184 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
175 </td> 185 </td>
176 </tr> 186 </tr>
177 </table> 187 </table>
...@@ -213,6 +223,9 @@ ...@@ -213,6 +223,9 @@
213 @contextmenu.prevent="openMenu($event, hs, 'h')" 223 @contextmenu.prevent="openMenu($event, hs, 'h')"
214 > 224 >
215 {{ hs.shbw }} 225 {{ hs.shbw }}
226 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
227 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
228 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
216 </td> 229 </td>
217 </tr> 230 </tr>
218 </table> 231 </table>
...@@ -327,11 +340,14 @@ export default { ...@@ -327,11 +340,14 @@ export default {
327 sjc: "", //当前的层的SJC +1 340 sjc: "", //当前的层的SJC +1
328 }, 341 },
329 formLabelWidth: "120px", 342 formLabelWidth: "120px",
343 yclpbData:{},
344 sclpbData:{}
330 }; 345 };
331 }, 346 },
332 created() {}, 347 created() {},
333 mounted() { 348 mounted() {
334 this.getLpb(this.$store.state.zrzbsm, this.$parent.scyclx); 349 this.getLpb(this.$store.state.zrzbsm, "0");
350 this.getLpb(this.$store.state.zrzbsm, "1");
335 setTimeout(() => { 351 setTimeout(() => {
336 //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight 352 //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
337 this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20; 353 this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
...@@ -354,7 +370,14 @@ export default { ...@@ -354,7 +370,14 @@ export default {
354 res.result.ljzs = res.result.ljzs 370 res.result.ljzs = res.result.ljzs
355 .sort(this.compare("place")) 371 .sort(this.compare("place"))
356 .reverse(); 372 .reverse();
357 this.lpbData = res.result == null ? this.lpbData : res.result; 373 // this.lpbData = res.result == null ? this.lpbData : res.result;
374 //给实预测楼盘表对象赋值，默认加载预测楼盘表数据
375 if(scyclx == 0){
376 this.yclpbData = res.result == null ? this.yclpbData : res.result;
377 this.lpbData = this.yclpbData;
378 }else{
379 this.sclpbData = res.result == null ? this.sclpbData : res.result;
380 }
358 this.$nextTick(() => { 381 this.$nextTick(() => {
359 //渲染楼盘表 382 //渲染楼盘表
360 this.dataChange(); 383 this.dataChange();
...@@ -426,6 +449,7 @@ export default { ...@@ -426,6 +449,7 @@ export default {
426 } 449 }
427 450
428 //计算逻辑幢下的幢单元和层户的高度 451 //计算逻辑幢下的幢单元和层户的高度
452 this.ljzzdyHeight = 1;
429 if (this.$refs.ljzzdy != undefined && this.$refs.ljzzdy.length > 0) { 453 if (this.$refs.ljzzdy != undefined && this.$refs.ljzzdy.length > 0) {
430 //判断自然幢下有没有比层户高的幢单元 454 //判断自然幢下有没有比层户高的幢单元
431 let higher = true; 455 let higher = true;
...@@ -605,6 +629,9 @@ export default { ...@@ -605,6 +629,9 @@ export default {
605 }); 629 });
606 }, 630 },
607 //end 631 //end
632 qsztClick(){
633
634 },
608 }, 635 },
609 computed: { 636 computed: {
610 createFlagChange() { 637 createFlagChange() {
...@@ -619,7 +646,12 @@ export default { ...@@ -619,7 +646,12 @@ export default {
619 }, 646 },
620 watch: { 647 watch: {
621 scyclx(n) { 648 scyclx(n) {
622 this.getLpb(this.$store.state.zrzbsm, n); 649 // this.getLpb(this.$store.state.zrzbsm, n);
650 if(n == '0'){
651 this.lpbData = this.yclpbData;
652 }else{
653 this.lpbData = this.sclpbData;
654 }
623 }, 655 },
624 createFlagChange: function(val) { 656 createFlagChange: function(val) {
625 setTimeout(() => { 657 setTimeout(() => {
...@@ -784,6 +816,31 @@ export default { ...@@ -784,6 +816,31 @@ export default {
784 line-height: 64px; 816 line-height: 64px;
785 text-align: center; 817 text-align: center;
786 cursor: pointer; 818 cursor: pointer;
819 position: relative;
820 .hqszt{
821 display: inline-block;
822 width: 16px;
823 height: 16px;
824 font-size: 12px;
825 line-height: 16px;
826 position: absolute;
827 left: 6px;
828 top: 6px;
829 border: 1px solid;
830 border-radius: 8px;
831 }
832 .lin{
833 color:#F7B500;
834 border-color: #F7B500;
835 }
836 .zheng{
837 color: #1AD6E1;
838 border-color: #1AD6E1;
839 }
840 .xian{
841 color: #45AEFD;
842 border-color: #45AEFD;
843 }
787 } 844 }
788 .tdSelect { 845 .tdSelect {
789 border: 1px solid #006cff !important; 846 border: 1px solid #006cff !important;
......
...@@ -265,6 +265,7 @@ ...@@ -265,6 +265,7 @@
265 <div style="min-height: 40px;text-align: center;margin-top: 10px"> 265 <div style="min-height: 40px;text-align: center;margin-top: 10px">
266 <el-button type="success" @click="onSave">保存</el-button> 266 <el-button type="success" @click="onSave">保存</el-button>
267 <el-button type="primary" @click="onSubmit">提交</el-button> 267 <el-button type="primary" @click="onSubmit">提交</el-button>
268 <el-button type="primary" @click="registerCall">登记调用</el-button>
268 </div> 269 </div>
269 </div> 270 </div>
270 </div> 271 </div>
...@@ -275,14 +276,14 @@ ...@@ -275,14 +276,14 @@
275 import Qlxz from "../../../components/formMenu/qlxz_simple"; 276 import Qlxz from "../../../components/formMenu/qlxz_simple";
276 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz" 277 import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
277 import {getQjZdjbxxDetailById} from "../../../api/zd" 278 import {getQjZdjbxxDetailById} from "../../../api/zd"
278 import {submit} from "../../../api/common" 279 import {submit,registerCall} from "../../../api/common"
279 export default { 280 export default {
280 name:'zrz', 281 name:'zrz',
281 components:{ 282 components:{
282 Qlr, 283 Qlr,
283 Qlxz, 284 Qlxz,
284 }, 285 },
285 inject:['reload'], 286 inject:['reload','getRightTree'],
286 data () { 287 data () {
287 return { 288 return {
288 289
...@@ -395,6 +396,18 @@ ...@@ -395,6 +396,18 @@
395 } 396 }
396 }, 397 },
397 methods: { 398 methods: {
399 registerCall(){
400 let data={
401 type:'zrz',
402 bsm:this.$route.query.bsm
403 }
404 registerCall(data).then(res=>{
405 if (res.success) {
406 this.$message.success("登记成功")
407 this.getRightTree(this.$store.state.zdbsm)
408 }
409 })
410 },
398 addYtInfo(){ 411 addYtInfo(){
399 this.form.fwytList.push({ 412 this.form.fwytList.push({
400 glbsm:'', 413 glbsm:'',
...@@ -475,7 +488,7 @@ ...@@ -475,7 +488,7 @@
475 console.log("属性保存完成!!"); 488 console.log("属性保存完成!!");
476 }); 489 });
477 } 490 }
478 491
479 }, 492 },
480 onSubmit(){ 493 onSubmit(){
481 let data={ 494 let data={
......