9.4

fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue

@@ -95,6 +95,13 @@
           </template>
         </el-table-column>
       </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
       <!--        -->
       <div class="d-b" style="margin-bottom: 15px;margin-top: 20px">
         <div class="d-s">
@@ -207,6 +214,13 @@
           </template>
         </el-table-column>
       </el-table>
+      <pagination
+        v-show="total1>0"
+        :total="total1"
+        :page.sync="queryParams1.page"
+        :limit.sync="queryParams1.pageSize"
+        @pagination="getRuleList"
+      />
     </div>
     <el-dialog
       title="新增/修改分时优惠"
@@ -395,10 +409,7 @@
                   ></el-date-picker>
                 </el-form-item>
               </el-col>
-
             </el-form-item>
-
-
             <el-form-item label="适用时间段" prop="timeType">
               <div>
                 <div class="icon-type" v-for="(item,index) in weekMonthTypeList" :key="index"
@@ -488,6 +499,8 @@ export default {
         pageSize: 5,
         activeType: 1
       },
+      total: 0,
+      total1: 0,
       ruleForm: {
         activeType: 1,
         title: '',
@@ -501,10 +514,39 @@ export default {
       rules: {
         title: [
           {required: true, message: '请输入名称', trigger: 'blur'},
-
         ],
         category: [
-          {required: true, message: '请选择类型', trigger: 'change'}
+          {required: true, message: '请输入名称', trigger: 'blur'},
+        ],
+        activeId: [
+          {required: true, message: '请输入名称', trigger: 'blur'},
+        ],
+        paymentType: [
+          {required: true, message: '请输入支付方式', trigger: 'blur'},
+        ],
+        babelIds: [
+          {required: true, message: '请输入会员标签', trigger: 'blur'},
+        ],
+        moneyMin: [
+          {required: true, message: '请输入实收金额', trigger: 'blur'},
+        ],
+        literMin: [
+          {required: true, message: '请输入加油升数', trigger: 'blur'},
+        ],
+        disMax: [
+          {required: true, message: '请输入优惠金额', trigger: 'blur'},
+        ],
+        dayLimitNum: [
+          {required: true, message: '请输入每人每日参与限制', trigger: 'blur'},
+        ],
+        ruleName: [
+          {required: true, message: '请输入规则名称', trigger: 'blur'},
+        ],
+        levelId: [
+          {required: true, message: '请输入会员等级', trigger: 'blur'},
+        ],
+        limitNum: [
+          {required: true, message: '请输入每人累计参与限制', trigger: 'blur'},
         ],
       },
       centerDialogVisible: false,
@@ -515,6 +557,7 @@ export default {
       oilList: [],
       // 活动规则列表
       queryParams1: {
+        activeType: 1,
         pageNo: 1,
         pageSize: 5,
       },
@@ -648,6 +691,7 @@ export default {
     getRuleList() {
       getPriceRuleList(this.queryParams1).then(res => {
         this.ruleList = res.data.records
+        this.total1 = res.data.total
       })
     },
     // 删除
@@ -719,6 +763,7 @@ export default {
     getList() {
       getRequestList(this.queryParams).then(res => {
         this.tableData = res.data.records
+        this.total = res.data.total
       })
     },
     // 新增分时

fuintAdmin/src/views/shopowner.vue

@@ -137,10 +137,26 @@
       </div>
     </div>
     <div class="b-bs">
-      <div class="la-left">
+      <div class="left-box-t">
         <div>数据展示</div>
       </div>
-      <div class="la-right"></div>
+      <div class="right-box-t">
+        <div style="font-size: 16px;font-weight: bold">员工排行</div>
+        <div class="hui-box">
+          <div style="width: 10%">排名</div>
+          <div>员工姓名</div>
+          <div style="width: 25%">会员充值金额（元)</div>
+          <div style="width: 25%">油品销售金额（元)</div>
+          <div>总销售额（元）</div>
+        </div>
+        <div class="hang-box" v-for="(item,index) in 5" :key="index">
+          <div style="width: 10%">{{index}}</div>
+          <div>员工姓名</div>
+          <div style="width: 25%">9999</div>
+          <div style="width: 25%">6666</div>
+          <div>198888</div>
+        </div>
+      </div>
     </div>
     <div class="bottom_">
       <div class="h-tt" style="margin-bottom: 15px" >数据统计</div>
@@ -307,7 +323,7 @@ export default {
       const chart1 = echarts.init(document.getElementById('cccc'))
       const chart2= echarts.init(document.getElementById('ccct'))
       const chart3= echarts.init(document.getElementById('ctct'))
-
+      const chart4= echarts.init(document.getElementById('cccf'))
       let dataList = []
       let allTotal = 0
       if (this.storeAmount.oilNameList) {
@@ -455,7 +471,6 @@ export default {
             }
           }
         },
-
         legend: {
           data: ['Evaporation','油品交易额','非油品交易额', '会员充值金额','会员消费金额', '会员余额']
         },
@@ -601,12 +616,166 @@ export default {
           containLabel: true
         }
       };
-
+      const option4 = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        legend: {
+          data: ['Evaporation','油品交易额','非油品交易额', '会员充值金额','会员消费金额', '会员余额']
+        },
+        xAxis: [
+          {
+            type: 'category',
+            // data: ['中建锦绣广场1站', '中建锦绣广场2站', '中建锦绣广场3站', '中建锦绣广场4站', '中建锦绣广场5站', '中建锦绣广场6站', '中建锦绣广场7站'],
+            data: storeNameList,
+            axisPointer: {
+              type: 'shadow'
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            name: '金额(元)',
+            // min: 0,
+            // max: 10000,
+            // interval: 2000,
+            axisLabel: {
+              formatter: '{value}'
+            }
+          }
+          // {
+          //   type: 'value',
+          //   name: '',
+          //   min: 0,
+          //   max: 25,
+          //   interval: 5,
+          //   axisLabel: {
+          //     formatter: '{value} '
+          //   }
+          // }
+        ],
+        series: [
+          {
+            name: '油品交易额',
+            color: '#FF9655',
+            type: 'bar',
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              }
+            },
+            barWidth: 13,
+            itemStyle: {
+              normal: {
+                barBorderRadius: [50, 50, 0, 0]
+              }
+            },
+            barGap: '60%',
+            // data: [
+            //   2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
+            // ]
+            data: oilAmountList
+          },
+          {
+            name: '非油品交易额',
+            color: '#55F3FF',
+            type: 'bar',
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              }
+            },
+            barWidth: 13,
+            itemStyle: {
+              normal: {
+                barBorderRadius: [50, 50, 0, 0]
+              }
+            },
+            // data: [
+            //   2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
+            // ]
+            data: noOilAmountList
+          },
+          {
+            name: '会员充值金额',
+            color: '#0DC291',
+            type: 'bar',
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              }
+            },
+            barWidth: 13,
+            itemStyle: {
+              normal: {
+                barBorderRadius: [50, 50, 0, 0]
+              }
+            },
+            // data: [
+            //   2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
+            // ]
+            data: rechargeBalanceList
+          },
+          {
+            name: '会员消费金额',
+            color: '#409EFF',
+            type: 'bar',
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              }
+            },
+            barWidth: 13,
+            itemStyle: {
+              normal: {
+                barBorderRadius: [50, 50, 0, 0]
+              }
+            },
+            // data: [
+            //   2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
+            // ]
+            data: consumeBalanceList
+          },
+          {
+            name: '会员余额',
+            color: '#D55F5F',
+            type: 'bar',
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              }
+            },
+            barWidth: 13,
+            itemStyle: {
+              normal: {
+                barBorderRadius: [50, 50, 0, 0]
+              }
+            },
+            // data: [
+            //   2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3
+            // ]
+            data: userBalanceList
+          }
+        ],
+        grid: {
+          left: '3%',
+          right: '3%',
+          bottom: '3%',
+          containLabel: true
+        }
+      };
       chart.setOption(option)
       chart1.setOption(option1)
       chart2.setOption(option2)
       chart3.setOption(option3)
-
+      chart4.setOption(option4)
 
     }
 
@@ -813,7 +982,7 @@ export default {
   color: #fff;
 }
 .la-left{
-  width: 70%;
+  width: 73%;
   background: #fff;
   border-radius: 10px;
 }
@@ -822,4 +991,31 @@ export default {
   background: #fff;
   border-radius: 10px;
 }
+.hui-box{
+  background: #F4F5F9;
+  border-radius: 8px;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 10px;
+  display: flex;
+  justify-content: space-between;
+  margin: 10px auto;
+  div{
+    width: 20%;
+    text-align: center;
+  }
+}
+.hang-box{
+  border-radius: 8px;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 10px;
+  display: flex;
+  justify-content: space-between;
+  margin: 10px auto;
+  div{
+    width: 20%;
+    text-align: center;
+  }
+}
 </style>