From 5e3f623cdc9973e839400caf0b3fbbe2a92eebe6 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Thu, 31 Aug 2023 18:57:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=A4=B9+demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 1 - src/utils/damo.js | 32 -------- src/utils/refreshTableColumn.js | 80 ------------------- src/views/modules/project/demo.vue | 28 ++----- .../project/projectInfo/projectInfo.vue | 9 ++- 5 files changed, 10 insertions(+), 140 deletions(-) delete mode 100644 src/utils/damo.js delete mode 100644 src/utils/refreshTableColumn.js diff --git a/src/main.js b/src/main.js index 073463b..923b7c9 100644 --- a/src/main.js +++ b/src/main.js @@ -37,7 +37,6 @@ Vue.prototype.decimalUtil = decimalUtil // 计算 Vue.prototype.dayjs = dayjs //时间格式化插件 2021-11-02 Vue.prototype.debounce = debounce // 防抖 Vue.prototype.throttle = throttle // 限流 - // 保存整站vuex本地储存初始状态 window.SITE_CONFIG['storeState'] = cloneDeep(store.state) diff --git a/src/utils/damo.js b/src/utils/damo.js deleted file mode 100644 index 603a535..0000000 --- a/src/utils/damo.js +++ /dev/null @@ -1,32 +0,0 @@ -// import { -// getTableDefaultListLanguage, -// getTableUserListLanguage, -// } from "@/api/table.js" -// -// -// -// -// async function getTableUserColumn2(queryTableUser,tableId, columnList) { -// queryTableUser.tableId=tableId -// await getTableUserListLanguage(queryTableUser).then(({data}) => { -// if (data.rows.length > 0) { -// -// columnList = data.rows -// -// } else { -// -// getTableDefaultListLanguage(queryTableUser).then(({data}) => { -// if (data.rows.length > 0) { -// -// columnList = data.rows -// -// } else { -// -// } -// }) -// } -// }) -// -// } -// -// export default {getTableUserColumn2} diff --git a/src/utils/refreshTableColumn.js b/src/utils/refreshTableColumn.js deleted file mode 100644 index 37d78c5..0000000 --- a/src/utils/refreshTableColumn.js +++ /dev/null @@ -1,80 +0,0 @@ -// import { -// getTableDefaultListLanguage, -// getTableUserListLanguage, -// } from "@/api/table.js" -// -// -// const refreshTableColumn = { -// methods: { -// async getTableUserColumn2(tableId, columnList) { -// debugger -// let queryTableUser = { -// userId: this.$store.state.user.name, -// functionId: this.$route.meta.menuId, -// tableId: tableId, -// status: true, -// languageCode: this.$i18n.locale -// } -// await getTableUserListLanguage(queryTableUser).then(({data}) => { -// if (data.rows.length > 0) { -// -// columnList = data.rows -// -// } else { -// let queryTable= { -// functionId: this.$route.meta.menuId, -// tableId: tableId, -// languageCode: this.$i18n.locale -// } -// getTableDefaultListLanguage(queryTable).then(({data}) => { -// if (!data.rows.length == 0) { -// -// columnList = data.rows -// -// } else { -// -// } -// }) -// } -// }) -// -// }, -// } -// } -// -// export default refreshTableColumn - - -import { - getTableDefaultListLanguage, - getTableUserListLanguage, -} from "@/api/table.js" - - - - -async function getTableUserColumn2(queryTableUser,tableId, columnList) { - - queryTableUser.tableId=tableId - await getTableUserListLanguage(queryTableUser).then(({data}) => { - if (data.rows.length > 0) { - - this.columnList = data.rows - - } else { - - getTableDefaultListLanguage(queryTableUser).then(({data}) => { - if (data.rows.length > 0) { - - this.columnList = data.rows - - } else { - - } - }) - } - }) - -} - -export default {getTableUserColumn2} diff --git a/src/views/modules/project/demo.vue b/src/views/modules/project/demo.vue index 142b334..0445ac2 100644 --- a/src/views/modules/project/demo.vue +++ b/src/views/modules/project/demo.vue @@ -53,28 +53,10 @@ name: "null", data() { return { - // 是否收藏 收藏夹功能 - favorite: false, - //动态列开始 - visible: false, - queryTable: { - functionId: this.$route.meta.menuId, - tableId: "mainTable", - languageCode: this.$i18n.locale - }, - // 用户table 查询参数 - queryTableUser: { - userId: this.$store.state.user.name, - functionId: this.$route.meta.menuId, - tableId: "mainTable", - status: true, - languageCode: this.$i18n.locale - }, - //动态列结束 height: 200, dataList:[], dataListLoading: false, - columnList: [ + columnList1: [ { userId: this.$store.state.user.name, functionId: 104001001, @@ -174,16 +156,16 @@ if (!data.rows.length == 0) { switch (columnId) { case 1: - this.columnList = data.rows + this.columnList1 = data.rows break; // case 2: - // this.columnList1 = data.rows + // this.columnList2 = data.rows // break; // case 3: - // this.columnList2 = data.rows + // this.columnList3 = data.rows // break; // case 4: - // this.columnList3 = data.rows + // this.columnList4 = data.rows // break; } } else { diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index eb5bfb7..70c497f 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -21,7 +21,7 @@