Merge remote-tracking branch 'origin/master'

@@ -160,9 +160,22 @@ ol, ul { list-style:none; }
         margin: 0;
         padding: 7px 16px;
         cursor: pointer;
+        position: relative;
+        .childUl{
+            display: none;
+            position: absolute;
+            left: 92px !important;
+            top: 0!important;
+            li{
+                width: 76px;
+            }
+        }
     }
     li:hover {
         background: #eee;
+        >.childUl{
+            display: block;
+        }
     }
     .noEdit{
         color: #E6E6E6;

@@ -58,7 +58,15 @@
 		>
 			<li @click="postionToMap">定位</li>
 			<li @click="importGeo">导入图形</li>
-			<li @click="exportToShp">导出图形</li>
+			<li @click="exportToShp">
+				导出图形
+				<ul class="contextmenu childUl">
+					<li>文本</li>
+					<li>CAD</li>
+					<li>Excel</li>
+					<li>ESRI Shape</li>
+				</ul>
+			</li>
 			<li v-show="isZD">导入属性</li>
 			<li v-show="!isZD">导入楼盘</li>
 			<li>重叠分析</li>

@@ -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 = '请求错误';

@@ -581,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)
@@ -594,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)
 
                         }

@@ -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 ');