Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
6f4675db by 杨威
Options

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

2 parents 36e2bd77 1b0d010a
Expand all
Inline Side-by-side
Showing 12 changed files with 111 additions and 95 deletions
...@@ -2,7 +2,7 @@ import store from '../../store/index' ...@@ -2,7 +2,7 @@ import store from '../../store/index'
2 import axios from 'axios' 2 import axios from 'axios'
3 import router from '../../router' 3 import router from '../../router'
4 import {Message, MessageBox} from 'element-ui' 4 import {Message, MessageBox} from 'element-ui'
5 import { Loading } from 'element-ui'; 5 // import { Loading } from 'element-ui';
6 import {httpStatus} from '@/api/config' 6 import {httpStatus} from '@/api/config'
7 7
8 // 创建一个 axios 实例 8 // 创建一个 axios 实例
...@@ -19,7 +19,7 @@ const service = axios.create({ ...@@ -19,7 +19,7 @@ const service = axios.create({
19 function errorLog() { 19 function errorLog() {
20 //请求完成关闭loading 20 //请求完成关闭loading
21 // this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 21 // this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
22 loadingInstance.close(); 22 // loadingInstance.close();
23 // }); 23 // });
24 MessageBox.alert('报错了请联系管理员', '消息提示', { 24 MessageBox.alert('报错了请联系管理员', '消息提示', {
25 confirmButtonText: '确定', 25 confirmButtonText: '确定',
...@@ -27,7 +27,7 @@ function errorLog() { ...@@ -27,7 +27,7 @@ function errorLog() {
27 }) 27 })
28 } 28 }
29 //定义loading 29 //定义loading
30 let loadingInstance = null 30 // let loadingInstance = null
31 31
32 // 请求拦截器 32 // 请求拦截器
33 service.interceptors.request.use( 33 service.interceptors.request.use(
...@@ -37,12 +37,12 @@ service.interceptors.request.use( ...@@ -37,12 +37,12 @@ service.interceptors.request.use(
37 // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改 37 // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
38 // config.headers['authkey'] = token 38 // config.headers['authkey'] = token
39 //请求发送成功显示loading 39 //请求发送成功显示loading
40 loadingInstance = Loading.service({ 40 // loadingInstance = Loading.service({
41 lock: true, 41 // lock: true,
42 text: 'Loading', 42 // text: 'Loading',
43 spinner: 'el-icon-loading', 43 // spinner: 'el-icon-loading',
44 background: 'rgba(0, 0, 0, 0.5)' 44 // background: 'rgba(0, 0, 0, 0.5)'
45 }); 45 // });
46 return config 46 return config
47 }, 47 },
48 error => { 48 error => {
...@@ -59,7 +59,7 @@ service.interceptors.response.use( ...@@ -59,7 +59,7 @@ service.interceptors.response.use(
59 const {code} = dataAxios 59 const {code} = dataAxios
60 //请求完成关闭loading 60 //请求完成关闭loading
61 // this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 61 // this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
62 loadingInstance.close(); 62 // loadingInstance.close();
63 // }); 63 // });
64 // 根据 code 进行判断 64 // 根据 code 进行判断
65 if (code === undefined) { 65 if (code === undefined) {
...@@ -90,7 +90,7 @@ service.interceptors.response.use( ...@@ -90,7 +90,7 @@ service.interceptors.response.use(
90 }, 90 },
91 error => { 91 error => {
92 if (error && error.response) { 92 if (error && error.response) {
93 loadingInstance.close(); 93 // loadingInstance.close();
94 switch (error.response.status) { 94 switch (error.response.status) {
95 case 400: 95 case 400:
96 error.message = '请求错误'; 96 error.message = '请求错误';
......
...@@ -70,6 +70,11 @@ const constantRoutes = [ ...@@ -70,6 +70,11 @@ const constantRoutes = [
70 name: "宗地", 70 name: "宗地",
71 code: "1-5", 71 code: "1-5",
72 component: () => import("@/views/zd/index"), 72 component: () => import("@/views/zd/index"),
73 },{
74 path: "/h",
75 name: "户",
76 code: "1-6",
77 component: () => import("@/views/systemH/index"),
73 }, 78 },
74 { 79 {
75 path: "/viewMap", 80 path: "/viewMap",
......
1 <template> 1 <template>
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="dzxx"><dzxx></dzxx></el-tab-pane> 4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
5 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
5 </el-tabs> 6 </el-tabs>
6 </div> 7 </div>
7 </template> 8 </template>
8 9
9 <script> 10 <script>
10 import dzxx from "./dzxx"; 11 import dzxx from "./dzxx";
12 import fjcl from "./../zd/fjcl/fjcl"
11 export default { 13 export default {
12 name: "", 14 name: "",
13 components: { 15 components: {
14 dzxx 16 dzxx,fjcl
15 }, 17 },
16 props: {}, 18 props: {},
17 data() { 19 data() {
18 return { 20 return {
19 activeName: "dzxx", 21 activeName: "dzxx",
22 dzJbxxVisble:false,
23 fjclVisible:false
20 }; 24 };
21 }, 25 },
22 methods: { 26 methods: {
23 handleClick(tab, event) { 27 handleClick(tab, event) {
24 console.log(tab, event); 28 switch (tab.name) {
29 case 'dzxx':
30 this.dzJbxxVisble = true;
31 break
32 case 'fjcl':
33 this.fjclVisible = true;
34 break;
35 default:
36 break;
37 }
25 }, 38 },
26 }, 39 },
27 created() {}, 40 created() {},
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 this.$store.state.zdbsm = row.glbsm 127 this.$store.state.zdbsm = row.glbsm
128 break; 128 break;
129 case "h": 129 case "h":
130 path = "h"; 130 path = "/h";
131 this.$store.state.hbsm = row.glbsm 131 this.$store.state.hbsm = row.glbsm
132 type = "2"; 132 type = "2";
133 default: 133 default:
......
...@@ -38,11 +38,6 @@ ...@@ -38,11 +38,6 @@
38 <el-tooltip class="item" effect="light" content="定位" placement="top"> 38 <el-tooltip class="item" effect="light" content="定位" placement="top">
39 <i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i> 39 <i class="iconfont icondingwei iconfontEdit" @click="postionToMap(scope.row)"></i>
40 </el-tooltip> 40 </el-tooltip>
41 <!-- <el-button type="text" size="small"
42 >办理
43 </el-button
44 >
45 <el-button type="text" size="small">定位</el-button> -->
46 </template> 41 </template>
47 </el-table-column> 42 </el-table-column>
48 </el-table> 43 </el-table>
...@@ -52,15 +47,6 @@ ...@@ -52,15 +47,6 @@
52 </el-pagination> 47 </el-pagination>
53 </div> 48 </div>
54 49
55 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
56 <hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
57 <div class="btnGroup">
58 <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
59 <el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
60 <el-button type="primary" @click="hbjResetInfo">重置</el-button>
61 <el-button type="primary" @click="hbjVisible = false">取消</el-button>
62 </div>
63 </el-dialog>
64 </div> 50 </div>
65 </div> 51 </div>
66 </template> 52 </template>
...@@ -68,11 +54,10 @@ ...@@ -68,11 +54,10 @@
68 <script> 54 <script>
69 import SearchHead from "../../../components/searchHead/searchHead"; 55 import SearchHead from "../../../components/searchHead/searchHead";
70 import {getSearchList} from "../../../api/search"; 56 import {getSearchList} from "../../../api/search";
71 import hbj from "./../../zrz/lpb/bjlp/hbj/index";
72 57
73 export default { 58 export default {
74 name: "", 59 name: "",
75 components: {SearchHead,hbj}, 60 components: {SearchHead},
76 props: {}, 61 props: {},
77 data() { 62 data() {
78 return { 63 return {
...@@ -82,9 +67,6 @@ ...@@ -82,9 +67,6 @@
82 tableData: [], 67 tableData: [],
83 tableHeight: 0, 68 tableHeight: 0,
84 queryData: {}, 69 queryData: {},
85 hbjVisible: false,
86 hbsm:'',
87 tabPosition: "1", //1是实测 0是预测
88 }; 70 };
89 }, 71 },
90 created() { 72 created() {
...@@ -106,20 +88,6 @@ ...@@ -106,20 +88,6 @@
106 return ""; 88 return "";
107 } 89 }
108 }, 90 },
109 //户保存
110 hbjSaveInfo() {
111 this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
112 this.getData({pageSize:15});
113 },
114 //户提交
115 hbjSubmitInfo() {
116 this.$refs.hbj.onSubmit(this.hbsm, this.tabPosition);
117 this.getData({pageSize:15});
118 },
119 //户编辑表单重置
120 hbjResetInfo() {
121 this.$refs.hbj.onReset();
122 },
123 handleCurrentChange(val) { 91 handleCurrentChange(val) {
124 this.pageNo = val; 92 this.pageNo = val;
125 this.queryData.pageNo = val; 93 this.queryData.pageNo = val;
...@@ -159,17 +127,8 @@ ...@@ -159,17 +127,8 @@
159 case "h": 127 case "h":
160 case "h0": 128 case "h0":
161 case "h1": 129 case "h1":
162 this.hbsm = row.glbsm; 130 path="/h";
163 this.hbjVisible = true; 131 this.$store.state.hbsm=row.glbsm
164 if(row.dylx === "h0"){
165 this.tabPosition = 0;
166 }else {
167 this.tabPosition = 1;
168 }
169 this.$nextTick(()=>{
170 console.log(this.$refs.hbj);
171 this.$refs.hbj.getHInfo(this.hbsm);
172 });
173 break; 132 break;
174 default: 133 default:
175 break; 134 break;
......
1 <template>
2 <div class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
4 <el-tab-pane label="户基本信息表" name="hjbxx">
5 <hbj :bsm="hbsm"></hbj>
6 </el-tab-pane>
7 <el-tab-pane label="登记簿" name="djb">
8 <djb v-if="djbVisible"></djb>
9 </el-tab-pane>
10 <el-tab-pane label="附件材料" name="fjcl">
11 <fjcl v-if="fjclVisible"></fjcl>
12 </el-tab-pane>
13 </el-tabs>
14 </div>
15 </template>
16
17 <script>
18 import hbj from "./../zrz/lpb/bjlp/hbj/index"
19 import djb from "./../zd/djb/index";
20 import fjcl from "./../zd/fjcl/fjcl"
21
22 export default {
23 name: "index",
24 components: {
25 hbj, djb, fjcl
26 },
27 data() {
28 return {
29 hbsm:this.$store.state.hbsm,
30 activeName: "hjbxx",
31 djbVisible: false,
32 fjclVisible: false,
33 }
34 },
35 mounted() {
36
37 },
38 methods: {
39 handleClick(tab, event) {
40 // console.log(tab, event);
41 switch (tab.name) {
42 case 'djb':
43 this.djbVisible = true;
44 break;
45 case 'fjcl':
46 this.fjclVisible = true;
47 break;
48 default:
49 break;
50 }
51 },
52 },
53 watch: {}
54 }
55 </script>
56
57 <style scoped>
58
59 </style>
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
106 window.open(`/api/file/download?url=`+url); 106 window.open(`/api/file/download?url=`+url);
107 }, 107 },
108 getFileList() { 108 getFileList() {
109 console.log(this.$route.name,'NAME')
109 switch (this.$route.name) { 110 switch (this.$route.name) {
110 case "宗地": 111 case "宗地":
111 this.filesData.dylx = 'zd'; 112 this.filesData.dylx = 'zd';
...@@ -115,6 +116,14 @@ ...@@ -115,6 +116,14 @@
115 this.filesData.dylx = 'zrz'; 116 this.filesData.dylx = 'zrz';
116 this.filesData.glbsm = this.$store.state.zrzbsm 117 this.filesData.glbsm = this.$store.state.zrzbsm
117 break 118 break
119 case "多幢":
120 this.filesData.dylx = 'dz';
121 this.filesData.glbsm = this.$store.state.dzbsm
122 break
123 case "户":
124 this.filesData.dylx = 'h';
125 this.filesData.glbsm = this.$store.state.hbsm
126 break;
118 default: 127 default:
119 break 128 break
120 } 129 }
......
...@@ -95,8 +95,8 @@ export default { ...@@ -95,8 +95,8 @@ export default {
95 ); 95 );
96 96
97 const tooltip = new G6.Tooltip({ 97 const tooltip = new G6.Tooltip({
98 offsetX: 210, 98 offsetX: 10,
99 offsetY: 210, 99 offsetY: 10,
100 itemTypes: ['node', 'edge'], 100 itemTypes: ['node', 'edge'],
101 getContent: (e) => { 101 getContent: (e) => {
102 const outDiv = document.createElement('div'); 102 const outDiv = document.createElement('div');
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
4 <el-row class="searchContent"> 4 <el-row class="searchContent">
5 <el-col :span="6"> 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>
8 <el-radio-button label="0">预测</el-radio-button> 7 <el-radio-button label="0">预测</el-radio-button>
8 <el-radio-button label="1">实测</el-radio-button>
9 </el-radio-group> 9 </el-radio-group>
10 <el-input 10 <el-input
11 maxlength="28" 11 maxlength="28"
...@@ -257,13 +257,6 @@ ...@@ -257,13 +257,6 @@
257 <!-- 双击户的弹出框 --> 257 <!-- 双击户的弹出框 -->
258 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center> 258 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
259 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj> 259 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
260 <div class="btnGroup">
261 <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
262 <el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
263 <el-button type="primary" @click="hbjResetInfo">重置</el-button>
264 <el-button type="primary" @click="hbjVisible = false">取消</el-button>
265 <el-button type="primary" @click="registerCall">登记调用</el-button>
266 </div>
267 </el-dialog> 260 </el-dialog>
268 </div> 261 </div>
269 </template> 262 </template>
...@@ -281,7 +274,6 @@ import addZdy from "./zdy/index"; ...@@ -281,7 +274,6 @@ import addZdy from "./zdy/index";
281 import addCh from "./ch/index"; 274 import addCh from "./ch/index";
282 import hbj from "./hbj/index"; 275 import hbj from "./hbj/index";
283 import lpbContent from "./lpbContent/index"; 276 import lpbContent from "./lpbContent/index";
284 import {registerCall} from "../../../../api/common";
285 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "../../../../api/lpb"; 277 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "../../../../api/lpb";
286 278
287 export default { 279 export default {
...@@ -312,7 +304,7 @@ export default { ...@@ -312,7 +304,7 @@ export default {
312 plzlVisible: false, 304 plzlVisible: false,
313 hbjVisible: false, 305 hbjVisible: false,
314 hcxlzVisible:false, 306 hcxlzVisible:false,
315 scyclx: "1", //1是实测 0是预测 307 scyclx: "0", //1是实测 0是预测
316 radio1: "", 308 radio1: "",
317 radio2: "", 309 radio2: "",
318 createFlag: false, 310 createFlag: false,
...@@ -406,18 +398,6 @@ export default { ...@@ -406,18 +398,6 @@ export default {
406 }, 100); 398 }, 100);
407 }, 399 },
408 methods: { 400 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(){ 401 batchCommit(){
422 if (this.bsms.length <= 0) { 402 if (this.bsms.length <= 0) {
423 Message.warning("请选择操作户") 403 Message.warning("请选择操作户")
...@@ -604,18 +584,6 @@ export default { ...@@ -604,18 +584,6 @@ export default {
604 }); 584 });
605 } 585 }
606 }, 586 },
607 //户保存
608 hbjSaveInfo() {
609 this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
610 },
611 //户保存
612 hbjSubmitInfo() {
613 this.$refs.hbj.onSubmit(this.bsms[this.bsms.length - 1], this.tabPosition);
614 },
615 //户编辑表单重置
616 hbjResetInfo() {
617 this.$refs.hbj.onReset();
618 },
619 //调用楼盘表信息查询接口 587 //调用楼盘表信息查询接口
620 getlpbData() { 588 getlpbData() {
621 this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm); 589 this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm);
...@@ -648,6 +616,7 @@ export default { ...@@ -648,6 +616,7 @@ export default {
648 // this.$refs.lpbContent.clearChoosedH(); 616 // this.$refs.lpbContent.clearChoosedH();
649 this.$nextTick(()=>{ 617 this.$nextTick(()=>{
650 //给hBsmList传值 618 //给hBsmList传值
619 // console.log(bsms,'bsms');
651 this.$refs.lpbContent.choosedList = bsms; 620 this.$refs.lpbContent.choosedList = bsms;
652 this.$refs.lpbContent.borderColor = color; 621 this.$refs.lpbContent.borderColor = color;
653 }) 622 })
......
...@@ -681,6 +681,8 @@ export default { ...@@ -681,6 +681,8 @@ export default {
681 //父组件中选择单元状态改变选中户的边框颜色 681 //父组件中选择单元状态改变选中户的边框颜色
682 choosedList(n) { 682 choosedList(n) {
683 this.$refs.hBsm.forEach((item) => { 683 this.$refs.hBsm.forEach((item) => {
684 // console.log(item.dataset.bsm,'item.dataset.bsm');
685 // console.log(this.choosedList,'this.choosedList');
684 this.choosedList.forEach((i) => { 686 this.choosedList.forEach((i) => {
685 if (item.dataset.bsm == i) { 687 if (item.dataset.bsm == i) {
686 console.log(item.style.borderColor ,'item.style.borderColor '); 688 console.log(item.style.borderColor ,'item.style.borderColor ');
......