From 7b15ab6e6abef789bc53f998db941cb5108185b2 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Tue, 7 Feb 2023 17:12:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-business-ui/vue.config.js | 2 +- supervise-crm-ui/vue.config.js | 2 +- supervise-customer-ui/vue.config.js | 2 +- supervise-message-ui/src/settings.js | 2 +- supervise-message-ui/vue.config.js | 2 +- supervise-organizational-ui/vue.config.js | 2 +- supervise-report-ui/vue.config.js | 2 +- supervise-risk-ui/src/settings.js | 2 +- supervise-risk-ui/vue.config.js | 2 +- supervise-uniapp/common/config.js | 6 +- supervise-uniapp/pages/home/AddFragment.vue | 74 ++--- supervise-uniapp/pages/home/FindFragment.vue | 279 +++++++++++++++++- supervise-uniapp/pages/home/UserFragment.vue | 284 ++++++++++++++++++- supervise-work-ui/vue.config.js | 2 +- yxt-portal-ui/src/views/Home/Home.vue | 2 +- yxt-portal-ui/vue.config.js | 2 +- 16 files changed, 606 insertions(+), 61 deletions(-) diff --git a/supervise-business-ui/vue.config.js b/supervise-business-ui/vue.config.js index a2d6b0e3..96f5322a 100644 --- a/supervise-business-ui/vue.config.js +++ b/supervise-business-ui/vue.config.js @@ -6,7 +6,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '贷后监管体系' // page title +const name = defaultSettings.title || '汇融银行供应链贷后监管平台' // page title // 如果端口设置为80， // 使用管理员权限执行命令行。 diff --git a/supervise-crm-ui/vue.config.js b/supervise-crm-ui/vue.config.js index e6e7125c..2886d5bb 100644 --- a/supervise-crm-ui/vue.config.js +++ b/supervise-crm-ui/vue.config.js @@ -6,7 +6,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '汇融银行贷后监管平台' // page title +const name = defaultSettings.title || '汇融银行供应链贷后监管平台' // page title // 如果端口设置为80， // 使用管理员权限执行命令行。 diff --git a/supervise-customer-ui/vue.config.js b/supervise-customer-ui/vue.config.js index 6aaa9441..4664272b 100644 --- a/supervise-customer-ui/vue.config.js +++ b/supervise-customer-ui/vue.config.js @@ -6,7 +6,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '贷后监管体系' // page title +const name = defaultSettings.title || '汇融银行供应链贷后监管平台' // page title // 如果端口设置为80， // 使用管理员权限执行命令行。 diff --git a/supervise-message-ui/src/settings.js b/supervise-message-ui/src/settings.js index 4159f6f8..d29191e3 100644 --- a/supervise-message-ui/src/settings.js +++ b/supervise-message-ui/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: '贷后监管体系', + title: '汇融银行供应链贷后监管平台', /** * @type {boolean} true | false diff --git a/supervise-message-ui/vue.config.js b/supervise-message-ui/vue.config.js index 214623eb..97e1581f 100644 --- a/supervise-message-ui/vue.config.js +++ b/supervise-message-ui/vue.config.js @@ -6,7 +6,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '贷后监管体系' // page title +const name = defaultSettings.title || '汇融银行供应链贷后监管平台' // page title // 如果端口设置为80， // 使用管理员权限执行命令行。 diff --git a/supervise-organizational-ui/vue.config.js b/supervise-organizational-ui/vue.config.js index 5e40359a..5d96052c 100644 --- a/supervise-organizational-ui/vue.config.js +++ b/supervise-organizational-ui/vue.config.js @@ -6,7 +6,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '贷后监管体系' // page title +const name = defaultSettings.title || '汇融银行供应链贷后监管平台' // page title // 如果端口设置为80， // 使用管理员权限执行命令行。 diff --git a/supervise-report-ui/vue.config.js b/supervise-report-ui/vue.config.js index 4e2dbe32..f5c7477f 100644 --- a/supervise-report-ui/vue.config.js +++ b/supervise-report-ui/vue.config.js @@ -6,7 +6,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '贷后监管体系' // page title +const name = defaultSettings.title || '汇融银行供应链贷后监管平台' // page title // 如果端口设置为80， // 使用管理员权限执行命令行。 diff --git a/supervise-risk-ui/src/settings.js b/supervise-risk-ui/src/settings.js index 4159f6f8..d29191e3 100644 --- a/supervise-risk-ui/src/settings.js +++ b/supervise-risk-ui/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: '贷后监管体系', + title: '汇融银行供应链贷后监管平台', /** * @type {boolean} true | false diff --git a/supervise-risk-ui/vue.config.js b/supervise-risk-ui/vue.config.js index 4155b0ff..7d1542fe 100644 --- a/supervise-risk-ui/vue.config.js +++ b/supervise-risk-ui/vue.config.js @@ -6,7 +6,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '贷后监管体系' // page title +const name = defaultSettings.title || '汇融银行供应链贷后监管平台' // page title // 如果端口设置为80， // 使用管理员权限执行命令行。 diff --git a/supervise-uniapp/common/config.js b/supervise-uniapp/common/config.js index de17e42c..35359ada 100644 --- a/supervise-uniapp/common/config.js +++ b/supervise-uniapp/common/config.js @@ -7,7 +7,7 @@ */ module.exports = { baseUrl: 'http://jianguan.yyundong.com/api', - tokenName : "Authorization", // 请求头中token的名字，与服务器端对应 - loginTimeoutCode : "5001", // 登录超时或失效的情况下，服务器端返回的错误码 - loginTimeoutPage : "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 + tokenName: "Authorization", // 请求头中token的名字，与服务器端对应 + loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码 + loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 } diff --git a/supervise-uniapp/pages/home/AddFragment.vue b/supervise-uniapp/pages/home/AddFragment.vue index c5d6303f..23c5c82d 100644 --- a/supervise-uniapp/pages/home/AddFragment.vue +++ b/supervise-uniapp/pages/home/AddFragment.vue @@ -7,9 +7,9 @@ - + 选择类型 - + @@ -214,48 +214,58 @@ ['1-7', 33370, 16888] ] + let _title = [] let _categories = [] - let _categories = [] - let _categories = [] + let _data1 = [] + let _data2 = [] for (var i = 0; i < source.length; i++) { // 取标题 if (i == 0) { let title = source[0] - for (var i = 0; i < title.length; i++) { - Things[i] + for (var j = 1; j < title.length; j++) { + _title.push(title[j]) } } else { // 取日期 - let date = source[i] - for (var i = 0; i < date.length; i++) { - _categories.push({ - name: date[0] - }) - } - + let data = source[i] + _categories.push(data[0]) // 取数值 - + _data1.push(data[1]) + _data2.push(data[2]) } - } - - setTimeout(() => { - //模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接 - let res = { - categories: ["2016", "2017", "2018", "2019", "2020", "2021"], - series: [{ - name: "分销商进货额", - data: [35, 36, 31, 33, 13, 34] - }, - { - name: "实际发货额", - data: [18, 27, 21, 24, 6, 28] - } - ] - }; - this.chartData = JSON.parse(JSON.stringify(res)); - }, 100); + // 拼接 + let res = { + categories: _categories, + series: [{ + name: _title[0], + data: _data1 + }, + { + name: _title[1], + data: _data2 + } + ] + }; + this.chartData = JSON.parse(JSON.stringify(res)); + + // setTimeout(() => { + // //模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接 + // let res = { + // categories: ["2016", "2017", "2018", "2019", "2020", "2021"], + // series: [{ + // name: "分销商进货额", + // data: [35, 36, 31, 33, 13, 34] + // }, + // { + // name: "实际发货额", + // data: [18, 27, 21, 24, 6, 28] + // } + // ] + // }; + // this.chartData = JSON.parse(JSON.stringify(res)); + // }, 100); }, } } diff --git a/supervise-uniapp/pages/home/FindFragment.vue b/supervise-uniapp/pages/home/FindFragment.vue index 8f716e5f..85caa63b 100644 --- a/supervise-uniapp/pages/home/FindFragment.vue +++ b/supervise-uniapp/pages/home/FindFragment.vue @@ -1,27 +1,288 @@ - diff --git a/supervise-uniapp/pages/home/UserFragment.vue b/supervise-uniapp/pages/home/UserFragment.vue index 9e2b320f..62d5db57 100644 --- a/supervise-uniapp/pages/home/UserFragment.vue +++ b/supervise-uniapp/pages/home/UserFragment.vue @@ -1,7 +1,77 @@ @@ -9,13 +79,217 @@ export default { data() { return { - } + newDate: this.getDate(), + // 类型1.全部,2.常规商品3.烟草 + range: [{ + "value": 1, + "text": "全部", + }, + { + "value": 2, + "text": "常规商品", + }, { + "value": 3, + "text": "烟草", + } + ], + tableData: [{ + name: "销售商品收到的现金(元)", + price: "2000000", + }, + { + name: "收到其他与经营活动有关的现金(元)", + price: "28700", + }, + { + name: "本项合计", + price: "123456", + }, + ], + tableData2: [{ + name: "销售商品收到的现金(元)", + totalAmount: "2000000", + accountsReceivable: "31914", + deductionAccountsReceivable: "35793" + }, + { + name: "连锁内加盟", + totalAmount: "2000000", + accountsReceivable: "31914", + deductionAccountsReceivable: "35793" + }, + { + name: "配送中心", + totalAmount: "2000000", + accountsReceivable: "31914", + deductionAccountsReceivable: "35793", + }, { + name: "连锁外加盟", + totalAmount: "2000000", + accountsReceivable: "31914", + deductionAccountsReceivable: "35793", + } + ], + chartData: {}, + opts: { + color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", + "#ea7ccc" + ], + padding: [15, 15, 0, 15], + enableScroll: false, + legend: {}, + xAxis: { + disableGrid: true, + title: "单位：年" + }, + yAxis: { + disabled: false, + disableGrid: false, + splitNumber: 5, + gridType: "dash", + dashLength: 4, + gridColor: "#CCCCCC", + padding: 10, + showTitle: true, + data: [{ + position: "left", + title: "折线" + }, + { + position: "right", + min: 0, + max: 200, + title: "柱状图", + textAlign: "left" + } + ] + }, + extra: { + mix: { + column: { + width: 20 + } + } + } + }, + queryParams: { + customerSid: "", + date: "", + type: "", + } + }; + }, + onReady() { + this.getServerData(); }, methods: { - } + getDate() { + var tempDate = new Date() // 获取今天的日期 + tempDate.setDate(tempDate.getDate() - 1) // 今天的前N天的日期，N自定义 + var endDate = tempDate.getFullYear() + '-' + (tempDate.getMonth() + 1) + '-' + tempDate.getDate() + console.log(endDate) + return endDate + }, + dateChange(e) { + console.log('----dateChange事件:', e); + + }, + typeChange(e) { + console.log('e:', e); + this.queryParams.type = e + }, + doQuery() { + this.newDate = this.queryParams.date + this.getServerData(); + }, + doReset() { + this.queryParams = { + customerSid: "", + date: "", + type: "", + } + this.newDate = this.getDate() + this.getServerData(); + }, + getServerData() { + // var _this = this + // this.$api.getSalesReport(_this.queryParams).then((resp) => { + // // if (resp.success) { + // console.log('1111', resp.data) + // // const data = resp.data + // // _this.dataList = data.financialData + // // _this.listSalesChannelData = data.listSalesChannelData + // // _this.drawLine(data.financialAnalysisChartData) + // // this.tableLoading = false + // // } else { + // // // 根据resp.code进行异常情况处理 + // // _this.dataList = [] + // // _this.listSalesChannelData = [] + // } + // }).catch(e => { + // console.log('eeeee', e) + // _this.tableLoading = false + // }) + + setTimeout(() => { + //模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接 + let res = { + categories: ["2018", "2019", "2020", "2021", "2022", "2023"], + series: [{ + name: "柱1", + index: 1, + type: "column", + data: [40, { + "value": 30, + "color": "#f04864" + }, 55, 110, 24, 58] + }, + { + name: "柱2", + index: 1, + type: "column", + data: [50, 20, 75, 60, 34, 38] + }, + { + name: "折线", + type: "line", + color: "#2fc25b", + data: [120, 140, 105, 170, 95, 160] + } + ] + }; + this.chartData = JSON.parse(JSON.stringify(res)); + }, 500); + }, + } } - diff --git a/supervise-work-ui/vue.config.js b/supervise-work-ui/vue.config.js index ba35c018..e72ab87d 100644 --- a/supervise-work-ui/vue.config.js +++ b/supervise-work-ui/vue.config.js @@ -6,7 +6,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '贷后监管体系' // page title +const name = defaultSettings.title || '汇融银行供应链贷后监管平台' // page title // 如果端口设置为80， // 使用管理员权限执行命令行。 diff --git a/yxt-portal-ui/src/views/Home/Home.vue b/yxt-portal-ui/src/views/Home/Home.vue index af29c895..39c473ab 100644 --- a/yxt-portal-ui/src/views/Home/Home.vue +++ b/yxt-portal-ui/src/views/Home/Home.vue @@ -417,7 +417,7 @@ export default { } else if (index === 6) { window.open('http://jianguan.yyundong.com/message/#/' + '?token=' + getStorage(), '_blank') } else if (index === 7) { - window.open('http://jianguan.yyundong.com/organizational/#/' + '?token=' + getStorage(), '_blank') + window.open('http://192.168.3.8:9531/#/index' + '?token=' + getStorage(), '_blank') } else if (index === 8) { window.open('http://jianguan.yyundong.com/crm/#/' + '?token=' + getStorage(), '_blank') } diff --git a/yxt-portal-ui/vue.config.js b/yxt-portal-ui/vue.config.js index 24ae8693..29801cb8 100644 --- a/yxt-portal-ui/vue.config.js +++ b/yxt-portal-ui/vue.config.js @@ -6,7 +6,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '贷后监管体系' // page title +const name = defaultSettings.title || '汇融银行供应链贷后监管平台' // page title // 如果端口设置为80， // 使用管理员权限执行命令行。