liupopo 2 years ago
parent
commit
4a059a500a
  1. 9
      supervise-uniapp/App.vue
  2. 4
      supervise-uniapp/common/config.js
  3. 9
      supervise-uniapp/common/request.api.js
  4. 177
      supervise-uniapp/pages/index/AccountBalance.vue
  5. 4
      supervise-uniapp/pages/index/DataAssembleList2.vue
  6. 32
      supervise-uniapp/pages/index/ProjectDetail.vue
  7. 6
      supervise-uniapp/pages/index/RegulatoryReporting.vue
  8. 3
      supervise-uniapp/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
  9. 1
      supervise-uniapp/utils/requester.js
  10. 4
      yxt-portal-ui/src/views/Home/Home.vue

9
supervise-uniapp/App.vue

@ -3,9 +3,9 @@
export default { export default {
globalData: { globalData: {
// wxSilentLoginURL: "https://supervise.yxtsoft.com/portal/v1/wxuser/wxSilentLogin", // 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", // 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",// SilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/SilentLogin",//
token: "", token: "",
isLogin: false, isLogin: false,
@ -31,7 +31,10 @@
onShow: function() { onShow: function() {
}, },
onHide: function() {}, onHide: function() {
console.log("onHide》》》》", "onHide");
wx.clearStorage()
},
methods: { methods: {
// //

4
supervise-uniapp/common/config.js

@ -6,8 +6,8 @@
* loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下,跳转到的登录页面 * loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下,跳转到的登录页面
*/ */
module.exports = { module.exports = {
// baseUrl: 'https://jianguan.yyundong.com/api', // baseUrl: 'http://jg.yyundong.com',// 测试
baseUrl: 'https://supervise.yxtsoft.com', baseUrl: 'https://supervise.yxtsoft.com',//正式
// baseUrl: 'http://192.168.1.107:8112', // baseUrl: 'http://192.168.1.107:8112',
// baseUrl: 'http://192.168.1.110:8112', // baseUrl: 'http://192.168.1.110:8112',
tokenName: "Authorization", // 请求头中token的名字,与服务器端对应 tokenName: "Authorization", // 请求头中token的名字,与服务器端对应

9
supervise-uniapp/common/request.api.js

@ -11,12 +11,12 @@ export default {
useropenid: (params = {}) => request.post("/api/portal/useropenid/save", params), 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), 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), selectBusinessRiskInfo: (params = {}) => request.post("/wxmpapi/v1/businessData/selectBusinessRiskInfo", params),
@ -63,6 +63,11 @@ export default {
"/reportwxmpapi/projectdaily/getProjectDaily", params), "/reportwxmpapi/projectdaily/getProjectDaily", params),
// "/report/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( getProjectDailyFiles: (params = {}) => request.get(
"/reportwxmpapi/projectdaily/getProjectDailyFiles/" + params.projectSid + "/" + params.orderDate, params), "/reportwxmpapi/projectdaily/getProjectDailyFiles/" + params.projectSid + "/" + params.orderDate, params),

177
supervise-uniapp/pages/index/AccountBalance.vue

@ -3,34 +3,36 @@
<view class="pages"> <view class="pages">
<view class="top"> <view class="top">
<image src="../../static/baseIcon/orders.png" style="width: 18px;height: 18px;" mode="aspectFill"></image> <!-- <image src="../../static/baseIcon/orders.png" style="width: 18px;height: 18px;" mode="aspectFill"></image> -->
<text class="top-name">{{info.name}}</text> <text class="top-name">{{info.name}}</text>
<text class="top-date">{{info.date}}</text>
</view> </view>
<view class="content"> <view class="content">
<view class="item"> <view class="content-lift">
<image src="https://supervise.yxtsoft.com/img/newApp/zhye.png" style="width: 18px;height: 18px;"
<text class="item-text">账户数量</text> mode="aspectFill"></image>
<text class="item-text1">{{info.number}}</text> <text class="content-title">总余额</text>
</view> </view>
<text class="content-balance">{{info.balance}}万元</text>
</view>
<view class="echarts" v-show="uEchartsShow">
<view class="item"> <qiun-data-charts type="bar" ref="charts" :ontouch='true' :echartsApp="true" :opts="opts"
:chartData="chartData" />
<text class="item-text">截止时间</text>
<text class="item-text1">{{info.date}}</text>
</view>
<view class="item" style="border-bottom: none;"> </view>
<text class="item-text">账户余额</text> <view v-show="!uEchartsShow">
<text class="item-text1" >{{info.balance}}</text> <view style="display:flex;flex-direction: column;justify-content: center;align-items: center;">
<image src="../../static/baseIcon/notData.png" mode="aspectFill" style="width: 150px;height: 150px;">
</image>
<text style="text-align: center;width: 100%; color: #717171;">暂无数据</text>
</view> </view>
</view> </view>
@ -43,6 +45,7 @@
data() { data() {
return { return {
uEchartsShow: false,
info: { info: {
sid: "", sid: "",
name: "", name: "",
@ -50,7 +53,50 @@
date: "", date: "",
balance: "", 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, date: option.date,
balance: option.balance, balance: option.balance,
} }
this.getServerData(this.info.sid)
}, },
methods: { 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)
})
}
} }
} }
</script> </script>
@ -75,57 +170,71 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #fff;
width: 100%; width: 100%;
height: 100%; height: 100%;
.top { .top {
background: #fff;
padding: 20px 25px; padding: 20px 25px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
.top-name { .top-name {
margin-left: 5px; flex: 1;
margin-right: 10px;
font-size: 16px; font-size: 16px;
color: #000; color: #000;
font-weight: 600; font-weight: 600;
font-family: sans-serif; font-family: sans-serif;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
} }
.top-date { .top-date {
flex-shrink: 0;
font-size: 13px; font-size: 13px;
color: #717171; color: #717171;
} }
} }
.content { .content {
background: #fff;
display: flex; display: flex;
margin-left: 20px; flex-direction: row;
margin-right: 20px; align-items: center;
flex-direction: column; margin-top: 3px;
border-top: 2px solid #eee; justify-content: space-between;
padding: 13px 18px;
.item { .content-lift {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between;
padding: 15px 20px;
border-bottom: 1px solid #eee;
.item-text{ .content-title {
font-size: 14px; margin-left: 5px;
color: #191919; color: #191919;
}
.item-text1{
font-size: 14px; font-size: 14px;
color: #717171;
} }
} }
.content-balance {
color: #6C6C6C;
font-size: 12px;
}
}
.echarts {
background: #fff;
margin-top: 2px;
width: 100%;
height: 300px;
} }
} }

4
supervise-uniapp/pages/index/DataAssembleList2.vue

@ -20,8 +20,8 @@
<view class="money"> <view class="money">
<text class="money-text">总授信{{allCredit}}</text> <text class="money-text">总授信{{allCredit}}</text>
<text class="money-text">总用信{{allUseCredit}}</text> <text class="money-text">总用信{{allUseCredit}}</text>
</view> </view>

32
supervise-uniapp/pages/index/ProjectDetail.vue

@ -48,7 +48,7 @@
<view class="list"> <view class="list">
<view class="list-item" v-for="item in imageArr" > <view class="list-item" v-for="item in imageArr">
<view class="list-item-lay" @click="imgClick(item)"> <view class="list-item-lay" @click="imgClick(item)">
<image class="item-img" :src="item.src" mode="aspectFill"> <image class="item-img" :src="item.src" mode="aspectFill">
@ -65,7 +65,7 @@
</view> </view>
</view> </view>
<!--
<view class="layout" style="margin-top: 10px;"> <view class="layout" style="margin-top: 10px;">
<view class="layout-item"> <view class="layout-item">
@ -83,6 +83,19 @@
<text class="text2">{{info.bManagerName}}</text> <text class="text2">{{info.bManagerName}}</text>
</view> </view>
</view> -->
<view class="layout" style="margin-top: 10px;">
<view class="layout-item">
<text class="text1">监管负责人</text>
<text class="text2">{{info.regulatoryLeader}}</text>
</view>
<view class="layout-item" style="border-bottom: none;">
<text class="text1">监管主管</text>
<text class="text2">{{info.regulatorySupervisor}}</text>
</view>
</view> </view>
<view class="layout" style="margin-top: 10px;"> <view class="layout" style="margin-top: 10px;">
@ -104,14 +117,7 @@
</view> </view>
<view class="layout" style="margin-top: 10px;">
<view class="layout-item" style="border-bottom: none;">
<text class="text1">事业部经理</text>
<text class="text2">{{info.generalManager}}</text>
</view>
</view>
<view class="layout" style="margin-top: 10px;padding: 20px;"> <view class="layout" style="margin-top: 10px;padding: 20px;">
@ -162,7 +168,7 @@
this.$api.getProjectBySid(sid).then((resp) => { this.$api.getProjectBySid(sid).then((resp) => {
// if (resp.success) { // if (resp.success) {
console.log('1111', resp) console.log('1111', resp)
this.info = resp this.info = resp.baseInfo
}).catch(e => { }).catch(e => {
console.log('eeeee', e) console.log('eeeee', e)
@ -181,7 +187,7 @@
console.log('item', item.name) console.log('item', item.name)
this.imageArr.push({ this.imageArr.push({
src: item.picUrl, src: item.picUrl,
sid:item.shSid, sid: item.shSid,
title: item.name title: item.name
}) })
} }
@ -191,11 +197,11 @@
}) })
}, },
imgClick(item){ imgClick(item) {
console.log('item', item) console.log('item', item)
uni.navigateTo({ uni.navigateTo({
url: 'WarehouseDetaile?sid='+item.sid url: 'WarehouseDetaile?sid=' + item.sid
}); });
} }

6
supervise-uniapp/pages/index/RegulatoryReporting.vue

@ -30,8 +30,8 @@
<view class="centre-bom"> <view class="centre-bom">
<text class="centre-lift-text">总授信{{info.creditLimit}}</text> <text class="centre-lift-text">总授信{{info.creditLimit}}</text>
<text class="centre-lift-text">总用信{{info.useLimit}}</text> <text class="centre-lift-text">总用信{{info.useLimit}}</text>
</view> </view>
@ -464,7 +464,7 @@
uni.navigateTo({ uni.navigateTo({
url: 'AccountBalance?sid=' + this.info.projectSid + "&name=" + this.info.projectName + url: 'AccountBalance?sid=' + this.info.projectSid + "&name=" + this.info.projectName +
"&number=暂无" + "&number=暂无" +
"&date=" + this.info.reportTime + "&balance=" + this.info.accountsBalanceWan "&date=" + this.info.orderDate + "&balance=" + this.info.accountsBalanceWan
}); });
break; break;
case "2": case "2":

3
supervise-uniapp/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js

@ -56,9 +56,12 @@ const cfu = {
"formatter":{ "formatter":{
"yAxisDemo1":function(val, index, opts){return val+'元'}, "yAxisDemo1":function(val, index, opts){return val+'元'},
"yAxisDemo2":function(val, index, opts){return val.toFixed(2)}, "yAxisDemo2":function(val, index, opts){return val.toFixed(2)},
"yAxisDemo3":function(val, index, opts){return val+'万元'},
"xAxisDemo1":function(val, index, opts){return val+'年';}, "xAxisDemo1":function(val, index, opts){return val+'年';},
"xAxisDemo2":function(val, index, opts){return formatDateTime(val,'h:m')}, "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+'元'}, "seriesDemo1":function(val, index, series, opts){return val+'元'},
"seriesDemo2":function(val, index, series, opts){return val+'万元'},
"tooltipDemo1":function(item, category, index, opts){ "tooltipDemo1":function(item, category, index, opts){
if(index==0){ if(index==0){
return '随便用'+item.data+'年' return '随便用'+item.data+'年'

1
supervise-uniapp/utils/requester.js

@ -64,6 +64,7 @@ const request = (options) => {
header: _opts.header, header: _opts.header,
timeout: _opts.timeout || 60000, timeout: _opts.timeout || 60000,
success: res => { success: res => {
console.log("url>>>",_baseUrl+_opts.url)
console.log("res>>>",res) console.log("res>>>",res)
if (200 === res.statusCode) { if (200 === res.statusCode) {

4
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('http://127.0.0.1:9531/#/' + '?token=' + getStorage(), '_blank')
window.open('/customer/#/' + '?token=' + getStorage(), '_blank') window.open('/customer/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 1) { } 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') // window.open('/report/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 2) { } else if (index === 2) {
window.open('/business/#/' + '?token=' + getStorage(), '_blank') window.open('/business/#/' + '?token=' + getStorage(), '_blank')
@ -460,7 +460,7 @@
window.open('http://192.168.1.102:9531/#/' + '?token=' + getStorage(), '_blank') window.open('http://192.168.1.102:9531/#/' + '?token=' + getStorage(), '_blank')
// window.open('/organizational/#/' + '?token=' + getStorage(), '_blank') // window.open('/organizational/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 8) { } 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') // window.open('/crm/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 9) { } else if (index === 9) {
// window.open('http://192.168.1.102:9531/#/' + '?token=' + getStorage(), '_blank') // window.open('http://192.168.1.102:9531/#/' + '?token=' + getStorage(), '_blank')

Loading…
Cancel
Save