防数据重复加载刷新

package-lock.json

@@ -7,6 +7,7 @@
       "dependencies": {
         "animate.css": "^4.1.1",
         "js-base64": "^3.7.2",
+        "js-md5": "^0.8.3",
         "jweixin-module": "^1.2.0",
         "uni-read-pages": "^1.0.5",
         "uni-simple-router": "^2.0.7",
@@ -78,6 +79,11 @@
       "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.5.tgz",
       "integrity": "sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="
     },
+    "node_modules/js-md5": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.8.3.tgz",
+      "integrity": "sha512-qR0HB5uP6wCuRMrWPTrkMaev7MJZwJuuw4fnwAzRgP4J4/F8RwtodOKpGp4XpqsLBFzzgqIO42efFAyz2Et6KQ=="
+    },
     "node_modules/jweixin-module": {
       "version": "1.6.0",
       "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",

package.json

@@ -2,6 +2,7 @@
   "dependencies": {
     "animate.css": "^4.1.1",
     "js-base64": "^3.7.2",
+    "js-md5": "^0.8.3",
     "jweixin-module": "^1.2.0",
     "uni-read-pages": "^1.0.5",
     "uni-simple-router": "^2.0.7",

pages/statistics/components/general_stat.vue

@@ -7,12 +7,12 @@
     <stat-finance :date-type-obj="dateTypeObj"></stat-finance>
 		<StatRanking is_group :leftText="'汇总明细'"></StatRanking>
 		<view class="sys-background-fff r-30">
-			<StatCapital :leftColor="0" :rightColor="1" :leftText="'任务资金汇总'">
-			</StatCapital>
+			<StatCapital :leftColor="0" :rightColor="1" :leftText="'任务资金汇总'"></StatCapital>
 			<view class="view_line"></view>
-			<StatRanking :is_margin_top="false" :is_type="2" :leftText="'个人业绩排行'"></StatRanking>
+      <StatCapital :leftColor="0" :rightColor="1" :leftText="'在途资金汇总'"></StatCapital>
+<!--			<StatRanking :is_margin_top="false" :is_type="2" :leftText="'个人业绩排行'"></StatRanking>-->
 		</view>
-		<StatSituation :type="1"></StatSituation>
+<!--		<StatSituation :type="1"></StatSituation>-->
 	</view>
 </template>
 
@@ -22,9 +22,10 @@
 	import StatCapital from "../module/stat_capital.vue"
 	import StatSituation from "../module/stat_situation.vue"
   import HeadData from "@/pages/statistics/module/head_data.vue";
-  import {getSysCashier} from "@/api/statistics";
+  import {getSysCashier,getSysPassage} from "@/api/statistics";
   import Stat_finance_chart from "@/pages/statistics/module/stat_finance_chart.vue";
   import StatFinance from "@/pages/statistics/module/stat_finance.vue";
+  import md5 from 'js-md5'
 
 	export default {
     props:{
@@ -64,13 +65,24 @@
           out_num: 0,
           put_money: 0,
           put_num: 0,
-        }
+        },
+        sysPassageObj:{},
+        sendMd5:''
       };
 		},
     methods: {
+      setSendMd5(){
+        let str=JSON.stringify(this.dateTypeObj)
+        return md5(str)
+      },
       initData(){
         if(this.dateTypeObj.censusUserType>0){
-          this.getSysCashier()
+          let sendMd5=this.setSendMd5()
+          if(sendMd5 !== this.sendMd5){
+            this.sendMd5=sendMd5
+            this.getSysCashier()
+            this.getSysPassage()
+          }
         }
       },
       getSysCashier(){
@@ -79,7 +91,86 @@
             this.moneyData=res.data
           }
         })
-      }
+      },
+      //管理员-在途资金汇总
+      getSysPassage(){
+        getSysPassage(this.dateTypeObj).then((res)=>{
+          if(res.code === 1){
+            // let ret = {series:[{data:res.data.list}]}
+            // this.$refs.chartsPieView.show = true
+            // this.$refs.chartsPieView.chartData2 = JSON.parse(JSON.stringify(ret));
+            this.sysPassageObj = res.data
+          }else{
+            // this.$refs.chartsPieView.setNoList()
+          }
+        })
+      },
+
+      // //管理员-行业统计
+      getSysIndustry(){
+        getSysIndustry(this.selectData).then((res)=>{
+          if(res.code === 1){
+            // let ret = {
+            //   categories:res.data.titles,
+            //   series:[{ name: "总业绩(万元)",data:res.data.oneMoney}]
+            // }
+            // this.$refs.chartsAdminTwo.show = true
+            // this.$refs.chartsAdminTwo.chartData3 = JSON.parse(JSON.stringify(ret))
+            let ret = {
+              series:[{data:res.data.roseData}]
+            }
+            this.$refs.chartsRose.show = true
+            this.$refs.chartsRose.chartData2 = JSON.parse(JSON.stringify(ret))
+
+          }else{
+            // this.$refs.chartsAdminTwo.setNoList()
+            this.$refs.chartsRose.setNoList()
+          }
+        })
+      },
+
+      //管理员-年龄区域统计
+      getSysAge(){
+        getSysAge(this.selectData).then((res)=>{
+          if(res.code === 1){
+            let ret = {
+              categories:res.data.titles,
+              series:[
+                {
+                  name: "男",
+                  index: 1,
+                  type: "column",
+                  data: res.data.oneMoney,
+                },
+                {
+                  name: "女",
+                  index: 1,
+                  type: "column",
+                  data: res.data.twoMoney,
+                },
+                {
+                  name: "单数(男)",
+                  type: "line",
+                  style: "curve",
+                  color: "#1890ff",
+                  disableLegend: true,
+                  data: res.data.oneNum,
+                },
+                {
+                  name: "单数(女)",
+                  type: "line",
+                  color: "#2fc25b",
+                  data: res.data.twoNum,
+                },
+              ]
+            }
+            this.$refs.chartsAdminThree.show = true
+            this.$refs.chartsAdminThree.chartData4 = JSON.parse(JSON.stringify(ret));
+          }else{
+            this.$refs.chartsAdminThree.setNoList()
+          }
+        })
+      },
     },
 	}
 </script>

pages/statistics/module/head_filter.vue

@@ -71,7 +71,9 @@
     watch:{
       'userStatusList':function () {
         console.log(this.userStatusList)
-        this.setCensusUserType(0)
+        if(this.dateTypeObj.selectDate!==''){
+          this.setCensusUserType(0)
+        }
       },
       'dateTypeObj':{
         deep:true,
@@ -98,6 +100,9 @@
         }else{
           this.dateTypeObj.selectDate = myYear+'/'+myMonth+'/'+myToday
         }
+        if(this.dateTypeObj.censusUserType===0){
+          this.setCensusUserType(0)
+        }
         this.setTimeData( this.dateTypeObj.selectDate,0)
       },
       setTimeData(date,num){

pages/statistics/module/stat_capital.vue

@@ -1,8 +1,7 @@
 <template>
 	<view class="page-box-bg-fff m-t20 r-30 p-30">
 		<!-- 标题插槽 -->
-		<StatisticsTitle :genre="genre" :leftText="leftText" :rightText="rightText" @onHandle="onHandle">
-		</StatisticsTitle>
+		<StatisticsTitle :genre="genre" :leftText="leftText" :is_right="false" >	</StatisticsTitle>
 		<view class="row-justify-sb center p-lr20">
 			<view class="capital_item">
 				<view class="row-c flex">
@@ -65,7 +64,10 @@
 			rightColor: {
 				type: Number,
 				default: 0
-			}
+			},
+      tabulateData:{
+        default: {}
+      }
 		},
 		data() {
 			return {

yarn.lock

@@ -53,6 +53,11 @@
   "resolved" "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.5.tgz"
   "version" "3.7.5"
 
+"js-md5@^0.8.3":
+  "integrity" "sha512-qR0HB5uP6wCuRMrWPTrkMaev7MJZwJuuw4fnwAzRgP4J4/F8RwtodOKpGp4XpqsLBFzzgqIO42efFAyz2Et6KQ=="
+  "resolved" "https://registry.npmjs.org/js-md5/-/js-md5-0.8.3.tgz"
+  "version" "0.8.3"
+
 "jweixin-module@^1.2.0":
   "integrity" "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
   "resolved" "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz"