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'
import axios from 'axios'
import router from '../../router'
import {Message, MessageBox} from 'element-ui'
import { Loading } from 'element-ui';
// import { Loading } from 'element-ui';
import {httpStatus} from '@/api/config'
// 创建一个 axios 实例
......@@ -19,7 +19,7 @@ const service = axios.create({
function errorLog() {
//请求完成关闭loading
// this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
// loadingInstance.close();
// });
MessageBox.alert('报错了请联系管理员', '消息提示', {
confirmButtonText: '确定',
......@@ -27,7 +27,7 @@ function errorLog() {
})
}
//定义loading
let loadingInstance = null
// let loadingInstance = null
// 请求拦截器
service.interceptors.request.use(
......@@ -37,12 +37,12 @@ service.interceptors.request.use(
// 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
// config.headers['authkey'] = token
//请求发送成功显示loading
loadingInstance = Loading.service({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.5)'
});
// loadingInstance = Loading.service({
// lock: true,
// text: 'Loading',
// spinner: 'el-icon-loading',
// background: 'rgba(0, 0, 0, 0.5)'
// });
return config
},
error => {
......@@ -59,7 +59,7 @@ service.interceptors.response.use(
const {code} = dataAxios
//请求完成关闭loading
// this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
// loadingInstance.close();
// });
// 根据 code 进行判断
if (code === undefined) {
......@@ -90,7 +90,7 @@ service.interceptors.response.use(
},
error => {
if (error && error.response) {
loadingInstance.close();
// loadingInstance.close();
switch (error.response.status) {
case 400:
error.message = '请求错误';
......
......@@ -70,6 +70,11 @@ const constantRoutes = [
name: "宗地",
code: "1-5",
component: () => import("@/views/zd/index"),
},{
path: "/h",
name: "户",
code: "1-6",
component: () => import("@/views/systemH/index"),
},
{
path: "/viewMap",
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx></dzxx></el-tab-pane>
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import dzxx from "./dzxx";
import fjcl from "./../zd/fjcl/fjcl"
export default {
name: "",
components: {
dzxx
dzxx,fjcl
},
props: {},
data() {
return {
activeName: "dzxx",
dzJbxxVisble:false,
fjclVisible:false
};
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
switch (tab.name) {
case 'dzxx':
this.dzJbxxVisble = true;
break
case 'fjcl':
this.fjclVisible = true;
break;
default:
break;
}
},
},
created() {},
......
......@@ -127,7 +127,7 @@
this.$store.state.zdbsm = row.glbsm
break;
case "h":
path = "h";
path = "/h";
this.$store.state.hbsm = row.glbsm
type = "2";
default:
......
......@@ -170,6 +170,8 @@
console.log(this.$refs.hbj);
this.$refs.hbj.getHInfo(this.hbsm);
});
path="/h";
this.$store.state.hbsm=row.glbsm
break;
default:
break;
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="户基本信息表" name="hjbxx">
<hbj ></hbj>
</el-tab-pane>
<el-tab-pane label="登记簿" name="djb">
<djb v-if="djbVisible"></djb>
</el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl">
<fjcl v-if="fjclVisible"></fjcl>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import hbj from "./../zrz/lpb/bjlp/hbj/index"
import djb from "./../zd/djb/index";
import fjcl from "./../zd/fjcl/fjcl"
export default {
name: "index",
components: {
hbj, djb, fjcl
},
data() {
return {
activeName: "hjbxx",
djbVisible: false,
fjclVisible: false,
}
},
mounted() {
},
methods: {
handleClick(tab, event) {
// console.log(tab, event);
switch (tab.name) {
case 'djb':
this.djbVisible = true;
break;
case 'fjcl':
this.fjclVisible = true;
break;
default:
break;
}
},
},
watch: {}
}
</script>
<style scoped>
</style>
......@@ -106,6 +106,7 @@
window.open(`/api/file/download?url=`+url);
},
getFileList() {
console.log(this.$route.name,'NAME')
switch (this.$route.name) {
case "宗地":
this.filesData.dylx = 'zd';
......@@ -115,6 +116,14 @@
this.filesData.dylx = 'zrz';
this.filesData.glbsm = this.$store.state.zrzbsm
break
case "多幢":
this.filesData.dylx = 'dz';
this.filesData.glbsm = this.$store.state.dzbsm
break
case "户":
this.filesData.dylx = 'h';
this.filesData.glbsm = this.$store.state.hbsm
break;
default:
break
}
......
......@@ -518,6 +518,11 @@
fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
}
},
created(){
let bsm=this.$store.state.hbsm
console.log(bsm,'户BSM')
this.getHInfo(bsm);
},
methods: {
addYtInfo(){
this.form.fwytList.push({
......@@ -576,7 +581,7 @@
this.$set(this.form,"sctnjzmj", this.form.gltnjzmj)
this.$set(this.form,"scftjzmj", this.form.glftjzmj)
this.$set(this.form,"scdxbfjzmj", this.form.gldxbfjzmj)
this.$set(this.form,"scqtjzmj", this.form.gltjzmj)
this.$set(this.form,"scqtjzmj", this.form.glqtjzmj)
this.$set(this.form,"scftxs", this.form.glftxs)
}else if(this.form.scyclx==='1'){
this.$set(this.form,"scjzmj", this.form.jzmj)
......@@ -589,7 +594,7 @@
this.$set(this.form,"yctnjzmj", this.form.gltnjzmj)
this.$set(this.form,"ycftjzmj", this.form.glftjzmj)
this.$set(this.form,"ycdxbfjzmj", this.form.gldxbfjzmj)
this.$set(this.form,"ycqtjzmj", this.form.gltjzmj)
this.$set(this.form,"ycqtjzmj", this.form.glqtjzmj)
this.$set(this.form,"ycftxs", this.form.glftxs)
}
......@@ -813,7 +818,7 @@
watch: {
scyclx:{
handler(n){
this.$nextTick(()=>{
this.$nextTick(()=>{
this.form.scyclx = this.scyclx;
})
}
......@@ -823,7 +828,7 @@
</script>
<style rel="stylesheet/less" lang="less" scoped>
.h {
height: 600px;
height: 100%;
width: 100%;
margin-top: 10px;
overflow-y: scroll;
......@@ -867,11 +872,11 @@
.hTable{
margin-top: 10px;
}
/deep/.el-select-tree{
width: 100%;
.el-input__inner{
height: 30px !important;
}
}
</style>
\ No newline at end of file
</style>
......
......@@ -4,8 +4,8 @@
<el-row class="searchContent">
<el-col :span="6">
<el-radio-group v-model="scyclx" @change="scyclxChange">
<el-radio-button label="1">实测</el-radio-button>
<el-radio-button label="0">预测</el-radio-button>
<el-radio-button label="1">实测</el-radio-button>
</el-radio-group>
<el-input
maxlength="28"
......@@ -312,7 +312,7 @@ export default {
plzlVisible: false,
hbjVisible: false,
hcxlzVisible:false,
scyclx: "1", //1是实测 0是预测
scyclx: "0", //1是实测 0是预测
radio1: "",
radio2: "",
createFlag: false,
......@@ -648,6 +648,7 @@ export default {
// this.$refs.lpbContent.clearChoosedH();
this.$nextTick(()=>{
//给hBsmList传值
// console.log(bsms,'bsms');
this.$refs.lpbContent.choosedList = bsms;
this.$refs.lpbContent.borderColor = color;
})
......
......@@ -681,6 +681,8 @@ export default {
//父组件中选择单元状态改变选中户的边框颜色
choosedList(n) {
this.$refs.hBsm.forEach((item) => {
// console.log(item.dataset.bsm,'item.dataset.bsm');
// console.log(this.choosedList,'this.choosedList');
this.choosedList.forEach((i) => {
if (item.dataset.bsm == i) {
console.log(item.style.borderColor ,'item.style.borderColor ');
......