代码合并 -01

dfda02d0 · wangjinjing · bea1ee8f · dfda02d0 · dfda02d0
Commit dfda02d0 authored Apr 25, 2020 by wangjinjing
Hide whitespace changes
Inline Side-by-side

Showing with 322 additions and 135 deletions

.gitignore .gitignore +2 -0

.idea/workspace.xml .idea/workspace.xml +320 -135

No files found.
--- a/.gitignore
+++ b/.gitignore
 /out
 /WebRoot/WEB-INF/classes
+/.idea
+/.settings
\ No newline at end of file
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,8 +10,257 @@
    <bookmark url="file://$PROJECT_DIR$/src/cn/yw/zxld/action/ZxldAction.java" line="460" />
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="44a845d5-f7de-40e2-a1f0-e7bdb36b97fe" name="Default Changelist" comment="">
+    <list default="true" id="44a845d5-f7de-40e2-a1f0-e7bdb36b97fe" name="Default Changelist" comment="代码 管理初始化">
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/impnhyw_war_exploded.xml" beforeDir="false" />
+      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/artifacts/impnhyw_Web.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/artifacts/impnhyw_Web_exploded.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/fastjson-1.2.62.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/javax.websocket-api-1.1.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/quartz-2.3.0.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-messaging-5.1.1.RELEASE.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-websocket-5.1.1.RELEASE.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/down/ip.xlsx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/down/zcxx.xlsx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/frame/assets/easyui/jquery-3.4.1.min.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/main.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/common/js/comboTreePlugin.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/common/js/style.css" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/history/detector/detectorhistorystate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/history/detector/gvdhistorystate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/history/detector/smartsensorhistorystate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/history/xhd/ywxhdhistorystate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/history/xhd/ywxhdhistorystate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/history/xhd/ywxhdhistorystate_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/history/ydp/ywydphistorystate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/history/ydp/ywydphistorystate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/history/ydp/ywydphistorystate_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/history/zxld/zxldhistorystate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/history/zxld/zxldhistorystate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/history/zxld/zxldhistorystate_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/deviceinfo/detectorstate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/deviceinfo/detectorstate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/deviceinfo/nhywjtxhdglstate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/deviceinfo/nhywjtydpglstate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/deviceinfo/nhywjtydpglstate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/deviceinfo/ywmachineinfochose.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/deviceinfo/ywmachineinfochose.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/deviceinfo/ywxhdcurrentstate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/deviceinfo/zxldstate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/deviceinfo/zxldstate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/showDetectorDetail.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/showDetectorDetail.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/showLDDetail.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/showLDDetail.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/showXHDDetail.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/showXHDDetail.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/showYDPDetail.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/showYDPDetail.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/jtsbgl/jtsbgl.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/jtsbgl/jtsbgl.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/main.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/detector/detector.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/detector/detector_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/detector/gvddetector.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/detector/smartsensordetector.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/gvd/gvd.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/js/jquery-1.8.0.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/ksh_kkxx/ksh_kkxx.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/ksh_kkxx/ksh_kkxx.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/ksh_kkxx/ksh_kkxx_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/ksh_kkxx/ksh_kkxx_show_detail.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywjjzcxx/nhywjjzcxx.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywjjzcxx/nhywjjzcxx.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywjjzcxx/nhywjjzcxx_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywjjzcxx/nhywjjzcxxemp.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywjtxcrzgl/jobinfo/ywallworkorderInfo.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywjtxcrzgl/jobinfo/ywallworkorderInfo.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywjtxcrzgl/jobinfo/ywworkorder_detail.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywjtxcrzgl/jobinfo/ywworkorder_detail.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywsbipgl/nhywsbipgl.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywsbipgl/nhywsbipgl.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywsbipgl/nhywsbipgl_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywsbipgl/nhywsbipglemp.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/nhywvideo/sbtdspsr_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/zxld/zxld.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/zxld/zxld.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/zxld/zxld_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount.rar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/maintenancetimeliness/maintenancetimeliness.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/maintenancetimeliness/maintenancetimeliness.js.bak" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/maintenancetimeliness/maintenancetimeliness.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/maintenancetimeliness/maintenancetimeliness20191222.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/onlinedurationcount/onlinedurationcount.js.bak" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/onlinedurationcount/onlinedurationcount.jsp.bak" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/arearecordcount/areaRecordCount.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/arearecordcount/areaRecordCount.js.bak" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/arearecordcount/areaRecordCount.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/arearecordcount/areaRecordCount.jsp.bak" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/latandloncount/jwCount.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/latandloncount/jwCount.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/alarmcount/alarmcount.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/alarmcount/alarmcount.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/alarmcount/alarmcount.jsp.bak" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/alarmcount/alarmcount20191222.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/alarmcount/shownArea.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/onlinecount/onlinecount.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/onlinecount/onlinecount.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/onlinecount/onlinecount.jsp.bak" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/onlinecount/shownOnline.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/yjyd/yjydCount.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/yjyd/yjydCount.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/yjydDefault/notnetwork.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/vqdcount/showCompute.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/vqdcount/showCompute.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/vqdcount/vqdCount.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/vqdcount/vqdCount.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/videoarchivecount/alarmcount/alarmcount.jsp.bak" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/videoarchivecount/alarmcount/alarmcount20191222.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/videoarchivecount/orderinfocount/orderinfocount.jsp.bak" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/videoarchivecount/orderpartmentcount/orderpartmentcount.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/videoarchivecount/orderpartmentcount/orderpartmentcount.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/videoarchivecount/orderpartmentcount/orderpartmentcount_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/videoarchivecount/orderpeoplecount/orderpeoplecount.jsp.bak" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/videoarchivecount/pointvideocount/pointrecord.jsp.bak" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/patroltask/videotaskcompleterate/ywvideotaskdevicelist.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/patroltask/videotaskcompleterate/ywvideotaskdevicelist.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/patroltask/xhdtaskhistory/ywxhdstatusinfo.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/patroltask/xhdtaskhistory/ywxhdstatusinfo.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/patroltask/xhdtaskhistory/ywxhdstatusinfo_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/patroltask/ydptaskhistory/ywydpstatusinfo.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/patroltask/ydptaskhistory/ywydpstatusinfo.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/patroltask/ydptaskhistory/ywydpstatusinfo_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/ptxzs - 副本.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/ptxzs - 副本.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/tree/MtrSearchZTree.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/tree/bootstrap.min.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/tree/css/demo.css" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/tree/css/zTreeStyle/img/line_conn.gif" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/tree/css/zTreeStyle/img/loading.gif" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/tree/css/zTreeStyle/img/zTreeStandard.gif" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/tree/css/zTreeStyle/img/zTreeStandard.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/tree/css/zTreeStyle/zTreeStyle.css" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/tree/js/jquery.ztree.all-3.5.min.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/tree/js/jquery.ztree.exhide-3.5.min.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/detectorstate/detectorcurrentstate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/detectorstate/detectorhistorystate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/detectorstate/detectorhistorystate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/detectorstate/detectorstate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/detectorstate/gvdcurrentstate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/detectorstate/smartsensorcurrentstate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/nhywjtxhdglstate/ywmachinestate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/nhywjtxhdglstate/ywxhdinfo.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/nhywjtxhdglstate/ywxhdinfo.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/nhywjtydpglstate/nhywjtydpglstate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/nhywjtydpglstate/nhywjtydpglstate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/nhywjtydpglstate/ywydpcurrentstate_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/nhywjtydpglstate/ywydphistorystate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/nhywjtydpglstate/ywydphistorystate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/nhywjtydpglstate/ywydpinfo.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/zxldstate/zxldcurrentstate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/zxldstate/zxldcurrentstate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/zxldstate/zxldcurrentstate_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/zxldstate/zxldhistorystate.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/zxldstate/zxldhistorystate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/zxldstate/zxldstate.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/repairmanage/checkWorkOrder/ywrepaircheck.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/repairmanage/checkWorkOrder/ywrepaircheck.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/repairmanage/checkWorkOrder/ywrepaircheckpage.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/repairmanage/checkWorkOrder/ywrepaircheckpage.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/repairmanage/ywworkorder/ywcheckworkorder.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/repairmanage/ywworkorder/ywcheckworkorder.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/jobinfo/ywrepairDevicejobinfo.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/jobinfo/ywrepairDevicejobinfo.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/map/toolbar_operation/itemPage/detector-search.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/map/toolbar_operation/itemPage/detector-search.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/map/toolbar_operation/itemPage/ld-search.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/map/toolbar_operation/itemPage/ld-search.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/resource/images/icons/dc-red.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/resource/images/icons/dc.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/resource/images/icons/ld-red.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/resource/images/icons/ld.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/resource/images/icons/video_noxj.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/resource/images/icons/video_xj.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/resource/images/icons/wb-red.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/resource/images/icons/wb.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/xhdmanage/xhdinfo/ywxhdinfo.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/xhdmanage/xhdinfo/ywxhdinfo.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/xhdmanage/xhdinfo/ywxhdinfo2.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/xhdmanage/xhdinfo/ywxhdtask_show.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/xhdmanage/xhdinfo/ywxhdtask_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/xhdmanage/ywvxhdtaskbyslist/addxhdList.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/xhdmanage/ywvxhdtaskbyslist/addxhdList.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ydpmanage/ydpinfo/ywydpinfo.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/ydpmanage/ydpinfo/ywydpinfo.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/yw/log/smslog/ywalarmsmslog.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/js/jquery-1.8.0.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywdzjkgl/nhywazxxgl.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywdzjkgl/nhywazxxgl_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywdzjkgl/nhywsbcsglxx.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywdzjkgl/nhywsbcsglxx_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywjjzcxx/nhywjjzcxx.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywjjzcxx/nhywjjzcxx.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywjjzcxx/nhywjjzcxx_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywjjzcxx/nhywjjzcxxemp.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywjtbxgl/nhywjtbxgl.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywvideo/sbtdspsr_show.jsp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/config/db2.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/config/szmap/mainConfig - 副本.json" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/impnhyw.rar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/impnhyw1227.rar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src.rar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/base/util/ImportExcelUtil.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/base/util/TreeUtil.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/im/ptxztree/model/PtxzsNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/map/szmap/action/SzMapStatisAction.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/map/szmap/dao/SzMapStatisDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/map/szmap/service/SzMapStatisService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/nhyw/khpj/action/YwglbmkhAction.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/nhyw/khpj/dao/YwglbmkhDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/nhyw/khpj/model/YwglbmkhBean.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/nhyw/khpj/service/YwglbmkhService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/socket/quartz/repaireInfoJob.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/socket/socket/HttpChatSessionConfigurator.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/socket/socket/WebSocketServer.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/detector/action/DetectorAction.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/detector/dao/DetectorDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/detector/model/detectorBean.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/detector/service/DetectorService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/ksh_kkxx/action/KSH_KKXXAction.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/ksh_kkxx/dao/KSH_KKXXDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/ksh_kkxx/model/kSH_KKXXBean.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/ksh_kkxx/service/KSH_KKXXService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/nhywjjzcxx/action/NhywjjzcxxAction.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/nhywjjzcxx/dao/NhywjjzcxxDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/nhywjjzcxx/model/NhywjjzcxxBean.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/nhywjjzcxx/service/NhywjjzcxxService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/nhywjtxcrzgl/action/UploadFileAction.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/nhywsbipgl/action/NhywsbipglAction.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/nhywsbipgl/dao/NhywsbipglDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/nhywsbipgl/model/NhywsbipglBean.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/nhyw/nhywsbipgl/service/NhywsbipglService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/sign/action/SignAction.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/sign/dao/SignDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/sign/model/SignBean.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/sign/service/SignService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/xhd/action/NhywledydpxjbAction.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/xhd/dao/NhywledydpCurrentStateDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/xhd/dao/NhywledydpxjbDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/xhd/model/nhywledydpxjbBean.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/xhd/service/NhywledydpxjbService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/zxld/action/ZxldAction.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/zxld/dao/ZxldDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/zxld/model/zxldBean.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/cn/yw/zxld/service/ZxldService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/sqlmap/Detector.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/sqlmap/Ksh_kkxx.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/sqlmap/Nhywjjzcxx.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/sqlmap/Nhywledydpxjb.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/sqlmap/Nhywsbipgl.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/sqlmap/Sign.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/sqlmap/SzMapStatis.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/sqlmap/Ywalarmcount - 副本.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/sqlmap/Ywglbmkh.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/sqlmap/Zxld.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/libraries/lib.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/lib.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
@@ -133,7 +382,7 @@
      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/classes/sqlmap/Ywvideohistorystate.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/classes/sqlmap/Ywvideosyncaccount.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/classes/sqlmap/Ywvideosyncchannel.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/classes/sqlmap/Ywvideotask.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/classes/sqlmap/Ywvideotask.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/sqlmap/Ywledtask.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/classes/sqlmap/Ywvideotaskbysetlist.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/classes/sqlmap/Ywvideotaskcatalog.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/classes/sqlmap/Ywvideotaskrule.xml" beforeDir="false" />
@@ -145,8 +394,6 @@
      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/classes/szmap/mainConfig.json" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/classes/szmap/mainConfig_CY.json" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/classes/szmap/map.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/Java-WebSocket-1.3.0.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/lib/quartz-2.0.2.jar" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/springBase.xml" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/springBase.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/springService.xml" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/springService.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/WEB-INF/web.xml" afterDir="false" />
@@ -174,7 +421,6 @@
      <change beforePath="$PROJECT_DIR$/WebRoot/yw/history/record/ywrecordhistorystate.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/history/record/ywrecordhistorystate.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/yw/history/video/ywvideohistorystate.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/history/video/ywvideohistorystate.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/yw/history/video/ywvideohistorystate.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/history/video/ywvideohistorystate.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebRoot/yw/homepage/addAlarm.css" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/yw/homepage/addAlarm.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/addAlarm.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/yw/homepage/homepage.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/homepage.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/WebRoot/yw/homepage/homepage.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/homepage/homepage.jsp" afterDir="false" />
@@ -2095,7 +2341,7 @@
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/frame/echarts/doc/asset/js/jquery-1.10.2.min.map" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/frame/echarts/doc/asset/js/jquery.flexslider.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/frame/echarts/doc/asset/js/jquery.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/frame/echarts/doc/asset/js/jquery.min.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/frame/echarts/doc/asset/js/jquery.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/ptxztree/tree/js/jquery.min.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/frame/echarts/doc/asset/js/jquery.min.map" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/frame/echarts/echarts-all.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/frame/echarts/echarts.js" beforeDir="false" />
@@ -2614,9 +2860,9 @@
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/frame/ywlogin/images/mainBg.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/frame/ywlogin/login.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/frame/ywlogin/login.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/im/nhyw/nhywgysglryxx_showjsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/im/nhyw/nhywgysglryxx_showjsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/im/nhyw/nhywgysglryxx_show.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/im/nhyw/nhywgysglryxxjs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/im/nhyw/nhywgysglryxxjs" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/im/nhyw/nhywgysglryxx.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/im/nhyw/nhywgysglryxxjsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/im/nhyw/nhywgysglryxxjsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/im/nhyw/nhywgysglryxx.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/index.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/nhyw/gysgl/cpxhgl/nhywcpxhgl.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/nhyw/gysgl/cpxhgl/nhywcpxhgl.jsp" beforeDir="false" />
@@ -2653,7 +2899,7 @@
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/nhyw/khpj/sbcsgl/nhywsbcsgl.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/nhyw/khpj/sbcsgl/nhywsbcsgl_show.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/nhyw/xxpzgl/xmxxgl/gysxz.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/nhyw/xxpzgl/xmxxgl/jquery.form.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/nhyw/xxpzgl/xmxxgl/jquery.form.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/js/jquery.form.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/nhyw/xxpzgl/xmxxgl/nhywxmglwdxx.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/nhyw/xxpzgl/xmxxgl/nhywxmglwdxx.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/nhyw/xxpzgl/xmxxgl/nhywxmglwdxx_uploadfile.jsp" beforeDir="false" />
@@ -2785,7 +3031,7 @@
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/countalarm/css/count.css" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/countalarm/jw/jwCount.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/countalarm/jw/jwCount.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/countalarm/jw/showCompute.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/countalarm/jw/showCompute.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/latandloncount/showCompute.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/countalarm/jw/showCompute.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/countalarm/jw/showJw.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/countalarm/jw/showJw.jsp" beforeDir="false" />
@@ -2830,8 +3076,8 @@
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/homepage/statisticsGraph.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/homepage/videoTaskPushlet.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/log/smslog/ywalarmsmslog.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/log/smslog/ywalarmsmslog.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/log/smslog/ywalarmsmslog.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/yw/log/smslog/ywalarmsmslog.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/log/smslog/ywalarmsmslog_show.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/log/smslog/ywalarmsmslog_show.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/yw/log/smslog/ywalarmsmslog_show.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/machinealarm/alarmOverview.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/machinealarm/alarmOverview.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/machinealarm/statusSearch.js" beforeDir="false" />
@@ -2851,24 +3097,24 @@
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/machinemanage/machinememory/ywmachinememory.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/machinemanage/machinememory/ywmachinememory_show.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/js/jquery.form.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/js/jquery.timers-1.2.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/js/jquery.timers-1.2.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/js/jquery.timers-1.2.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywdzjkgl/nhywazxxgl.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywdzjkgl/nhywazxxgl.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywdzjkgl/nhywazxxgl.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywdzjkgl/nhywazxxgl.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywdzjkgl/nhywazxxgl_show.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywdzjkgl/nhywsbcsglxx.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywdzjkgl/nhywsbcsglxx.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywdzjkgl/nhywsbcsglxx.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywdzjkgl/nhywsbcsglxx.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywdzjkgl/nhywsbcsglxx_show.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjksbtzxx/nhywjksbtzxx.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjksbtzxx/nhywjksbtzxx.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjksbtzxx/nhywjksbtzxx_show.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtbxgl/nhywjtbxgl.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtbxgl/nhywjtbxgl.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtbxgl/nhywjtbxgl.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/yw/nhyw/nhywjtbxgl/nhywjtbxgl.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtbxgl/nhywjtbxgl_show.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtbxgl/nhywjtbxgl_show_detail.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtbzgl/nhywjtbzgl.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtbzgl/nhywjtbzgl.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtbzgl/nhywjtbzgl_show.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtbzgl/nhywjtbzgl_show_detail.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtbzgl/nhywjtbzgl_show_detail.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/videoarchivecount/orderpartmentcount/nhywjtbzgl_show_detail.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjthlgl/nhywjthlgl.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjthlgl/nhywjthlgl.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjthlgl/nhywjthlgl_show.jsp" beforeDir="false" />
@@ -2877,9 +3123,9 @@
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtjzwxxb/nhywjtjzwxxb.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtjzwxxb/nhywjtjzwxxb_show.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtledydpgl/nhywjtledydpgl.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtledydpgl/nhywjtledydpgl.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtledydpgl/nhywjtledydpgl.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/gvd/gvd.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtledydpgl/nhywjtledydpgl_show.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtledydpgl/nhywjtledydpgl_show.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/gvd/gvd_show.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtledydpgl/nhywjtledydpgl_show_detail.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtledydpgl/nhywjtledydpgl_show_detail.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/nhyw/gvd/gvd_show_detail.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtsbbhgl/nhywjtsbbhgl.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtsbbhgl/nhywjtsbbhgl.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtsbbhgl/nhywjtsbbhgl_show.jsp" beforeDir="false" />
@@ -2906,17 +3152,17 @@
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/nhyw/nhywjtxhdgl/nhywjtxhdgl_show_detail.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/arearecordcount/areaRecordCount.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/arearecordcount/areaRecordCount.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/arearecordcount/showCompute.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/arearecordcount/showCompute.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/arearecordcount/showCompute.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/arearecordcount/showCompute.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/arearecordcount/showCompute.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/arearecordcount/showCompute.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/arearecordcount/showRecord.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/arearecordcount/showRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/arearecordcount/showRecord.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/arearecordcount/showRecord.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/arearecordcount/showRecord.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/arearecordcount/showRecord.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/css/count.css" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/css/count.css" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/css/count.css" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/latandloncount/jwCount.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/latandloncount/jwCount.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/latandloncount/showCompute.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/latandloncount/showCompute.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/latandloncount/showCompute.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/latandloncount/showCompute.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/latandloncount/showJw.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/latandloncount/showJw.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/latandloncount/showJw.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/latandloncount/showJw.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/latandloncount/showJw.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/latandloncount/showJw.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/onlinedurationcount/onlinedurationcount.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/onlinedurationcount/onlinedurationcount.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/regionassessmentcount/regionAssessmentCount.js" beforeDir="false" />
@@ -2927,13 +3173,13 @@
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/regionassessmentcount/showRegion.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/regionassessmentcount/showWeight.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/regionassessmentcount/showWeight.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/alarmcount/EchartsBase.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/alarmcount/EchartsBase.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/alarmcount/EchartsBase.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/alarmcount/alarmcount.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/alarmcount/alarmcount.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/alarmcount/lookJsgs.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/alarmcount/lookJsgs.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/alarmcount/lookJsgs.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/alarmcount/shownArea.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/onlinecount/EchartsBase.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/onlinecount/EchartsBase.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/onlinecount/EchartsBase.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/onlinecount/lookJsgs.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/onlinecount/lookJsgs.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/onlinecount/lookJsgs.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/onlinecount/onlinecount.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/onlinecount/onlinecount.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/onlinecount/shownOnline.jsp" beforeDir="false" />
@@ -2953,17 +3199,17 @@
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/pointvideocount/lookJsgs.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/pointvideocount/pointrecord.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/pointvideocount/pointrecord.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/yjyd/lookJsgs.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/yjyd/lookJsgs.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/yjyd/lookJsgs.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/yjyd/yjydCount.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/yjyd/yjydCount.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/yjydDefault/EchartsBase.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/yjydDefault/EchartsBase.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/videoarchivecount/yjydDefault/EchartsBase.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/yjydDefault/notnetwork.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/yjydDefault/yjydDefaultCount.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/videoarchivecount/yjydDefault/yjydDefaultCount.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/vqdcount/showCompute.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/vqdcount/showCompute.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/vqdcount/showVideo.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/vqdcount/showVideo.js" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/vqdcount/showVideo.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/vqdcount/showVideo.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/vqdcount/showVideo.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/operationcount/operationcount/vqdcount/showVideo.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/vqdcount/vqdCount.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/operationcount/vqdcount/vqdCount.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/patroltask/machinetaskhistory/ywmachinestatusinfo.js" beforeDir="false" />
@@ -2981,13 +3227,13 @@
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/ptxztree/ptxzs_show.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachinecurrentstate.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachinecurrentstate.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachinecurrentstate_show.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachinecurrentstate_show.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/detectorstate/detectorcurrentstate_show.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachinedetail.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachinedetail.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/nhywjtydpglstate/ywydpdetail.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachinehistorystate.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachinehistorystate.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachineinfo.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachineinfo.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachineinfo.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/nhywjtydpglstate/ywnhywjtledydpgl.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachinestate.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywmachinecurrentstate/ywmachinestate.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/recordalarm/nhywjtydpglstate/ywydpstate.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywrecordcurrentstate/playvideo/playvideo.css" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywrecordcurrentstate/playvideo/playvideo.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/recordalarm/ywrecordcurrentstate/playvideo/playvideo.jsp" beforeDir="false" />
@@ -3096,7 +3342,7 @@
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/szmap/business/base/item/iframe/jklk-tab-frame.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/szmap/business/base/item/iframe/jklk-tab-selected-frame.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/szmap/business/base/item/iframe/jklk-tab_show.jsp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/szmap/business/base/item/iframe/monitor-tab-frame.jsp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/szmap/business/base/item/iframe/monitor-tab-frame.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/WebRoot/yw/szmap/business/base/item/iframe/monitor-tab-frame - 副本.jsp" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/szmap/business/base/item/iframe/monitor-tab-selected-frame.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/szmap/business/base/item/iframe/monitor-tab_show.jsp" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/out/artifacts/impnhyw_war_exploded/yw/szmap/business/base/item/iframe/plan/Plan.js" beforeDir="false" />
@@ -3382,27 +3628,11 @@
      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptConst/action/XtclAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptConst/action/XtclAction.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptConst/dao/XtclDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptConst/dao/XtclDao.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptConst/service/XtclService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptConst/service/XtclService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptlog/action/PtyhczrzAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptlog/action/PtyhczrzAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtcdjsAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtcdjsAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtyhAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtyhAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtyhbmAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtyhbmAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtyhbmscbfAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtyhbmscbfAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtyhcdjsAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtyhcdjsAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtyhhmdlAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtyhhmdlAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtyhscbfAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/PtyhscbfAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/SbtdjqqxAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/SbtdjqqxAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/SbtdtpqxAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/bsystem/ptuserrole/action/SbtdtpqxAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/im/ptdlfw/action/PtdlfwAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/im/ptdlfw/action/PtdlfwAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/im/ptdlfw/action/PtdlfwzAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/im/ptdlfw/action/PtdlfwzAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/im/ptlxstore/action/PtlxccqAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/im/ptlxstore/action/PtlxccqAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/im/ptlxstore/action/PtlxccqzAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/im/ptlxstore/action/PtlxccqzAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/im/ptlxstore/action/PtlxccqzglAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/im/ptlxstore/action/PtlxccqzglAction.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/cn/im/ptxztree/action/PtxzsAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/im/ptxztree/action/PtxzsAction.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/cn/im/ptxztree/dao/PtxzsDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/im/ptxztree/dao/PtxzsDao.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/cn/im/ptxztree/service/PtxzsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/im/ptxztree/service/PtxzsService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/cn/im/trafficcount/service/BigScreenService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/im/trafficcount/service/BigScreenService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/cn/im/trafficdevice/dao/TrafficroadinfoDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/im/trafficdevice/dao/TrafficroadinfoDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cn/im/xtyh/action/XtpzyhAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/im/xtyh/action/XtpzyhAction.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/cn/map/szmap/action/SzMapHttpAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/map/szmap/action/SzMapHttpAction.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/cn/map/szmap/cache/CacheManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/map/szmap/cache/CacheManager.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/cn/map/szmap/cache/impl/CheGpsLayerImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/cn/map/szmap/cache/impl/CheGpsLayerImpl.java" afterDir="false" />
@@ -3505,15 +3735,6 @@
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/config/menu.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1740">
-              <caret line="58" column="130" selection-start-line="58" selection-start-column="111" selection-end-line="58" selection-end-column="130" />
-            </state>
-          </provider>
-        </entry>
-      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/cn/yw/video/videostate/action/YwvideocurrentstateAction.java">
          <provider selected="true" editor-type-id="text-editor">
@@ -3541,11 +3762,20 @@
          </provider>
        </entry>
      </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/sqlmap/Ywvideocurrentstate.xml">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="502">
+            <state relative-caret-position="652">
-              <caret line="649" lean-forward="true" selection-start-line="649" selection-end-line="649" />
+              <caret line="654" column="48" selection-start-line="654" selection-start-column="48" selection-end-line="654" selection-end-column="48" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.gitignore">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="90">
+              <caret line="3" column="10" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
            </state>
          </provider>
        </entry>
@@ -3653,7 +3883,6 @@
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
-        <option value="$PROJECT_DIR$/src/cn/yw/xhd/action/NhywledydpCurrentStateAction.java" />
        <option value="$PROJECT_DIR$/src/cn/yw/nhyw/nhywjtledydpgl/action/NhywledydpCurrentStateAction.java" />
        <option value="$PROJECT_DIR$/src/cn/yw/nhyw/nhywjtledydpgl/dao/NhywledydpCurrentStateDao.java" />
        <option value="$PROJECT_DIR$/src/cn/yw/nhyw/nhywjtledydpgl/service/NhywledydpCurrentStateService.java" />
@@ -3704,6 +3933,7 @@
        <option value="$PROJECT_DIR$/src/sqlmap/Ywrepairjobinfo.xml" />
        <option value="$PROJECT_DIR$/src/cn/yw/zxld/service/ZxldService.java" />
        <option value="$PROJECT_DIR$/src/sqlmap/Ywvideocurrentstate.xml" />
+        <option value="$PROJECT_DIR$/.gitignore" />
      </list>
    </option>
  </component>
@@ -3739,55 +3969,6 @@
              <item name="impnhyw" type="b2602c69:ProjectViewProjectNode" />
              <item name="impnhyw" type="462c0819:PsiDirectoryNode" />
            </path>
-            <path>
-              <item name="impnhyw" type="b2602c69:ProjectViewProjectNode" />
-              <item name="impnhyw" type="462c0819:PsiDirectoryNode" />
-              <item name="config" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="impnhyw" type="b2602c69:ProjectViewProjectNode" />
-              <item name="impnhyw" type="462c0819:PsiDirectoryNode" />
-              <item name="out" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="impnhyw" type="b2602c69:ProjectViewProjectNode" />
-              <item name="impnhyw" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="impnhyw" type="b2602c69:ProjectViewProjectNode" />
-              <item name="impnhyw" type="462c0819:PsiDirectoryNode" />
-              <item name="WebRoot" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="impnhyw" type="b2602c69:ProjectViewProjectNode" />
-              <item name="impnhyw" type="462c0819:PsiDirectoryNode" />
-              <item name="WebRoot" type="462c0819:PsiDirectoryNode" />
-              <item name="yw" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="impnhyw" type="b2602c69:ProjectViewProjectNode" />
-              <item name="impnhyw" type="462c0819:PsiDirectoryNode" />
-              <item name="WebRoot" type="462c0819:PsiDirectoryNode" />
-              <item name="yw" type="462c0819:PsiDirectoryNode" />
-              <item name="operationcount" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="impnhyw" type="b2602c69:ProjectViewProjectNode" />
-              <item name="impnhyw" type="462c0819:PsiDirectoryNode" />
-              <item name="WebRoot" type="462c0819:PsiDirectoryNode" />
-              <item name="yw" type="462c0819:PsiDirectoryNode" />
-              <item name="operationcount" type="462c0819:PsiDirectoryNode" />
-              <item name="maintenancetimeliness" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="impnhyw" type="b2602c69:ProjectViewProjectNode" />
-              <item name="impnhyw" type="462c0819:PsiDirectoryNode" />
-              <item name="WebRoot" type="462c0819:PsiDirectoryNode" />
-              <item name="yw" type="462c0819:PsiDirectoryNode" />
-              <item name="operationcount" type="462c0819:PsiDirectoryNode" />
-              <item name="onlinedurationcount" type="462c0819:PsiDirectoryNode" />
-            </path>
          </expand>
          <select />
        </subPane>
@@ -3799,7 +3980,7 @@
  <component name="PropertiesComponent">
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1587744675718" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1587747133634" />
    <property name="last_opened_file_path" value="C:/Program Files/Git/bin/git.exe" />
    <property name="project.structure.last.edited" value="Libraries" />
    <property name="project.structure.proportion" value="0.15" />
@@ -3958,12 +4139,12 @@
      <workItem from="1587517627628" duration="27395000" />
      <workItem from="1587604292686" duration="21547000" />
      <workItem from="1587690073390" duration="25228000" />
-      <workItem from="1587745756799" duration="67000" />
+      <workItem from="1587745756799" duration="969000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="684631000" />
+    <option name="totallyTimeSpent" value="685533000" />
  </component>
  <component name="TodoView">
    <todo-panel id="selected-file">
@@ -3985,7 +4166,7 @@
      <window_info id="UI Designer" order="4" />
      <window_info id="Favorites" order="5" sideWeight="0.29511678" side_tool="true" weight="0.19402985" />
      <window_info id="Web" order="6" sideWeight="0.29511678" side_tool="true" weight="0.19402985" />
-      <window_info content_ui="combo" id="Project" order="7" sideWeight="0.9176598" visible="true" weight="0.19829424" />
+      <window_info active="true" content_ui="combo" id="Project" order="7" sideWeight="0.9176598" visible="true" weight="0.19829424" />
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49946696" weight="0.3531961" />
      <window_info anchor="bottom" id="Run" order="2" weight="0.43445286" />
@@ -4010,7 +4191,7 @@
      <window_info anchor="right" id="Database" order="5" weight="0.32942432" />
      <window_info anchor="right" id="Palette&#9;" order="6" />
      <window_info anchor="right" id="Theme Preview" order="7" />
-      <window_info anchor="right" id="Maven" order="8" weight="0.32942432" />
+      <window_info anchor="right" id="Maven" order="8" visible="true" weight="0.32942432" />
    </layout>
    <layout-to-restore>
      <window_info id="Structure" order="0" sideWeight="0.14931238" side_tool="true" weight="0.17217484" />
@@ -4051,6 +4232,10 @@
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="代码 管理初始化" />
+    <option name="LAST_COMMIT_MESSAGE" value="代码 管理初始化" />
+  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
@@ -4419,13 +4604,6 @@
    </expressions>
  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/cn/map/szmap/service/SzMapStatisService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="358">
-          <caret line="158" column="56" selection-start-line="158" selection-start-column="56" selection-end-line="158" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/src/cn/map/szmap/dao/SzMapStatisDao.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="442">
@@ -4840,8 +5018,15 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/src/sqlmap/Ywvideocurrentstate.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="502">
+        <state relative-caret-position="652">
-          <caret line="649" lean-forward="true" selection-start-line="649" selection-end-line="649" />
+          <caret line="654" column="48" selection-start-line="654" selection-start-column="48" selection-end-line="654" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="3" column="10" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
        </state>
      </provider>
    </entry>