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

@@ -89,7 +89,7 @@ export function getTreeByZrzbsm(zrzbsm) {
 /**x
 /**x
  *修改 宗地，自然幢，户的权属状态
  *修改 宗地，自然幢，户的权属状态
  */
  */
-export function updateQsztByBsm(data){
+export function updateQsztByBsm(data) {
     return request({
     return request({
         url: '/gz/updateByBsm',
         url: '/gz/updateByBsm',
         method: 'post',
         method: 'post',
@@ -100,24 +100,25 @@ export function updateQsztByBsm(data){
 /**x
 /**x
  *修改 宗地，自然幢，户的权属状态
  *修改 宗地，自然幢，户的权属状态
  */
  */
-export function copyZdjbxx(data){
+export function copyZdjbxx(data) {
     return request({
     return request({
         url: '/bg/fwsxbg/copyZdjbxx',
         url: '/bg/fwsxbg/copyZdjbxx',
         method: 'post',
         method: 'post',
         data: data
         data: data
     })
     })
 }
 }
+
 /**
 /**
  * 提交表单信息
  * 提交表单信息
  * glbsm 关联标识码，自然幢，多幢等标识码 ,
  * glbsm 关联标识码，自然幢，多幢等标识码 ,
  * status 状态
  * status 状态
  * type  类型，zrz，dz，zd等信息，首字母缩写
  * type  类型，zrz，dz，zd等信息，首字母缩写
  */
  */
-export function submit (data) {
+export function submit(data) {
     return request({
     return request({
         url: '/system/submit/submitInfo',
         url: '/system/submit/submitInfo',
         method: 'post',
         method: 'post',
-        data:data
+        data: data
     })
     })
 }
 }
 
 
@@ -126,8 +127,21 @@ export function submit (data) {
  */
  */
 export function insertFile(data) {
 export function insertFile(data) {
     return request({
     return request({
-        url:'/file',
-        method:'post',
-        data:data
+        url: '/file',
+        method: 'post',
+        data: data
+    })
+}
+
+/**
+ * 获取文件
+ */
+export function getFileLis(glbsm) {
+    return request({
+        url: '/file/list',
+        method: 'get',
+        params: {
+            glbsm
+        }
     })
     })
 }
 }

@@ -16,17 +16,22 @@
         </el-upload>
         </el-upload>
         <table border="2">
         <table border="2">
             <tr>
             <tr>
-                <th>序号</th>
-                <th>文件名称</th>
-                <th>文件类型</th>
-                <th>操作</th>
+                <th class="xh">序号</th>
+                <th class="mc">文件名称</th>
+                <th class="lx">文件类型</th>
+                <th class="cz">操作</th>
             </tr>
             </tr>
-            <tr v-for="(item,index) in list" :key="index">
-                <td>{{index+1}}</td>
-                <td>{{item.wjmc}}</td>
-                <td>{{item.wjlx}}</td>
-                <td>
-                    <span>下载</span>
+            <tr v-if="list.length==0">
+                <td colspan="4" class="noData" >
+                    <span>暂无数据</span>
+                </td>
+            </tr>
+            <tr v-else v-for="(item,index) in list"  :key="index" >
+                <td class="xh">{{index+1}}</td>
+                <td class="mc">{{item.filename}}</td>
+                <td class="lx">{{item.filepostfix}}</td>
+                <td class="cz">
+                    <span @click="downloadFile(item.fileurl)">下载</span>
                     <span>预览</span>
                     <span>预览</span>
                 </td>
                 </td>
             </tr>
             </tr>
@@ -35,35 +40,21 @@
 </template>
 </template>
 
 
 <script>
 <script>
-    import {insertFile} from "./../../../api/common"
+    import {insertFile, getFileLis, downloadFile} from "./../../../api/common"
     import {Message} from "element-ui"
     import {Message} from "element-ui"
+
     export default {
     export default {
         name: "fjcl",
         name: "fjcl",
         data() {
         data() {
             return {
             return {
                 list: [
                 list: [
                     {
                     {
-                        wjmc: '调查文档1',
-                        wjlx: 'doc',
-                        url: ''
-                    },
-                    {
-                        wjmc: '调查文档2',
-                        wjlx: 'doc',
-                        url: ''
-                    },
-                    {
-                        wjmc: '调查文档3',
-                        wjlx: 'doc',
-                        url: ''
-                    },
-                    {
-                        wjmc: '调查文档4',
-                        wjlx: 'doc',
-                        url: ''
-                    },
+                        filename: '调查文档1',
+                        filepostfix: 'doc',
+                        fileurl: ''
+                    }
                 ],
                 ],
-                filesData:{
+                filesData: {
                     dylx: "",
                     dylx: "",
                     glbsm: "",
                     glbsm: "",
                     list: [
                     list: [
@@ -76,31 +67,45 @@
                 },
                 },
             }
             }
         },
         },
-        mounted(){
+        mounted() {
             switch (this.$route.name) {
             switch (this.$route.name) {
                 case "宗地":
                 case "宗地":
-                  this.filesData.dylx='zd';
-                  this.filesData.glbsm=this.$store.state.zdbsm
+                    this.filesData.dylx = 'zd';
+                    this.filesData.glbsm = this.$store.state.zdbsm
                     break;
                     break;
                 case "自然幢":
                 case "自然幢":
-                  this.filesData.dylx='zrz';
-                  this.filesData.glbsm=this.$store.state.zrzbsm
+                    this.filesData.dylx = 'zrz';
+                    this.filesData.glbsm = this.$store.state.zrzbsm
                     break
                     break
                 default:
                 default:
                     break
                     break
             }
             }
+            this.getFileList(this.filesData.glbsm)
         },
         },
         methods: {
         methods: {
-            uploadError(err,file,fileList){
-                console.log("上传文件失败",err)
+            downloadFile(url) {
+                window.open(`/api/file/download?url=`+url);
+            },
+            getFileList(bsm) {
+                getFileLis(bsm).then(res => {
+                    if (res.success) {
+                        this.list = res.result;
+                    } else {
+
+                    }
+                })
+            },
+            uploadError(err, file, fileList) {
+                console.log("上传文件失败", err)
             },
             },
             uploadSuccess(res, file, fileList) {
             uploadSuccess(res, file, fileList) {
                 this.filesData.list = res.result;
                 this.filesData.list = res.result;
-                console.log(res,"res=========")
-                insertFile(this.filesData).then(res=>{
+                console.log(res, "res=========")
+                insertFile(this.filesData).then(res => {
                     if (res.success) {
                     if (res.success) {
                         Message.warning("上传成功")
                         Message.warning("上传成功")
-                    }else {
+                        this.getFileList(this.filesData.glbsm)
+                    } else {
                         Message.error(res.message)
                         Message.error(res.message)
                     }
                     }
                 })
                 })
@@ -119,8 +124,7 @@
                 return this.$confirm(`确定移除 ${ file.name }？`);
                 return this.$confirm(`确定移除 ${ file.name }？`);
             }
             }
         },
         },
-        watch:{
-        }
+        watch: {}
     }
     }
 </script>
 </script>
 
 
@@ -134,6 +138,7 @@
 
 
     table {
     table {
         margin-top: 10px;
         margin-top: 10px;
+        cursor: pointer;
         background-color: #fff;
         background-color: #fff;
         font-size: 14px;
         font-size: 14px;
         width: 100%;
         width: 100%;
@@ -142,6 +147,28 @@
             height: 36px;
             height: 36px;
             min-width: 50px;
             min-width: 50px;
         }
         }
+        td span {
+            color: blue;
+        }
+        .cz span:hover {
+            color: blue;
+            text-decoration: underline;
+        }
+        .xh{
+            width: 100px;
+        }
+        .mc{
+            width: 300px;
+        }
+        .lx{
+            width: 120px;
+        }
+        .cz{
+            width: 150px;
+        }
+        .noData span{
+            color: #BBB;
+        }
     }
     }