Source/UBCS-WEB/src/views/docking/data.vue

@@ -23,7 +23,7 @@
</template>

<script>
import {getList} from "@/api/docking/data";
import {getDataList} from "@/api/docking/data";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
import website from "@/config/website";
@@ -87,9 +87,10 @@
    data:[],
    option: {
      height:'auto',
      calcHeight: 0,
      columnBtn:false,
      tip: false,
      searchShow: false,
      searchShowBtn:false,
      searchMenuSpan: 6,
      border: true,
      index: true,
@@ -242,7 +243,7 @@
          query['conditionMap["' + key + '"]'] = this.query[key];
        }
      }
      getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
      getDataList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
        const data = res.data.data;
        this.page.total = data.total;
        this.data = data.records;