Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
8aa76ec9 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 99fb18d1 17ddc62b
Inline Side-by-side
Showing 6 changed files with 40 additions and 16 deletions
...@@ -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;
......
...@@ -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>
......
...@@ -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 = '请求错误';
......
...@@ -581,7 +581,7 @@ ...@@ -581,7 +581,7 @@
581 this.$set(this.form,"sctnjzmj", this.form.gltnjzmj) 581 this.$set(this.form,"sctnjzmj", this.form.gltnjzmj)
582 this.$set(this.form,"scftjzmj", this.form.glftjzmj) 582 this.$set(this.form,"scftjzmj", this.form.glftjzmj)
583 this.$set(this.form,"scdxbfjzmj", this.form.gldxbfjzmj) 583 this.$set(this.form,"scdxbfjzmj", this.form.gldxbfjzmj)
584 this.$set(this.form,"scqtjzmj", this.form.gltjzmj) 584 this.$set(this.form,"scqtjzmj", this.form.glqtjzmj)
585 this.$set(this.form,"scftxs", this.form.glftxs) 585 this.$set(this.form,"scftxs", this.form.glftxs)
586 }else if(this.form.scyclx==='1'){ 586 }else if(this.form.scyclx==='1'){
587 this.$set(this.form,"scjzmj", this.form.jzmj) 587 this.$set(this.form,"scjzmj", this.form.jzmj)
...@@ -594,7 +594,7 @@ ...@@ -594,7 +594,7 @@
594 this.$set(this.form,"yctnjzmj", this.form.gltnjzmj) 594 this.$set(this.form,"yctnjzmj", this.form.gltnjzmj)
595 this.$set(this.form,"ycftjzmj", this.form.glftjzmj) 595 this.$set(this.form,"ycftjzmj", this.form.glftjzmj)
596 this.$set(this.form,"ycdxbfjzmj", this.form.gldxbfjzmj) 596 this.$set(this.form,"ycdxbfjzmj", this.form.gldxbfjzmj)
597 this.$set(this.form,"ycqtjzmj", this.form.gltjzmj) 597 this.$set(this.form,"ycqtjzmj", this.form.glqtjzmj)
598 this.$set(this.form,"ycftxs", this.form.glftxs) 598 this.$set(this.form,"ycftxs", this.form.glftxs)
599 599
600 } 600 }
......
...@@ -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 ');
......