Explorar o código

#261 修改「已啟用Hiteach序號數」為「已啟用Hiteach數」及其算法

已啟用Hiteach數:所有啟用且綁定的機台數
Louise Lin %!s(int64=4) %!d(string=hai) anos
pai
achega
a00a9ad309

+ 5 - 2
TEAMModelOS/ClientApp/src/store/module/serviceDriveAuth.js

@@ -21,7 +21,7 @@ export default {
     serialInfo:{
       totalNum:0,
       couldActiveNum:0, //可啟用數:所有未啟用的序號總和 expireStatus=''
-      activeNum:0, //已啟用數:目前啟用的序號總和  expireStatus='A'
+      activeNum:0, //已啟用序號數:目前啟用的序號總和  Jeff=> expireStatus='A',目前改為已啟用Hiteach數 James 所有啟用且綁定的機台數
     }
   },
   getters: {
@@ -88,9 +88,12 @@ export default {
        //計算已啟用數
        let activeNum=0
        data.forEach(item => {
+        
         if(item.expireStatus=='A'){
-          activeNum++
+          //console.log(item.deviceBound.length)
+          activeNum+=item.deviceBound.length
         }
+        
        
 
     });

+ 2 - 2
TEAMModelOS/ClientApp/src/view/serviceDriveAuth/SubComponents/HiteachAuthList.vue

@@ -39,7 +39,7 @@
             </i-col>
             <i-col :xs="24" :sm="24" :md="24" :lg="8">
               <div class="hiteach-info">
-                <p class="nomal-text">已啟用Hiteach序號數</p>
+                <p class="nomal-text">已啟用Hiteach數</p>
                 <p class="info-num">
                  {{ serialInfo.activeNum }}
                 </p>
@@ -171,7 +171,7 @@
                     v-if="i.expireStatus == 'A'||i.expireStatus === ''"
                     >{{ i.endDate == 0 ? "無到期日" : converTime(i.endDate) }}
                   </span>
-                  <span  class="strong-text" v-if="i.expireStatus === ''">(未啟用)</span>
+                  <!--span  class="strong-text" v-if="i.expireStatus === ''">(未啟用)</span-->
                   <span class="strong-text" v-if="i.expireStatus == 'F'"
                     >已到期</span
                   >