Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
10346c5d by 杨威
Options

代码合并，楼盘表图例单元状态数据统计

2 parents 93128983 a7d0085d
Expand all
Inline Side-by-side
Showing 9 changed files with 418 additions and 162 deletions
...@@ -77,4 +77,20 @@ export function getLpbTj (data) { ...@@ -77,4 +77,20 @@ export function getLpbTj (data) {
77 method: 'get', 77 method: 'get',
78 data:data 78 data:data
79 }) 79 })
80 }
81
82 /**
83 * 楼盘表 批量实预测转换
84 * zrzbsm 自然幢标识码 ,
85 * scyclx 实测预测类型 0预测，1实测
86 */
87 export function batchGeneratorBdcdyh (dpdm,zrzbsm) {
88 return request({
89 url: 'system/generator/batchGeneratorBdcdyh',
90 method: 'get',
91 params: {
92 zrzbsm:zrzbsm,
93 dpdm:dpdm,
94 },
95 })
80 } 96 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -150,7 +150,7 @@ export function jzxsbatchModify(data) { ...@@ -150,7 +150,7 @@ export function jzxsbatchModify(data) {
150 */ 150 */
151 export function deleteZdInfoByBsm(data) { 151 export function deleteZdInfoByBsm(data) {
152 return request({ 152 return request({
153 url: '/zd/qjZdjbxx/deleteZdjbxxByBsm', 153 url: '/delete/deleteDyByBsm',
154 method: 'delete', 154 method: 'delete',
155 data: data 155 data: data
156 }) 156 })
...@@ -161,10 +161,32 @@ export function deleteZdInfoByBsm(data) { ...@@ -161,10 +161,32 @@ export function deleteZdInfoByBsm(data) {
161 */ 161 */
162 export function zdfg(data) { 162 export function zdfg(data) {
163 return request({ 163 return request({
164 url: '/fg/zdFg', 164 url: '/bg/zdSplitMerge/zdFg',
165 method: 'post', 165 method: 'post',
166 data: data 166 data: data
167 }) 167 })
168 } 168 }
169 169
170 /**
171 * 获取宗地下的自然幢、逻辑幢、幢单元
172 */
173 export function zdXlcd(bsm) {
174 return request({
175 url:'/zd/qjZdjbxx/parcels',
176 method:'get',
177 params:{
178 bsm
179 }
180 })
181 }
170 182
183 /**
184 * 户落宗
185 */
186 export function hzl(data) {
187 return request({
188 url:'/system/qjH/hcxlz',
189 method:'put',
190 data:data
191 })
192 }
......
...@@ -48,14 +48,14 @@ ...@@ -48,14 +48,14 @@
48 </el-row> 48 </el-row>
49 <table border="1"> 49 <table border="1">
50 <tr> 50 <tr>
51 <td>序号</td> 51 <td class="xh">序号</td>
52 <td>操作</td> 52 <td class="zddm">宗地代码</td>
53 <td>宗地代码</td> 53 <td class="bdcdyh">不动产单元号</td>
54 <td>不动产单元号</td> 54 <td class="xmmc">项目名称</td>
55 <td>项目名称</td> 55 <td class="bdcqzh">不动产权证号</td>
56 <td>不动产权证号</td> 56 <td class="qlr">权利人</td>
57 <td>权利人</td> 57 <td class="zl">坐落</td>
58 <td>坐落</td> 58 <td class="cz">操作</td>
59 </tr> 59 </tr>
60 <tr v-if="Data.length==0"> 60 <tr v-if="Data.length==0">
61 <td colspan="8"> 61 <td colspan="8">
...@@ -63,16 +63,16 @@ ...@@ -63,16 +63,16 @@
63 </td> 63 </td>
64 </tr> 64 </tr>
65 <tr v-else v-for="(item,index) in Data" :key="index"> 65 <tr v-else v-for="(item,index) in Data" :key="index">
66 <td>{{index+1}}</td> 66 <td class="xh">{{index+1}}</td>
67 <td @click="select(item)" class="xz"> 67 <td class="zddm" :title="item.zddm">{{item.zddm}}</td>
68 <span>选择</span> 68 <td class="bdcqdyh" :title="item.bdcdyh">{{item.bdcdyh}}</td>
69 <td class="xmmc" :title="item.xmmc">{{item.xmmc}}</td>
70 <td class="bdcqzh" :title="item.bdcqzd">{{item.bdcqzh}}</td>
71 <td class="qlr" :title="item.qlr">{{item.qlr}}</td>
72 <td class="zl" :title="item.zl">{{item.zl}}</td>
73 <td @click="saveNotarize(item)" class="cz">
74 <span>落宗</span>
69 </td> 75 </td>
70 <td>{{item.zddm}}</td>
71 <td>{{item.bdcdyh}}</td>
72 <td>{{item.xmmc}}</td>
73 <td>{{item.bdcqzh}}</td>
74 <td>{{item.qlr}}</td>
75 <td>{{item.zl}}</td>
76 </tr> 76 </tr>
77 </table> 77 </table>
78 </div> 78 </div>
...@@ -86,10 +86,6 @@ ...@@ -86,10 +86,6 @@
86 > 86 >
87 </el-pagination> 87 </el-pagination>
88 </div> 88 </div>
89 <div class="footer-button">
90 <el-button type="primary" @click="save">确认</el-button>
91 <el-button type="primary" @click="close">取消</el-button>
92 </div>
93 </el-dialog> 89 </el-dialog>
94 </div> 90 </div>
95 </template> 91 </template>
...@@ -144,13 +140,25 @@ ...@@ -144,13 +140,25 @@
144 created() { 140 created() {
145 }, 141 },
146 methods: { 142 methods: {
143 saveNotarize: function (val) {
144 this.zdbsm = val.glbsm;
145 this.$confirm('将落宗在该宗地上, 是否继续?', '提示', {
146 confirmButtonText: '确定',
147 cancelButtonText: '取消',
148 type: 'warning'
149 }).then(() => {
150 this.save();
151 }).catch(() => {
152 this.$message({
153 type: 'info',
154 message: '已取消'
155 });
156 });
157 },
147 currentChange: function (val) { 158 currentChange: function (val) {
148 this.queryData.pageNo = val; 159 this.queryData.pageNo = val;
149 this.getData(this.queryData); 160 this.getData(this.queryData);
150 }, 161 },
151 select: function (val) {
152 this.zdbsm = val.glbsm
153 },
154 save: function () { 162 save: function () {
155 zrzcxlz({ 163 zrzcxlz({
156 zdBsm: this.zdbsm, 164 zdBsm: this.zdbsm,
...@@ -216,6 +224,9 @@ ...@@ -216,6 +224,9 @@
216 background-color: #fff; 224 background-color: #fff;
217 font-size: 14px; 225 font-size: 14px;
218 width: 100%; 226 width: 100%;
227 tr:hover{
228 background-color: #F5F7FA;
229 }
219 } 230 }
220 231
221 td { 232 td {
...@@ -248,8 +259,38 @@ ...@@ -248,8 +259,38 @@
248 height: 650px; 259 height: 650px;
249 } 260 }
250 261
251 .footer-button { 262 .xh {
252 text-align: center; 263 width: 50px;
253 margin-top: 20px; 264 }
265
266 .zddm {
267 width: 120px;
268 }
269
270 .bdcdyh {
271 width: 180px;
272 }
273
274 .xmmc {
275 width: 100px;
276 }
277
278 .bdcqzh {
279 width: 100px;
280 }
281
282 .qlr {
283 width: 100px;
284 }
285
286 .zl {
287 width: 100px;
288 }
289
290 .cz {
291 width: 50px;
292 span {
293 color: blue;
294 }
254 } 295 }
255 </style> 296 </style>
......
1 <template>
2 <div class="main">
3 <div class='input' contenteditable placeholder='请输入文字'>
4 <div @mouseover="mouseover($event)" @mouseleave="mouseLeave($event)" v-for="(item,index) in datas"
5 :key="index" style="float: left;"
6 class="item">
7 {{item}};
8 <div style="float: right;display: none" @click="itemClick(index)">X</div>
9 </div>
10
11 </div>
12 </div>
13 </template>
14
15 <script>
16 export default {
17 name: "emailInput",
18 data() {
19 return {
20 datas: ['111', '222', '333', '444', '555', '666', '777', '888', '999'],
21 }
22 },
23 props: {},
24 methods: {
25 mouseover(e) {
26 // e.target 是你当前点击的元素
27 // 是你绑定事件的元素
28 let dom = e.currentTarget.firstElementChild
29 dom.style = "float: right;display: block";
30 // 获得点击元素的前一个元素
31 /* e.currentTarget.previousElementSibling.innerHTML
32 // 获得点击元素的第一个子元素
33 e.currentTarget.firstElementChild
34 // 获得点击元素的下一个元素
35 e.currentTarget.nextElementSibling
36 // 获得点击元素中id为string的元素
37 e.currentTarget.getElementById("string")
38 // 获得点击元素的string属性
39 e.currentTarget.getAttributeNode('string')
40 //获得点击元素的父级元素
41 e.currentTarget.parentElement
42 // 获得点击元素的前一个元素的第一个子元素的HTML值
43 e.currentTarget.previousElementSibling.firstElementChild.innerHTML*/
44
45 },
46 mouseLeave(e) {
47 let dom = e.currentTarget.firstElementChild
48 dom.style = "float: right;display: none"
49 },
50 itemClick(index){
51 this.datas.splice(index,1)
52 }
53 },
54 computed: {
55 text: function () {
56 let text = "";
57 for (let item of this.datas) {
58 text += item + ";";
59 }
60
61 return text;
62 }
63 }
64 }
65 </script>
66
67 <style scoped lang="less">
68 .main {
69 .input {
70 width: auto;
71 height: 24px;
72 line-height: 24px;
73 font-size: 14px;
74 padding: 5px 8px;
75 border: 1px solid #ddd;
76 }
77 .input:empty::before {
78 content: attr(placeholder);
79 }
80 .item{
81 cursor: pointer;
82 }
83 .item:hover {
84 border: 1px solid #BBF;
85 }
86 }
87 </style>
1 <template>
2 <div class="main">
3 <el-dialog
4 title="户重新落宗"
5 :visible.sync="isVisible"
6 width="50%"
7 @close="close"
8 :modal-append-to-body="false"
9 >
10 <div class="content">
11 <div class="input-suffix">
12 宗 地：
13 <input
14 placeholder="请选择宗地" v-model="zdxx" readonly="readonly"
15 />
16 <el-button type="primary" @click="xzzdVisible = true">选择宗地</el-button>
17 </div>
18 <div class="input-suffix">
19 自然幢：
20 <el-select v-model="hcxlzData.zrzbsm" filterable placeholder="请选择" @change="zrzChange">
21 <el-option
22 v-for="item in zrzList"
23 :key="item.xmmc"
24 :label="item.label"
25 :value="item.bsm">
26 </el-option>
27 </el-select>
28 </div>
29 <div class="input-suffix">
30 逻辑幢：
31 <el-select v-model="hcxlzData.ljzbsm" filterable placeholder="请选择" @change="ljzChange">
32 <el-option
33 v-for="item in ljzList"
34 :key="item.bsm"
35 :label="item.ljzmc"
36 :value="item.bsm">
37 </el-option>
38 </el-select>
39 </div>
40 <div class="input-suffix">
41 幢单元：
42 <el-select v-model="hcxlzData.zdybsm" filterable placeholder="请选择">
43 <el-option
44 v-for="item in zdyList"
45 :key="item.bsm"
46 :label="item.zdymc"
47 :value="item.bsm">
48 </el-option>
49 </el-select>
50 </div>
51 </div>
52 <div class="footer">
53 <el-button type="primary" @click="save">保存</el-button>
54 <el-button type="primary" @click="cancel">取消</el-button>
55 </div>
56 <query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"></query-data>
57 </el-dialog>
58 </div>
59 </template>
60
61 <script>
62 import queryData from './../../components/queryData/queryData'
63 import {zdXlcd, hzl} from './../../api/zd'
64 import {Message} from 'element-ui'
65 export default {
66 name: "hCxlz",
67 components: {queryData},
68 data() {
69 return {
70 zd: {},
71 zrz: {},
72 ljz: {},
73 zdy: {},
74 xzzdVisible: false,
75 isVisible: false,
76 zdxx: '', // 宗地信息
77 hcxlzData: {
78 bsms: [],
79 zrzbsm: '',
80 ljzbsm: '',
81 zdybsm: ''
82 },
83 total: 1,
84 zrzList: [],
85 ljzList: [],
86 zdyList: []
87 }
88 },
89 props: {
90 hCxlzVisble: {
91 type: Boolean,
92 default: false
93 },
94 bsms: {
95 type: Array
96 }
97 },
98 mounted() {
99 },
100 methods: {
101 ljzChange: function () {
102 const item = this.ljzList.find(i => i.bsm == this.hcxlzData.ljzbsm)
103 this.hcxlzData.zdybsm = ''
104 this.zdyList = item.list;
105 this.zdyList.push({
106 zdymc: '空',
107 bsm: ''
108 })
109 },
110 zrzChange: function () {
111 const item = this.zrzList.find(i => i.bsm == this.hcxlzData.zrzbsm);
112 this.hcxlzData.ljzbsm = ''
113 this.hcxlzData.zdybsm = ''
114 this.ljzList = item.ljzList;
115 this.ljzList.push({
116 ljzmc: '空',
117 bsm: ''
118 })
119 this.zdyList = item.zdyList;
120 this.zdyList.push({
121 zdymc: '空',
122 bsm: ''
123 })
124 },
125 getZrz: function (bsm) {
126 zdXlcd(bsm).then(res => {
127 this.zrzList = res.result;
128 })
129 },
130 getZdxx: function (val) {
131 console.log(val, "宗地信息")
132 this.zd = val
133 this.zdxx = val.xmmc + "(" + val.zddm + ")";
134 },
135 xzzdClose: function () {
136 this.xzzdVisible = false;
137 },
138 result: function () {
139 this.hcxlzData = {
140 bsms: [],
141 zrzbsm: '',
142 ljzbsm: '',
143 zdybsm: ''
144 };
145 },
146 cancel() {
147 console.log("cancel......")
148 this.close();
149 },
150 save() {
151 console.log("save.......")
152 if (this.hcxlzData.zrzbsm == '') {
153 Message.error("请选择自然幢")
154 return;
155 }
156 hzl(this.hcxlzData).then(res => {
157 if (res.success) {
158 this.close();
159 } else {
160 Message.error(res.message)
161 }
162 });
163 },
164 close() {
165 this.$emit('close', false);
166 this.result();
167 },
168 },
169 watch: {
170 hCxlzVisble: function (val) {
171 this.isVisible = val
172 },
173 zd: function (val) {
174 //this.getZrz(val.glbsm)
175 this.getZrz('815c80d0d5b35968432fdd9c654dd134')
176 }
177 }
178 }
179 </script>
180
181 <style scoped lang="less">
182 .input-suffix {
183 input {
184 width: 210px;
185 height: 30px;
186 border-radius: 3px;
187 border-color: #BBB;
188 }
189 }
190
191 .content {
192 text-align: center;
193 }
194
195 .footer {
196 margin-top: 20px;
197 text-align: center;
198 }
199 </style>
200
201
202
203
...@@ -222,23 +222,23 @@ export default { ...@@ -222,23 +222,23 @@ export default {
222 }, 222 },
223 //右键菜单的删除 223 //右键菜单的删除
224 deleteByBsm(){ 224 deleteByBsm(){
225 let zdBsm = this.zdData.zdbsm; 225 //let zdBsm = this.zdData.zdbsm;
226 let type; 226 //let type;
227 console.log(zdBsm); 227 console.log(this.zdData.zdbsm);
228 switch (this.zdData.type){ 228 //switch (this.zdData.type){
229 case "zd": 229 // case "zd":
230 type="0"; 230 // type="0";
231 break; 231 // break;
232 case "zrz": 232 // case "zrz":
233 type="1"; 233 // type="1";
234 break; 234 // break;
235 case "h": 235 // case "h":
236 type="2"; 236 // type="2";
237 break; 237 // break;
238 default: 238 // default:
239 break; 239 // break;
240 } 240 //}
241 let params={"id":zdBsm,"type":type} 241 let params={"bsm":this.zdData.zdbsm,"type":this.zdData.type}
242 deleteZdInfoByBsm(params) 242 deleteZdInfoByBsm(params)
243 .then((res) => { 243 .then((res) => {
244 if(res.code=200){ 244 if(res.code=200){
......
...@@ -79,6 +79,16 @@ ...@@ -79,6 +79,16 @@
79 </div> 79 </div>
80 <span slot="footer" class="dialog-footer"> 80 <span slot="footer" class="dialog-footer">
81 </span> 81 </span>
82 <div class="page">
83 <el-pagination
84 background
85 layout="prev, pager, next,total"
86 :page-size="queryData.pageSize"
87 :total="total"
88 @current-change="currentChange"
89 >
90 </el-pagination>
91 </div>
82 </el-dialog> 92 </el-dialog>
83 93
84 </div> 94 </div>
...@@ -91,6 +101,7 @@ ...@@ -91,6 +101,7 @@
91 name: "queryData", 101 name: "queryData",
92 data() { 102 data() {
93 return { 103 return {
104 total:1,
94 queryData: { 105 queryData: {
95 bdcdyh: "", 106 bdcdyh: "",
96 bdcqzh: "", 107 bdcqzh: "",
...@@ -99,7 +110,9 @@ ...@@ -99,7 +110,9 @@
99 qszt: "2", 110 qszt: "2",
100 xmmc: "", 111 xmmc: "",
101 zddm: "", 112 zddm: "",
102 zl: "" 113 zl: "",
114 pageNo: 1,
115 pageSize: 10,
103 }, 116 },
104 Data: [], 117 Data: [],
105 isVisible: false 118 isVisible: false
...@@ -125,6 +138,10 @@ ...@@ -125,6 +138,10 @@
125 created() { 138 created() {
126 }, 139 },
127 methods: { 140 methods: {
141 currentChange: function (val) {
142 this.queryData.pageNo = val;
143 this.getData(this.queryData);
144 },
128 result: function () { 145 result: function () {
129 this.queryData = { 146 this.queryData = {
130 bdcdyh: "", 147 bdcdyh: "",
...@@ -133,7 +150,9 @@ ...@@ -133,7 +150,9 @@
133 qszt: "2", 150 qszt: "2",
134 xmmc: "", 151 xmmc: "",
135 zddm: "", 152 zddm: "",
136 zl: "" 153 zl: "",
154 pageNo: 1,
155 pageSize: 10
137 }; 156 };
138 this.getData(this.queryData) 157 this.getData(this.queryData)
139 }, 158 },
...@@ -141,6 +160,7 @@ ...@@ -141,6 +160,7 @@
141 data['dylxs'] = this.dylxs; 160 data['dylxs'] = this.dylxs;
142 getSearchList(data).then(res => { 161 getSearchList(data).then(res => {
143 this.Data = res.result.records 162 this.Data = res.result.records
163 this.total = res.result.total;
144 }) 164 })
145 }, 165 },
146 search: function () { 166 search: function () {
...@@ -151,7 +171,7 @@ ...@@ -151,7 +171,7 @@
151 }, 171 },
152 close: function () { 172 close: function () {
153 this.$emit('close') 173 this.$emit('close')
154 this.isVisible = false 174 this.result();
155 } 175 }
156 }, 176 },
157 watch: { 177 watch: {
...@@ -176,6 +196,9 @@ ...@@ -176,6 +196,9 @@
176 background-color: #fff; 196 background-color: #fff;
177 font-size: 14px; 197 font-size: 14px;
178 width: 100%; 198 width: 100%;
199 tr:hover{
200 background-color: #F5F7FA;
201 }
179 } 202 }
180 203
181 td { 204 td {
......
...@@ -41,14 +41,14 @@ ...@@ -41,14 +41,14 @@
41 </el-row> 41 </el-row>
42 <table border="1"> 42 <table border="1">
43 <tr> 43 <tr>
44 <td>序号</td> 44 <td class="xh">序号</td>
45 <td>操作</td> 45 <td class="cz">操作</td>
46 <td>宗地代码</td> 46 <td class="zddm">宗地代码</td>
47 <td>不动产单元号</td> 47 <td class="bdcdyh">不动产单元号</td>
48 <td>项目名称</td> 48 <td class="xmmc">项目名称</td>
49 <td>不动产权证号</td> 49 <td class="bdcqzh">不动产权证号</td>
50 <td>权利人</td> 50 <td class="qlr">权利人</td>
51 <td>坐落</td> 51 <td class="zl">坐落</td>
52 </tr> 52 </tr>
53 <tr v-if="Data.length == 0"> 53 <tr v-if="Data.length == 0">
54 <td colspan="8"> 54 <td colspan="8">
...@@ -56,16 +56,16 @@ ...@@ -56,16 +56,16 @@
56 </td> 56 </td>
57 </tr> 57 </tr>
58 <tr v-else v-for="(item, index) in Data" :key="index"> 58 <tr v-else v-for="(item, index) in Data" :key="index">
59 <td>{{ index + 1 }}</td> 59 <td class="xh">{{ index + 1 }}</td>
60 <td @click="xzzrz(item)" class="xz"> 60 <td @click="xzzrz(item)" class="cz">
61 <span>选择</span> 61 <span>选择</span>
62 </td> 62 </td>
63 <td>{{ item.zddm }}</td> 63 <td class="zddm" :title="item.zddm">{{ item.zddm }}</td>
64 <td>{{ item.bdcdyh }}</td> 64 <td class="bdcdyh" :title="item.bdcdyh">{{ item.bdcdyh }}</td>
65 <td>{{ item.xmmc }}</td> 65 <td class="xmmc" :title="item.xmmc">{{ item.xmmc }}</td>
66 <td>{{ item.bdcqzh }}</td> 66 <td class="bdcqzh" :title="item.bdcqzh ">{{ item.bdcqzh }}</td>
67 <td>{{ item.qlr }}</td> 67 <td class="qlr" :title="item.qlr">{{ item.qlr }}</td>
68 <td>{{ item.zl }}</td> 68 <td class="zl">{{ item.zl }}</td>
69 </tr> 69 </tr>
70 </table> 70 </table>
71 </div> 71 </div>
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
107 bdcqzh: "", 107 bdcqzh: "",
108 dylxs: ["zrz"], 108 dylxs: ["zrz"],
109 qlrmc: "", 109 qlrmc: "",
110 qszt: "", 110 qszt: "2",
111 xmmc: "", 111 xmmc: "",
112 zddm: "", 112 zddm: "",
113 zl: "", 113 zl: "",
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
142 bdcqzh: "", 142 bdcqzh: "",
143 dylxs: ["zrz"], 143 dylxs: ["zrz"],
144 qlrmc: "", 144 qlrmc: "",
145 qszt: "", 145 qszt: "2",
146 xmmc: "", 146 xmmc: "",
147 zddm: "", 147 zddm: "",
148 zl: "", 148 zl: "",
...@@ -178,12 +178,19 @@ ...@@ -178,12 +178,19 @@
178 background-color: #fff; 178 background-color: #fff;
179 font-size: 14px; 179 font-size: 14px;
180 width: 100%; 180 width: 100%;
181 } 181 table-layout: fixed;
182 182 tr:hover{
183 td { 183 background-color: #F5F7FA;
184 text-align: center; 184 }
185 height: 36px; 185 td, th {
186 min-width: 50px; 186 text-align: center;
187 height: 36px;
188 min-width: 50px;
189 overflow: hidden;
190 white-space: nowrap;
191 -ms-text-overflow: ellipsis;
192 text-overflow: ellipsis;
193 }
187 } 194 }
188 195
189 table:hover { 196 table:hover {
...@@ -198,8 +205,39 @@ ...@@ -198,8 +205,39 @@
198 margin-top: 20px; 205 margin-top: 20px;
199 } 206 }
200 207
201 .xz { 208 .xh {
202 color: blue; 209 width: 50px;
210 }
211
212 .zddm {
213 width: 120px;
214 }
215
216 .bdcdyh {
217 width: 180px;
218 }
219
220 .xmmc {
221 width: 100px;
222 }
223
224 .bdcqzh {
225 width: 100px;
226 }
227
228 .qlr {
229 width: 100px;
230 }
231
232 .zl {
233 width: 100px;
234 }
235
236 .cz {
237 width: 50px;
238 span {
239 color: blue;
240 }
203 } 241 }
204 242
205 .noData { 243 .noData {
......