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

@@ -68,11 +68,17 @@
 					<span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span>
 					<span class="edit">查看全部 <i class="fa fa-angle-right " aria-hidden="true"></i></span>
 				</div>
 				</div>
 				<el-table
 				<el-table
-					:data="tableData"
+					:data="downloadData"
 					:height="tableHeight"
 					:height="tableHeight"
+					border
+					@row-click="download"
 					:row-class-name="tableRowClassName"
 					:row-class-name="tableRowClassName"
 				>
 				>
-					<el-table-column prop="title" align="center" label="内容名称">
+					<el-table-column
+							type="index" align="center"
+							width="50" label="序号">
+					</el-table-column>
+					<el-table-column prop="name" align="center" label="下载文件">
 					</el-table-column>
 					</el-table-column>
 				</el-table>
 				</el-table>
 			</el-card>
 			</el-card>
@@ -99,6 +105,15 @@ export default {
 				{ name: "添加", img: require("@assets/images/tj.png") },
 				{ name: "添加", img: require("@assets/images/tj.png") },
 			],
 			],
 			tableData: [],
 			tableData: [],
+            downloadData:[
+                {
+                    name:"宗地导入模板",
+                    url:"api/tx/excelGeo/template?type=zd"
+                },{
+                    name:"自然幢导入模板",
+                    url:"api/tx/excelGeo/template?type=zrz"
+                }
+			],
 			tableHeight: 0,
 			tableHeight: 0,
 			total: 0,
 			total: 0,
 			isEdit:false
 			isEdit:false
@@ -110,6 +125,9 @@ export default {
 		});
 		});
 	},
 	},
 	methods: {
 	methods: {
+        download(row,column,event){
+			window.open(row.url)
+		},
 		handleSelect() {
 		handleSelect() {
 			//非编辑状态才可以点击
 			//非编辑状态才可以点击
 			if (!isEdit) {
 			if (!isEdit) {

 <template>
 <template>
-	<div class="content_box">
-		<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
+	<!-- <div class="content_box"> -->
+		<el-tabs v-model="activeName"  @tab-click="handleClick" type="border-card" >
 			<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
 			<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
 			<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible"></mjftb></el-tab-pane>
 			<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible"></mjftb></el-tab-pane>
 			<el-tab-pane label="界址点" name="jzd"><jzd v-if="jzdVisible"></jzd></el-tab-pane>
 			<el-tab-pane label="界址点" name="jzd"><jzd v-if="jzdVisible"></jzd></el-tab-pane>
@@ -9,7 +9,7 @@
 			<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
 			<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
 			<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
 			<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
 		</el-tabs>
 		</el-tabs>
-	</div>
+	<!-- </div> -->
 </template>
 </template>
 
 
 <script>
 <script>
@@ -71,4 +71,23 @@ export default {
 	watch: {},
 	watch: {},
 };
 };
 </script>
 </script>
-<style scoped lang="less"></style>
+<style scoped lang="less">
+	.el-tabs{
+		height: calc(100% - 50px);
+		/deep/.el-tabs__content{
+			//height: 100%;
+			 /deep/.el-tab-pane{
+			 	height: 100%;
+			 }
+			background: #eaedf5;
+			padding: 0;
+		}
+		/deep/ .el-tabs__item {
+			height: 48px;
+		}
+		/deep/ .el-tabs__header{
+			background-color: #ffffff;
+		}
+	}
+
+</style>

@@ -245,7 +245,7 @@
         width: 100%;
         width: 100%;
 
 
         table {
         table {
-            margin-top: 10px;
+            // margin-top: 10px;
             background-color: #fff;
             background-color: #fff;
             font-size: 14px;
             font-size: 14px;
             width: 100%;
             width: 100%;

@@ -785,6 +785,10 @@
                                     }
                                     }
                                 })
                                 })
                                 .catch((error) => {
                                 .catch((error) => {
+                                    this.$message({
+                                        message: error.message+"，查看日志，联系管理员",
+                                        type: "error",
+                                    });
                                 });
                                 });
                             //保存到空间库里面
                             //保存到空间库里面
                             var self = this;
                             var self = this;