From 8e12e678decdf72f546e488601dc0842127aeabc Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 19 十月 2020 16:43:58 +0800
Subject: [PATCH] 加入集群添加loading

---
 src/components/subComponents/ModelCard.vue |   39 +++++++++++++++++++++++++++++++++------
 1 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/components/subComponents/ModelCard.vue b/src/components/subComponents/ModelCard.vue
index 7c07467..061737a 100644
--- a/src/components/subComponents/ModelCard.vue
+++ b/src/components/subComponents/ModelCard.vue
@@ -43,6 +43,9 @@
               <p>
                 <span class="fontStyleForModel">{{ data.cameraAddr }}</span>
               </p>
+              <p>
+                <span class="fontStyleForModel">{{ data.analyServerName }}</span>
+              </p>
               <p style="width:100%">
                 <span v-for="(item,index) in data.alarmRules" :key="index+'rule'">
                   <span class="fontStyleForModel">{{data.taskName}}</span>&nbsp;&nbsp;
@@ -148,15 +151,15 @@
               </p>
               <p>
                 <span class="labelInfo">鎬у埆</span>
-                <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[0]}}</span>
+                <span class="val">{{data.baseInfo[initialIndex].labels | sex}}</span>
               </p>
               <p>
                 <span class="labelInfo">韬唤璇佸彿</span>
-                <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[1]}}</span>
+                <span class="val">{{data.baseInfo[initialIndex].labels | idCard}}</span>
               </p>
               <p>
                 <span class="labelInfo">鎵嬫満鍙�</span>
-                <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[2]}}</span>
+                <span class="val">{{data.baseInfo[initialIndex].labels | phoneNum}}</span>
               </p>
               <p>
                 <span class="labelInfo">浜哄憳绛夌骇</span>
@@ -255,15 +258,15 @@
               </p>
               <p>
                 <span class="labelInfo">鎬у埆</span>
-                <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[0]}}</span>
+                <span class="val">{{data.baseInfo[initialIndex].labels | sex}}</span>
               </p>
               <p>
                 <span class="labelInfo">韬唤璇佸彿</span>
-                <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[1]}}</span>
+                <span class="val">{{data.baseInfo[initialIndex].labels | idCard}}</span>
               </p>
               <p>
                 <span class="labelInfo">鎵嬫満鍙�</span>
-                <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[2]}}</span>
+                <span class="val">{{data.baseInfo[initialIndex].labels | phoneNum}}</span>
               </p>
               <p>
                 <span class="labelInfo">浜哄憳绛夌骇</span>
@@ -321,6 +324,30 @@
     },
     percentage(score) {
       return score.toFixed(2) + "%"
+    },
+    sex(v) {
+      try {
+        let obj = JSON.parse(v)
+        return obj.sex
+      } catch (error) {
+        return v.split("/")[0]
+      }
+    },
+    idCard(v) {
+      try {
+        let obj = JSON.parse(v)
+        return obj.idCard
+      } catch (error) {
+        return v.split("/")[1]
+      }
+    },
+    phoneNum(v) {
+      try {
+        let obj = JSON.parse(v)
+        return obj.phone
+      } catch (error) {
+        return v.split("/")[2]
+      }
     }
   },
   mounted() {

--
Gitblit v1.8.0