Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
99354aa1 by 焦泽平
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents 055f0d33 1ce5b014
Inline Side-by-side
Showing 10 changed files with 118 additions and 23 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:
......
...@@ -170,6 +170,8 @@ ...@@ -170,6 +170,8 @@
170 console.log(this.$refs.hbj); 170 console.log(this.$refs.hbj);
171 this.$refs.hbj.getHInfo(this.hbsm); 171 this.$refs.hbj.getHInfo(this.hbsm);
172 }); 172 });
173 path="/h";
174 this.$store.state.hbsm=row.glbsm
173 break; 175 break;
174 default: 176 default:
175 break; 177 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 ></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 activeName: "hjbxx",
30 djbVisible: false,
31 fjclVisible: false,
32 }
33 },
34 mounted() {
35
36 },
37 methods: {
38 handleClick(tab, event) {
39 // console.log(tab, event);
40 switch (tab.name) {
41 case 'djb':
42 this.djbVisible = true;
43 break;
44 case 'fjcl':
45 this.fjclVisible = true;
46 break;
47 default:
48 break;
49 }
50 },
51 },
52 watch: {}
53 }
54 </script>
55
56 <style scoped>
57
58 </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 }
......
...@@ -518,6 +518,11 @@ ...@@ -518,6 +518,11 @@
518 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量 518 fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
519 } 519 }
520 }, 520 },
521 created(){
522 let bsm=this.$store.state.hbsm
523 console.log(bsm,'户BSM')
524 this.getHInfo(bsm);
525 },
521 methods: { 526 methods: {
522 addYtInfo(){ 527 addYtInfo(){
523 this.form.fwytList.push({ 528 this.form.fwytList.push({
...@@ -576,7 +581,7 @@ ...@@ -576,7 +581,7 @@
576 this.$set(this.form,"sctnjzmj", this.form.gltnjzmj) 581 this.$set(this.form,"sctnjzmj", this.form.gltnjzmj)
577 this.$set(this.form,"scftjzmj", this.form.glftjzmj) 582 this.$set(this.form,"scftjzmj", this.form.glftjzmj)
578 this.$set(this.form,"scdxbfjzmj", this.form.gldxbfjzmj) 583 this.$set(this.form,"scdxbfjzmj", this.form.gldxbfjzmj)
579 this.$set(this.form,"scqtjzmj", this.form.gltjzmj) 584 this.$set(this.form,"scqtjzmj", this.form.glqtjzmj)
580 this.$set(this.form,"scftxs", this.form.glftxs) 585 this.$set(this.form,"scftxs", this.form.glftxs)
581 }else if(this.form.scyclx==='1'){ 586 }else if(this.form.scyclx==='1'){
582 this.$set(this.form,"scjzmj", this.form.jzmj) 587 this.$set(this.form,"scjzmj", this.form.jzmj)
...@@ -589,7 +594,7 @@ ...@@ -589,7 +594,7 @@
589 this.$set(this.form,"yctnjzmj", this.form.gltnjzmj) 594 this.$set(this.form,"yctnjzmj", this.form.gltnjzmj)
590 this.$set(this.form,"ycftjzmj", this.form.glftjzmj) 595 this.$set(this.form,"ycftjzmj", this.form.glftjzmj)
591 this.$set(this.form,"ycdxbfjzmj", this.form.gldxbfjzmj) 596 this.$set(this.form,"ycdxbfjzmj", this.form.gldxbfjzmj)
592 this.$set(this.form,"ycqtjzmj", this.form.gltjzmj) 597 this.$set(this.form,"ycqtjzmj", this.form.glqtjzmj)
593 this.$set(this.form,"ycftxs", this.form.glftxs) 598 this.$set(this.form,"ycftxs", this.form.glftxs)
594 599
595 } 600 }
...@@ -813,7 +818,7 @@ ...@@ -813,7 +818,7 @@
813 watch: { 818 watch: {
814 scyclx:{ 819 scyclx:{
815 handler(n){ 820 handler(n){
816 this.$nextTick(()=>{ 821 this.$nextTick(()=>{
817 this.form.scyclx = this.scyclx; 822 this.form.scyclx = this.scyclx;
818 }) 823 })
819 } 824 }
...@@ -823,7 +828,7 @@ ...@@ -823,7 +828,7 @@
823 </script> 828 </script>
824 <style rel="stylesheet/less" lang="less" scoped> 829 <style rel="stylesheet/less" lang="less" scoped>
825 .h { 830 .h {
826 height: 600px; 831 height: 100%;
827 width: 100%; 832 width: 100%;
828 margin-top: 10px; 833 margin-top: 10px;
829 overflow-y: scroll; 834 overflow-y: scroll;
...@@ -867,11 +872,11 @@ ...@@ -867,11 +872,11 @@
867 .hTable{ 872 .hTable{
868 margin-top: 10px; 873 margin-top: 10px;
869 } 874 }
870 875
871 /deep/.el-select-tree{ 876 /deep/.el-select-tree{
872 width: 100%; 877 width: 100%;
873 .el-input__inner{ 878 .el-input__inner{
874 height: 30px !important; 879 height: 30px !important;
875 } 880 }
876 } 881 }
877 </style>
...\ No newline at end of file ...\ No newline at end of file
882 </style>
......
...@@ -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"
...@@ -312,7 +312,7 @@ export default { ...@@ -312,7 +312,7 @@ export default {
312 plzlVisible: false, 312 plzlVisible: false,
313 hbjVisible: false, 313 hbjVisible: false,
314 hcxlzVisible:false, 314 hcxlzVisible:false,
315 scyclx: "1", //1是实测 0是预测 315 scyclx: "0", //1是实测 0是预测
316 radio1: "", 316 radio1: "",
317 radio2: "", 317 radio2: "",
318 createFlag: false, 318 createFlag: false,
...@@ -648,6 +648,7 @@ export default { ...@@ -648,6 +648,7 @@ export default {
648 // this.$refs.lpbContent.clearChoosedH(); 648 // this.$refs.lpbContent.clearChoosedH();
649 this.$nextTick(()=>{ 649 this.$nextTick(()=>{
650 //给hBsmList传值 650 //给hBsmList传值
651 // console.log(bsms,'bsms');
651 this.$refs.lpbContent.choosedList = bsms; 652 this.$refs.lpbContent.choosedList = bsms;
652 this.$refs.lpbContent.borderColor = color; 653 this.$refs.lpbContent.borderColor = color;
653 }) 654 })
......
...@@ -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 ');
......