首页/三方登录更新

src/views/dashboard/PanelGroup.vue

@@ -6,7 +6,7 @@
           <img src="@/assets/images/home-icon1.png" alt="">
         </div>
         <div class="card-panel-description">
-          资产数量
+          资产总数量
           <div class="card-panel-text">
             <count-to :start-val="0" :end-val="topObjectNum && topObjectNum.assetTotalNum" :duration="3200" class="card-panel-num" />
           </div>
@@ -32,9 +32,15 @@
           <img src="@/assets/images/home-icon3.png" alt="">
         </div>
         <div class="card-panel-description">
-          仓库
+          仓库总数量
           <div class="card-panel-text">
-            <count-to :start-val="0" :end-val="topObjectNum && topObjectNum.warehouseNum" :duration="3200" class="card-panel-num" />
+            <count-to :start-val="0" :end-val="topObjectNum && topObjectNum.warehouseTotalNum" :duration="3200" class="card-panel-num" />
+          </div>
+        </div>
+        <div class="card-panel-description">
+          本市州仓库
+          <div class="card-panel-text">
+            <count-to :start-val="0" :end-val="topObjectNum && topObjectNum.warehouseNum" :duration="3200" class="card-panel-num" style="color: #ED4A41;" />
           </div>
         </div>
       </div>
@@ -45,9 +51,15 @@
           <img src="@/assets/images/home-icon4.png" alt="">
         </div>
         <div class="card-panel-description">
-          设备
+          设备总数量
+          <div class="card-panel-text">
+            <count-to :start-val="0" :end-val="topObjectNum && topObjectNum.deviceTotalNum" :duration="3200" class="card-panel-num" />
+          </div>
+        </div>
+        <div class="card-panel-description">
+          本市州设备
           <div class="card-panel-text">
-            <count-to :start-val="0" :end-val="topObjectNum && topObjectNum.deviceNum" :duration="3200" class="card-panel-num" />
+            <count-to :start-val="0" :end-val="topObjectNum && topObjectNum.deviceNum" :duration="3200" class="card-panel-num" style="color: #ED4A41;" />
           </div>
         </div>
       </div>

src/views/features/ssoLogin.vue

@@ -96,7 +96,7 @@ export default {
 
             // 延迟跳转，让用户看到成功提示
             setTimeout(() => {
-              this.$router.replace('/')
+              location.href = '/'
             }, 500)
           } else {
             // 登录失败

src/views/home.vue

@@ -188,8 +188,10 @@ export default {
       topObjectNum: {
         assetTotalNum: 0,
         deviceNum: 0,
+        deviceTotalNum: 0,
         fondsNum: 0,
         warehouseNum: 0,
+        warehouseTotalNum: 0,
         stockTakenotNum: 0,
         stockTakeingNum: 0,
         stockTakedNum: 0,
@@ -282,8 +284,10 @@ export default {
         this.topObjectNum = {
           assetTotalNum: data.assetTotalNum || 0,
           deviceNum: data.deviceNum || 0,
+          deviceTotalNum: data.deviceTotalNum || 0,
           fondsNum: data.fondsNum || 0,
           warehouseNum: data.warehouseNum || 0,
+          warehouseTotalNum: data.warehouseTotalNum || 0,
           stockTakenotNum: data.stockTakenotNum || 0,
           stockTakeingNum: data.stockTakeingNum || 0,
           stockTakedNum: data.stockTakedNum || 0,