xsh 3 lat temu
rodzic
commit
d71b52af22
2 zmienionych plików z 24 dodań i 3 usunięć
  1. 1 1
      src/views/MainLayout.vue
  2. 23 2
      src/views/Production/Production.vue

+ 1 - 1
src/views/MainLayout.vue

@@ -29,7 +29,7 @@
       <!--  返回首页    -->
       <div v-show="!isHome" class="main-back" @click="back">首页</div>
     </div>
-    <div class="main-right">
+    <div class="main-right" v-show="isHome">
       <i class="maxTem" v-if="alarm.maxTem" @click="openShow(0)"></i>
       <i class="minTem" v-if="alarm.minTem" @click="openShow(1)"></i>
       <i class="shan" v-if="Object.keys(weatherInfo).length > 0" @click="openShow(2)"></i>

+ 23 - 2
src/views/Production/Production.vue

@@ -141,6 +141,14 @@
             </div> -->
             <div class="sales-content">
               <div class="sales-left">
+                <div class="water">
+                  <p>本月累计销售额</p>
+                  <p>{{ monthSales }}元</p>
+                </div>
+                <div class="water">
+                  <p>本月累计销售量</p>
+                  <p>{{ monthAmount }}头</p>
+                </div>
                 <div class="up">
                   <label>本月销售额</label>
                   <span>{{ weekSales }}元</span>
@@ -375,6 +383,8 @@ export default {
       weekSalesChange: 10,
       weekSalesVolume: 1000,
       weekSalesVolumeChange: -10,
+      monthSales: 0,
+      monthAmount: 0,
       salesChartData: {
         // 销售图的数据
         quantitys: [],
@@ -661,6 +671,8 @@ export default {
         type: 2,
       }).then((res) => {
         if (res.code === 10000) {
+          this.monthSales = res.data.nowMoney.toLocaleString();
+          this.monthAmount = res.data.nowQuantity.toLocaleString();
           this.weekSales = res.data.money;
           this.weekSalesChange = res.data.moneyPercent;
           this.weekSalesVolume = res.data.quantity;
@@ -827,7 +839,7 @@ export default {
   z-index: 10;
 }
 .sales-content {
-  padding-top: 20px;
+  /*padding-top: 20px;*/
   width: 100%;
   display: flex;
   flex-direction: row;
@@ -836,8 +848,9 @@ export default {
 }
 .sales-left {
   width: 23%;
+  height: 100%;
   line-height: 25px;
-  padding-top: 30px;
+  /*padding-top: 30px;*/
 }
 .sales-left > .up {
   margin-bottom: 10px;
@@ -886,6 +899,7 @@ export default {
 /* 销售情况右侧 */
 .sales-right {
   width: 77%;
+  /*height: 90%;*/
   /* border-left: 1px solid rgba(228, 228, 228, 1); */
   /* height: 200px; */
   /* background-color: #fff; */
@@ -1001,4 +1015,11 @@ export default {
   text-align: left;
   text-indent: 2em;
 }
+.water {
+  text-align: center;
+  font-size: 12px;
+}
+.water p {
+  margin: 0;
+}
 </style>