Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/config/config.js

@@ -24,8 +24,8 @@ const store = new Vuex.Store({
         // socket: "https://poll.cocorobo.cn",
         // socket: "http://localhost:1473",
         // api: 'http://10.3.16.226:7003/api',
-        api: 'http://127.0.0.1:7003/api',
-        // api: 'http://10.3.13.84:7003/api',
+        // api: 'http://127.0.0.1:7003/api',
+        api: 'http://10.3.13.84:7003/api',
 
     },
 

src/views/projectSettlement/projectSettlement3.vue

@@ -27,7 +27,6 @@
         :data="tableData"
         tooltip-effect="dark"
         stripe
-        style="height: 550px;"
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         >
@@ -91,15 +90,15 @@
     </el-dialog>
     <!-- 展示文档结束 -->
         <!-- 分页 -->
-        <el-pagination
+        <!-- <el-pagination
             @current-change="handleCurrentChange"
             :current-page="table.currentPage"
             :page-size="table.packageSize"
             layout=" prev, pager, next"
             background
-            class="pagination"
+            class="paginations"
             :total="table.total">
-          </el-pagination>
+          </el-pagination> -->
         <!-- 分页结束 -->
     </div>
   </template>
@@ -175,22 +174,18 @@
               let param={
                 uid:this.$store.state.userInfo.userid,
                 pid:JSON.parse(localStorage.getItem('pid')),
-                page:this.table.currentPage,
-                lim:this.table.packageSize
+                // page:this.table.currentPage,
+                // lim:this.table.packageSize
               }
               // console.log(param);
               this.ajax
                     .get(this.$store.state.api+'/SelectProjectFile',param)
                     .then(res=>{
-                      // console.log(res.data);
                       let k=[]
                       res.data[0].forEach((e,i) => {
-                        // console.log(e);
                         let { projectFile: l } = e;
-                        // console.log(l);
                         k=JSON.parse(l)
                       });
-                      // console.log(k);
                       this.tableData=k
                     },err=>{
                       console.log(err);

src/views/projectSettlement/projectSettlement4.vue

@@ -75,8 +75,8 @@
           </template>
         </el-table-column>
         </el-table>
-<!-- 展示文档开始 -->
-<el-dialog
+      <!-- 展示文档开始 -->
+      <el-dialog
             title="展示文件"
             :visible.sync="showFile"
             width="80vw"
@@ -92,15 +92,15 @@
     <!-- 展示文档结束 -->
 
       <!-- 分页 -->
-      <el-pagination
+      <!-- <el-pagination
             @current-change="handleCurrentChange"
             :current-page="table.currentPage"
             :page-size="table.packageSize"
             layout=" prev, pager, next"
             background
-            class="pagination"
+            class="paginations"
             :total="table.total">
-          </el-pagination>
+          </el-pagination> -->
         <!-- 分页结束 -->
   
     </div>
@@ -115,11 +115,11 @@
         data() {
           return {
           accept:".doc,.docx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-            table:{         // 分页数据
-              total:0,
-              packageSize:8,
-              currentPage:1
-            }, 
+            // table:{         // 分页数据
+            //   total:0,
+            //   packageSize:8,
+            //   currentPage:1
+            // }, 
             showFile:false,
             showFileType: 0,
             showFileUrl: "",
@@ -183,8 +183,8 @@
               let param={
                 uid:this.$store.state.userInfo.userid,
                 pid:JSON.parse(localStorage.getItem('pid')),
-                page:this.table.currentPage,
-                lim:this.table.packageSize
+                // page:this.table.currentPage,
+                // lim:this.table.packageSize
               }
               // console.log(param);
               this.ajax