From aa936a9827e13101cc7e096b103126f9136c4cf5 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Fri, 24 Nov 2023 15:39:34 +0800 Subject: [PATCH] 2023-11-24 --- supervise-report-ui/.env.development | 2 +- supervise-report-ui/src/api/main/main.js | 28 ++- supervise-report-ui/src/main.js | 2 +- supervise-report-ui/src/views/index.vue | 207 ++++++++++++------ .../src/views/project/projectDaily.vue | 6 +- supervise-uniapp/common/config.js | 3 +- .../pages/index/RegulatoryReporting.vue | 111 +++++++--- supervise-uniapp/static/baseIcon/user.png | Bin 0 -> 1780 bytes 8 files changed, 253 insertions(+), 106 deletions(-) create mode 100644 supervise-uniapp/static/baseIcon/user.png diff --git a/supervise-report-ui/.env.development b/supervise-report-ui/.env.development index bc2bd356..bb727456 100644 --- a/supervise-report-ui/.env.development +++ b/supervise-report-ui/.env.development @@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 ##VUE_APP_URL = "http://8.130.39.13:8112" -VUE_APP_URL = "http://192.168.0.108:7009" +VUE_APP_URL = "http://192.168.2.112:7009" diff --git a/supervise-report-ui/src/api/main/main.js b/supervise-report-ui/src/api/main/main.js index 715f30d3..09c9bef0 100644 --- a/supervise-report-ui/src/api/main/main.js +++ b/supervise-report-ui/src/api/main/main.js @@ -2,9 +2,35 @@ import request from '@/utils/request' // 主页 -// 列表 export default { + // 获取全部项目 + getProjectListAllNew(data) { + return request({ + url: '/v1/projectinformation/listAllNew', + method: 'get', + data: data + }) + }, + // 顶部数据 + getProjectDailySum(data) { + return request({ + url: '/projectdaily/getProjectDailySum', + method: 'post', + data: data + }) + }, + + // 分析图 + getProjectDailyZx(data) { + return request({ + url: '/projectdaily/getProjectDailyZx', + method: 'post', + data: data + }) + }, + + // 底部列表 getProjectDailys(data) { return request({ url: '/projectdaily/getProjectDailys', diff --git a/supervise-report-ui/src/main.js b/supervise-report-ui/src/main.js index 208eaf65..51ed9220 100644 --- a/supervise-report-ui/src/main.js +++ b/supervise-report-ui/src/main.js @@ -50,7 +50,7 @@ VueAMap.initAMapApiLoader({ Vue.config.productionTip = false let token = null -// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDA2NDM3OTN9.a9Zmp99E33LC4fCVSwD5rDpiivzQCXRShw8p8voL4OQ' +// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDA4Nzk3NjF9.2LvPpT8YheMSXVJN7B94LP0RCyx87XdNxTM9W2XDiEo' token = GetQueryString('token') if (token) { setStorage(token) diff --git a/supervise-report-ui/src/views/index.vue b/supervise-report-ui/src/views/index.vue index 02aafe29..49e86351 100644 --- a/supervise-report-ui/src/views/index.vue +++ b/supervise-report-ui/src/views/index.vue @@ -9,9 +9,9 @@
- - + @@ -34,10 +34,10 @@ 动产质押类项目
- 1 + {{info.dongChan}} 个
- 165161655元 + {{info.dcUseLimit}}元 @@ -48,10 +48,10 @@ 保证类项目
- 1 + {{info.baoZheng}} 个
- 165161655元 + {{info.bzUseLimit}}元 @@ -62,10 +62,10 @@ 应收帐款质押类项目
- 1 + {{info.yingShou}} 个
- 165161655元 + {{info.ysUseLimit}}元 @@ -77,9 +77,9 @@
账户余额 - ￥155651.15 - ↑ 15.66% - ↓ 12.21% + ￥{{info.accountsBalance}} + ↑ {{info.accountsBalanceBfb}}% + ↓ {{info.accountsBalanceBfb}}%
@@ -87,9 +87,9 @@
应收账款 - ￥155651.15 - ↑ 15.66% - ↓ 12.21% + ￥{{info.accountsReceivable}} + ↑ {{info.accountsReceivableBfb}}% + ↓ {{info.accountsReceivableBfb}}%
@@ -97,9 +97,9 @@
库存货值 - ￥155651.15 - ↑ 15.66% - ↓ 12.21% + ￥{{info.stockAmount}} + ↑ {{info.stockAmountBfb}}% + ↓ {{info.stockAmountBfb}}%
@@ -107,9 +107,9 @@
在途货值 - ￥155651.15 - ↑ 15.66% - ↓ 12.21% + ￥{{info.transitAmount}} + ↑ {{info.transitAmountBfb}}% + ↓ {{info.transitAmountBfb}}%
@@ -117,10 +117,9 @@
预付款 - ￥155651.15 - ↑ 15.66% - ↓ 12.21% - + ￥{{info.advancePayment}} + ↑ {{info.advancePaymentBfb}}% + ↓ {{info.advancePaymentBfb}}%
@@ -134,7 +133,13 @@ 库存分析图 -
+
+
+ + + + +
@@ -144,7 +149,8 @@
- + @@ -175,59 +181,114 @@ name: '', data() { return { + tableKey:0, tableLoading: false, times: getDateRang('yesterday'), projectValue: "全部项目", - projectList: [ - - { - label: "111111111", - value: "项目1" - }, - { - label: "222222", - value: "项目2" - }, - { - label: "333333", - value: "项目3" - } - ], - projectlistlData: [ - ], + projectSid: "", + projectList: [], + day: [{ + value: "7", + label: "7日", + }, { + value: "15", + label: "15日", + }], + dayValue: "15", + projectlistlData: [], + + info: {} } }, mounted() { - this.drawLine() + }, created() { + this.getProjectListAllNew() + this.getProjectDailySum() + this.getReportInventory() this.init() }, methods: { + getProjectListAllNew(){ + req.getProjectListAllNew().then(res => { + + console.log('getProjectListAllNew:', res) + + this.projectList = res.data + + }) + }, + + getProjectDailySum() { + + let params = { + orderDate: this.times, + projectSid: this.projectSid, + } + req.getProjectDailySum(params).then(res => { + console.log('getProjectDailySum:', res) + + this.info = res.data + + }) + }, init() { // 获取列表 let params = { orderDate: this.times, - projectSid: "", + projectSid: this.projectSid, } req.getProjectDailys(params).then(res => { console.log('getProjectDailys:', res) this.projectlistlData = res.data + + console.log('projectlistlData:', this.projectlistlData) }) }, + dayValueChange(val) { + + console.log('val:', val) + this.dayValue = val + this.getReportInventory() + }, + + getReportInventory() { + + let params = { + orderDate: this.times, + projectSid: this.projectSid, + intervalTime: this.dayValue + } + + req.getProjectDailyZx(params).then(res => { + + console.log('getProjectDailyZx:', res) + + // this.projectlistlData = res.data + + this.drawLine(res.data) + }) + }, + projectSelect(val) { console.log('projectSelect:', val) + this.projectSid = val + + this.getProjectDailySum() + this.getReportInventory() + this.init() }, selectTime(val) { @@ -238,7 +299,7 @@ }, // 折线图初始化 - drawLine() { + drawLine(obj) { // 基于准备好的dom，初始化echarts实例 var myChart = echarts.init(document.getElementById('main')); // 绘制图表 @@ -250,7 +311,7 @@ trigger: 'axis' }, legend: { - data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine'] + data: ['账户余额', '应收账款', '库存货值', '在途货值', '预付款'] }, grid: { left: '3%', @@ -282,43 +343,38 @@ xAxis: { type: 'category', boundaryGap: false, - data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] + data: obj.date }, yAxis: { type: 'value' }, series: [{ - name: 'Email', + name: '账户余额', type: 'line', - stack: 'Total', - data: [120, 132, 101, 134, 90, 230, 210] + data: obj.accountsBalance }, { - name: 'Union Ads', + name: '应收账款', type: 'line', - stack: 'Total', - data: [220, 182, 191, 234, 290, 330, 310] + data: obj.accountsReceivable }, { - name: 'Video Ads', + name: '库存货值', type: 'line', - stack: 'Total', - data: [150, 232, 201, 154, 190, 330, 410] + data: obj.stockAmount }, { - name: 'Direct', + name: '在途货值', type: 'line', - stack: 'Total', - data: [320, 332, 301, 334, 390, 330, 320] + data: obj.transitAmount }, { - name: 'Search Engine', + name: '预付款', type: 'line', - stack: 'Total', - data: [820, 932, 901, 934, 1290, 1330, 1320] + data: obj.advancePayment } ] - }) + }, true) }, @@ -434,7 +490,7 @@ } .top-right { - width: 55%; + width:60%; display: flex; flex-direction: row; align-items: center; @@ -508,10 +564,25 @@ .centre-title-view { margin-left: 10px; - margin-top: 10px; flex: 1; - height: 3px; - background: #efefef; + display: flex; + flex-direction: row; + border-bottom: solid 4px #dadada; + + ::v-deep .el-select { + width: 100px; + margin-bottom: -10px; + margin-top: -10px; + + .el-input { + .el-input__inner { + color: #999; + background: transparent; + border: none; + font-size: 15px; + } + } + } } } } diff --git a/supervise-report-ui/src/views/project/projectDaily.vue b/supervise-report-ui/src/views/project/projectDaily.vue index 189edc5d..8fe05f0d 100644 --- a/supervise-report-ui/src/views/project/projectDaily.vue +++ b/supervise-report-ui/src/views/project/projectDaily.vue @@ -52,8 +52,8 @@ @@ -192,7 +192,7 @@ - 备注 + 工作日报 - - - - - - 报表下载 - - @@ -48,7 +40,7 @@ --> - + @@ -124,12 +116,37 @@ - - + + + + + + + + + 工作日报 + + + + + {{info.userName}} + + + + + + + 报表下载 + + + + {{info.remarks}} - + @@ -140,11 +157,10 @@ - - - + + + @@ -277,10 +293,10 @@ }, confirmClick(date) { console.log('confirmClick', date) - console.log('date.value',date.value) - console.log('getTime',(new Date(date.value)).getTime()) - - + console.log('date.value', date.value) + console.log('getTime', (new Date(date.value)).getTime()) + + console.log('formatTimeTwo', formatTimeTwo((new Date(date.value)).getTime(), "Y-M-D")) this.params.orderDate = formatTimeTwo((new Date(date.value)).getTime(), "Y-M-D") @@ -449,6 +465,12 @@ }) + }, + makeCall(){ + wx.makePhoneCall({ + //仅为示例，并非真实的电话号码 + phoneNumber: this.info.userMobile + }) }, jump() { // 下载 @@ -544,7 +566,7 @@ justify-content: space-between; .top-name { - flex: 1; + flex: 1; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; @@ -562,26 +584,55 @@ } .download { - - position: absolute; - top: 100px; - right: 5px; background-color: #fff; display: flex; align-items: center; flex-direction: row; + justify-content: space-between; + padding: 18px 18px 11px 18px; + border-bottom: 1px #eee solid; - .download-lift-view { - z-index: 2222; + .download-left { + margin-right: 20px; + flex: 1; + display: flex; + align-items: center; + flex-direction: row; + justify-content: space-between; + + .download-left-text { + font-size: 16px; + color: #191919; + + } + + .download-lift-view { + display: flex; + align-items: center; + flex-direction: row; + + .download-lift-view-text { + margin-left: 5px; + font-size: 14px; + color: #018AD2; + padding-bottom: 2px; + border-bottom: 1px #018AD2 solid; + } + } + } + + .download-right { display: flex; align-items: center; flex-direction: row; - .download-lift-view-text { - margin-left: 10px; + .download-right-text { + margin-left: 5px; font-size: 14px; color: #018AD2; + padding-bottom: 2px; + border-bottom: 1px #018AD2 solid; } } } diff --git a/supervise-uniapp/static/baseIcon/user.png b/supervise-uniapp/static/baseIcon/user.png new file mode 100644 index 0000000000000000000000000000000000000000..e798e4610da93f831cfca9bb82b143e50674fca8 GIT binary patch literal 1780 zcmVPx*u1Q2eRCr$PU0qV#I1rW$`<}2Dm{cvP$|-=85FTL<0egsrN8lt(PLZmxRhb+h zBnKF*Em>&nF|w`SPp!f8k|CC@c7N($b!#}AKcqOoNl`Ns!)8E;ErJ=484zL|AVyAc z67uK2-#&|~I%@bR>SM)EzEJ;)m0*0OdCYnHU0&P#e=UCK@6T0t%z86MUjKdmY3pwU zc0~XpL8v)D<&3=mfMAWDLxC*#`V0XOX+REc{<~#Dd`7Z=Y%VUu+0VZ}-le36Bp?Sj zkC#latCTP9`|O&pKctitQh>a>`MTg@|2B_mvV$nKl#l`B-Ob~1CD?-ze=WCKKjvG>ph zbtzvn&a(w$%U>6VCvl!;eo8h#-d{gHQ1+&b?BeX|>HP4YodcvayP*N7IXn4%ez@E@ zKn||IeJ@E>p$xj52d=V8l@6JlOl{D!08*-SFo6Al15%!w+p!kA2ngk*;gq3HomABG zLv2Wru5QCAjQxPBtdi9gA|QlINXdYp3_4gs%1E!9YzZPDgiAa>!IX1nmF0Ff)e_`Y|1|*)Wx*0HLuD z;sOZL<%Jsc1`sNxp$5BP&Lm)6UN|5$?8t!qFqN-@4LTeU3TkV}CYUnOsFZt_NL^2w zGe8{5Ntx6YIv|9*z1>v+H}0I@)lA$ERg9QyTMp^SqOz26Pup%FS9c}E{d4uaoN65~ z*|l8KkqwZvw#42u8gepnNk>*d6f?wa^!hAI&uGx&v%KFS4s{v|4GjB~B~e`y$-uFu zpq#2It5M%F@CodR$(!1A?+*4X+N(OJCGR*mtAuD;Q&gkK)!wv4H?7mJ_c^xtL<5Yh zHUy%+ELJB4HI+3m9OIF)DdwF!3*Nd9$!x$)1d~u%UBZ%iU%j_SR+6}^6mo!Q;?)i# zyPVelF0b3v`zLR@ainN#I9WiV14A4LGH$Q!YLf8-WBUs(*d=FTF)2Bm-|@QsVv|0x zr2#RHyo8J~L4(weS+AyYR|uwt%uzHTAumq#-t2%hdl78^v}Wu3+^bvClADHXfM_7v zQ-8#YHF>DCZO22B(dO0i(g6oV0rAI60BB$jxKeO9*(g>u=Vz(gp!*zv0%D)tRjV|m z8hb6F1F{2lmmz?JMBjS%FV;zJ)syI#3Fc{S_9_nU((b|5BkA1gpNmaKxkAa zI~D`9d0X_`zrqW0fd? zVA~9)-A}(*!$)W7d*Vg)!GIu*xNAWI7MM7dE5U%kR8@chjTf9wNKpWdtw{=yRMd-( zNrsjJUW*^{rzeIh+|w3#D>jC!t{@4)G;xk~Jef*{%r*v-IZ&X490lkN2&(VgRIX#^ zM7(B9PMU2MkvAYI%0Ep+_q$+S)TBw(Vd(ak5^q2t>dIgwUFYpfm5B7THO*8{S3^P~P*GWQfK@~Bs z29T4~hCpMG04C76)ji4RBq8!eQOP+vO!cS4)qcpCoB_e^Q~NU``<