Merge branch 'master' of hhq/kmall-pt-general into master

kmall-admin/src/main/webapp/WEB-INF/page/sale/realtimeSalesDetection.html

@@ -12,7 +12,7 @@
             <div class="row" style="border:0;margin-bottom:10px">
                 <div class="col-md-12 selectDiv">
 
-                    日期：<input type="date" name="date2" id="date2" v-model="date2" />&nbsp;
+                    日期：<input type="date" name="salesDate" id="salesDate" v-model="salesDate" />&nbsp;
                     刷新间隔：<input type="number" name="refreshTime" v-model="refreshTime"  id="refreshTime" oninput="if(value > 1000 || value < 1 ){alert('非法输入！');value = ''}"/>秒&nbsp;
 
                     <input type="radio" name="type" value="store" v-model="type" />门店 &nbsp;

kmall-admin/src/main/webapp/js/sale/realtimeSales.js

@@ -8,23 +8,22 @@ $("#jqGrid").jqGrid({
     datatype: "json",
     colModel: [
         {label: '门店编码', name: 'storeId', index: 'storeId', width: 120},
-        {label: '门店名称', name: 'storeName', index: 'storeName', width: 280},
-        {label: '商户编码', name: 'merchSn', index: 'storeId', width: 180},
-        {label: '商户名称', name: 'merchName', index: 'storeName', width: 280},
-        {label: '售价总额', name: 'totalSales', index: 'totalSales',align: 'right',width: 180},
-        {label: '实际销售额', name: 'actualSales', index: 'actualSales',align: 'right',width: 180},
-        {label: '占比 %', name: 'proportion', index: 'proportion',align: 'right',width: 180},
-        {label: '优惠损失', name: 'preferentialLoss', index: 'preferentialLoss',align: 'right',width: 180},
-        {label: '成本总额', name: 'totalCost', index: 'totalCost',align: 'right',width: 180},
-        {label: '毛利', name: 'grossProfit', index: 'grossProfit',align: 'right',width: 180},
-        {label: '毛利率', name: 'grossProfitRatio', index: 'grossProfitRatio',align: 'right',width: 180},
-        {label: '来客数', name: 'guestNumber', index: 'guestNumber',align: 'right',width: 180},
-        {label: '客单价', name: 'guestUnitPrice', index: 'guestUnitPrice',align: 'right',width: 180},
+        {label: '门店名称', name: 'storeName', index: 'storeName', width: 180},
+        {label: '商户编码', name: 'merchSn', index: 'storeId', width: 220},
+        {label: '商户名称', name: 'merchName', index: 'storeName', width: 180},
+        {label: '售价总额', name: 'totalSales', index: 'totalSales',align: 'right',width: 140},
+        {label: '实际销售额', name: 'actualSales', index: 'actualSales',align: 'right',width: 140},
+        {label: '占比 %', name: 'proportion', index: 'proportion',align: 'right',width: 140},
+        {label: '优惠损失', name: 'preferentialLoss', index: 'preferentialLoss',align: 'right',width: 140},
+        {label: '成本总额', name: 'totalCost', index: 'totalCost',align: 'right',width: 140},
+        {label: '毛利', name: 'grossProfit', index: 'grossProfit',align: 'right',width: 140},
+        {label: '毛利率', name: 'grossProfitRatio', index: 'grossProfitRatio',align: 'right',width: 140},
+        {label: '来客数', name: 'guestNumber', index: 'guestNumber',align: 'right',width: 100},
+        {label: '客单价', name: 'guestUnitPrice', index: 'guestUnitPrice',align: 'right',width: 140},
 
         {label: '最后销售时间', name: 'lastSalesTime', index: 'lastSalesTime', align: 'center',width: 180,formatter: function (value) {
                 return transDate(value,'yyyy-MM-dd hh:mm:ss');
-            }},
-        {label: '客单价', name: 'guestUnitPrice', index: 'guestUnitPrice',align: 'right',width: 180}
+            }}
     ],
     viewrecords: true,
     height: 200,
@@ -175,9 +174,7 @@ let vm = new Vue({
     },
     methods: {
         refresh: function () {
-            console.log(vm.showList);
             vm.showList = true;
-            console.log(vm.showList);
             var postParam = {"salesDate":(vm.salesDate==''||vm.salesDate==null)?vm.salesDate='2020-06-02':vm.salesDate, "storeId":vm.storeId==''?'10':vm.storeId}
             $.ajax({
                 url:'../realtimeSalesDetection/query',
@@ -188,12 +185,10 @@ let vm = new Vue({
                     r = r.page.list[0];
                     console.log(r);
 
-
                     vm.storeId = r.storeId;
                     vm.merchSn = r.merchSn;
                     vm.merchName = r.merchName;
                     vm.storeName = r.storeName;
-                    // vm.salesDate = r.salesDate;
                     vm.totalSales = r.totalSales;
                     vm.actualSales = r.actualSales;
                     vm.preferentialLoss = r.preferentialLoss;
@@ -206,6 +201,7 @@ let vm = new Vue({
                     vm.lastSalesTime = r.lastSalesTime;
 
                     vm.seriesList =[];
+                    vm.seriesList2 =[];
                     vm.seriesList.push(
                         {
                             // name: '销售额',
@@ -214,7 +210,7 @@ let vm = new Vue({
                             data: [vm.totalSales]
                         })
                     ;
-                    vm.seriesList2 .push( vm.totalSales);
+                    vm.seriesList2.push( vm.totalSales);
                     console.log(vm.seriesList2);
                     console.log('vm.seriesList2');
 
@@ -262,7 +258,7 @@ let vm = new Vue({
                     vm.seriesList2.push(vm.totalSales2);
 
                     vm.dataList.push(
-                        '['+vm.storeId2+']'+vm.storeName2+'2总销售额('+vm.salesDate2+')'
+                        '['+vm.storeId2+']'+vm.storeName2+'总销售额('+vm.salesDate2+')'
                     );
                     console.log(vm.dataList);
                     myChart.setOption({