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

@@ -17,7 +17,7 @@
                     <td>界址点类型</td>
                     <td>界址点类型</td>
                 </tr>
                 </tr>
                 <tr v-if="jzdlist.length==0">
                 <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>
                 <tr v-for="(item,index) in jzdlist" :key="index" v-else>
                 <tr v-for="(item,index) in jzdlist" :key="index" v-else>
                     <td><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td>
                     <td><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td>
@@ -165,6 +165,8 @@
 
 
         },
         },
         mounted() {
         mounted() {
+            let bsm = this.$store.state.zdbsm
+            this.getData(bsm)
         },
         },
         methods: {
         methods: {
             getData(bsm) {
             getData(bsm) {
@@ -276,21 +278,12 @@
         padding: 18px;
         padding: 18px;
         height: auto;
         height: auto;
         width: 80%;
         width: 80%;
-    }
-
         table {
         table {
             margin-top: 10px;
             margin-top: 10px;
             background-color: #fff;
             background-color: #fff;
             font-size: 14px;
             font-size: 14px;
             width: 100%;
             width: 100%;
-    }
-
-    td {
-        text-align: center;
-        height: 36px;
-    }
-
-    table .formInput {
+            .formInput {
                 margin: 0;
                 margin: 0;
                 height: 36px;
                 height: 36px;
                 outline: none;
                 outline: none;
@@ -300,6 +293,12 @@
                 text-align: center;
                 text-align: center;
                 cursor: text;
                 cursor: text;
             }
             }
+        }
+
+        td {
+            text-align: center;
+            height: 36px;
+        }
 
 
         table:hover {
         table:hover {
             cursor: pointer;
             cursor: pointer;
@@ -308,4 +307,11 @@
         .batchlx {
         .batchlx {
             text-align: center;
             text-align: center;
         }
         }
+
+        .nodata {
+            color: #b2b2b2;
+        }
+    }
+
+
 </style>
 </style>

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