Merge remote-tracking branch 'origin/visu_resources' into visu_resources

src/api/monitor.js

@@ -44,7 +44,7 @@ export function rotation(lng,lat,list) {
   // lng = '124.41986560821533';
   // lat = '43.08817137032747';
   return request({
-    url: '/center-fire/VisuForestMonitorCenterController/rotation',
+    url: '/center-resources/VisuForestMonitorCenterController/rotation',
     method: 'post',
     data:{
       lng:lng,

src/components/eventLocation.vue

@@ -483,7 +483,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>摄像头类型：' + (res.data[i].cameraFactory=="1"?"大华":"海康") + '</h4>' +
+                '                  <h4>网络运营商：' + (res.data[i].operatorType == "1" ? "联通" : (res.data[i].operatorType == "2" ? "移动":"电信")) + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +

src/views/monitor.vue

@@ -511,7 +511,8 @@ export default {
               '<span>' +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
-              '                  <h4>摄像头类型：' + (res.data.visuForestCloudCameraBOList[i].cameraFactory=="1"?"大华":"海康") + '</h4>' +
+              '                  <h4>网络运营商：' + (res.data.visuForestCloudCameraBOList[i].operatorType == "1" ? "联通" : (res.data.visuForestCloudCameraBOList[i].operatorType == "2" ? "移动":"电信")) + '</h4>' +
+
               '                </div>' +
               '                </div>' +
               '                </span>' +
@@ -607,7 +608,7 @@ export default {
               '<span>' +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
-              '                  <h4>摄像头类型：' + (res.data[i].cameraFactory=="1"?"大华":"海康") + '</h4>' +
+              '                  <h4>网络运营商：' + (res.data[i].operatorType == "1" ? "联通" : (res.data[i].operatorType == "2" ? "移动":"电信")) + '</h4>' +
               '                </div>' +
               '                </div>' +
               '                </span>' +