Commit a2b92b4d authored by godwithdh's avatar godwithdh

tiip_form

parent b4b5d774
...@@ -13,8 +13,8 @@ function urlFun(name){ ...@@ -13,8 +13,8 @@ function urlFun(name){
* 默认公司 * 默认公司
*/ */
// default:`http://192.168.4.39:5001`, // default:`http://192.168.4.39:5001`,
default:`https://weixin.huansi.net/apiproxy/huansi/hszh_HSFabricTradeTest`, // default:`https://weixin.huansi.net/apiproxy/huansi/hszh_HSFabricTradeTest`,
// default:`https://weixin.huansi.net/apiproxy/huansi/service/proxy/${userID}`, default:`https://weixin.huansi.net/apiproxy/huansi/service/proxy/${userID}`,
/** /**
* 基本地址 * 基本地址
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</div> </div>
<table class="DATA"> <table class="DATA">
<tr> <tr>
<td>#</td> <td>序号</td>
<td>回款目标</td> <td>回款目标</td>
<td>回款金额</td> <td>回款金额</td>
<td>客户</td> <td>客户</td>
......
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
{ {
name:'访问来源', name:'访问来源',
type:'pie', type:'pie',
radius: ['60%', '90%'], radius: ['60%', '80%'],
avoidLabelOverlap: false, avoidLabelOverlap: false,
label: { label: {
normal: { normal: {
......
...@@ -167,8 +167,9 @@ export default { ...@@ -167,8 +167,9 @@ export default {
this.resize(this.chart6,1.35) this.resize(this.chart6,1.35)
}) })
}) })
this.$nextTick(()=>{
this.searchData(); this.searchData();
})
this.global.$off('searchData'); this.global.$off('searchData');
this.global.$on('searchData',()=>{ this.global.$on('searchData',()=>{
...@@ -234,7 +235,7 @@ export default { ...@@ -234,7 +235,7 @@ export default {
dStartDate:this.search.dBeginDate, dStartDate:this.search.dBeginDate,
dEndDate:this.search.dEndDate dEndDate:this.search.dEndDate
} }
},true,{iProjectId:this.iProjectId}) },"加载中",{iProjectId:this.iProjectId})
Object.assign(this.chartData,{ Object.assign(this.chartData,{
nOrderSameRatio:Math.round((value.set1&&value.set1[0]&&value.set1[0].nOrderSameRatio||0)*100)/100, nOrderSameRatio:Math.round((value.set1&&value.set1[0]&&value.set1[0].nOrderSameRatio||0)*100)/100,
nOrderRingRatio:Math.round((value.set2&&value.set2[0]&&value.set2[0].nOrderRingRatio||0)*100)/100, nOrderRingRatio:Math.round((value.set2&&value.set2[0]&&value.set2[0].nOrderRingRatio||0)*100)/100,
...@@ -246,8 +247,18 @@ export default { ...@@ -246,8 +247,18 @@ export default {
iSellCount:value.set4&&value.set4[0]&&value.set4[0].iSellCount||0, iSellCount:value.set4&&value.set4[0]&&value.set4[0].iSellCount||0,
nSellAmount:(Math.round((value.set4&&value.set4[0]&&value.set4[0].nSellAmount||0)/100)/100).toLocaleString(), nSellAmount:(Math.round((value.set4&&value.set4[0]&&value.set4[0].nSellAmount||0)/100)/100).toLocaleString(),
}, },
set5:typeof value.set5=='object'&&value.set5.length>0&&value.set5||[], set5:typeof value.set5=='object'&&value.set5.length>0&&value.set5.map(v=>{
set6:typeof value.set6=='object'&&value.set6.length>0&&value.set6||[], return{
name:v.sCustomerName,
value:v.nAmount
}
})||[],
set6:typeof value.set6=='object'&&value.set6.length>0&&value.set6.map(v=>{
return{
name:v.sSampleMaterialNo,
value:v.nAmount
}
})||[],
}) })
}, },
...@@ -399,27 +410,28 @@ export default { ...@@ -399,27 +410,28 @@ export default {
} }
} }
}, },
toolbox: { // toolbox: {
feature: { // feature: {
// dataView: {show: true, readOnly: false}, // // dataView: {show: true, readOnly: false},
// magicType: {show: true, type: ['line', 'bar']}, // // magicType: {show: true, type: ['line', 'bar']},
restore: {show: true}, // restore: {show: true},
// saveAsImage: {show: true} // // saveAsImage: {show: true}
}, // },
}, // },
grid: { grid: {
left: '2%', // 与容器左侧的距离 left: '2%', // 与容器左侧的距离
right: '2%', // 与容器右侧的距离 right: '2%', // 与容器右侧的距离
height:160, top:"40",
height:180,
containLabel: true containLabel: true
}, },
legend: { // legend: {
data:['金额','数量'], // data:['金额','数量'],
x: 'left' // x: 'left'
}, // },
xAxis: [{ xAxis: [{
type: 'category', type: 'category',
data: data.value.map(v=>v.sCustomerName), data: data.value.map(v=>v.name),
axisPointer: { axisPointer: {
type: 'shadow' type: 'shadow'
}, },
...@@ -427,7 +439,8 @@ export default { ...@@ -427,7 +439,8 @@ export default {
alignWithLabel: true alignWithLabel: true
}, },
axisLabel: { axisLabel: {
interval:0 interval:0,
rotate:-15,
}, },
}], }],
yAxis: [ yAxis: [
...@@ -444,20 +457,20 @@ export default { ...@@ -444,20 +457,20 @@ export default {
} }
} }
}, },
{ // {
type: 'value', // type: 'value',
name: '数量', // name: '数量',
scale:true, // scale:true,
axisLabel: { // axisLabel: {
formatter: '{value}' // formatter: '{value}'
} // }
} // }
], ],
series: [ series: [
{ {
name:'金额', name:'金额',
type:'bar', type:'bar',
data:data.value.map(v=>v.nAmount), data:data.value.map(v=>v.value),
barWidth:32, barWidth:32,
color:new echarts.graphic.LinearGradient(0.5, 0, 0.5, 1, [{ color:new echarts.graphic.LinearGradient(0.5, 0, 0.5, 1, [{
offset: 0, offset: 0,
...@@ -467,17 +480,17 @@ export default { ...@@ -467,17 +480,17 @@ export default {
color: '#00B2EE' color: '#00B2EE'
}]) }])
}, },
{ // {
name:'数量', // name:'数量',
type:'line', // type:'line',
yAxisIndex: 1, // yAxisIndex: 1,
data:data.value.map(v=>v.nQty), // data:data.value.map(v=>v.nQty),
itemStyle:{ // itemStyle:{
normal:{ // normal:{
color:'#708bf6' // color:'#708bf6'
} // }
} // }
} // }
], ],
dataZoom: [{ dataZoom: [{
type: 'inside', type: 'inside',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment