Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
4 changed files
with
33 additions
and
13 deletions
| ... | @@ -166,12 +166,12 @@ export function getFileLis(glbsm) { | ... | @@ -166,12 +166,12 @@ export function getFileLis(glbsm) { |
| 166 | /** | 166 | /** |
| 167 | * 获取文件预览地址 | 167 | * 获取文件预览地址 |
| 168 | */ | 168 | */ |
| 169 | export function loadFile(url) { | 169 | export function loadFile(id) { |
| 170 | return request({ | 170 | return request({ |
| 171 | url:"/file/loadImage", | 171 | url:"/file/loadImage", |
| 172 | method:'get', | 172 | method:'get', |
| 173 | params:{ | 173 | params:{ |
| 174 | url | 174 | id |
| 175 | } | 175 | } |
| 176 | }) | 176 | }) |
| 177 | } | 177 | } | ... | ... |
| ... | @@ -33,7 +33,7 @@ | ... | @@ -33,7 +33,7 @@ |
| 33 | <td class="cz"> | 33 | <td class="cz"> |
| 34 | <span @click="downloadFile(item.fileurl)">下载</span> | 34 | <span @click="downloadFile(item.fileurl)">下载</span> |
| 35 | <span>/</span> | 35 | <span>/</span> |
| 36 | <span @click="loadFile(item.fileurl)">预览</span> | 36 | <span @click="loadFile(item.bsm)">预览</span> |
| 37 | <span>/</span> | 37 | <span>/</span> |
| 38 | <span @click="deleteFile(item.bsm)">删除</span> | 38 | <span @click="deleteFile(item.bsm)">删除</span> |
| 39 | </td> | 39 | </td> |
| ... | @@ -51,11 +51,6 @@ | ... | @@ -51,11 +51,6 @@ |
| 51 | data() { | 51 | data() { |
| 52 | return { | 52 | return { |
| 53 | list: [ | 53 | list: [ |
| 54 | { | ||
| 55 | filename: '调查文档1', | ||
| 56 | filepostfix: 'doc', | ||
| 57 | fileurl: '' | ||
| 58 | } | ||
| 59 | ], | 54 | ], |
| 60 | filesData: { | 55 | filesData: { |
| 61 | dylx: "", | 56 | dylx: "", |
| ... | @@ -64,7 +59,8 @@ | ... | @@ -64,7 +59,8 @@ |
| 64 | { | 59 | { |
| 65 | filename: "", | 60 | filename: "", |
| 66 | filepostfix: "", | 61 | filepostfix: "", |
| 67 | fileurl: "" | 62 | fileurl: "", |
| 63 | preViewUrl:"" | ||
| 68 | } | 64 | } |
| 69 | ] | 65 | ] |
| 70 | }, | 66 | }, |
| ... | @@ -94,8 +90,8 @@ | ... | @@ -94,8 +90,8 @@ |
| 94 | }); | 90 | }); |
| 95 | }); | 91 | }); |
| 96 | }, | 92 | }, |
| 97 | loadFile(url){ | 93 | loadFile(bsm){ |
| 98 | loadFile(url).then(res=>{ | 94 | loadFile(bsm).then(res=>{ |
| 99 | if (res.success) { | 95 | if (res.success) { |
| 100 | window.open(res.message) | 96 | window.open(res.message) |
| 101 | } | 97 | } | ... | ... |
| ... | @@ -25,10 +25,34 @@ | ... | @@ -25,10 +25,34 @@ |
| 25 | label="户号" | 25 | label="户号" |
| 26 | :formatter="hhFilter"> | 26 | :formatter="hhFilter"> |
| 27 | </el-table-column> | 27 | </el-table-column> |
| 28 | <el-table-column | ||
| 29 | prop="fwyt" | ||
| 30 | label="房屋用途"> | ||
| 31 | </el-table-column> | ||
| 32 | <el-table-column | ||
| 33 | prop="fwjg" | ||
| 34 | label="房屋结构"> | ||
| 35 | </el-table-column> | ||
| 28 | <el-table-column | 36 | <el-table-column |
| 29 | prop="mj" | 37 | prop="jzmj" |
| 30 | label="面积"> | 38 | label="面积"> |
| 31 | </el-table-column> | 39 | </el-table-column> |
| 40 | <el-table-column | ||
| 41 | prop="tnjzmj" | ||
| 42 | label="套内建筑面积"> | ||
| 43 | </el-table-column> | ||
| 44 | <el-table-column | ||
| 45 | prop="ftjzmj" | ||
| 46 | label="分摊建筑面积"> | ||
| 47 | </el-table-column> | ||
| 48 | <el-table-column | ||
| 49 | prop="dxbfjzmj" | ||
| 50 | label="地下部分建筑面积"> | ||
| 51 | </el-table-column> | ||
| 52 | <el-table-column | ||
| 53 | prop="qtjzmj" | ||
| 54 | label="其它建筑面积"> | ||
| 55 | </el-table-column> | ||
| 32 | </el-table> | 56 | </el-table> |
| 33 | </div> | 57 | </div> |
| 34 | </template> | 58 | </template> | ... | ... |
-
Please register or sign in to post a comment