diff --git a/supervise-uniapp/App.vue b/supervise-uniapp/App.vue index c58db223..c7ad80a3 100644 --- a/supervise-uniapp/App.vue +++ b/supervise-uniapp/App.vue @@ -3,9 +3,9 @@ export default { globalData: { // wxSilentLoginURL: "https://supervise.yxtsoft.com/portal/v1/wxuser/wxSilentLogin", - wxSilentLoginURL: "http://192.168.1.107:8112/portal/v1/wxuser/wxSilentLogin", + wxSilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxSilentLogin",// 静默登录 // wxSilentLoginURL: "http://192.168.1.110:8112/portal/v1/wxuser/wxSilentLogin", - wxAuthLoginURL: "https://supervise.yxtsoft.com/api/portal//v1/wxuser/wxAuthLogin", + wxAuthLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxAuthLogin", SilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/SilentLogin",// 注册 token: "", isLogin: false, @@ -31,7 +31,10 @@ onShow: function() { }, - onHide: function() {}, + onHide: function() { + console.log("onHide》》》》", "onHide"); + wx.clearStorage() + }, methods: { //登录的回调函数 diff --git a/supervise-uniapp/common/config.js b/supervise-uniapp/common/config.js index beb0a488..6636bd84 100644 --- a/supervise-uniapp/common/config.js +++ b/supervise-uniapp/common/config.js @@ -6,8 +6,8 @@ * loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 */ module.exports = { - // baseUrl: 'https://jianguan.yyundong.com/api', - baseUrl: 'https://supervise.yxtsoft.com', + // baseUrl: 'http://jg.yyundong.com',// 测试 + baseUrl: 'https://supervise.yxtsoft.com',//正式 // baseUrl: 'http://192.168.1.107:8112', // baseUrl: 'http://192.168.1.110:8112', tokenName: "Authorization", // 请求头中token的名字，与服务器端对应 diff --git a/supervise-uniapp/common/request.api.js b/supervise-uniapp/common/request.api.js index d3036936..e11bb60d 100644 --- a/supervise-uniapp/common/request.api.js +++ b/supervise-uniapp/common/request.api.js @@ -11,12 +11,12 @@ export default { useropenid: (params = {}) => request.post("/api/portal/useropenid/save", params), // 获取 验证码 - sendVerificationCode: (params = {}) => request.get("/portal/v1/wxuser/sendVerificationCode/" + params.phone + + sendVerificationCode: (params = {}) => request.get("/api/portal/v1/wxuser/sendVerificationCode/" + params.phone + "/" + params.type, params), // 绑定手机号 - wxBindMobile: (params = {}) => request.post("/portal/v1/wxuser/wxBindMobile", params), + wxBindMobile: (params = {}) => request.post("/api/portal/v1/wxuser/wxBindMobile", params), // 查看预警信息 selectBusinessRiskInfo: (params = {}) => request.post("/wxmpapi/v1/businessData/selectBusinessRiskInfo", params), @@ -62,6 +62,11 @@ export default { getProjectDaily: (params = {}) => request.post( "/reportwxmpapi/projectdaily/getProjectDaily", params), // "/report/projectdaily/getProjectDaily", params), + + // 账户余额数据 + getAccountByProjectSid: (params = {}) => request.get( + "/api/crm/projectAccount/getAccountByProjectSid/"+params, params), + // "/crm/projectAccount/getAccountByProjectSid/"+params, params), // 项目监管报表 getProjectDailyFiles: (params = {}) => request.get( diff --git a/supervise-uniapp/pages/index/AccountBalance.vue b/supervise-uniapp/pages/index/AccountBalance.vue index 4a7c5f0d..937d680d 100644 --- a/supervise-uniapp/pages/index/AccountBalance.vue +++ b/supervise-uniapp/pages/index/AccountBalance.vue @@ -3,34 +3,36 @@ - + {{info.name}} + {{info.date}} + - - - - 账户数量 - {{info.number}} - - - - - - - 截止时间 - {{info.date}} + + + 总余额 + {{info.balance}}万元 + - + - 账户余额 - {{info.balance}} + + + + + + + + 暂无数据 + - @@ -43,6 +45,7 @@ data() { return { + uEchartsShow: false, info: { sid: "", name: "", @@ -50,7 +53,50 @@ date: "", balance: "", }, + bankList: [], + chartData: { + }, + opts: { + color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", + "#ea7ccc" + ], + padding: [15, 15, 15, 5], // 上、 右、下、左 + enableScroll: false, + legend: { + show: false, + }, // 隐藏X轴下方图列 + xAxis: { + boundaryGap: "justify", + disableGrid: false, + min: 0, + axisLine: true, + max: 1000, + rotateLabel: true, + type: 'grid', + gridColor: '#CCCCCC', + gridType: 'dash', + dashLength: 8, + }, + yAxis: { + disabled: false, + disableGrid: false, + gridType: 'dash', + dashLength: 8, + gridColor: '#CCCCCC', + }, + extra: { + bar: { + type: "stack", + width: 30, + meterBorde: 1, + meterFillColor: "#f0f", + activeBgColor: "#000000", + activeBgOpacity: 0.08, + categoryGap: 2 + } + } + } } }, @@ -62,10 +108,59 @@ date: option.date, balance: option.balance, } - + this.getServerData(this.info.sid) }, methods: { + getServerData(sid) { + this.$api.getAccountByProjectSid(sid).then((resp) => { + console.log('1111>>>>>>', resp) + + this.bankList = resp + var bankData = [] + var balanceData = [] + + console.log('1111>>>>>>', this.bankList) + + this.uEchartsShow = this.bankList.length > 0 + + for (var i = 0; i < this.bankList.length; i++) { + + var strEnd = this.bankList[i].accountNumber.substring(this.bankList[i].accountNumber + .length - 4, this.bankList[i].accountNumber.length) + + console.log('1111>>>>>>', strEnd) + + bankData.push(this.bankList[i].bank + strEnd) + balanceData.push(this.bankList[i].wBalance) + } + console.log('bankData>>>>>>', bankData) + + + setTimeout(() => { + //模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接 + let res = { + categories: bankData, + series: [{ + name: "账户余额", + data: balanceData, + format: "seriesDemo2" + }, + + ] + }; + + this.opts.xAxis.format = "xAxisDemo3" + this.chartData = JSON.parse(JSON.stringify(res)); + }, 500); + + + }).catch(e => { + console.log('eeeee', e) + + }) + + } } } @@ -75,57 +170,71 @@ display: flex; flex-direction: column; - background-color: #fff; width: 100%; height: 100%; .top { - + background: #fff; padding: 20px 25px; display: flex; flex-direction: row; align-items: center; .top-name { - margin-left: 5px; + flex: 1; + margin-right: 10px; font-size: 16px; color: #000; font-weight: 600; font-family: sans-serif; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 1; + -webkit-box-orient: vertical; } .top-date { + flex-shrink: 0; font-size: 13px; color: #717171; } } .content { + background: #fff; display: flex; - margin-left: 20px; - margin-right: 20px; - flex-direction: column; - border-top: 2px solid #eee; + flex-direction: row; + align-items: center; + margin-top: 3px; + justify-content: space-between; + padding: 13px 18px; - .item { + .content-lift { display: flex; flex-direction: row; align-items: center; - justify-content: space-between; - padding: 15px 20px; - border-bottom: 1px solid #eee; - - .item-text{ - font-size: 14px; + + .content-title { + margin-left: 5px; color: #191919; - } - - .item-text1{ font-size: 14px; - color: #717171; } } + + .content-balance { + color: #6C6C6C; + font-size: 12px; + } + + } + + .echarts { + background: #fff; + margin-top: 2px; + width: 100%; + height: 300px; } } diff --git a/supervise-uniapp/pages/index/DataAssembleList2.vue b/supervise-uniapp/pages/index/DataAssembleList2.vue index e1be53a9..d8913ba5 100644 --- a/supervise-uniapp/pages/index/DataAssembleList2.vue +++ b/supervise-uniapp/pages/index/DataAssembleList2.vue @@ -20,8 +20,8 @@ - 总授信：{{allCredit}}元 - 总用信：{{allUseCredit}}元 + 总授信：{{allCredit}}万元 + 总用信：{{allUseCredit}}万元 diff --git a/supervise-uniapp/pages/index/ProjectDetail.vue b/supervise-uniapp/pages/index/ProjectDetail.vue index ca81c9c8..89ee2b34 100644 --- a/supervise-uniapp/pages/index/ProjectDetail.vue +++ b/supervise-uniapp/pages/index/ProjectDetail.vue @@ -48,7 +48,7 @@ - + @@ -65,7 +65,7 @@ - + + + + + 监管负责人 + {{info.regulatoryLeader}} + + + + 监管主管 + {{info.regulatorySupervisor}} + + @@ -104,14 +117,7 @@ - - - 事业部经理 - {{info.generalManager}} - - - @@ -162,7 +168,7 @@ this.$api.getProjectBySid(sid).then((resp) => { // if (resp.success) { console.log('1111', resp) - this.info = resp + this.info = resp.baseInfo }).catch(e => { console.log('eeeee', e) @@ -181,7 +187,7 @@ console.log('item', item.name) this.imageArr.push({ src: item.picUrl, - sid:item.shSid, + sid: item.shSid, title: item.name }) } @@ -190,12 +196,12 @@ console.log('eeeee', e) }) }, - - imgClick(item){ + + imgClick(item) { console.log('item', item) - + uni.navigateTo({ - url: 'WarehouseDetaile?sid='+item.sid + url: 'WarehouseDetaile?sid=' + item.sid }); } diff --git a/supervise-uniapp/pages/index/RegulatoryReporting.vue b/supervise-uniapp/pages/index/RegulatoryReporting.vue index 5ad47dec..4787671a 100644 --- a/supervise-uniapp/pages/index/RegulatoryReporting.vue +++ b/supervise-uniapp/pages/index/RegulatoryReporting.vue @@ -30,8 +30,8 @@ - 总授信：{{info.creditLimit}}元 - 总用信：{{info.useLimit}}元 + 总授信：{{info.creditLimit}}万元 + 总用信：{{info.useLimit}}万元 @@ -464,7 +464,7 @@ uni.navigateTo({ url: 'AccountBalance?sid=' + this.info.projectSid + "&name=" + this.info.projectName + "&number=暂无" + - "&date=" + this.info.reportTime + "&balance=" + this.info.accountsBalanceWan + "&date=" + this.info.orderDate + "&balance=" + this.info.accountsBalanceWan }); break; case "2": diff --git a/supervise-uniapp/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/supervise-uniapp/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js index 17b28b3b..514a466a 100644 --- a/supervise-uniapp/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js +++ b/supervise-uniapp/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js @@ -56,9 +56,12 @@ const cfu = { "formatter":{ "yAxisDemo1":function(val, index, opts){return val+'元'}, "yAxisDemo2":function(val, index, opts){return val.toFixed(2)}, + "yAxisDemo3":function(val, index, opts){return val+'万元'}, "xAxisDemo1":function(val, index, opts){return val+'年';}, "xAxisDemo2":function(val, index, opts){return formatDateTime(val,'h:m')}, + "xAxisDemo3":function(val, index, opts){return val+'万元';}, "seriesDemo1":function(val, index, series, opts){return val+'元'}, + "seriesDemo2":function(val, index, series, opts){return val+'万元'}, "tooltipDemo1":function(item, category, index, opts){ if(index==0){ return '随便用'+item.data+'年' diff --git a/supervise-uniapp/utils/requester.js b/supervise-uniapp/utils/requester.js index 4a3d1c46..b4e1b838 100644 --- a/supervise-uniapp/utils/requester.js +++ b/supervise-uniapp/utils/requester.js @@ -64,6 +64,7 @@ const request = (options) => { header: _opts.header, timeout: _opts.timeout || 60000, success: res => { + console.log("url>>>",_baseUrl+_opts.url) console.log("res>>>",res) if (200 === res.statusCode) { diff --git a/yxt-portal-ui/src/views/Home/Home.vue b/yxt-portal-ui/src/views/Home/Home.vue index fdacc72e..a7ce5266 100644 --- a/yxt-portal-ui/src/views/Home/Home.vue +++ b/yxt-portal-ui/src/views/Home/Home.vue @@ -443,7 +443,7 @@ // window.open('http://127.0.0.1:9531/#/' + '?token=' + getStorage(), '_blank') window.open('/customer/#/' + '?token=' + getStorage(), '_blank') } else if (index === 1) { - window.open('http://192.168.1.103:9531#/' + '?token=' + getStorage(), '_blank') + window.open('http://192.168.1.104:9531#/' + '?token=' + getStorage(), '_blank') // window.open('/report/#/' + '?token=' + getStorage(), '_blank') } else if (index === 2) { window.open('/business/#/' + '?token=' + getStorage(), '_blank') @@ -460,7 +460,7 @@ window.open('http://192.168.1.102:9531/#/' + '?token=' + getStorage(), '_blank') // window.open('/organizational/#/' + '?token=' + getStorage(), '_blank') } else if (index === 8) { - window.open('http://192.168.1.103:9532/#/' + '?token=' + getStorage(), '_blank') + window.open('http://192.168.1.104:9532/#/' + '?token=' + getStorage(), '_blank') // window.open('/crm/#/' + '?token=' + getStorage(), '_blank') } else if (index === 9) { // window.open('http://192.168.1.102:9531/#/' + '?token=' + getStorage(), '_blank')