Merge branch 'blueBranch' into allTestUrgent

src/views/mediaStatistics/modules/futureTwelveMonths.vue

@@ -98,13 +98,13 @@ export default {
         if (num == index){
           this.chartMapData[indexNew] = {
             "signdate_due":item.signdate_due,
-            "value":Math.round(this.tool.unitConversion(item.signamount_due,10000)),
+            "value":Math.round(this.tool.unitConversion(item.signamount_due,10000)*100)/100,
             "name":this.$t('预计签约金额')+ this.$t('(万)')
           }
           indexNew = indexNew + 1
           this.chartMapData[indexNew] = {
             "signdate_due":item.signdate_due,
-            "value":Math.round(this.tool.unitConversion(item.dealamount_due,10000)),
+            "value":Math.round(this.tool.unitConversion(item.dealamount_due,10000)*100)/100,
             "name":this.$t('预计成交金额') + this.$t('(万)')
           }
           indexNew = indexNew + 1
@@ -142,14 +142,16 @@ export default {
               fontSize:12
             },
             formatter: (datum) =>{
-              return '¥' + this.tool.formatAmount(datum.value,0)
+              console.log(datum.value)
+              return '¥' + this.tool.formatAmount(datum.value,2)
             }
           },
           tooltip: {
             formatter: (datum) => {
+              console.log(datum.value)
               return {
                 name:datum.name,
-                value:'¥' + this.tool.formatAmount(datum.value,0)
+                value:'¥' + this.tool.formatAmount(datum.value,2)
               }
             }
           },

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -159,7 +159,7 @@
             background
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="projectParam.content.pageNumber"
+            :current-page="siteid == 'HY' || siteid == 'YOSTEST1'?transactionParam.content.pageNumber:projectParam.content.pageNumber"
             :page-sizes="[20,50,100,150]"
             :page-size="20"
             layout="total,sizes, prev, pager, next, jumper"
@@ -263,6 +263,8 @@ export default {
           "dataid": "0",
           "stagename":[],
           "signdate_due":'',
+          "pageNumber": 1,
+          "pageSize": 20,
           "where": {
             "tradefield": "",
             "isleave":"",
@@ -848,13 +850,25 @@ export default {
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
-      this.projectParam.content.pageSize = val
-      this.getProjectList()
+      if (this.siteid == 'HY' || this.siteid == 'YOSTEST1'){
+        this.transactionParam.content.pageSize = val
+        this.queryProject(this.transactionParam.content.signdate_due)
+      }else {
+        this.projectParam.content.pageSize = val
+        this.getProjectList()
+      }
+
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.projectParam.content.pageNumber = val
-      this.getProjectList()
+      if (this.siteid == 'HY' || this.siteid == 'YOSTEST1'){
+        this.transactionParam.content.pageNumber = val
+        this.queryProject(this.transactionParam.content.signdate_due)
+      }else {
+        this.projectParam.content.pageNumber = val
+        this.getProjectList()
+      }
+
     },
     /*获取领域*/
     async queryTradeField(){
@@ -971,6 +985,7 @@ export default {
     },
     clickChart(date){
       this.transactionParam.content.signdate_due = date
+      this.transactionParam.content.pageNumber = 1
       this.queryProject(date)
     },
     async queryProject(date){