xyh123999 1 year ago
parent
commit
b64c9d787e
1 changed files with 27 additions and 17 deletions
  1. 27 17
      src/views/taskScreen.vue

+ 27 - 17
src/views/taskScreen.vue

@@ -811,17 +811,19 @@ export default {
       let index = 0;
       this.camaraSrc = ["", "", "", "", ""];
       this.camaraName = ["监控名称", "监控名称", "监控名称", "监控名称", "监控名称"];
+
       for (let item in res.data.data) {
-        this.camaraSrc[index] = res.data.data[item].url;
-        this.camaraName[index++] = res.data.data[item].name;
+        // this.camaraSrc[index] = res.data.data[item].url;
+        // this.camaraName[index++] = res.data.data[item].name;
+        let data = {
+          ip: res.data.data[item].ip,
+          Port: res.data.data[item].port,
+          Username: res.data.data[item].username,
+          Password: res.data.data[item].password,
+          channelName: res.data.data[item].channelName
+        };
+         this.camaraData.push(data);
       }
-      setTimeout(() => {
-
-        for(let index = 0; index < this.camaraSrc.length;index++)
-        {
-          this.camaraData.push(this.resolveUrl(this.camaraSrc[index]))
-        }
-      }, 1000);
 
       setTimeout(() => {
         this.HKCamaraShow = true;
@@ -838,16 +840,24 @@ export default {
       this.cardSrc = ["", "", "", "", ""];
       this.cardName = ["监控名称", "监控名称", "监控名称", "监控名称", "监控名称"];
       for (let item in res1.data.data) {
-        this.cardSrc[index1] = res1.data.data[item].url;
-        this.cardName[index1++] = res1.data.data[item].name;
+        // this.cardSrc[index1] = res1.data.data[item].url;
+        // this.cardName[index1++] = res1.data.data[item].name;
+               let data = {
+          ip: res1.data.data[item].ip,
+          Port: res1.data.data[item].port,
+          Username: res1.data.data[item].username,
+          Password: res1.data.data[item].password,
+          channelName: res1.data.data[item].channelName
+        };
+         this.cardData.push(data);
       }
-      setTimeout(() => {
+      // setTimeout(() => {
 
-        for(let index = 0; index < this.cardSrc.length;index++)
-        {
-          this.cardData.push(this.resolveUrl(this.cardSrc[index]))
-        }
-      }, 1000);
+      //   for(let index = 0; index < this.cardSrc.length;index++)
+      //   {
+      //     this.cardData.push(this.resolveUrl(this.cardSrc[index]))
+      //   }
+      // }, 1000);
 
     },
     resolveUrl(url){