From fc4af63b26a4c45daa0db6ae9df48ce455ba1c54 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期四, 02 七月 2026 19:33:07 +0800
Subject: [PATCH] Revert "update"

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html |   73 +++++++++++++++++++++++++-----------
 1 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
index 6d9ebd3..0e5b55f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
@@ -268,13 +268,6 @@
 <script src="${ctxPath}/modular/system/dataStatistics/tSite.js"></script>
 <script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
 <script>
-    function currentStoreId() {
-        if ($("#objectType").val() == 3) {
-            return $("#objectId").val();
-        }
-        return $("#cCode").val();
-    }
-
 
 
     function search(){
@@ -398,7 +391,11 @@
 
         });
         ajax.set("type",1);
-        ajax.set("storeId", currentStoreId())
+        if($("#objectType").val()==3){
+            ajax.set("id",$("#objectId").val())
+        }else {
+            ajax.set("storeId", $("#cCode").val())
+        }
         ajax.start();
         // 营收
         var income  = echarts.init(document.getElementById('income'));
@@ -424,7 +421,7 @@
 
 
     function srtj() {
-        var id = currentStoreId()
+        var id = $("#cCode").val()
         var beginTime = $("#beginTime").val()
         console.log(id)
         if(id==""){
@@ -553,7 +550,11 @@
         }, function (data) {
 
         });
-        ajax.set("id", id)
+        if($("#objectType").val()==3){
+            ajax.set("id",$("#objectId").val())
+        }else {
+            ajax.set("id", id)
+        }
         ajax.set("time",beginTime);
         ajax.start();
 
@@ -561,7 +562,7 @@
 
 
     function yytj() {
-        let id  = currentStoreId()
+        let id  = $("#cCode").val()
         console.log(id)
         if(id==''){
             Feng.info("请先选择门店");
@@ -686,12 +687,16 @@
         }, function (data) {
 
         });
-        ajax.set("id", id)
+        if($("#objectType").val()==3){
+            ajax.set("id",$("#objectId").val())
+        }else {
+            ajax.set("id", id)
+        }
         ajax.start();
     }
 
     function jxtj()     {
-        var id = currentStoreId()
+        var id = $("#cCode").val()
         console.log(id,333)
         if(id==""){
             Feng.info("请先选择门店");
@@ -804,13 +809,17 @@
 
         });
 
-        ajax.set("id", id)
+        if($("#objectType").val()==3){
+            ajax.set("id",$("#objectId").val())
+        }else {
+            ajax.set("id", id)
+        }
         ajax.start();
 
     }
     function tuifei() {
         var myChart1 = echarts.init(document.getElementById('refund'));
-        let id  = currentStoreId()
+        let id  = $("#cCode").val()
         console.log(id)
         if(id==''){
             Feng.info("请先选择门店");
@@ -885,7 +894,11 @@
 
             };
         });
-        ajax3.set("id", id)
+        if($("#objectType").val()==3){
+            ajax3.set("id",$("#objectId").val())
+        }else {
+            ajax3.set("id", id)
+        }
         ajax3.start();
 
         myChart1.on('legendselectchanged', obj => {
@@ -1000,7 +1013,11 @@
                 ]
             };
         });
-        ajax2.set("id", currentStoreId())
+        if($("#objectType").val()==3){
+            ajax2.set("id",$("#objectId").val())
+        }else {
+            ajax2.set("id", $("#cCode").val())
+        }
         ajax2.start()
 
         myChart6.setOption(option6);
@@ -1023,7 +1040,7 @@
             }
             myChart2.setOption(options, true)
         });
-        let id  = currentStoreId()
+        let id  = $("#cCode").val()
         console.log(id)
         if(id==''){
             Feng.info("请先选择门店");
@@ -1172,7 +1189,11 @@
                 ]
             };
         });
-        ajax2.set("id", id)
+        if($("#objectType").val()==3){
+            ajax2.set("id",$("#objectId").val())
+        }else {
+            ajax2.set("id", id)
+        }
         ajax2.start()
         myChart2.setOption(option2);
         myChart3.setOption(option3);
@@ -1261,7 +1282,11 @@
                 ]
             };
         });
-        ajax2.set("id", currentStoreId())
+        if($("#objectType").val()==3){
+            ajax2.set("id",$("#objectId").val())
+        }else {
+            ajax2.set("id", $("#cCode").val())
+        }
         ajax2.start()
         myChart7.setOption(option7);
     }
@@ -1289,7 +1314,7 @@
             }
             myChart5.setOption(options, true)
         });
-        let id  = currentStoreId()
+        let id  = $("#cCode").val()
         console.log(id)
         if(id==''){
             Feng.info("请先选择门店");
@@ -1397,7 +1422,11 @@
             };
         });
 
-        ajax2.set("id", id)
+        if($("#objectType").val()==3){
+            ajax2.set("id",$("#objectId").val())
+        }else {
+            ajax2.set("id", id)
+        }
         ajax2.start()
         myChart4.setOption(option4);
         myChart5.setOption(option5);

--
Gitblit v1.7.1