From b4d2703e653bf702d705b18c20d9edb9066c7c8a Mon Sep 17 00:00:00 2001 From: ZZJ <zzjdsg2300@163.com> Date: 星期三, 03 十一月 2021 17:35:10 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/vue-smart-ai --- src/pages/example/index/App.vue | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pages/example/index/App.vue b/src/pages/example/index/App.vue index 52e2765..fb4d0de 100644 --- a/src/pages/example/index/App.vue +++ b/src/pages/example/index/App.vue @@ -55,12 +55,12 @@ <script> import { testDBCompare } from "./api"; -import { getSyncTables } from "@/api/baseLibrary" +import { getSyncTables, getLocalTables } from "@/api/baseLibrary" export default { data() { return { - tables: "", + tables: [], tagTable: "", cmpData: [] @@ -78,7 +78,13 @@ getDBTables() { getSyncTables().then(rsp => { if (rsp && rsp.success) { - this.tables = rsp.data.datalist + this.tables = this.tables.concat(rsp.data.datalist) + } + }) + + getLocalTables().then(rsp => { + if (rsp && rsp.success) { + this.tables = this.tables.concat(rsp.data.datalist) } }) }, -- Gitblit v1.8.0