From 1e408236f717c20dc61521af70c206960236a251 Mon Sep 17 00:00:00 2001 From: Apcallover <1503963513@qq.com> Date: Thu, 21 Mar 2024 20:58:44 +0800 Subject: [PATCH] =?UTF-8?q?flat:=20=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenant/main/serve/Dialog/pushService.vue | 50 ++++++++++++++----- vue.config.js | 4 +- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/src/views/tenant/main/serve/Dialog/pushService.vue b/src/views/tenant/main/serve/Dialog/pushService.vue index 07e9d77..4c7c24d 100644 --- a/src/views/tenant/main/serve/Dialog/pushService.vue +++ b/src/views/tenant/main/serve/Dialog/pushService.vue @@ -196,7 +196,7 @@ export default { if(!this.rowData) return this.getLeftServeList() this.getLeftUserList() - this.getRightListPolicy() + // this.getRightListPolicy() }, onPageInit() { this.formInline = {} @@ -224,6 +224,7 @@ export default { this.rightTabs = type this.rightDataSelections = [] type === 0 && this.getRightListPolicy() + type === 1 && this.getRightSearch() }, searchInputChange: debounce(function (val) { this.getRightSearch() @@ -298,26 +299,35 @@ export default { } }, async getRightSearch() { - let params = {keywords: this.searchInput} + let params = {keywords: this.searchInput || '1'} + const createTime = Date.now() + 5000 this.rightLoading = true let resData = await getSearchAll(params) - this.rightLoading = false if(resData.data.code === 200){ - this.rightDataList = resData.data.data - console.log(resData.data) + const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0 + setTimeout(() => { + this.rightLoading = false + this.rightDataList = resData.data.data + }, timed) + } }, async getRightListPolicy() { let params = {ids: this.rowData.policyIds} + const createTime = Date.now() + 5000 this.rightLoading = true let resData = await getListByids(params) - this.rightLoading = false if(resData.data.code === 200){ - this.rightDataList = resData.data.data + const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0 + setTimeout(() => { + this.rightLoading = false + this.rightDataList = resData.data.data + }, timed) } }, async getLeftUserList(type) { const {current, size} = this.leftPages + const createTime = Date.now() + 5000 let params = { ...this.formInline, current, size, @@ -327,11 +337,15 @@ export default { // params.labels = '未分组' this.leftLoading = true let resData = await getListAllByLabels(params) - this.leftLoading = false if ( resData.data.code === 200 ) { - const { records, total, size, current } = resData.data.data - this.leftUserDataList = records - this.leftPages = { total, size, current } + const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0 + setTimeout(() => { + const { records, total, size, current } = resData.data.data + this.leftUserDataList = records + this.leftPages = { total, size, current } + this.leftLoading = false + }, timed) + } }, async getLeftServeList() { @@ -363,9 +377,12 @@ export default { flex-direction: column; } .content-right{ + //修改动画的大小 给文字加粗效果 + .right-search{ width: 100%; } + } .leftInput{ width: 500px; @@ -373,7 +390,7 @@ export default { width: 160px !important; } .el-input__inner{ - width: 200px; + width: 300px; } .input-search{ margin-right: -15px; @@ -382,6 +399,15 @@ export default { } } +/deep/.el-loading-spinner{ + font-size: 80px; + font-weight: bold; +} +/deep/.el-loading-spinner .circular{ + width: 80px; + height: 80px; +} + .content-footer{ float: right; } diff --git a/vue.config.js b/vue.config.js index 6dcf1b9..fe0929e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -24,11 +24,11 @@ module.exports = { proxy: { "/api": { // target: 'http://10.165.0.173:8000', - // target: "http://39.98.184.58:8000", // 阿里云后台地址 + target: "http://39.98.184.58:8000", // 阿里云后台地址 // target: "http://192.168.3.104:8000", // 本地 // target: 'http://192.168.1.106:8000', // target: 'http://192.168.3.173:8000', - target: 'http://10.165.0.173:8000', + // target: 'http://10.165.0.173:8000', // target: 'http://198.168.3.120:8000', ws: true, changeOrigin: true,