资源落点

src/api/components/supermap.js

@@ -28,7 +28,7 @@ export const iconList = {
   'sj-icon-map-centerdata-t-environment-source-pollution': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-environment-source-pollution.png'),//污染源
   'sj-icon-map-centerdata_t_environment_sewage_outlet': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_t_environment_sewage_outlet.png'),//排污口
   'sj-icon-map-centerdata-t-environment-key-enterprise': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-environment-key-enterprise.png'),//重点企业
-
+  'sj-icon-map-centerdata-slmonitor-traffic': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-slmonitor-traffic.png'),//交通精细化摄像头
   // 数据中心传感器
   'sj-icon-map-centerdata_water_quality_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_quality_sensor.png'),//水质传感器
   'sj-icon-map-centerdata_water_gauge': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_gauge.png'),//水尺

src/views/eventdetailsdialog.vue

@@ -313,7 +313,7 @@
         </el-form-item>
         <el-form-item label="联动内容" v-if="eventStatusButton=='ld'">
           <el-input type="textarea" v-model="sendTaskContent"  :maxlength='500' :autosize="{ minRows: 7, maxRows: 7}"
-                    :maxlength='500'    placeholder="请输入联动内容">
+                     placeholder="请输入联动内容">
           </el-input>
         </el-form-item>
         <el-form-item label="联动部门" v-if="eventStatusButton=='ld'">

src/views/monitor.vue

@@ -270,7 +270,7 @@ export default {
       this.getTreeselect();
       this.deptId = Cookies.get("deptId");
       // this.getSensorListByDeptIds()
-      this.getMonitorDeviceAndDataLists();
+      this.getMonitorDeviceAndDataLists(this.deptId);
        this.getDlblistBydeptIds(this.deptId);
       // this.chuanSet();
       this.selectDeviceType(-1);
@@ -897,7 +897,7 @@ export default {
           });
         });
       } else if (that.localMark == "chuan") {
-        that.getSensorListByDeptId()
+        //that.getSensorListByDeptId()
         that.getMonitorDeviceAndDataList(data.id);
       } else if (that.localMark == "la") {
          that.getDlblistBydeptId(this.deptId);
@@ -930,7 +930,7 @@ export default {
       this.placeholderMsg = "请输入传感器名称";
       this.deptId = Cookies.get("deptId");
       let that = this;
-      this.getMonitorDeviceAndDataList(null);
+      this.getMonitorDeviceAndDataList(this.deptId);
       clearInterval(this.cgqTimer);
     },
     //传感器2
@@ -1287,6 +1287,13 @@ export default {
             markersMap.lat = res.data.visuForestCloudCameraBOList[i].latitude;
             markersMap.radius =
               res.data.visuForestCloudCameraBOList[i].cameraRadius;
+            if (res.data.visuForestCloudCameraBOList[i].cameraUse == 1) {
+              markersMap.icon = "sj-icon-map-centerdata-slmonitor";
+            } else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 2) {
+              markersMap.icon = "camera";
+            }else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 3) {
+              markersMap.icon = "sj-icon-map-centerdata-slmonitor-traffic";
+            }
             markersMap.bindPopupHtml =
               '<div class="map-tip">' +
               "<span>" +