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

@@ -13,42 +13,42 @@
   },
   },
   "dependencies": {
   "dependencies": {
     "@antv/g6": "^4.0.3",
     "@antv/g6": "^4.0.3",
-    "axios": "^0.19.0",
-    "core-js": "^2.6.5",
-    "e-icon-picker": "^1.0.7",
+    "axios": "^0.19.2",
+    "core-js": "^2.6.12",
+    "e-icon-picker": "^1.0.15",
     "el-select-tree": "^1.0.26",
     "el-select-tree": "^1.0.26",
-    "el-tree-select": "^3.1.10",
-    "element-ui": "^2.13.2",
+    "el-tree-select": "^3.1.11",
+    "element-ui": "^2.14.1",
     "esri-loader": "^2.16.0",
     "esri-loader": "^2.16.0",
-    "file-saver": "^2.0.2",
-    "form-making": "^1.2.9",
+    "file-saver": "^2.0.5",
+    "form-making": "^1.2.10",
     "insert-css": "^2.0.0",
     "insert-css": "^2.0.0",
     "js-cookie": "^2.2.1",
     "js-cookie": "^2.2.1",
     "mockjs": "^1.1.0",
     "mockjs": "^1.1.0",
     "screenfull": "^5.0.2",
     "screenfull": "^5.0.2",
     "shapefile": "^0.6.6",
     "shapefile": "^0.6.6",
-    "style-resources-loader": "^1.3.3",
+    "style-resources-loader": "^1.4.1",
     "terraformer-arcgis-parser": "^1.1.0",
     "terraformer-arcgis-parser": "^1.1.0",
     "terraformer-wkt-parser": "^1.2.1",
     "terraformer-wkt-parser": "^1.2.1",
-    "vue": "^2.6.10",
+    "vue": "^2.6.12",
     "vue-cli-plugin-style-resources-loader": "^0.1.4",
     "vue-cli-plugin-style-resources-loader": "^0.1.4",
     "vue-quill-editor": "^3.0.6",
     "vue-quill-editor": "^3.0.6",
-    "vue-router": "^3.0.3",
-    "vuex": "^3.0.1",
+    "vue-router": "^3.4.9",
+    "vuex": "^3.6.0",
     "webpack-theme-color-replacer": "^1.3.14",
     "webpack-theme-color-replacer": "^1.3.14",
-    "xlsx": "^0.16.6"
+    "xlsx": "^0.16.9"
   },
   },
   "devDependencies": {
   "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",
+    "@vue/cli-plugin-babel": "^3.12.1",
+    "@vue/cli-plugin-eslint": "^3.12.1",
+    "@vue/cli-service": "^3.12.1",
+    "babel-eslint": "^10.1.0",
     "babel-polyfill": "^6.26.0",
     "babel-polyfill": "^6.26.0",
     "eslint": "^5.16.0",
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.0.0",
     "eslint-plugin-vue": "^5.0.0",
-    "less": "^3.0.4",
+    "less": "^3.12.2",
     "less-loader": "^5.0.0",
     "less-loader": "^5.0.0",
     "script-loader": "^0.7.2",
     "script-loader": "^0.7.2",
-    "vue-template-compiler": "^2.6.10"
+    "vue-template-compiler": "^2.6.12"
   }
   }
 }
 }

@@ -179,3 +179,18 @@ export function batchCommit(data) {
         data:data
         data:data
     })
     })
 }
 }
+
+
+/**
+ * 批量提交
+ */
+export function getDetailInfo(zrzbsm,lx) {
+    return request({
+        url:'/fw/lpb/getDetailInfo',
+        method:'get',
+        params: {
+            zrzbsm:zrzbsm,
+            scyclx:lx,
+        },
+    })
+}

 <template>
 <template>
-  <div class=""></div>
+  <div class="">
+    <el-table
+            :data="tableData"
+            style="width: 100%;margin-bottom: 20px;"
+            row-key="bsm"
+            border
+            default-expand-all
+            :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <el-table-column
+              prop="mc"
+              label="地址(单元名称)">
+      </el-table-column>
+      <el-table-column
+              prop="bdcdyh"
+              label="不动产单元号">
+      </el-table-column>
+      <el-table-column
+              prop="ch"
+              label="层号"
+              :formatter="chFilter">
+      </el-table-column>
+      <el-table-column
+              prop="hh"
+              label="户号"
+              :formatter="hhFilter">
+      </el-table-column>
+      <el-table-column
+              prop="mj"
+              label="面积">
+      </el-table-column>
+    </el-table>
+  </div>
 </template>
 </template>
 
 
 <script>
 <script>
+import {getDetailInfo} from "./../../../../api/lpb"
 export default {
 export default {
   name:"",
   name:"",
   components:{},
   components:{},
   props:{},
   props:{},
   data(){
   data(){
     return {
     return {
+      tableData: []
     }
     }
   },
   },
   created(){},
   created(){},
-  mounted(){},
-  methods:{},
+  mounted(){
+    this.getData();
+  },
+  methods:{
+
+    chFilter(row, column){
+      if(row.ch === 0){
+        return ''
+      }else {
+        return row.ch;
+      }
+    },
+
+    hhFilter(row, column){
+      if(row.hh === 0){
+        return ''
+      }else {
+        return row.hh;
+      }
+    },
+
+    getData(){
+      let zrzbsm = '12a4eb0cf2b527273ff5f0b96820715a';
+      let scyclx = '0';
+      getDetailInfo(zrzbsm,scyclx).then((res)=>{
+        if(res.code===200){
+          console.log(res.result)
+          this.tableData = res.result;
+        }
+      })
+    },
+
+    load(tree, treeNode, resolve) {
+      setTimeout(() => {
+        resolve([
+          {
+            id: 31,
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+          }, {
+            id: 32,
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+          }
+        ])
+      }, 1000)
+    }
+
+
+  },
   computed: {},
   computed: {},
   watch: {},
   watch: {},
 }
 }