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

@@ -166,12 +166,12 @@ export function getFileLis(glbsm) {
 /**
  * 获取文件预览地址
  */
-export function loadFile(url) {
+export function loadFile(id) {
     return request({
         url:"/file/loadImage",
         method:'get',
         params:{
-            url
+            id
         }
     })
 }

@@ -19,7 +19,7 @@
         data() {
             return {
                 activeName: "dzxx",
-                dzJbxxVisble:false,
+                dzJbxxVisble:true,
                 fjclVisible:false
             };
         },

@@ -33,7 +33,7 @@
                 <td class="cz">
                     <span @click="downloadFile(item.fileurl)">下载</span>
                     <span>/</span>
-                    <span @click="loadFile(item.fileurl)">预览</span>
+                    <span @click="loadFile(item.bsm)">预览</span>
                     <span>/</span>
                     <span @click="deleteFile(item.bsm)">删除</span>
                 </td>
@@ -51,11 +51,6 @@
         data() {
             return {
                 list: [
-                    {
-                        filename: '调查文档1',
-                        filepostfix: 'doc',
-                        fileurl: ''
-                    }
                 ],
                 filesData: {
                     dylx: "",
@@ -64,7 +59,8 @@
                         {
                             filename: "",
                             filepostfix: "",
-                            fileurl: ""
+                            fileurl: "",
+                            preViewUrl:""
                         }
                     ]
                 },
@@ -94,8 +90,8 @@
                     });
                 });
             },
-            loadFile(url){
-                loadFile(url).then(res=>{
+            loadFile(bsm){
+                loadFile(bsm).then(res=>{
                     if (res.success) {
                         window.open(res.message)
                     }

@@ -25,10 +25,34 @@
               label="户号"
               :formatter="hhFilter">
       </el-table-column>
+        <el-table-column
+                prop="fwyt"
+                label="房屋用途">
+        </el-table-column>
+        <el-table-column
+                prop="fwjg"
+                label="房屋结构">
+        </el-table-column>
       <el-table-column
-              prop="mj"
+              prop="jzmj"
               label="面积">
       </el-table-column>
+        <el-table-column
+                prop="tnjzmj"
+                label="套内建筑面积">
+        </el-table-column>
+        <el-table-column
+                prop="ftjzmj"
+                label="分摊建筑面积">
+        </el-table-column>
+        <el-table-column
+                prop="dxbfjzmj"
+                label="地下部分建筑面积">
+        </el-table-column>
+        <el-table-column
+                prop="qtjzmj"
+                label="其它建筑面积">
+        </el-table-column>
     </el-table>
   </div>
 </template>