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

# Conflicts:
#	src/views/zd/jzd/index.vue

@@ -48,9 +48,9 @@
 						active_color: item.expand,
 					}"
 				>
-					<span v-if="item.qszt=='0'" style="color:red">(临)</span>
-					<span v-if="item.qszt=='1'" style="color:green">(正)</span>
-					<span v-if="item.qszt=='2'" style="color:blue">(现)</span>
+					<img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/>
+					<img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/>
+					<img class="qsztImg" v-if="item.qszt=='2'" :src="xianshi"/>
 					{{ item.mc }}
 				</div>
 			</div>
@@ -97,6 +97,9 @@ export default {
 		return {
 			time:null,
 			treeXzqHeight:0,
+			linshi:require("../../assets/images/lin.png"),
+			zhengshi:require("../../assets/images/zheng.png"),
+			xianshi:require("../../assets/images/xian.png"),
 		}
 	},
 	mounted(){
@@ -370,4 +373,9 @@ export default {
 		center;
 	background-size: contain;
 }
+.qsztImg{
+	width: 14px;
+	position: relative;
+    top: 1px;
+}
 </style>

@@ -154,7 +154,7 @@ export default {
 							this.$router.push({
 								path: path,
 								query: {
-									bsm: newGlbsm,
+									bsm: res.result,
 									source: 2
 								}
 							});

@@ -36,7 +36,7 @@ export default {
 	},
 	methods: {
 		handleClick(tab, event) {
-			console.log(tab, event);
+			// console.log(tab, event);
 		},
     //查询界址点
     getJZD(){

@@ -6,7 +6,7 @@
             <el-button type="primary" @click="batchExit">批量修改</el-button>
         </div>
         <div class="table">
-            <table :data="jzdlist" border="1">
+            <table border="1">
                 <tr>
                     <td class="cz"><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td>
                     <td class="jzdh">界址点号</td>
@@ -93,6 +93,7 @@
 <script>
     import {queryjzd, jzdsingleModify, jzdbatchModify} from '../../../api/zd'
     import {Message} from 'element-ui'
+
     export default {
         name: "jzd",
         components: {},
@@ -165,7 +166,8 @@
         },
         mounted() {
             let bsm = this.$store.state.zdbsm
-            this.getData({"glBsm":bsm})
+            this.bsm=bsm;
+            this.getData(bsm)
         },
         methods: {
             getData(bsm) {
@@ -259,6 +261,7 @@
         computed: {},
         watch: {
             "$store.state.zdbsm": function (bsm) {
+                this.bsm=bsm
                 this.getData(bsm)
             }
         },

@@ -233,6 +233,7 @@
         },
         mounted() {
             let bsm = this.$store.state.zdbsm
+            this.bsm=bsm;
             this.getData(bsm)
         },
         methods: {
@@ -327,6 +328,7 @@
         computed: {},
         watch: {
             "$store.state.zdbsm": function (bsm) {
+                this.bsm=bsm;
                 this.getData(bsm)
             }
         },

@@ -687,6 +687,7 @@ export default {
 		background-color: #fff;
 		font-size: 14px;
 		width: 100%;
+		table-layout: fixed;
 		th {
 			height: 36px;
 			line-height: 36px;