merge

src/pages/main/onlineOffice/index.vue

@@ -25,7 +25,7 @@
             </myUpload>
         </div>
 
-        <fromList  @changeNum="changeNum" :list="firstTable" @clickDemand="clickDemand" />
+        <fromList @changeNum="changeNum" :list="firstTable" @clickDemand="clickDemand" />
         <div>
 
             <el-dialog :modal="false" title="提示" :visible.sync="officeStatus" style="height:100% ;" width="100%"
@@ -55,10 +55,10 @@ export default {
     },
     data() {
         return {
-            dataList:[],
-            page:1,
-            searchData:'',
-            limit:10,
+            dataList: [],
+            page: 1,
+            searchData: '',
+            limit: 10,
             form: {},
             visible: false,
             saveStatus: false,
@@ -70,7 +70,7 @@ export default {
                 type: 'btn',
                 typename: '导入',
                 urlType: 'office',
-                url: '/office/file/upload',
+                url: '/office/restfile/upload',
                 fileList: []
             },
             firstTable: {
@@ -133,7 +133,7 @@ export default {
         clickNewSave() {
             // this.saveStatus = true
             this.$http({
-                url: "/office/file/create",
+                url: "/office/restfile/create",
                 method: "post",
                 type: 'office',
                 headers: {
@@ -155,8 +155,8 @@ export default {
                 this.getListEdit(res)
             }
         },
-        getListEdit(e) {
-            this.$http({
+        async getListEdit(e) {
+            await this.$http({
                 url: "/office/restfile/edit",
                 method: "post",
                 type: 'office',
@@ -192,8 +192,12 @@ export default {
 
                     }
                 }
-                this.config = config;
-                this.officeStatus = true;
+                if (res.data.code == 0) {
+                    this.config = config;
+                    this.officeStatus = true;
+                    console.log(this.config);
+                }
+
 
             });
         },
@@ -228,9 +232,9 @@ export default {
                 index < this.page * this.limit && index >= this.limit * (this.page - 1)
             )
         },
-        changeNum(e){
-           this.page = e;
-           this.currentPage(this.dataList)
+        changeNum(e) {
+            this.page = e;
+            this.currentPage(this.dataList)
         }
     },
 };
@@ -264,7 +268,8 @@ export default {
     height: 100%;
     background: #fff;
 }
-::v-deep .el-pagination{
+
+::v-deep .el-pagination {
     background-color: #fff !important;
 }
 </style>