commit

src/libs/host.js

@@ -6,7 +6,7 @@ function urlFun(name){
         /**
          * 门市域名
          */
-        // sales:`http://192.168.4.40:5000`,
+        // sales:`http://192.168.4.67:5000`,
         // sales:`http://122.224.36.54:18005`,//测试服务器
         sales:`https://weixin.huansi.net/apiproxy/huansi/Mall`,
         /**

src/main.js

@@ -64,6 +64,7 @@ FastClick.attach(document.body)
 Vue.config.productionTip = false;
 
 router.beforeEach((to, from, next) => {
+  console.log(222)
   if(to.path.indexOf('shopVersion') != -1 && to.params.hasOwnProperty('iProjectId')){
     store.dispatch('setIproject',to.params.iProjectId);
   }

src/view/chart/custom/index.vue

@@ -106,6 +106,8 @@ export default {
 
     await this.getPbcustomer();
     await this.getPbsales();
+    
+    this.global.$off('searchData');
     this.global.$on('searchData',async ()=>{
         await this.getPbcustomer();
         await this.getPbsales();
@@ -189,7 +191,6 @@ export default {
         this.setChart(this.myChart2,this.pbsales,'pbsales')
     },
     setChart(myChart,value,id){
-        console.log(myChart)
         let options = {
            title:{
                subtext:"长按查看详情",

src/view/chart/income/index.vue

@@ -108,6 +108,8 @@ export default {
     
     await this.getPayable();
     await this.getReceivepay();
+    
+    this.global.$off('searchData');
     this.global.$on('searchData',async ()=>{
         await this.getPayable();
         await this.getReceivepay();

src/view/chart/sales/statistics.vue

@@ -169,7 +169,9 @@ export default {
 
         this.iProjectId= this.$route.params.iProjectId;
         this.$store.dispatch('setIproject',this.iProjectId);
-        this.searchData()
+        this.searchData();
+        
+        this.global.$off('searchData');
         this.global.$on('searchData',()=>{
             this.searchData()
         })

src/view/shopVersion/form/empAna/index.vue

@@ -85,7 +85,7 @@ export default {
     data () {
         return {
             search:{
-                dBeginDate:Util.dateFormat(new Date(),'yyyy-01-01'),
+                dBeginDate:Util.dateFormat(new Date(),'yyyy-MM-01'),
                 dEndDate:Util.dateFormat(new Date(),'yyyy-MM-dd')
             },
             typeList:{time:true},
@@ -144,8 +144,7 @@ export default {
                 await this.renderChart3();
             }
         })
-    },
-    async activated(){
+
         window.d = this;
         this.global.$off('searchData');
         //查询条件触发加载
@@ -176,6 +175,9 @@ export default {
                 await this.renderChart3();
             }
         });
+    },
+    async activated(){
+        
     },
     methods:{
         renderResize() {

src/view/shopVersion/form/empAna/mixins/employees.js

@@ -72,14 +72,15 @@ export const employees = {
                     padding: [ 3, 5 ]
                 },
                 onShow: function onShow(ev) {
+                    console.log(ev)
                     const items = ev.items;
                     items[0].name = '';
                     items[0].value = items[0].value + ' 元';
                 }
             });
-            this.chart1.interval().position('sSalesName*nAmount').style({
-                radius: [ 2, 2, 0, 0 ]
-            });
+            // this.chart1.interval().position('sSalesName*nAmount').style({
+            //     radius: [ 2, 2, 0, 0 ]
+            // });
 
             // 定义进度条
             this.chart1.scrollBar({

src/view/shopVersion/form/empAna/mixins/orderAmount.js

@@ -43,9 +43,10 @@ export const orderAmount = {
                 onShow: function onShow(ev) {
                     const items = ev.items;
                     items[0].name = items[0].title;
+                    items[0].value = items[0].value + ' 元';
+                    ev.items.splice(1,1);
                 }
             });
-            this.chart3.line().position('sMonth*nAmount');
             this.chart3.point().position('sMonth*nAmount').style({
                 lineWidth: 1,
                 stroke: '#fff'

src/view/shopVersion/form/empAna/mixins/receivable.js

@@ -43,14 +43,16 @@ export const receivable = {
                 onShow: function onShow(ev) {
                     const items = ev.items;
                     items[0].name = items[0].title;
+                    items[0].value = items[0].value + ' 元';
+                    ev.items.splice(1,1);
                 }
             });
-            this.chart2.line().position('sMonth*nPaydAmount');
+            
+            this.chart2.line().position('sMonth*nPaydAmount').color('#708bf6');
             this.chart2.point().position('sMonth*nPaydAmount').style({
                 lineWidth: 1,
                 stroke: '#fff'
             });
-        
             this.chart2.interaction('pan');
             // 定义进度条
             this.chart2.scrollBar({
@@ -61,8 +63,6 @@ export const receivable = {
                     offsetY: -2
                 }
             });
-            this.chart2.line().position('sMonth*nPaydAmount').color('#708bf6');
-
             this.chart2.render();
         }
     }