Merge branch 'accompaniment' into Nov16thResetMusic

src/components/Pagination/index.vue

@@ -79,6 +79,7 @@ export default {
   mounted() {
     if (this.sync) {
       const searchs = new Searchs(this.$route.fullPath)
+      console.log(searchs)
       const active = searchs.get()
       if (active && active.page) {
         for (const key in active.page) {

src/helpers/index.js

@@ -22,7 +22,7 @@ export class Searchs {
     let json = {}
     try {
       const val = sessionStorage.getItem(this.saveKey)
-      json = JSON.parse(val) || {}
+      json = JSON.parse(val) || initSearch
     } catch (error) {}
     return json
   }

src/views/accompaniment/index.vue

@@ -25,7 +25,7 @@
             <el-option v-for="item in selects.subjects" :value="item.id" :label="item.name" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-button @click="submit" type="primary">提交</el-button>
+        <el-button @click="submit" type="primary">搜索</el-button>
         <el-button @click="reset" type="danger">重置</el-button>
       </saveform>
       <el-table
@@ -184,7 +184,7 @@ export default {
         const res = await QueryPage({
           ...this.searchForm,
           page: this.rules.page,
-          limit: this.rules.limit,
+          rows: this.rules.limit,
         })
         this.tableList = res.data.rows
         this.$set(this.rules, 'total', res.data.total)