Browse Source

修改bug

JX.LI 2 years ago
parent
commit
1fde06ee76
2 changed files with 6 additions and 6 deletions
  1. 2 2
      src/views/eventdetailsdialog.vue
  2. 4 4
      src/views/firespread.vue

+ 2 - 2
src/views/eventdetailsdialog.vue

@@ -1738,7 +1738,7 @@
                     markersMap.parameter = {
                       code: res.data[i].cameraCode,
                       type: res.data[i].cameraFactory ? res.data[i].cameraFactory : 1,
-                      name: res.data[i].name
+                      name: res.data[i].cameraName
                     }
                   }
                 }
@@ -1748,7 +1748,7 @@
                   '<span>' +
                   '                  <div class="d-l-con">' +
                   '                  <div class="d-l-l-text">' +
-                  '                  <h4>资源名称:' + res.data[i].name + '</h4>' +
+                  '                  <h4>资源名称:' + res.data[i].cameraName + '</h4>' +
                   '                </div>' +
                   '                </div>' +
                   '                </span>' +

+ 4 - 4
src/views/firespread.vue

@@ -2388,9 +2388,9 @@
                     markersMap.click = 'preview'
                     // markersMap.parameter = res.data[i].cameraCode
                     markersMap.parameter = {
-                      code: res.data.data[i].cameraCode,
-                      type: res.data.data[i].cameraFactory,
-                      name: res.data[i].name
+                      code: res.data.cameraFactory[i].cameraCode,
+                      type: res.data.cameraFactory[i].cameraFactory,
+                      name: res.data[i].cameraName
                     }
                   }
                 }
@@ -2400,7 +2400,7 @@
                   '<span>' +
                   '                  <div class="d-l-con">' +
                   '                  <div class="d-l-l-text">' +
-                  '                  <h4>资源名称:' + res.data[i].name + '</h4>' +
+                  '                  <h4>资源名称:' + res.data[i].cameraName + '</h4>' +
                   '                </div>' +
                   '                </div>' +
                   '                </span>' +