tiip_form

src/libs/host.js

@@ -13,8 +13,8 @@ function urlFun(name){
          * 默认公司
          */
         // default:`http://192.168.4.39:5001`,
-        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/hszh_HSFabricTradeTest`,
+        default:`https://weixin.huansi.net/apiproxy/huansi/service/proxy/${userID}`,
 
         /**
          * 基本地址

src/view/tiip/IntReportForms/Repayment.vue

@@ -78,7 +78,7 @@
             </div>
             <table class="DATA">
                 <tr>
-                    <td>#</td>
+                    <td>序号</td>
                     <td>回款目标</td>
                     <td>回款金额</td>
                     <td>客户</td>

src/view/tiip/IntReportForms/revenue.vue

@@ -160,7 +160,7 @@ export default {
                     {
                         name:'访问来源',
                         type:'pie',
-                        radius: ['60%', '90%'],
+                        radius: ['60%', '80%'],
                         avoidLabelOverlap: false,
                         label: {
                             normal: {

src/view/tiip/IntReportForms/salesStatistics.vue

@@ -167,8 +167,9 @@ export default {
                 this.resize(this.chart6,1.35)
             })
         })
-
-        this.searchData();
+        this.$nextTick(()=>{
+            this.searchData();
+        })
         
         this.global.$off('searchData');
         this.global.$on('searchData',()=>{
@@ -234,7 +235,7 @@ export default {
                     dStartDate:this.search.dBeginDate,
                     dEndDate:this.search.dEndDate
                 }
-            },true,{iProjectId:this.iProjectId})
+            },"加载中",{iProjectId:this.iProjectId})
             Object.assign(this.chartData,{
                 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,
@@ -246,8 +247,18 @@ export default {
                     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(),
                 },
-                set5:typeof value.set5=='object'&&value.set5.length>0&&value.set5||[],
-                set6:typeof value.set6=='object'&&value.set6.length>0&&value.set6||[],
+                set5:typeof value.set5=='object'&&value.set5.length>0&&value.set5.map(v=>{
+                    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 {
                         }
                     }
                 },
-                toolbox: {
-                    feature: {
-                        // dataView: {show: true, readOnly: false},
-                        // magicType: {show: true, type: ['line', 'bar']},
-                        restore: {show: true},
-                        // saveAsImage: {show: true}
-                    },
-                },
+                // toolbox: {
+                //     feature: {
+                //         // dataView: {show: true, readOnly: false},
+                //         // magicType: {show: true, type: ['line', 'bar']},
+                //         restore: {show: true},
+                //         // saveAsImage: {show: true}
+                //     },
+                // },
                 grid: {
                     left: '2%',   // 与容器左侧的距离
                     right: '2%', // 与容器右侧的距离
-                    height:160,
+                    top:"40",
+                    height:180,
                     containLabel: true
                 },
-                legend: {
-                    data:['金额','数量'],
-                    x: 'left'
-                },
+                // legend: {
+                //     data:['金额','数量'],
+                //     x: 'left'
+                // },
                 xAxis: [{
                     type: 'category',
-                    data: data.value.map(v=>v.sCustomerName),
+                    data: data.value.map(v=>v.name),
                     axisPointer: {
                         type: 'shadow'
                     },
@@ -427,7 +439,8 @@ export default {
                         alignWithLabel: true
                     },
                     axisLabel: {
-                        interval:0 
+                        interval:0,
+                        rotate:-15,
                     },
                 }],
                 yAxis: [
@@ -444,20 +457,20 @@ export default {
                             }
                         }
                     },
-                    {
-                        type: 'value',
-                        name: '数量',
-                        scale:true,
-                        axisLabel: {
-                            formatter: '{value}'
-                        }
-                    }
+                    // {
+                    //     type: 'value',
+                    //     name: '数量',
+                    //     scale:true,
+                    //     axisLabel: {
+                    //         formatter: '{value}'
+                    //     }
+                    // }
                 ],
                 series: [
                     {
                         name:'金额',
                         type:'bar',
-                        data:data.value.map(v=>v.nAmount),
+                        data:data.value.map(v=>v.value),
                         barWidth:32,
                         color:new echarts.graphic.LinearGradient(0.5, 0, 0.5, 1, [{
                                 offset: 0,
@@ -467,17 +480,17 @@ export default {
                                 color: '#00B2EE'
                         }])
                     },
-                    {
-                        name:'数量',
-                        type:'line',
-                        yAxisIndex: 1,
-                        data:data.value.map(v=>v.nQty),
-                        itemStyle:{
-                            normal:{
-                                color:'#708bf6'
-                            }
-                        }
-                    }
+                    // {
+                    //     name:'数量',
+                    //     type:'line',
+                    //     yAxisIndex: 1,
+                    //     data:data.value.map(v=>v.nQty),
+                    //     itemStyle:{
+                    //         normal:{
+                    //             color:'#708bf6'
+                    //         }
+                    //     }
+                    // }
                 ],
                 dataZoom: [{
                     type: 'inside',