提交代码

src/api/system/firstPage.js

+import request from '@/utils/request'
+
+// 查询数据
+export function allData() {
+  return request({
+    url: '/firstPage/getData',
+    method: 'get',
+  })
+}

src/views/analysis/eattingAnalysis/index.vue

@@ -46,12 +46,12 @@
       <el-table-column label="名称" align="center" prop="userName" />
       <el-table-column label="账号" align="center" prop="employeeId" />
       <el-table-column label="早餐就餐份数" align="center" prop="breakfastCount" />
-      <el-table-column label="早餐就餐总费用" align="center" prop="breakfastPrice" />
+      <el-table-column label="早餐就餐总费用" align="center" prop="breakfastPrice" :formatter="formatterrebreakfastPrice"/>
       <el-table-column label="午餐就餐份数" align="center" prop="lunchCount" />
-      <el-table-column label="午餐就餐总费用" align="center" prop="lunchPrice" />
+      <el-table-column label="午餐就餐总费用" align="center" prop="lunchPrice"  :formatter="formatterrelunchPrice"/>
       <el-table-column label="晚餐就餐份数" align="center" prop="dinnerCount" />
-      <el-table-column label="晚餐就餐总费用" align="center" prop="dinnerPrice" />
-      <el-table-column label="全天用餐总费用" align="center" prop="totalPrice" />
+      <el-table-column label="晚餐就餐总费用" align="center" prop="dinnerPrice" :formatter="formatterredinnerPrice"/>
+      <el-table-column label="全天用餐总费用" align="center" prop="totalPrice" :formatter="formatterretotalPrice"/>
       <el-table-column label="日期" align="center" prop="createDate" />
     </el-table>
 
@@ -122,6 +122,21 @@
       });
     },
     methods: {
+      formatterrebreakfastPrice(row, column) {
+        return row.breakfastPrice / 100;
+      },
+      formatterrelunchPrice(row, column) {
+        return row.lunchPrice / 100;
+      },
+      formatterredinnerPrice(row, column) {
+        return row.dinnerPrice / 100;
+      },
+
+      formatterretotalPrice(row, column) {
+        return row.totalPrice / 100;
+      },
+
+
       /** 查询就餐列表 */
       getList() {
         this.loading = true;

src/views/analysis/personalAnalysis/index.vue

@@ -43,10 +43,11 @@
       <el-table-column label="员工账号" align="center" prop="userId" />
       <el-table-column label="所属部门" align="center" prop="department" />
       <el-table-column label="员工名称" align="center" prop="nickName" />
-      <el-table-column label="余额" align="center" prop="balance" />
-      <el-table-column label="充值数" align="center" prop="rechargeTotal" />
-      <el-table-column label="消费数" align="center" prop="consumeTotal" />
-<!--      <el-table-column label="补贴金额" align="center" prop="allowanceTotal" />-->
+      <el-table-column label="余额" align="center" prop="balance" :formatter="formatterbalance" />
+      <el-table-column label="充值总额" align="center" prop="rechargeTotal" :formatter="formatterrechargeTotal"/>
+      <el-table-column label="待付款" align="center" prop="prepayment"  :formatter="formatterprepayment"/>
+      <el-table-column label="消费总额" align="center" prop="consumeTotal" :formatter="formatterconsumeTotal" />
+      <el-table-column label="补贴金额" align="center" prop="allowanceTotal" :formatter="formatterallowanceTotal" />
     </el-table>
 
     <pagination
@@ -107,6 +108,21 @@
       });
     },
     methods: {
+      formatterbalance(row, column) {
+        return row.balance / 100;
+      },
+      formatterrechargeTotal(row, column) {
+        return row.rechargeTotal / 100;
+      },
+      formatterprepayment(row, column) {
+        return row.prepayment / 100;
+      },
+      formatterconsumeTotal(row, column) {
+        return row.consumeTotal / 100;
+      },
+      formatterallowanceTotal(row, column) {
+        return row.allowanceTotal / 100;
+      },
       /** 查询客餐申请列表 */
       getList() {
         this.loading = true;

src/views/dashboard/PanelGroup.vue

 <template>
-  <el-row :gutter="40" class="panel-group">
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+  <el-row :gutter="40" class="panel-group" >
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col" >
+      <div class="card-panel" >
+        <div class="card-panel-icon-wrapper icon-people">
+          <svg-icon icon-class="people" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            用户总数
+          </div>
+        <div class="card-panel-text2">
+          {{personCount}}
+        </div>
+        </div>
+      </div>
+    </el-col>
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col" >
+      <div class="card-panel"  >
         <div class="card-panel-icon-wrapper icon-people">
-          <svg-icon icon-class="peoples" class-name="card-panel-icon" />
+          <svg-icon icon-class="money" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            访客
+            本月充值金额
+          </div>
+          <div class="card-panel-text2">
+            {{rechargePrice / 100}}
           </div>
-          <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('messages')">
+      <div class="card-panel" >
         <div class="card-panel-icon-wrapper icon-message">
-          <svg-icon icon-class="message" class-name="card-panel-icon" />
+          <svg-icon icon-class="money" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            消息
+            本月消费金额
+          </div>
+          <div class="card-panel-text2">
+            {{consumePrice / 100}}
           </div>
-          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('purchases')">
+      <div class="card-panel">
         <div class="card-panel-icon-wrapper icon-money">
           <svg-icon icon-class="money" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            金额
+            实时余额
+          </div>
+          <div class="card-panel-text2" v-text="balanceTotalPrice / 100">
           </div>
-          <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+      <div class="card-panel" >
         <div class="card-panel-icon-wrapper icon-shopping">
-          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+          <svg-icon icon-class="money" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            订单
+            退款总金额
+          </div>
+          <div class="card-panel-text2">
+            {{drawbackTotalPrice / 100}}
           </div>
-          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -56,22 +78,50 @@
 </template>
 
 <script>
-import CountTo from 'vue-count-to'
-
-export default {
-  components: {
-    CountTo
+  import {
+    allData
+  } from "@/api/system/firstPage";
+
+  export default {
+    data() {
+      return{
+        rechargePrice: null,
+        personCount: null,
+        consumePrice: null,
+        balanceTotalPrice: null,
+        drawbackTotalPrice: null,
+      }
+    },
+    // components: {
+    //   CountTo
+    // },
+    created() {
+     // this.getRechargePrice();
+     // this.getConsumePrice();
+     // this.getDrawbackTotalPrice();
+     // this.getPersonCount();
+     // this.getBalanceTotalPrice();
+     this.getData();
     },
     methods: {
-    handleSetLineChartData(type) {
-      this.$emit('handleSetLineChartData', type)
+      // 获取数据
+      getData() {
+        this.loading = true;
+        allData().then(response => {
+          this.personCount = response.data.personCount;
+          this.rechargePrice = response.data.rechangeAllCount;
+          this.consumePrice = response.data.consumeAllCount;
+          this.balanceTotalPrice = response.data.nowBalanceAllCount;
+          this.drawbackTotalPrice = response.data.drawbackTotalPrice;
+          this.loading = false;
+        });
+      },
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
+  .panel-group {
     margin-top: 18px;
 
     .card-panel-col {
@@ -153,14 +203,22 @@ export default {
           margin-bottom: 12px;
         }
 
+        .card-panel-text2 {
+          line-height: 18px;
+          color: #000000;
+          font-size: 18px;
+          font-weight: bold;
+          margin-bottom: 12px;
+        }
+
         .card-panel-num {
           font-size: 20px;
         }
       }
     }
-}
+  }
 
-@media (max-width:550px) {
+  @media (max-width:550px) {
     .card-panel-description {
       display: none;
     }
@@ -177,5 +235,5 @@ export default {
         float: none !important;
       }
     }
-}
+  }
 </style>

src/views/formalRecipe/formalRecipeCheck/index.vue

@@ -57,7 +57,7 @@
       <el-table-column label="客餐类型" align="center" prop="applyPeriod" />
       <el-table-column label="客餐理由" align="center" prop="remark" />
       <el-table-column label="客餐数量" align="center" prop="applyAmount" />
-      <el-table-column label="客餐总金额" align="center" prop="totalMoneny" />
+      <el-table-column label="客餐总金额" align="center" prop="totalMoneny" :formatter="formatterTotalMoneny"/>
       <el-table-column label="申请人" align="center" prop="nickName" />
       <el-table-column label="所在部门" align="center" prop="deptName" />
       <el-table-column label="状态" align="center" prop="status" >
@@ -154,6 +154,10 @@
       });
     },
     methods: {
+      formatterTotalMoneny(row, column) {
+        return row.totalMoneny/100;
+      },
+
       /** 查询客餐申请列表 */
       getList() {
         this.loading = true;

src/views/index.vue

@@ -2,7 +2,7 @@
   <div class="dashboard-editor-container">
 
     <panel-group @handleSetLineChartData="handleSetLineChartData" />
-
+<!--
     <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
       <line-chart :chart-data="lineChartData" />
     </el-row>
@@ -23,7 +23,7 @@
           <bar-chart />
         </div>
       </el-col>
-    </el-row>
+    </el-row>-->
 
 
   </div>
@@ -59,10 +59,10 @@ export default {
   name: 'Index',
   components: {
     PanelGroup,
-    LineChart,
-    RaddarChart,
-    PieChart,
-    BarChart
+    // LineChart,
+    // RaddarChart,
+    // PieChart,
+    // BarChart
   },
   data() {
     return {

src/views/rule/allowance/index.vue

@@ -11,7 +11,7 @@
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="40" align="center" :show-overflow-tooltip="true"/>
       <el-table-column label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
-      <el-table-column label="补贴" align="center" prop="departmentAllowance" :show-overflow-tooltip="true"/>
+      <el-table-column label="补贴" align="center" prop="departmentAllowance" :formatter="formatter" :show-overflow-tooltip="true"/>
     </el-table>
 
     <!--分页按钮组-->
@@ -69,6 +69,10 @@
       this.getList()
     },
     methods: {
+      formatter(row, column) {
+        return row.departmentAllowance / 100;
+      },
+
       /** get all announcement list */
       getList() {
         this.loading = true;
@@ -102,7 +106,7 @@
         this.reset();
         const depId = row.depId || this.ids[0]
         getCurrentDepAllowance(depId).then(response => {
-          let departmentAllowance = parseFloat(response.data.departmentAllowance)
+          let departmentAllowance = parseFloat(response.data.departmentAllowance )/ 100
           this.form = response.data;
           response.data.departmentAllowance = departmentAllowance
           this.open = true;
@@ -113,8 +117,8 @@
       submitForm: function() {
         this.$refs["form"].validate(valid => {
           if (valid) {
-            if (this.form.depId != undefined) {
-              console.log(this.form)
+            if (this.form.depId !== undefined) {
+              this.form.departmentAllowance *= 100
               updateDepAllowance(this.form).then(response => {
                 if (response.code === 200) {
                   this.msgSuccess("修改成功");