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

@@ -17,7 +17,7 @@
                     <td>界址点类型</td>
                 </tr>
                 <tr v-if="jzdlist.length==0">
-                    <td colspan="7"><span style="color: #b2b2b2;">暂无数据</span></td>
+                    <td colspan="7"><span class="nodata">暂无数据</span></td>
                 </tr>
                 <tr v-for="(item,index) in jzdlist" :key="index" v-else>
                     <td><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td>
@@ -165,6 +165,8 @@
 
         },
         mounted() {
+            let bsm = this.$store.state.zdbsm
+            this.getData(bsm)
         },
         methods: {
             getData(bsm) {
@@ -276,36 +278,40 @@
         padding: 18px;
         height: auto;
         width: 80%;
-    }
+        table {
+            margin-top: 10px;
+            background-color: #fff;
+            font-size: 14px;
+            width: 100%;
+            .formInput {
+                margin: 0;
+                height: 36px;
+                outline: none;
+                border: none;
+                color: #606764;
+                overflow: visible;
+                text-align: center;
+                cursor: text;
+            }
+        }
 
-    table {
-        margin-top: 10px;
-        background-color: #fff;
-        font-size: 14px;
-        width: 100%;
-    }
+        td {
+            text-align: center;
+            height: 36px;
+        }
 
-    td {
-        text-align: center;
-        height: 36px;
-    }
+        table:hover {
+            cursor: pointer;
+        }
 
-    table .formInput {
-        margin: 0;
-        height: 36px;
-        outline: none;
-        border: none;
-        color: #606764;
-        overflow: visible;
-        text-align: center;
-        cursor: text;
-    }
+        .batchlx {
+            text-align: center;
+        }
 
-    table:hover {
-        cursor: pointer;
+        .nodata {
+            color: #b2b2b2;
+        }
     }
 
-    .batchlx {
-        text-align: center;
-    }
+
 </style>

@@ -18,7 +18,7 @@
                     <td>说明</td>
                 </tr>
                 <tr v-if="jzxlist.length==0">
-                    <td colspan="8"><span style="color: #b2b2b2;">暂无数据</span></td>
+                    <td colspan="8"><span class="nodata">暂无数据</span></td>
                 </tr>
                 <tr v-for="(item,index) in jzxlist" :key="index" v-else>
                     <td><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td>
@@ -122,7 +122,7 @@
         props: {},
         data() {
             return {
-                bsm:'',
+                bsm: '',
                 isCheckAll: false,
                 centerDialogVisible: false,
                 jzxwz: [
@@ -231,7 +231,8 @@
 
         },
         mounted() {
-
+            let bsm = this.$store.state.zdbsm
+            this.getData(bsm)
         },
         methods: {
             getData(bsm) {
@@ -241,7 +242,7 @@
                         res.result[i]['jjisdisabled'] = 'readonly';
                         res.result[i]['jzxisdisabled'] = true;
                     }
-                    this.isCheckAll=false;
+                    this.isCheckAll = false;
                     this.jzxlist = res.result;
                 })
             },
@@ -343,37 +344,38 @@
         padding: 18px;
         height: auto;
         width: 80%;
-    }
-
-    table {
-        margin-top: 10px;
-        background-color: #fff;
-        font-size: 14px;
-        width: 100%;
-    }
-
-    td {
-        text-align: center;
-        height: 36px;
-    }
-
-    table .formInput {
-        margin: 0;
-        height: 36px;
-        outline: none;
-        border: none;
-        color: #606764;
-        overflow: visible;
-        text-align: center;
-        cursor: text;
-    }
+        table {
+            margin-top: 10px;
+            background-color: #fff;
+            font-size: 14px;
+            width: 100%;
+            .formInput {
+                margin: 0;
+                height: 36px;
+                outline: none;
+                border: none;
+                color: #606764;
+                overflow: visible;
+                text-align: center;
+                cursor: text;
+            }
+        }
+        table:hover {
+            cursor: pointer;
+        }
+        td {
+            text-align: center;
+            height: 36px;
+        }
+        .batchlx {
+            //text-align: justify;
+            justify-content: space-between;
+        }
 
-    table:hover {
-        cursor: pointer;
+        .nodata {
+            color: #b2b2b2;
+            height: 100px;
+        }
     }
 
-    .batchlx {
-        //text-align: justify;
-        justify-content: space-between;
-    }
 </style>