车辆监控修改显示车辆状态和位置

src/widgets/XJCarWatching/config.json

@@ -7,8 +7,8 @@
     "requestWatchingSetting": {
         "URL_request": "/SysSetting/Info"
     },
-    "requestAllCarInfo": {
-        "URL_Query": "/DeviceUpload/ListCar",
+    "requestAllCarInfo": {                          "_comment":"//获取监控车辆信息的接口",
+        "URL_Query": "/DeviceUpload/ListCarWatch",
         "MSG_Error": "查询车辆信息出错！",
         "MSG_Null": "查询车辆信息为空！"
     },
@@ -50,8 +50,8 @@
         "MSG_error": "查询公司信息出错！",
         "MSG_null": "查询公司信息为空！"
     },
-    "relativeLayerIds": ["car_allPathGraphicLayer", "car_pathShowGraphicLayer", "car_pathMoveGraphicLayer"],
-    "baseLayerIds": ["GraphicLayer_car"],
+    "relativeLayerIds": ["car_activeGraphicLayer","car_allPathGraphicLayer", "car_pathShowGraphicLayer", "car_pathMoveGraphicLayer"],   "_comment":"//车辆轨迹相关graphiclayer图层id",
+    "baseLayerIds": ["GraphicLayer_car"],          "_comment":"//车辆graphiclayer图层id",
     "setSymbol": {
         "PNGPATH_WorkerPng": {
             "onWork": "/widgets/XJCarWatching/css/img/onWork.png",
@@ -101,24 +101,6 @@
         "MSG_error": "查询巡检人员工作日志出错！",
         "MSG_null": "查询巡检人员工作日志为空！"
     },
-    "initWorkerLog": {
-        "IMG_gpsnormal": "widgets/XJCarWatching/css/img/loggpsnormal.png",
-        "IMG_gpserror": "widgets/XJCarWatching/css/img/loggpserror.png",
-        "IMG_onwork": "widgets/XJCarWatching/css/img/logonwork.png",
-        "IMG_offwork": "widgets/XJCarWatching/css/img/logoffwork.png"
-
-
-    },
-    "requestWorkerAllPlanId": {
-        "URL_request": "/Plan/list",
-        "MSG_error": "查询巡检人员巡检计划出错！",
-        "MSG_null": "查询巡检人员巡检计划为空！"
-    },
-    "requestCheckedPoint": {
-        "URL_request": "/Plan/Plan_List_Point_Current",
-        "MSG_error": "查询巡检人员巡检子计划出错！",
-        "MSG_null": "查询巡检人员巡检子计划为空！"
-    },
     "getWorkePoint": "/PlanPoint/List",
     "pathPlayerPng": "widgets/XJCarWatching/css/img/people0.png",
     "setIntervalTime": 3000,
@@ -140,35 +122,9 @@
         "netError": "/widgets/XJCarWatching/css/img/netErrorActive.png",
         "MSG_locateerror": "无定位信息！"
 
-    },
-    "initBaseLayer": {
-        "URL_hidedanger": "/Trouble/List",
-        "URL_worker": "/DeviceUpload/List",
-        "URL_buildsite": "/BuildManage/List",
-        "URL_xjpoint": "/PlanPoint/List",
-        "URL_xjline": "/PlanPoint/List",
-        "URL_region": "/GpsRegion/List",
-        "buildsite_layerid": "Graphiclayer_buildsite",
-        "xjpoint_layerid": "Graphiclayer_xjpoint",
-        "xjline_layerid": "Graphiclayer_xjline",
-        "xjregion_layerid": "Graphiclayer_xjregion"
-    },
-    "requestBuildSiteInfoCallback": {
-        "Str_layerid": "Graphiclayer_buildsite",
-        "URL_symbol": "/widgets/XJCarWatching/css/img/buildsite.png"
-    },
-    "requestXJpointInfoCallback": {
-        "URL_symbol": "/widgets/XJCarWatching/css/img/planpoint.png"
-    },
-    "requestXJLineInfoCallback": {
-        "Str_layerid": "Graphiclayer_xjline"
-
-    },
-    "requestXJRegionInfoCallback": {
-        "Str_layerid": "Graphiclayer_xjregion"
-
     },
     "watchingConfig": {
         "refreshtimespan": 60000
-    }
+    },
+    "ontimespan":300000,       "_comment":"//判断在线与当前时间点的间隔"
 }

src/widgets/XJCarWatching/css/style.scss

@@ -18,9 +18,13 @@
                     padding: 3px 6px;
                     width: 100px;
                 }
-                select.company {
-                    width: 240px;
+                .companySelect{
+                    select.company {
+                        width: 240px;
+                    }
+                    display: none;
                 }
+               
             }
             /* 巡检人员列表样式*/
             .workerlist {