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

@@ -19,30 +19,31 @@
     "el-select-tree": "^1.0.26",
     "el-tree-select": "^3.1.10",
     "element-ui": "^2.13.2",
+    "esri-loader": "^2.16.0",
     "file-saver": "^2.0.2",
     "form-making": "^1.2.9",
     "insert-css": "^2.0.0",
     "js-cookie": "^2.2.1",
     "mockjs": "^1.1.0",
     "screenfull": "^5.0.2",
+    "shapefile": "^0.6.6",
     "style-resources-loader": "^1.3.3",
+    "terraformer-arcgis-parser": "^1.1.0",
+    "terraformer-wkt-parser": "^1.2.1",
     "vue": "^2.6.10",
     "vue-cli-plugin-style-resources-loader": "^0.1.4",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.0.3",
     "vuex": "^3.0.1",
     "webpack-theme-color-replacer": "^1.3.14",
-    "xlsx": "^0.16.6",
-    "esri-loader": "^2.15.0",
-    "shapefile": "^0.6.6",
-    "terraformer-arcgis-parser": "^1.1.0",
-    "terraformer-wkt-parser": "^1.2.1"
+    "xlsx": "^0.16.6"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.11.0",
     "@vue/cli-plugin-eslint": "^3.11.0",
     "@vue/cli-service": "^3.11.0",
     "babel-eslint": "^10.0.1",
+    "babel-polyfill": "^6.26.0",
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.0.0",
     "less": "^3.0.4",

@@ -37,6 +37,7 @@ if (
     }
   }, false)
 }
+import "babel-polyfill"
 Vue.config.productionTip = false
 Vue.use(ElementUI)
 new Vue({

@@ -10,7 +10,7 @@
 					/>
 					<span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span>
 				</div>
-				<div class="treeModule" :style="{height:treeHeight+'px'}">
+				<div class="treeModule"  :style="{height:treeHeight+'px'}">
 					<LineTree :pd="pd" @itemClick="itemClick"></LineTree>
 				</div>
 			</el-aside>
@@ -49,6 +49,7 @@
 				</el-main>
 			</el-container>
 		</el-container>
+		<div class="treeModule-show" :class="{ 'w0': isActive }"></div>
 	</div>
 </template>
 <script>
@@ -410,6 +411,7 @@ export default {
 .home-box {
 	width: 100%;
 	height: 100vh;
+	position: relative;
 	.calcWidth{
 		width: calc(100% - 300px);
 	}
@@ -441,15 +443,6 @@ export default {
 					color: #000;
 				}
 			}
-			.top-items:not(:last-child)::after {
-				// content: "";
-				// width: 1px;
-				// height: 14px;
-				// background: #eaeaea;
-				// position: absolute;
-				// right: -1px;
-				// top: 24px;
-			}
 			.top-items.is-active {
 				color: #006cff;
 				border-left: 1px solid #EAEAEA;
@@ -526,5 +519,23 @@ export default {
 		// line-height: 160px;
 		padding: 0;
 	}
+	
+	.treeModule-show{
+		width: 290px;
+		height: calc(100% - 120px);
+		position: absolute;
+		top: 120px;
+		left: 0;
+		z-index: 1;
+		pointer-events: none;
+		-webkit-box-shadow: inset -14px 0px 16px red;
+		box-shadow: inset -23px 0px 16px #1d50dd;
+		transition: 0.3s;
+		display: none;
+	}
+	.w0{
+		display: block;
+		width: 64px;
+	}
 }
 </style>

@@ -135,7 +135,13 @@
                     default:
                         break;
                 }
-                this.$router.push(path);
+                this.$router.push({
+                    path: path,
+                    query: {
+                        bsm: row.glbsm,
+                        source: 2
+                    }
+                });
             },
         },
         computed: {},

@@ -372,7 +372,7 @@
             return {
                 tabName: 'zd',
                 centerDialogVisible: false,
-                bgqData: [],
+                zdFgqData: [],
                 hbhData: {},
                 fgBoxWidth: 0,
                 xzq: [],
@@ -462,10 +462,10 @@
             },
             addData: function (val) {
                 this.centerDialogVisible = false;
-                this.bgqData.push(val)
+                this.zdFgqData.push(val)
             },
             getData: function (data) {
-                this.bgqData.push(data)
+                this.zdFgqData.push(data)
             },
         },
         computed: {},

@@ -42,7 +42,7 @@
 			</el-card>
 		</div>
 		<div class="notice" ref="notice">
-			<el-card>
+			<el-card class="news">
 				<div slot="header" class="clearfix">
 					<span>通知公告</span>
 					<span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span>

@@ -8,6 +8,7 @@
                 :before-remove="beforeRemove"
                 :on-success="uploadSuccess"
                 :on-error="uploadError"
+                :show-file-list="false"
                 multiple
                 :limit="3"
                 :on-exceed="handleExceed"
@@ -107,10 +108,9 @@
             },
             uploadSuccess(res, file, fileList) {
                 this.filesData.list = res.result;
-                console.log(res, "res=========")
                 insertFile(this.filesData).then(res => {
                     if (res.success) {
-                        Message.warning("上传成功")
+                        Message.success("上传成功")
                         this.getFileList(this.filesData.glbsm)
                     } else {
                         Message.error(res.message)

@@ -26,48 +26,48 @@
 				<el-col :span="16">
 					<div class="fr">
 						<el-button class="radioBtn" label="1" border @click="create"
-							>创建楼盘</el-button
+							><i class="fa fa-building-o"></i>创建楼盘</el-button
 						>
 						<el-button class="radioBtn" label="2" border @click="plScYcChange"
-							>实预测转换</el-button
+							><i class="fa fa-building-o"></i>实预测转换</el-button
 						>
 						<el-button
 							class="radioBtn"
 							label="3"
 							border
 							@click="openPl('h')"
-							>批量户</el-button
+							><i class="fa fa-building-o"></i> 批量户</el-button
 						>
 						<el-button
 							class="radioBtn"
 							label="4"
 							border
 							@click="openPlC"
-							>批量层</el-button
+							><i class="fa fa-building-o"></i>批量层</el-button
 						>
 						<el-button
 							class="radioBtn"
 							label="5"
 							border
 							@click="openPl('sh')"
-							>批量室号</el-button
+							><i class="fa fa-building-o"></i>批量室号</el-button
 						>
 						<el-button
 							class="radioBtn"
 							label="6"
 							border
 							@click="openPl('zl')"
-							>批量坐落</el-button
+							><i class="fa fa-building-o"></i>批量坐落</el-button
 						>
 						<el-button class="radioBtn" label="7" border @click="addBdcdyh"
-							>批量单元号</el-button
+							><i class="fa fa-building-o"></i>批量单元号</el-button
 						>
 						<el-button
 							class="radioBtn"
 							label="7"
 							border
 							@click="hcxlzVisible = true"
-							>户重新落宗</el-button
+							><i class="fa fa-building-o"></i>户重新落宗</el-button
 						>
 					</div>
 				</el-col>
@@ -141,7 +141,7 @@
 							@click="handleChoosedH(item.bsms)"
 						>
 							<td>
-								<i class="el-icon-star-on" :style="{ color: item.color }"></i
+								<i class="fa fa-circle" :style="{ color: item.color }"></i
 								>{{ item.name }}
 							</td>
 							<td>{{ item.ts }}</td>
@@ -168,7 +168,7 @@
 							@click="handleChoosedH(item.bsms)"
 						>
 							<td>
-								<i class="el-icon-star-on" :style="{ color: item.color }"></i
+								<i class="fa fa-circle" :style="{ color: item.color }"></i
 								>{{ item.name }}
 							</td>
 							<td>{{ item.ts }}</td>
@@ -198,7 +198,7 @@
 							@click="handleChoosedH(item.bsms)"
 						>
 							<td>
-								<i class="el-icon-star-on" :style="{ color: item.color }"></i
+								<i class="fa fa-circle" :style="{ color: item.color }"></i
 								>{{ item.name }}
 							</td>
 							<td>{{ item.ts }}</td>
@@ -314,55 +314,55 @@ export default {
 			dyztList: [
 				{
 					name: "未确权",
-					color: "#2591FD",
+					color: "#83AAFE",
 					ts: "12",
 					mj: "1633",
 				},
 				{
 					name: "已确权",
-					color: "#2591FD",
+					color: "#6EDEE1",
 					ts: "22",
 					mj: "3109",
 				},
 				{
 					name: "已备案",
-					color: "#2591FD",
+					color: "#8ADC88",
 					ts: "3",
 					mj: "409",
 				},
 				{
 					name: "预抵押",
-					color: "#2591FD",
+					color: "#F2AD67",
 					ts: "11",
 					mj: "1466",
 				},
 				{
 					name: "在建抵押",
-					color: "#2591FD",
+					color: "#F191C8",
 					ts: "13",
 					mj: "1792",
 				},
 				{
 					name: "抵押",
-					color: "#2591FD",
+					color: "#FF8282",
 					ts: "14",
 					mj: "13",
 				},
 				{
 					name: "查封",
-					color: "#2591FD",
+					color: "#D7CECF",
 					ts: "9",
 					mj: "1436",
 				},
 				{
 					name: "异议",
-					color: "#2591FD",
+					color: "#D4A3EB",
 					ts: "34",
 					mj: "4342",
 				},
 				{
 					name: "限制",
-					color: "#2591FD",
+					color: "#A5A3FB",
 					ts: "2",
 					mj: "285",
 				},
@@ -614,34 +614,42 @@ export default {
 					this.dyztList.splice(1,0,this.dyztList[8]);
 					this.dyztList.pop();
 					this.dyztList.forEach(item=>{
-						item.color = "#2591FD";
 						item.ts = item.bsms.length;
 							switch (item.name) {
 								case 'Qqzt':
+									item.color = "#6EDEE1";
 									item.name = "已确权"
 									break;
 								case 'Wqqzt':
+									item.color = "#83AAFE";
 									item.name = "未确权"
 									break;
 								case 'Bazt':
+									item.color = "#8ADC88";
 									item.name = "已备案"
 									break;
 								case 'Ydyzt':
+									item.color = "#F2AD67";
 									item.name = "预抵押"
 									break;
 								case 'Zjgcdyzt':
+									item.color = "#F191C8";
 									item.name = "在建抵押"
 									break;
 								case 'Dyzt':
+									item.color = "#FF8282";
 									item.name = "抵押"
 									break;
 								case 'Cfzt':
+									item.color = "#D7CECF";
 									item.name = "查封"
 									break;
 								case 'Yyzt':
+									item.color = "#D4A3EB";
 									item.name = "异议"
 									break;
 								case 'Xzzt':
+									item.color = "#A5A3FB";
 									item.name = "限制"
 									break;
 								default:
@@ -698,6 +706,9 @@ export default {
 				this.lpbContentwidth += 260;
 			}
 		},
+		selectedZt(n){
+			this.legendToggleFlag = true;
+		}
 	},
 };
 </script>
@@ -736,7 +747,8 @@ export default {
 			}
 		}
 		.radioBtn {
-			margin-left: 20px;
+			margin-left: 16px;
+			padding:12px 14px;
 			/deep/.el-radio-button__inner {
 				border: 1px solid #dcdfe6;
 				border-radius: 4px;
@@ -857,5 +869,8 @@ export default {
 			margin-top: 10vh!important;
 		}
 	}
+	.fa{
+		padding-right: 4px;
+	}
 }
 </style>