Merge remote-tracking branch 'origin/visu_resources_01_siping_2.5d' into visu_resources_01_siping_2.5d

src/components/eventLocation.vue

@@ -569,7 +569,9 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>网络运营商：' + (res.data[i].operatorType == "1" ? "联通" : (res.data[i].operatorType == "2" ? "移动":"电信")) + '</h4>' +
+                '                  <h4>网络运营商：' + (res.data[i].operatorType == "1" ? "联通" :
+                  (res.data[i].operatorType == "2" ? "移动":
+                    (res.data[i].operatorType == "3" ? "电信":  "无")) + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +

src/views/monitor.vue

@@ -1223,8 +1223,9 @@ import {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>网络运营商：' + (res.data.visuForestCloudCameraBOList[i].operatorType == "1" ?
-                  "联通" : (res.data.visuForestCloudCameraBOList[i].operatorType == "2" ? "移动" : "电信")) + '</h4>' +
+                '                  <h4>网络运营商：' + (res.data[i].operatorType == "1" ? "联通" :
+                  (res.data[i].operatorType == "2" ? "移动":
+                    (res.data[i].operatorType == "3" ? "电信":  "无")) + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
@@ -1370,8 +1371,9 @@ import {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>网络运营商：' + (res.data[i].operatorType == "1" ? "联通" : (res.data[i]
-                  .operatorType == "2" ? "移动" : "电信")) + '</h4>' +
+                '                  <h4>网络运营商：' + (res.data[i].operatorType == "1" ? "联通" :
+                  (res.data[i].operatorType == "2" ? "移动":
+                    (res.data[i].operatorType == "3" ? "电信":  "无")) + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +