#

src/App.vue

@@ -498,7 +498,7 @@
 
         }
       }
-    
+      
       .inputNumber{       //输入框只能数字
         /* 普通IE浏览器 样式清除 */
         input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{
@@ -509,7 +509,11 @@
         -moz-appearance:textfield;
         }
       }
-
+      .paginations{
+          position: absolute;
+          right: 6%;
+          bottom: 6%;
+      }
 
 
 </style>

src/views/projectApply/projectApplication.vue

@@ -177,7 +177,7 @@
             :page-size="table.packageSize"
             layout=" prev, pager, next"
             background
-            class="pagination"
+            class="paginations"
             :total="table.total">
           </el-pagination>
         <!-- 分页结束 -->
@@ -514,11 +514,6 @@
   .el-table::before{
     height: 0;
   }
-  .pagination{
-    float: right;
-    margin: 20px 35px 10px;
-  }
-
 
   .addDialog{          //删除对话框
   font-size: 18px;

src/views/projectApply/projectApplicationApply3.vue

@@ -68,7 +68,6 @@
               :data="data.tableData2"
               tooltip-effect="dark"
               stripe
-              style="height: 300px;"
               class="fontSize"
               :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
               >

src/views/projectManage/ProjectManagement.vue

@@ -164,7 +164,7 @@
             :page-size="table.packageSize"
             layout=" prev, pager, next"
             background
-            class="pagination"
+            class="paginations"
             :total="table.total">
           </el-pagination>
         <!-- 分页结束 -->
@@ -331,7 +331,7 @@ import beUpload from '../../components/tool/beUpload'
   }
     .projectBlock{   //循环列表大框
       width: 100%;
-      height: 560px;
+      // height: 560px;
       display: flex;
       flex-wrap: wrap;
       overflow:auto;

src/views/projectManage/ProjectManagement3.vue

@@ -26,7 +26,6 @@
         tooltip-effect="dark"
         stripe
         width="100%"
-        style="height: 550px;"
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         >
@@ -98,7 +97,7 @@
             :page-size="table.packageSize"
             layout=" prev, pager, next"
             background
-            class="pagination"
+            class="paginations"
             :total="table.total">
           </el-pagination>
         <!-- 分页结束 -->
@@ -194,8 +193,8 @@
   <style lang="less">
   .ProjectManagement3{
     .pagination{   //分页
-      float: right;
-      margin: 20px 0px 10px;
+      // float: right;
+      // margin: 20px 0px 10px;
     }
 
     .projectBlock{

src/views/projectManage/ProjectManagement4.vue

@@ -27,7 +27,6 @@
         :data="tableData"
         tooltip-effect="dark"
         stripe
-        style="height: 550px;"
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         >
@@ -96,7 +95,7 @@
             :page-size="table.packageSize"
             layout=" prev, pager, next"
             background
-            class="pagination"
+            class="paginations"
             :total="table.total">
           </el-pagination>
         <!-- 分页结束 -->

src/views/projectManage/ProjectManagement5.vue

@@ -28,7 +28,6 @@
         :data="tableData"
         tooltip-effect="dark"
         stripe
-        height="550px"
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         >
@@ -97,7 +96,7 @@
             :page-size="table.packageSize"
             layout=" prev, pager, next"
             background
-            class="pagination"
+            class="paginations"
             :total="table.total">
           </el-pagination>
         <!-- 分页结束 -->

src/views/projectSettlement/projectSettlement.vue

@@ -82,7 +82,6 @@
         :data="tableData"
         tooltip-effect="dark"
         class="fontSize"
-        style="height: 500px;"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         @selection-change="handleSelectionChange">
         <!-- <el-table-column
@@ -162,7 +161,7 @@
       :page-size="table.packageSize"
       layout=" prev, pager, next"
       background
-      class="pagination"
+      class="paginations"
       :total="table.total">
     </el-pagination>
   <!-- 分页结束 -->

src/views/projectSettlement/projectSettlement3.vue

@@ -69,13 +69,27 @@
           >
           <template #default="scope">
               <div class="operations">
-                      <el-button type="primary" class="bt1" size="mini" @click="lookDetails(scope.rows.id)" style="background: #477edd">详情查看</el-button>
+                      <el-button type="primary" class="bt1" size="mini" @click="checkFile(scope.row.url)" style="background: #477edd">详情查看</el-button>
               </div>
           </template>
         </el-table-column>
         </el-table>
         <!-- 表格结束 -->
-
+      <!-- 展示文档开始 -->
+      <el-dialog
+            title="展示文件"
+            :visible.sync="showFile"
+            width="80vw"
+            class="addDialog showDialog"
+          >
+      <div class="addDialogLogo">LOGO</div>
+      <div class="showFileArea">
+        <!-- <vpdf v-if="/^\s*$/g.test(showFileUrl)&&showFileUrl.split('.')[showFileUrl.split('.').length-1]=='pdf'" :pdfUrl="showFileUrl"></vpdf> -->
+        <vword v-if="showFileType == 0" :pdfUrl="showFileUrl"></vword>
+        <vpdf v-else :pdfUrl="showFileUrl"></vpdf>
+      </div>
+    </el-dialog>
+    <!-- 展示文档结束 -->
         <!-- 分页 -->
         <el-pagination
             @current-change="handleCurrentChange"
@@ -92,9 +106,10 @@
   
   <script>
   import beUpload from '../../components/tool/beUpload'
-
+  import vpdf from "@/components/vpdf.vue";
+  import vword from "@/components/vword.vue";
       export default {
-        components:{beUpload},
+        components: { beUpload, vpdf, vword },
         data() {
           return {
           accept:".doc,.docx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document",
@@ -103,10 +118,28 @@
               packageSize:8,
               currentPage:1
             }, 
+            showFile:false,
+            showFileType: 0,
+            showFileUrl: "",
             tableData:[],
           }
         },
         methods:{
+          //展示文件
+          checkFile(url) {
+            console.log(url);
+            if (
+              url.split(".")[url.split(".").length - 1].toLocaleUpperCase() == "PDF"
+            ) {
+              this.showFileUrl = url;
+              this.showFileType = 1;
+            } else {
+              this.showFileUrl =
+                "https://view.officeapps.live.com/op/view.aspx?src=" + url;
+              this.showFileType = 0;
+            }
+            this.showFile = true;
+          },
           getFile(val) {    //上传文件
             this.file = val;
             let oldData = [];
@@ -195,23 +228,78 @@
       float: right;
       margin: 20px 55px 10px;
     }
-  
-
-   
-    .pm1Tit{
-        display: flex;
-        margin-left: 20px;
-        div{
-          width: 130px;
-          cursor: pointer;
-          font-weight: 550;
+    .addDialog {
+        font-size: 18px;
+        .el-dialog {
+          border-radius: 5px;
+          overflow: hidden;
         }
-        .pr1TitBass{
-          height: 2px;
+        .deleteContent {
           width: 100%;
-          background: #3D67BC;
+          margin: 30px 0;
+          font-size: 22px;
+          color: #000;
         }
-    }
+        .addDialogLogo {
+          width: 60px;
+          height: 30px;
+          line-height: 30px;
+          background: #f2f2f2;
+          position: absolute;
+          display: flex;
+          justify-content: center;
+          left: 20px;
+          top: 15px;
+        }
+        .el-dialog__header {
+          display: flex;
+          justify-content: center;
+          background: #32455b;
+        }
+        .el-dialog__title {
+          color: #fff;
+          font-size: 22px;
+        }
+        .addDialogMid {
+          box-sizing: border-box;
+          padding: 0 60px 0 10px;
+          .addDialogTit {
+            display: flex;
+            span {
+              width: 80px;
+              font-size: 16px;
+              line-height: 40px;
+              text-align: left;
+            }
+          }
+          .addDialogTit1 {
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: 15px;
+          }
+          .addDialogTit2 {
+            margin-top: 10px;
+            font-size: 16px;
+            color: #000;
+            text-indent: 2em;
+          }
+          .addDialogCon {
+            margin-top: 20px;
+          }
+        }
+        .dialog-footer {
+          display: flex;
+          justify-content: center;
+          box-sizing: border-box;
+          .btn5 {
+            font-size: 16px;
+          }
+        }
+      }
+   
+
+   
+
     .pmInp{
       width: 100%;
       display: flex;

src/views/projectSettlement/projectSettlement4.vue

@@ -70,12 +70,26 @@
           >
           <template #default="scope">
               <div class="operations">
-                      <el-button type="primary"  size="mini" @click="detail(scope.rows.id)" style="background: #477edd">明细查看</el-button>
+                      <el-button type="primary"  size="mini" @click="checkFile(scope.row.url)" style="background: #477edd">明细查看</el-button>
               </div>
           </template>
         </el-table-column>
         </el-table>
-
+<!-- 展示文档开始 -->
+<el-dialog
+            title="展示文件"
+            :visible.sync="showFile"
+            width="80vw"
+            class="addDialog showDialog"
+          >
+      <div class="addDialogLogo">LOGO</div>
+      <div class="showFileArea">
+        <!-- <vpdf v-if="/^\s*$/g.test(showFileUrl)&&showFileUrl.split('.')[showFileUrl.split('.').length-1]=='pdf'" :pdfUrl="showFileUrl"></vpdf> -->
+        <vword v-if="showFileType == 0" :pdfUrl="showFileUrl"></vword>
+        <vpdf v-else :pdfUrl="showFileUrl"></vpdf>
+      </div>
+    </el-dialog>
+    <!-- 展示文档结束 -->
 
       <!-- 分页 -->
       <el-pagination
@@ -94,9 +108,10 @@
   
   <script>
   import beUpload from '../../components/tool/beUpload'
-
+  import vpdf from "@/components/vpdf.vue";
+  import vword from "@/components/vword.vue";
       export default {
-        components:{beUpload},
+        components: { beUpload, vpdf, vword },
         data() {
           return {
           accept:".doc,.docx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document",
@@ -105,12 +120,28 @@
               packageSize:8,
               currentPage:1
             }, 
-            title:"",
+            showFile:false,
+            showFileType: 0,
+            showFileUrl: "",
             tableData:[],  //附件列表
-            file:''
+            file:''    //上传文件数据
           }
         },
         methods:{
+          //展示文件
+          checkFile(url) {
+            if (
+              url.split(".")[url.split(".").length - 1].toLocaleUpperCase() == "PDF"
+            ) {
+              this.showFileUrl = url;
+              this.showFileType = 1;
+            } else {
+              this.showFileUrl =
+                "https://view.officeapps.live.com/op/view.aspx?src=" + url;
+              this.showFileType = 0;
+            }
+            this.showFile = true;
+          },
           getFile(val) {    //上传文件
             this.file = val;
             let oldData = [];
@@ -202,32 +233,76 @@
       margin: 20px 55px 10px;
     }
   
-
-    .pm5footer{
-        float: right;
-        margin-top: 30px;
-        
-        .backBtn{
-            background: #169bd5;
-            float: right;
-            width: 100px;
-        }
-    }
-    
-    .pm1Tit{
-        display: flex;
-        margin-left: 20px;
-        div{
-        width: 130px;
-        cursor: pointer;
-        font-weight: 550;
+    .addDialog {
+        font-size: 18px;
+        .el-dialog {
+          border-radius: 5px;
+          overflow: hidden;
         }
-        .pr1TitBass{
-          height: 2px;
+        .deleteContent {
           width: 100%;
-          background: #3D67BC;
+          margin: 30px 0;
+          font-size: 22px;
+          color: #000;
         }
-    }
+        .addDialogLogo {
+          width: 60px;
+          height: 30px;
+          line-height: 30px;
+          background: #f2f2f2;
+          position: absolute;
+          display: flex;
+          justify-content: center;
+          left: 20px;
+          top: 15px;
+        }
+        .el-dialog__header {
+          display: flex;
+          justify-content: center;
+          background: #32455b;
+        }
+        .el-dialog__title {
+          color: #fff;
+          font-size: 22px;
+        }
+        .addDialogMid {
+          box-sizing: border-box;
+          padding: 0 60px 0 10px;
+          .addDialogTit {
+            display: flex;
+            span {
+              width: 80px;
+              font-size: 16px;
+              line-height: 40px;
+              text-align: left;
+            }
+          }
+          .addDialogTit1 {
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: 15px;
+          }
+          .addDialogTit2 {
+            margin-top: 10px;
+            font-size: 16px;
+            color: #000;
+            text-indent: 2em;
+          }
+          .addDialogCon {
+            margin-top: 20px;
+          }
+        }
+        .dialog-footer {
+          display: flex;
+          justify-content: center;
+          box-sizing: border-box;
+          .btn5 {
+            font-size: 16px;
+          }
+        }
+      }
+    
+
     .pmInp{
       width: 100%;
       margin: 10px 0 10px 0;

src/views/resultShow/resultsShow.vue

@@ -114,7 +114,7 @@
           :page-size="table.packageSize"
           layout=" prev, pager, next"
           background
-          class="pagination"
+          class="paginations"
           :total="table.total">
         </el-pagination>
       <!-- 分页结束 -->
@@ -247,7 +247,6 @@
     width: 100%;
     display: flex;
     flex-wrap: wrap;
-    height: 560px;
     overflow:auto;
 
     .classBlock{   //独立小框