Ver código fonte

提交时间202108241718

fanghuisheng 3 anos atrás
pai
commit
1dd675d411
100 arquivos alterados com 2847 adições e 2730 exclusões
  1. 0 3
      .gitignore
  2. 8 0
      .idea/.gitignore
  3. 13 0
      .idea/artifacts/YtIoT_Web_exploded.xml
  4. 7 0
      .idea/encodings.xml
  5. 9 0
      .idea/libraries/code.xml
  6. 10 0
      .idea/libraries/direct_grid_pt2.xml
  7. 9 0
      .idea/libraries/geekflicks.xml
  8. 9 0
      .idea/libraries/geekflicks1.xml
  9. 95 0
      .idea/libraries/lib.xml
  10. 9 0
      .idea/libraries/reference_files.xml
  11. 9 0
      .idea/libraries/start.xml
  12. 6 0
      .idea/misc.xml
  13. 8 0
      .idea/modules.xml
  14. 6 0
      .idea/vcs.xml
  15. 2 1
      WebRoot/WEB-INF/web.xml
  16. 14 2
      WebRoot/view/inspectors/scripts/inspectors.js
  17. 1 1
      WebRoot/view/maintenanceplan/scripts/maintenanceplan.js
  18. 936 1088
      WebRoot/view/patrolplan/scripts/patrolplan.js
  19. 1669 1635
      WebRoot/view/patrolpoint/scripts/patrolpoint.js
  20. 24 0
      YtIoT.iml
  21. 3 0
      out/artifacts/YtIoT_Web_exploded/META-INF/MANIFEST.MF
  22. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/DPAction.cgi
  23. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/DPAction2.cgi
  24. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/DPActionTest.cgi
  25. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/WebAction.bak.cgi
  26. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/WebAction.cgi
  27. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/WebAction2.cgi
  28. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/WebAction3.cgi
  29. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/demo.cgi
  30. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/demo2.cgi
  31. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/demo3.cgi
  32. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/videoact.cgi
  33. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/filter/HTMLFilter.class
  34. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/filter/XssEncode.class
  35. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/filter/XssFilter1.class
  36. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/filter/XssHttpServletRequestWrapper.class
  37. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/CommonUtil/BaseController.class
  38. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/EfAnalysis/dao/YtiotTEfAnalysisDao.class
  39. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/EfAnalysis/dao/YtiotTEfAnalysisDaoImpl.class
  40. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/EfAnalysis/service/YtiotTEfAnalysisService.class
  41. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/EfAnalysis/service/YtiotTEfAnalysisServicesImpl.class
  42. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/MyException/FileUploadException.class
  43. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotTAdminDao.class
  44. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotTAdminDaoImpl.class
  45. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotTAdminVerDao.class
  46. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotTAdminVerDaoImpl.class
  47. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotVUserCompanyDao.class
  48. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotVUserCompanyDaoImpl.class
  49. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotVUserphoneDao.class
  50. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotVUserphoneDaoImpl.class
  51. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/service/YtiotTAdminService.class
  52. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/service/YtiotTAdminServicesImpl.class
  53. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/service/YtiotVUserCompanyService.class
  54. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/service/YtiotVUserCompanyServiceImpl.class
  55. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarm/dao/YtiotVAlarmDao.class
  56. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarm/dao/YtiotVAlarmDaoImpl.class
  57. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarm/service/YtiotVAlarmService.class
  58. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarm/service/YtiotVAlarmServiceImpl.class
  59. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarmpackages/dao/YtiotTcAlarmPackagesDao.class
  60. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarmpackages/dao/YtiotTcAlarmPackagesDaoImpl.class
  61. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarmpackageszb/dao/YtiotTcAlarmPackagesZbDao.class
  62. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarmpackageszb/dao/YtiotTcAlarmPackagesZbDaoImpl.class
  63. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/annotion/AutoLog.class
  64. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/area/dao/YtiotTAreaDao.class
  65. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/area/dao/YtiotTAreaDaoImpl.class
  66. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/area/dao/YtiotTAreaverDao.class
  67. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/area/dao/YtiotTAreaverDaoImpl.class
  68. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/area/service/YtiotTAreaService.class
  69. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/area/service/YtiotTAreaServicesImpl.class
  70. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/aspect/AutoLogAspect$1.class
  71. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/aspect/AutoLogAspect.class
  72. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/auth/TokenAuthBO.class
  73. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/auth/TokenAuthEnum.class
  74. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/auth/TokenAuthService.class
  75. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/building/dao/YtiotTBuildingDao.class
  76. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/building/dao/YtiotTBuildingDaoImpl.class
  77. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/building/dao/YtiotTBuildingverDao.class
  78. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/building/dao/YtiotTBuildingverDaoImpl.class
  79. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/building/service/YtiotTBuildingService.class
  80. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/building/service/YtiotTBuildingServicesImpl.class
  81. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/dao/YtiotTCompanyDao.class
  82. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/dao/YtiotTCompanyDaoImpl.class
  83. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/dao/YtiotTCompanyVerDao.class
  84. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/dao/YtiotTCompanyVerDaoImpl.class
  85. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/dao/YtiotVCompanyDao.class
  86. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/dao/YtiotVCompanyDaoImpl.class
  87. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/service/YtiotTCompanyService.class
  88. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/service/YtiotTCompanyServicesImpl.class
  89. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/service/YtiotVCompanyService.class
  90. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/service/YtiotVCompanyServiceImpl.class
  91. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/AdminController.class
  92. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/AlarmViewController.class
  93. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/AnalysisViewController.class
  94. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/AreaController.class
  95. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/BuildingController.class
  96. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/CheckRecord2Controller.class
  97. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/CheckRecordController.class
  98. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/CompanyController.class
  99. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/CompanyViewController.class
  100. BIN
      out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/DataViewController.class

+ 0 - 3
.gitignore

@@ -1,3 +0,0 @@
-/.idea/
-/out/
-/YtIoT.iml

+ 8 - 0
.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/../../../../../../:\Users\windows\Desktop\YtIoT\.idea/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

+ 13 - 0
.idea/artifacts/YtIoT_Web_exploded.xml

@@ -0,0 +1,13 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="YtIoT:Web exploded">
+    <output-path>$PROJECT_DIR$/out/artifacts/YtIoT_Web_exploded</output-path>
+    <root id="root">
+      <element id="javaee-facet-resources" facet="YtIoT/web/Web" />
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="YtIoT" />
+        </element>
+      </element>
+    </root>
+  </artifact>
+</component>

+ 7 - 0
.idea/encodings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

+ 9 - 0
.idea/libraries/code.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="code">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/WebRoot/res/extjs/docs/guides/mvc_pt3/code.zip!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 10 - 0
.idea/libraries/direct_grid_pt2.xml

@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="direct_grid_pt2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/WebRoot/res/extjs/docs/guides/direct_grid_pt2/start.zip!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/res/extjs/docs/guides/direct_grid_pt2/reference-files.zip!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/geekflicks.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="geekflicks">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/WebRoot/res/extjs/docs/guides/editable_grid_pt2/geekflicks.zip!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/geekflicks1.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="geekflicks1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/WebRoot/res/extjs/docs/guides/editable_grid/geekflicks.zip!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 95 - 0
.idea/libraries/lib.xml

@@ -0,0 +1,95 @@
+<component name="libraryTable">
+  <library name="lib">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/ognl-3.1.14.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/zxing.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/hibernate3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-core-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-websocket-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/joda-time-2.10.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/javax.annotation.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/jboss-transaction-api_1.1_spec-1.0.1.Final.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/org.springframework.web.servlet-3.2.1.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-web-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/hibernate-annotations.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/jackson-databind-2.9.8.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/log4j-1.2.16.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/jackson-annotations-2.9.8.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/jstl-1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/javax.jms.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/commons-logging-1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/httpcore-4.4.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/javase-3.3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/javax.servlet.jsp.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/javax.ejb.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/commons-lang3-3.3.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/commons-fileupload-1.3.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-expression-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/org.eclipse.paho.client.mqttv3-1.1.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/ant-1.9.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/antlr-2.7.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/ehcache-core-2.6.8.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/jackson-core-2.9.8.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/commons-pool.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/c3p0-0.9.5.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/fastjson-1.2.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/commons-httpclient-3.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/json-lib-2.3-jdk15.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/aopalliance-1.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/poi-examples-3.11-20141221.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/com.springsource.org.apache.commons.fileupload-1.2.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/poi-excelant-3.11-20141221.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-webmvc-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/commons-httpclient-contrib.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/cglib-3.2.5.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/commons-lang-2.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-aspects-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/gson-2.3.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/javassist-3.21.0-GA.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-beans-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/commons-collections-3.2.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-aop-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-test-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/hibernate-validator.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/dom4j-1.6.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/httpmime-4.5.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/poi-scratchpad-3.11-20141221.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/javax.resource.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-jdbc-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/commons-codec-1.15.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/slf4j-api-1.7.7.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-tx-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/ejb3-persistence.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/mysql-connector-java-5.1.46-bin.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-messaging-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-context-support-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/aspectjweaver-1.9.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/poi-3.11-20141221.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/xwork-core-2.3.24.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/jboss-interceptors-api_1.1_spec-1.0.0.Beta1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/asm-5.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/commons-beanutils-1.9.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/commons-dbcp.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/poi-ooxml-schemas-3.11-20141221.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/poi-ooxml-3.11-20141221.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/mchange-commons-java-0.2.12.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/c3p0-0.9.5.2-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/hibernate-commons-annotations.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/ezmorph-1.0.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/javax.servlet.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/ant-launcher-1.9.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/httpclient-4.4.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/hibernate-entitymanager.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/commons-io-2.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/core-3.3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/spring-context-4.0.0.RELEASE.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WebRoot/WEB-INF/lib/jboss-logging-3.3.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/reference_files.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="reference-files">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/WebRoot/res/extjs/docs/guides/direct_grid_pt1/reference-files.zip!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 9 - 0
.idea/libraries/start.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="start">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/WebRoot/res/extjs/docs/guides/keyboard_nav/start.zip!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

+ 6 - 0
.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

+ 8 - 0
.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/YtIoT.iml" filepath="$PROJECT_DIR$/YtIoT.iml" />
+    </modules>
+  </component>
+</project>

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

+ 2 - 1
WebRoot/WEB-INF/web.xml

@@ -29,7 +29,7 @@
         <filter-class>cn.com.usky.filter.XssFilter1</filter-class>
     </filter>
     <filter-mapping>
-        <filter-name>XssSqlFilter</filter-name>
+            <filter-name>XssSqlFilter</filter-name>
         <url-pattern>/*</url-pattern>
         <dispatcher>REQUEST</dispatcher>
     </filter-mapping>
@@ -73,6 +73,7 @@
         <url-pattern>*.woff</url-pattern>
         <url-pattern>*.svg</url-pattern>
         <url-pattern>*.html</url-pattern>
+        <url-pattern>*.ico</url-pattern>
     </servlet-mapping>
     <session-config>
         <session-timeout>15</session-timeout>

+ 14 - 2
WebRoot/view/inspectors/scripts/inspectors.js

@@ -322,7 +322,13 @@ Ext.onReady(function(){
 			name:'name',
 			maxLength:20,
 			maxLengthText:'长度不得超出{0}',
-			anchor:'75%'
+			anchor:'75%',
+			listeners: {
+				select: function(o,e){
+					console.log(o,e)
+					// value.replace(/^1(?:3\d|4[4-9]|5[0-35-9]|6[67]|7[013-8]|8\d|9\d)\d{8}$/,'')
+				}
+			}
 		},{
 			fieldLabel:'电话号码',
 			id: 'fa_Inspectors_phone',
@@ -500,7 +506,13 @@ Ext.onReady(function(){
 				name:'name',
 				maxLength:20,
 				maxLengthText:'长度不得超出{0}',
-				anchor:'75%'
+				anchor:'75%',
+				listeners: {
+					select: function(o,e){
+						console.log(o,e)
+						// value.replace(/^1(?:3\d|4[4-9]|5[0-35-9]|6[67]|7[013-8]|8\d|9\d)\d{8}$/,'')
+					}
+				}
 			},{
 				fieldLabel:'电话号码',
 				id: 'fm_inspectors_phone',

+ 1 - 1
WebRoot/view/maintenanceplan/scripts/maintenanceplan.js

@@ -730,7 +730,7 @@ Ext.onReady(function(){
 	
 	var reset1 = function(){
 		document.getElementById('maintenancePlan_title2_input').value = '';
-		document.getElementById('maintenancePlan_title3_input1').value = '';
+		document.getElementById('maintenancePlan_title3_input1').value = '0';
 		$("#plan_name").val('');
 		$("#person_liable_id").val('');
 		show_page();

Diferenças do arquivo suprimidas por serem muito extensas
+ 936 - 1088
WebRoot/view/patrolplan/scripts/patrolplan.js


+ 1669 - 1635
WebRoot/view/patrolpoint/scripts/patrolpoint.js

@@ -6,23 +6,23 @@
  */
 
 Ext.Loader.setConfig({
-    enabled: true
+	enabled: true
 });
 
 Ext.Loader.setPath('Ext.ux', '../../res/extjs/examples/ux');
 
 Ext.require([
-    'Ext.grid.*',
-    'Ext.data.*',
-    'Ext.ux.RowExpander',
-    'Ext.selection.CheckboxModel'
+	'Ext.grid.*',
+	'Ext.data.*',
+	'Ext.ux.RowExpander',
+	'Ext.selection.CheckboxModel'
 ]);
 
 
 var company_code;
-var myStore=null;
-var myStore1=null;
-var V_LOGINNAME='',V_PASSWORD='';
+var myStore = null;
+var myStore1 = null;
+var V_LOGINNAME = '', V_PASSWORD = '';
 var menuidx = '';
 var mouseon;
 var mouseoff;
@@ -40,458 +40,457 @@ var initflag1 = false;
 
 var sm = Ext.create('Ext.selection.CheckboxModel');
 
-Ext.define('Maintenance',{
+Ext.define('Maintenance', {
 	extend: 'Ext.data.Model',
 	fields: [
-		{name:'id',  type:'string'},
-		{name:'xh',  type:'int'},
-		{name:'spot_name',  type:'string'},
-		{name:'company_code',  type:'string'},
-		{name:'spot_address',  type:'string'},
-		{name:'spot_type',  type:'string'},
-		{name:'type_name',  type:'string'},
-		{name:'latest_change_time',  type:'string'},
-		{name:'building_name',  type:'string'},
-		{name:'equipment_code',  type:'string'},
-		{name:'remarks',  type:'string'},
-		{name:'picture_route',  type:'string'},
+		{ name: 'id', type: 'string' },
+		{ name: 'xh', type: 'int' },
+		{ name: 'spot_name', type: 'string' },
+		{ name: 'company_code', type: 'string' },
+		{ name: 'spot_address', type: 'string' },
+		{ name: 'spot_type', type: 'string' },
+		{ name: 'type_name', type: 'string' },
+		{ name: 'latest_change_time', type: 'string' },
+		{ name: 'building_name', type: 'string' },
+		{ name: 'equipment_code', type: 'string' },
+		{ name: 'remarks', type: 'string' },
+		{ name: 'picture_route', type: 'string' },
 	]
 });
 
-Ext.define('CheckRecord3',{
+Ext.define('CheckRecord3', {
 	extend: 'Ext.data.Model',
 	fields: [
-		{name:'id',  type:'string'},
-		{name:'spot_id',  type:'string'},
-		{name:'xh',  type:'int'},
-		{name:'equipment_code',  type:'string'},
-		{name:'device_name',  type:'string'},
-		{name:'unitinfo',  type:'string'},
+		{ name: 'id', type: 'string' },
+		{ name: 'spot_id', type: 'string' },
+		{ name: 'xh', type: 'int' },
+		{ name: 'equipment_code', type: 'string' },
+		{ name: 'device_name', type: 'string' },
+		{ name: 'unitinfo', type: 'string' },
 	]
 });
 
-Ext.define('patrolpoint1',{
+Ext.define('patrolpoint1', {
 	extend: 'Ext.data.Model',
 	fields: [
-		{name:'device_id',  type:'string'},
-		{name:'device_name',  type:'string'},
-		{name:'xh',  type:'int'},
-		{name:'unitinfo',  type:'string'},
+		{ name: 'device_id', type: 'string' },
+		{ name: 'device_name', type: 'string' },
+		{ name: 'xh', type: 'int' },
+		{ name: 'unitinfo', type: 'string' },
 	]
 });
 
-Ext.define('patrolpoint2',{
+Ext.define('patrolpoint2', {
 	extend: 'Ext.data.Model',
 	fields: [
-		{name:'device_id',  type:'string'},
-		{name:'device_name',  type:'string'},
-		{name:'xh',  type:'int'},
-		{name:'unitinfo',  type:'string'},
-		{name:'pd',  type:'string'},
-		
+		{ name: 'device_id', type: 'string' },
+		{ name: 'device_name', type: 'string' },
+		{ name: 'xh', type: 'int' },
+		{ name: 'unitinfo', type: 'string' },
+		{ name: 'pd', type: 'string' },
+
 	]
 });
 
-function checkfilename(){
+function checkfilename() {
 	var subwin = window.frames['file_uploader'].contentWindow;
 	subwin.setpic();
-//	add_pic();
+	//	add_pic();
 }
 
-function checkfilename2(){
+function checkfilename2() {
 	var subwin = window.frames['file_uploader2'].contentWindow;
 	subwin.setpic2();
-//	add_pic();
+	//	add_pic();
 }
 
-var add_pic = function() {
-	 Ext.create('Ext.window.Window', {
-		id:'patrol_point_pic_win',
-	    title: '图片上传',
-	    height: 200,
-	    width: 300,
-	    layout: 'fit',
-	    modal:true,
-	    buttons:[
-	    	{
-	    		text:'上传',
-	    		 handler : function() {
-	    			 var subwin = window.frames['file_uploader'].contentWindow;
-	    			 subwin.uploadpic();
-	    			 Ext.getCmp('patrol_point_pic_win').destroy();
-	    		 }
-	    	}
-	    	,
-	    	{
-	    		text:'关闭',
-	    		 handler : function() {
-	    			 Ext.getCmp('patrol_point_pic_win').destroy();
-	    		 }
-	    	}
-	    ],
-	    closeAction:'destroy',
-	    html:'<div style="padding:20px;">点击上传按钮提交图片文件</div>'
-	 }).show();
+var add_pic = function () {
+	Ext.create('Ext.window.Window', {
+		id: 'patrol_point_pic_win',
+		title: '图片上传',
+		height: 200,
+		width: 300,
+		layout: 'fit',
+		modal: true,
+		buttons: [
+			{
+				text: '上传',
+				handler: function () {
+					var subwin = window.frames['file_uploader'].contentWindow;
+					subwin.uploadpic();
+					Ext.getCmp('patrol_point_pic_win').destroy();
+				}
+			}
+			,
+			{
+				text: '关闭',
+				handler: function () {
+					Ext.getCmp('patrol_point_pic_win').destroy();
+				}
+			}
+		],
+		closeAction: 'destroy',
+		html: '<div style="padding:20px;">点击上传按钮提交图片文件</div>'
+	}).show();
 
 }
 
-function exportbtn_click(){
+function exportbtn_click() {
 	baseUrl = document.getElementById('basePath').value;
 	V_LOGINNAME = $("#V_LOGINNAME").val();
 	V_PASSWORD = $("#V_PASSWORD").val();
 	spot_name = document.getElementById('spot_name').value;
 	spot_address = document.getElementById('spot_address').value;
 	var fields = '';
-	var array = ['id','spot_name','building_name','spot_address','type_name','spot_label_analysis','remarks','latest_change_time'];
-	var excelname = ['编号','点位名称','所属建筑/项目','点位地址','设备类型','点位标签','点位备注','最新改动时间'];
-	for(var i=0;i<8;i++){
-		if(i>0)
+	var array = ['id', 'spot_name', 'building_name', 'spot_address', 'type_name', 'spot_label_analysis', 'remarks', 'latest_change_time'];
+	var excelname = ['编号', '点位名称', '所属建筑/项目', '点位地址', '设备类型', '点位标签', '点位备注', '最新改动时间'];
+	for (var i = 0; i < 8; i++) {
+		if (i > 0)
 			fields += ',';
-	    fields += '{id:"'+array[i]+'",title:"'+excelname[i]+'",shown:"'+true+'"}';
+		fields += '{id:"' + array[i] + '",title:"' + excelname[i] + '",shown:"' + true + '"}';
 	}
-			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			// query.V_PASSWORD = V_PASSWORD;
-			query.spot_name = spot_name;
-			query.spot_address = spot_address;
-			query.EXPORT_FILE = '巡检点位列表';
-			query.fields = '['+fields+']';
-			$.ajax({
-		        type:'POST',
-		        url: baseUrl+"iot/excel/view/XjInspectionPointsExcel1",
-		        data: {
-		        	queryJson : Ext.JSON.encode(query)
-		    	 },
-		    	 success: function(result){
-		    		
-			            var json = eval('(' + result + ')');
-			            if(json.action=='dormExport'){
-			                ConfirmStore = json.RESULT;
-			               
-			                var elemIF = document.createElement("iframe");
-							elemIF.src = baseUrl+json.filename;
-							elemIF.style.display = "none"; 
-							document.body.appendChild(elemIF);
-			            }
-			    
-			        }
-		    });
-			
+	var query = new Object();
+	query.V_LOGINNAME = V_LOGINNAME;
+	// query.V_PASSWORD = V_PASSWORD;
+	query.spot_name = spot_name;
+	query.spot_address = spot_address;
+	query.EXPORT_FILE = '巡检点位列表';
+	query.fields = '[' + fields + ']';
+	$.ajax({
+		type: 'POST',
+		url: baseUrl + "iot/excel/view/XjInspectionPointsExcel1",
+		data: {
+			queryJson: Ext.JSON.encode(query)
+		},
+		success: function (result) {
+
+			var json = eval('(' + result + ')');
+			if (json.action == 'dormExport') {
+				ConfirmStore = json.RESULT;
+
+				var elemIF = document.createElement("iframe");
+				elemIF.src = baseUrl + json.filename;
+				elemIF.style.display = "none";
+				document.body.appendChild(elemIF);
+			}
+
+		}
+	});
+
 }
-var file_result = function(text){
-	Ext.MessageBox.alert('错误信息',text);
+var file_result = function (text) {
+	Ext.MessageBox.alert('错误信息', text);
 	var hiddenFrame = document.getElementById('hiddenFrame');
-	hiddenFrame.innerHTML='<iframe id="file_uploader" width="0" height="0" frameborder="0" src="test.jsp"></iframe>';
+	hiddenFrame.innerHTML = '<iframe id="file_uploader" width="0" height="0" frameborder="0" src="test.jsp"></iframe>';
 }
-var file_result2 = function(text){
-	Ext.MessageBox.alert('错误信息',text);
+var file_result2 = function (text) {
+	Ext.MessageBox.alert('错误信息', text);
 	var hiddenFrame2 = document.getElementById('hiddenFrame2');
-	hiddenFrame2.innerHTML='<iframe id="file_uploader2" width="0" height="0" frameborder="0" src="test2.jsp"></iframe>';
+	hiddenFrame2.innerHTML = '<iframe id="file_uploader2" width="0" height="0" frameborder="0" src="test2.jsp"></iframe>';
 }
-var get_file = function(name){
-//	alert("got file: '"+name+"'");
-	Ext.MessageBox.alert('操作信息','文件上传成功');
-	document.getElementById('patrol_add_picture').setAttribute('src',baseUrl+name);
+var get_file = function (name) {
+	//	alert("got file: '"+name+"'");
+	Ext.MessageBox.alert('操作信息', '文件上传成功');
+	document.getElementById('patrol_add_picture').setAttribute('src', baseUrl + name);
 	Ext.getCmp('patrol_point_addURL').setValue(name);
 	var hiddenFrame = document.getElementById('hiddenFrame');
-	hiddenFrame.innerHTML='<iframe id="file_uploader" width="0" height="0" frameborder="0" src="test.jsp"></iframe>';
+	hiddenFrame.innerHTML = '<iframe id="file_uploader" width="0" height="0" frameborder="0" src="test.jsp"></iframe>';
 }
 
-var get_file2 = function(name){
-//	alert("got file: '"+name+"'");
-	Ext.MessageBox.alert('操作信息','文件上传成功');
-	document.getElementById('patrol_upload_picture').setAttribute('src',baseUrl+name);
+var get_file2 = function (name) {
+	//	alert("got file: '"+name+"'");
+	Ext.MessageBox.alert('操作信息', '文件上传成功');
+	document.getElementById('patrol_upload_picture').setAttribute('src', baseUrl + name);
 	Ext.getCmp('patrol_point_uploadURL').setValue(name);
 	var hiddenFrame2 = document.getElementById('hiddenFrame2');
-	hiddenFrame2.innerHTML='<iframe id="file_uploader2" width="0" height="0" frameborder="0" src="test2.jsp"></iframe>';
+	hiddenFrame2.innerHTML = '<iframe id="file_uploader2" width="0" height="0" frameborder="0" src="test2.jsp"></iframe>';
 }
 
-var body_resize = function(){
-	maxHeight =  document.documentElement.clientHeight;
+var body_resize = function () {
+	maxHeight = document.documentElement.clientHeight;
 	maxWidth = document.documentElement.clientWidth;
 	Ext.getCmp('PatrolpointPiebar').setHeight(maxHeight);
 	Ext.getCmp('PatrolpointPiebar').setWidth(maxWidth);
 }
 
 
-Ext.onReady(function(){  
+Ext.onReady(function () {
 	baseUrl = document.getElementById('basePath').value;
 	var theme = document.getElementById('theme').value;
-	var chkIcon = '<img src="'+baseUrl+'res/img/common/check.gif"/>'
-	var unchkIcon = '<img src="'+baseUrl+'res/img/common/uncheck.gif"/>'
-//	company_code = document.getElementById('company_code').value;
+	var chkIcon = '<img src="' + baseUrl + 'res/img/common/check.gif"/>'
+	var unchkIcon = '<img src="' + baseUrl + 'res/img/common/uncheck.gif"/>'
+	//	company_code = document.getElementById('company_code').value;
 	$("#V_LOGINNAME").val(sessionStorage.getItem('V_LOGINNAME'));
 	$("#V_PASSWORD").val(sessionStorage.getItem('V_PASSWORD'));
 	V_LOGINNAME = $("#V_LOGINNAME").val();
-    V_PASSWORD = $("#V_PASSWORD").val();
+	V_PASSWORD = $("#V_PASSWORD").val();
 	var countPerPage = 15;
 	var maxHeight = 10000;
-	
-	var chkBoolean = function(flag) {
-		if(flag)
+
+	var chkBoolean = function (flag) {
+		if (flag)
 			return chkIcon;
 		return unchkIcon;
 	}
 	var queryJson = new Object();
 	queryJson.V_LOGINNAME = V_LOGINNAME;
 	// queryJson.V_PASSWORD =  V_PASSWORD;
-	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
+	if ((company_code != null) && (company_code != 'null') && (company_code.length > 0))
 		queryJson.company_code = company_code;
-	
-	
-	Ext.define('QrcodeAnalysis2',{
-		extend:'Ext.data.Model',
+
+
+	Ext.define('QrcodeAnalysis2', {
+		extend: 'Ext.data.Model',
 		fields: [
-			{name:'building_name',  type:'string'},
-			{name:'building_id',type:'string'}
+			{ name: 'building_name', type: 'string' },
+			{ name: 'building_id', type: 'string' }
 		]
 	});
-	
-	var getManufacturerId2 = Ext.create('Ext.data.Store',{
+
+	var getManufacturerId2 = Ext.create('Ext.data.Store', {
 		model: 'QrcodeAnalysis2',
-	    proxy: {
-	        type: 'ajax',
-	        actionMethods: {
-                create : 'POST',
-                read   : 'POST', // by default GET
-                update : 'POST',
-                destroy: 'POST'
-	        },
-	        url: baseUrl+'iot/company/view/getBuildingNameList',
-	        reader: {
-	            type: 'json',
-	            root: 'RESULT',
-	            totalProperty: 'totalCount'
-	        },
-	        extraParams:{
-	        	queryJson:Ext.JSON.encode(queryJson)
-	        }
-	    }
+		proxy: {
+			type: 'ajax',
+			actionMethods: {
+				create: 'POST',
+				read: 'POST', // by default GET
+				update: 'POST',
+				destroy: 'POST'
+			},
+			url: baseUrl + 'iot/company/view/getBuildingNameList',
+			reader: {
+				type: 'json',
+				root: 'RESULT',
+				totalProperty: 'totalCount'
+			},
+			extraParams: {
+				queryJson: Ext.JSON.encode(queryJson)
+			}
+		}
 	});
-	
-	var clear_append_form = function (){
+
+	var clear_append_form = function () {
 		Ext.getCmp('fa_patrol_spot_name').setValue("");
 		Ext.getCmp('fa_patrol_company_code').setValue("");
 		Ext.getCmp('fa_patrol_spot_address').setValue("");
-//		Ext.getCmp('fa_patrol_equipment_code').setValue("");
+		//		Ext.getCmp('fa_patrol_equipment_code').setValue("");
 		Ext.getCmp('fa_patrol_spot_type').setValue(false);
 		Ext.getCmp('fa_patrol_point_message').setValue("");
-//		Ext.getCmp('fa_id').setValue("");	
+		//		Ext.getCmp('fa_id').setValue("");	
 		Ext.getCmp('PatrolpointListPageToolbar').moveFirst();
 
 	}
-	
-	var deselect_fun = function(record){
-		  var index = AllSelectedRecords.indexOf(record.get("device_id"));
-		  if (index > -1) {
-		   AllSelectedRecords.splice(index, 1);
-		   return AllSelectedRecords;
-		  }
+
+	var deselect_fun = function (record) {
+		var index = AllSelectedRecords.indexOf(record.get("device_id"));
+		if (index > -1) {
+			AllSelectedRecords.splice(index, 1);
+			return AllSelectedRecords;
+		}
 	}
-     sm1 = Ext.create('Ext.selection.CheckboxModel',{
-		     mode: "MULTI",
-		     listeners: {
-		         deselect: function (me, record, index, opts) {
-		          if(initflag){
-//		           alert("初始化");
-		          }else{
-		           deselect_fun(record);
-		          }
-		          
-		         },
-		         select: function (me, record, index, opts) {
-		          var index = AllSelectedRecords.indexOf(record.get("device_id"));
-		          if (index > -1) {
-		        return AllSelectedRecords;
-		       }else{
-		        AllSelectedRecords.push(record.get("device_id"));
-		        return AllSelectedRecords;
-		       }
-		             
-		         }
-		     }
+	sm1 = Ext.create('Ext.selection.CheckboxModel', {
+		mode: "MULTI",
+		listeners: {
+			deselect: function (me, record, index, opts) {
+				if (initflag) {
+					//		           alert("初始化");
+				} else {
+					deselect_fun(record);
+				}
+
+			},
+			select: function (me, record, index, opts) {
+				var index = AllSelectedRecords.indexOf(record.get("device_id"));
+				if (index > -1) {
+					return AllSelectedRecords;
+				} else {
+					AllSelectedRecords.push(record.get("device_id"));
+					return AllSelectedRecords;
+				}
+
+			}
+		}
 	});
-	
-   var deselect_fun1 = function(record){
-		  var index = AllSelectedRecords1.indexOf(record.get("device_id"));
-		  if (index > -1) {
-		   AllSelectedRecords1.splice(index, 1);
-		   return AllSelectedRecords1;
-		  }
+
+	var deselect_fun1 = function (record) {
+		var index = AllSelectedRecords1.indexOf(record.get("device_id"));
+		if (index > -1) {
+			AllSelectedRecords1.splice(index, 1);
+			return AllSelectedRecords1;
+		}
 	}
-    sm2 = Ext.create('Ext.selection.CheckboxModel',{
-		     mode: "MULTI",
-		     listeners: {
-		         deselect: function (me, record, index, opts) {
-		          if(initflag1){
-		        	  
-		          }else{
-		           deselect_fun1(record);
-		          }
-		          
-		         },
-		         select: function (me, record, index, opts) {
-		          var index = AllSelectedRecords1.indexOf(record.get("device_id"));
-		          if (index > -1) {
-		        return AllSelectedRecords1;
-		       }else{
-		        AllSelectedRecords1.push(record.get("device_id"));
-		        return AllSelectedRecords1;
-		       }
-		             
-		         }
-		     }
+	sm2 = Ext.create('Ext.selection.CheckboxModel', {
+		mode: "MULTI",
+		listeners: {
+			deselect: function (me, record, index, opts) {
+				if (initflag1) {
+
+				} else {
+					deselect_fun1(record);
+				}
+
+			},
+			select: function (me, record, index, opts) {
+				var index = AllSelectedRecords1.indexOf(record.get("device_id"));
+				if (index > -1) {
+					return AllSelectedRecords1;
+				} else {
+					AllSelectedRecords1.push(record.get("device_id"));
+					return AllSelectedRecords1;
+				}
+
+			}
+		}
 	});
-	
+
 	myStore = Ext.create('Ext.data.Store', {
-	    model: 'Maintenance',
-	    pageSize: countPerPage, 
-	    proxy: {
-	        type: 'ajax',
-	        actionMethods: {
-                create : 'POST',
-                read   : 'POST', // by default GET
-                update : 'POST',
-                destroy: 'POST'
-	        },
-	        url: baseUrl+'iot/inspectionpoints/getList1',
-	        reader: {
-	            type: 'json',
-	            root: 'RESULT',
-	            totalProperty: 'totalCount'
-	        },
-	        extraParams:{
-	        	queryJson:Ext.JSON.encode(queryJson)
-	        }
-	    },
-//	    sorters:[{
-//	    	property:'data_time',
-//	    	direction:'DESC'
-//	    }],
-	    remoteSort: true
-	});	
-	
+		model: 'Maintenance',
+		pageSize: countPerPage,
+		proxy: {
+			type: 'ajax',
+			actionMethods: {
+				create: 'POST',
+				read: 'POST', // by default GET
+				update: 'POST',
+				destroy: 'POST'
+			},
+			url: baseUrl + 'iot/inspectionpoints/getList1',
+			reader: {
+				type: 'json',
+				root: 'RESULT',
+				totalProperty: 'totalCount'
+			},
+			extraParams: {
+				queryJson: Ext.JSON.encode(queryJson)
+			}
+		},
+		//	    sorters:[{
+		//	    	property:'data_time',
+		//	    	direction:'DESC'
+		//	    }],
+		remoteSort: true
+	});
+
 	myStore1 = Ext.create('Ext.data.Store', {
-	    model: 'CheckRecord3',
-	    pageSize: 10, 
-	    proxy: {
-	        type: 'ajax',
-	        url: baseUrl+'iot/inspectionpoints/getXzsbList',
-	        reader: {
-	            type: 'json',
-	            root: 'RESULT',
-	            totalProperty: 'totalCount'
-	        },
-	        extraParams:{
-	        	queryJson:Ext.JSON.encode(queryJson)
-	        }
-	    },
-	    remoteSort: true
+		model: 'CheckRecord3',
+		pageSize: 10,
+		proxy: {
+			type: 'ajax',
+			url: baseUrl + 'iot/inspectionpoints/getXzsbList',
+			reader: {
+				type: 'json',
+				root: 'RESULT',
+				totalProperty: 'totalCount'
+			},
+			extraParams: {
+				queryJson: Ext.JSON.encode(queryJson)
+			}
+		},
+		remoteSort: true
 	});
-	
-	
+
+
 	var myStore2 = Ext.create('Ext.data.Store', {
-	    model: 'patrolpoint1',
-	    pageSize: 5,
-	    listeners: {
-	        beforeload : function(me, store, operation, eOpts) {       
-	         initflag = true;
-	        },
-	              load: function (me, records, success, opts) {
-	                  if (!success || !records || records.length == 0)
-	                      return;
-
-	                  //根据全局的选择,初始化选中的列
-	                  var selModel = Ext.getCmp('PatrolCheckListPanel2').getSelectionModel();
-	                  Ext.Array.forEach(AllSelectedRecords, function (item) {
-	                      for (var i = 0; i < records.length; i++) {
-	                          var record = records[i];
-	                          if (record.get("device_id") == item) {
-	                              selModel.select(record, true, true);    //选中record,并且保持现有的选择,不触发选中事件
-	                          }
-	                      }
-	                  });
-//	                  sm1.addListener('deselect',deselect_fun);
-	                  initflag = false;
-	              }
-	          },
-	    proxy: {
-	        type: 'ajax',
-	        url: baseUrl+'iot/inspectionpoints/getSbList',
-	        reader: {
-	            type: 'json',
-	            root: 'RESULT',
-	            totalProperty: 'totalCount'
-	        },
-	        extraParams:{
-	        	queryJson:Ext.JSON.encode(queryJson)
-	        }
-	    },
-	    remoteSort: true
+		model: 'patrolpoint1',
+		pageSize: 5,
+		listeners: {
+			beforeload: function (me, store, operation, eOpts) {
+				initflag = true;
+			},
+			load: function (me, records, success, opts) {
+				if (!success || !records || records.length == 0)
+					return;
+
+				//根据全局的选择,初始化选中的列
+				var selModel = Ext.getCmp('PatrolCheckListPanel2').getSelectionModel();
+				Ext.Array.forEach(AllSelectedRecords, function (item) {
+					for (var i = 0; i < records.length; i++) {
+						var record = records[i];
+						if (record.get("device_id") == item) {
+							selModel.select(record, true, true);    //选中record,并且保持现有的选择,不触发选中事件
+						}
+					}
+				});
+				//	                  sm1.addListener('deselect',deselect_fun);
+				initflag = false;
+			}
+		},
+		proxy: {
+			type: 'ajax',
+			url: baseUrl + 'iot/inspectionpoints/getSbList',
+			reader: {
+				type: 'json',
+				root: 'RESULT',
+				totalProperty: 'totalCount'
+			},
+			extraParams: {
+				queryJson: Ext.JSON.encode(queryJson)
+			}
+		},
+		remoteSort: true
 	});
-	
-	myStore2.on('load',function(myStore2, record){
-		for (var i = 0; i < record.length; i++) { 
-			var records = record[i]; 
+
+	myStore2.on('load', function (myStore2, record) {
+		for (var i = 0; i < record.length; i++) {
+			var records = record[i];
 			if (records.get('pd') == 1) {
 				Ext.getCmp('PatrolCheckListPanel2').getSelectionModel().select(records, true);
 			}
 		};
-    });
-	
+	});
+
 	var myStore3 = Ext.create('Ext.data.Store', {
-	    model: 'patrolpoint2',
-	    pageSize:5,
-	    listeners: {
-	        beforeload : function(me, store, operation, eOpts) {       
-	         initflag1 = true;
-	        },
-	              load: function (me, records, success, opts) {
-	                  if (!success || !records || records.length == 0)
-	                      return;
-
-	                  //根据全局的选择,初始化选中的列
-	                  var selModel = Ext.getCmp('PatrolCheckListPanel3').getSelectionModel();
-	                  Ext.Array.forEach(AllSelectedRecords1, function (item) {
-	                      for (var i = 0; i < records.length; i++) {
-	                          var record = records[i];
-	                          if (record.get("device_id") == item &&record.get('pd') != 1) {
-	                              selModel.select(record, true, true);    //选中record,并且保持现有的选择,不触发选中事件
-	                          }
-	                      }
-	                  });
-	                  initflag1 = false;
-	              }
-	          },
-	    proxy: {
-	        type: 'ajax',
-	        url: baseUrl+'iot/inspectionpoints/getSbList',
-	        reader: {
-	            type: 'json',
-	            root: 'RESULT',
-	            totalProperty: 'totalCount'
-	        },
-	        extraParams:{
-	        	queryJson:Ext.JSON.encode(queryJson)
-	        }
-	    },
-	    remoteSort: true
+		model: 'patrolpoint2',
+		pageSize: 5,
+		listeners: {
+			beforeload: function (me, store, operation, eOpts) {
+				initflag1 = true;
+			},
+			load: function (me, records, success, opts) {
+				if (!success || !records || records.length == 0)
+					return;
+
+				//根据全局的选择,初始化选中的列
+				var selModel = Ext.getCmp('PatrolCheckListPanel3').getSelectionModel();
+				Ext.Array.forEach(AllSelectedRecords1, function (item) {
+					for (var i = 0; i < records.length; i++) {
+						var record = records[i];
+						if (record.get("device_id") == item && record.get('pd') != 1) {
+							selModel.select(record, true, true);    //选中record,并且保持现有的选择,不触发选中事件
+						}
+					}
+				});
+				initflag1 = false;
+			}
+		},
+		proxy: {
+			type: 'ajax',
+			url: baseUrl + 'iot/inspectionpoints/getSbList',
+			reader: {
+				type: 'json',
+				root: 'RESULT',
+				totalProperty: 'totalCount'
+			},
+			extraParams: {
+				queryJson: Ext.JSON.encode(queryJson)
+			}
+		},
+		remoteSort: true
 	});
-	
-	myStore3.on('load',function(myStore3, record){
-		for (var i = 0; i < record.length; i++) { 
+
+	myStore3.on('load', function (myStore3, record) {
+		for (var i = 0; i < record.length; i++) {
 			var records = record[i];
-			var len=AllSelectedRecords1.length;
-	        for(var j=0;j<len;j++)
-	        {
-	            if(AllSelectedRecords1[j]==records.get('device_id')){
-	            	Ext.getCmp('PatrolCheckListPanel3').getSelectionModel().select(records, true);
-	            }
-	        }
+			var len = AllSelectedRecords1.length;
+			for (var j = 0; j < len; j++) {
+				if (AllSelectedRecords1[j] == records.get('device_id')) {
+					Ext.getCmp('PatrolCheckListPanel3').getSelectionModel().select(records, true);
+				}
+			}
 		};
-    });
-	
-	var clear_modify_form = function (){
+	});
+
+	var clear_modify_form = function () {
 		Ext.getCmp('fm_patrol_spot_name').setValue("");
 		Ext.getCmp('fm_patrol_company_code').setValue("");
 		Ext.getCmp('fm_patrol_spot_address').setValue("");
@@ -500,1477 +499,1512 @@ Ext.onReady(function(){
 		Ext.getCmp('fm_patrol_point_id').setValue("");
 		Ext.getCmp('PatrolpointListPanel').getStore().reload();
 	}
-	
-	
+
+
 	var patrolUploadForm = Ext.create('Ext.form.Panel', {
-    	id: 'patrolUploadForm',
-    	labelWidth: 55,
-		url: baseUrl+'iot/inspectionpoints/update1',
+		id: 'patrolUploadForm',
+		labelWidth: 55,
+		url: baseUrl + 'iot/inspectionpoints/update1',
 		bodyPadding: 15,
-		frame:true,
-	    labelAlign:'left',
-	    region:'north',
-	    enableDrop: true,
-	    ddGroup: 'treeID',
-	    height: 200,
+		frame: true,
+		labelAlign: 'left',
+		region: 'north',
+		enableDrop: true,
+		ddGroup: 'treeID',
+		height: 200,
 		items: [{
-			autoHeight:true,
-	        layout:'column',
-	        border:false,
-	        items: [{
-	        	columnWidth:.45,
-                xtype: 'fieldset',
-                layout:'form',
-//                defaults: {anchor: '95%'},
-                style: 'margin-left: 5px;padding-left: 5px;border:0px solid #B5B8C8!important;',
-                items:[
-                	{
-                		xtype:'textfield',
-        				fieldLabel:'点位名称',
-        				id: 'fm_patrol_spot_name',
-        				name:'spot_name',
-        				maxLength:20,
-        				maxLengthText:'长度不得超出{0}',
-        				anchor:'50%'
-        		 },{
-        			fieldLabel:'所属建筑/项目',
-        			id:'fm_patrol_company_code',
-        			name:'company_code',
-        			xtype:'combo',
-        			store:getManufacturerId2,
-        			displayField : 'building_name',  
-        	        valueField : 'building_id',
-        	        editable : false,
-        	        anchor:'50%'
-        	        
-        		},{
-        			xtype:'textfield',
-        			fieldLabel:'点位地址',
-        			id: 'fm_patrol_spot_address',
-        			name:'spot_address',
-        			maxLength:30,
-        			maxLengthText:'长度不得超出{0}',
-        			anchor:'50%'
-        		}]
-	        },{
-	        	columnWidth:.55,
-                xtype: 'fieldset',
-                layout:'form',
-//                defaults: {anchor: '95%'},
-                style: 'margin-left: 5px;padding-left: 5px;border:0px solid #B5B8C8!important;',
-                items:[
-                	{
-            	    	 xtype:'textareafield',
-            	         grow:true,
-            	         height: 60,
-            	         id: 'fm_patrol_point_message',
-            	         name:'message',
-            	         fieldLabel:'备注',
-            	         anchor:'50%'
-            		},{
-            			xtype:'checkboxgroup',
-                        fieldLabel:'设备类型',
-//                        defaultType:'radiofield',
-                        columns:3,
-                        id:"fm_patrol_spot_type",
-//                        defaults:{
-//                            flex:1
-//                        },
-//                        layout:'hbox',
-            	        items: [
-            	               {boxLabel: '水系统', name: 'fm_patrol_water_type',inputValue:"1",id:'radio81'},
-            	               {boxLabel: '火系统', name: 'fm_patrol_fire_type',inputValue:"2",id:'radio82'},
-            	               {boxLabel: '电气火灾', name: 'fm_patrol_efire_type',inputValue:"3",id:'radio83'},
-            	               {boxLabel: '气体灭火', name: 'fm_patrol_extinguishing_type',inputValue:"4",id:'radio84'},
-            	               {boxLabel: 'RTU', name: 'fm_patrol_rtu_type',inputValue:"5",id:'radio85'},
-            	               {boxLabel: '视频监控', name: 'fm_patrol_view_type',inputValue:"6",id:'radio86'},
-            	               {boxLabel: '其他', name: 'fm_patrol_other_type',inputValue:"7",id:'radio87'},
-            	    ]},{
-            			xtype:'textfield',
-            			id:'fm_patrol_point_queryJson',
-            			name:'queryJson',
-            			hidden:true
-            		},{
-            			xtype:'textfield',
-            			name: 'uploadURL',
-            			id : 'patrol_point_uploadURL',
-            			hidden: true
-            		},{
-            			xtype:'textfield',
-            			id:'fm_patrol_point_id',
-            			name:'id',
-            			hidden:true
-            		}
-                ]
-	        }
-		]}]
-
-    });
-	
+			autoHeight: true,
+			layout: 'column',
+			border: false,
+			items: [{
+				columnWidth: .45,
+				xtype: 'fieldset',
+				layout: 'form',
+				//                defaults: {anchor: '95%'},
+				style: 'margin-left: 5px;padding-left: 5px;border:0px solid #B5B8C8!important;',
+				items: [
+					{
+						xtype: 'textfield',
+						fieldLabel: '点位名称',
+						id: 'fm_patrol_spot_name',
+						name: 'spot_name',
+						maxLength: 20,
+						maxLengthText: '长度不得超出{0}',
+						anchor: '50%'
+					}, {
+						fieldLabel: '所属建筑/项目',
+						id: 'fm_patrol_company_code',
+						name: 'company_code',
+						xtype: 'combo',
+						store: getManufacturerId2,
+						displayField: 'building_name',
+						valueField: 'building_id',
+						editable: false,
+						anchor: '50%'
+
+					}, {
+						xtype: 'textfield',
+						fieldLabel: '点位地址',
+						id: 'fm_patrol_spot_address',
+						name: 'spot_address',
+						maxLength: 30,
+						maxLengthText: '长度不得超出{0}',
+						anchor: '50%'
+					}]
+			}, {
+				columnWidth: .55,
+				xtype: 'fieldset',
+				layout: 'form',
+				//                defaults: {anchor: '95%'},
+				style: 'margin-left: 5px;padding-left: 5px;border:0px solid #B5B8C8!important;',
+				items: [
+					{
+						xtype: 'textareafield',
+						grow: true,
+						height: 60,
+						id: 'fm_patrol_point_message',
+						name: 'message',
+						fieldLabel: '备注',
+						anchor: '50%'
+					}, {
+						xtype: 'checkboxgroup',
+						fieldLabel: '设备类型',
+						//                        defaultType:'radiofield',
+						columns: 3,
+						id: "fm_patrol_spot_type",
+						//                        defaults:{
+						//                            flex:1
+						//                        },
+						//                        layout:'hbox',
+						items: [
+							{ boxLabel: '水系统', name: 'fm_patrol_water_type', inputValue: "1", id: 'radio81' },
+							{ boxLabel: '火系统', name: 'fm_patrol_fire_type', inputValue: "2", id: 'radio82' },
+							{ boxLabel: '电气火灾', name: 'fm_patrol_efire_type', inputValue: "3", id: 'radio83' },
+							{ boxLabel: '气体灭火', name: 'fm_patrol_extinguishing_type', inputValue: "4", id: 'radio84' },
+							{ boxLabel: 'RTU', name: 'fm_patrol_rtu_type', inputValue: "5", id: 'radio85' },
+							{ boxLabel: '视频监控', name: 'fm_patrol_view_type', inputValue: "6", id: 'radio86' },
+							{ boxLabel: '其他', name: 'fm_patrol_other_type', inputValue: "7", id: 'radio87' },
+						]
+					}, {
+						xtype: 'textfield',
+						id: 'fm_patrol_point_queryJson',
+						name: 'queryJson',
+						hidden: true
+					}, {
+						xtype: 'textfield',
+						name: 'uploadURL',
+						id: 'patrol_point_uploadURL',
+						hidden: true
+					}, {
+						xtype: 'textfield',
+						id: 'fm_patrol_point_id',
+						name: 'id',
+						hidden: true
+					}
+				]
+			}
+			]
+		}]
+
+	});
+
 	var patroladdForm = Ext.create('Ext.form.Panel', {
-    	id: 'patroladdForm',
-    	labelWidth: 55,
-		url: baseUrl+'iot/inspectionpoints/append1',
+		id: 'patroladdForm',
+		labelWidth: 55,
+		url: baseUrl + 'iot/inspectionpoints/append1',
 		bodyPadding: 15,
-		frame:true,
-	    labelAlign:'left',
-	    region:'north',
-	    enableDrop: true,
-	    ddGroup: 'treeID',
-	    height: 200,
+		frame: true,
+		labelAlign: 'left',
+		region: 'north',
+		enableDrop: true,
+		ddGroup: 'treeID',
+		height: 200,
 		items: [{
-			autoHeight:true,
-	        layout:'column',
-	        border:false,
-	        items: [{
-	        	columnWidth:.45,
-                xtype: 'fieldset',
-                layout:'form',
-//                defaults: {anchor: '95%'},
-                style: 'margin-left: 5px;padding-left: 5px;border:0px solid #B5B8C8!important;',
-                items:[
-                	{
-                		xtype:'textfield',
-        				fieldLabel:'点位名称',
-        				id: 'fa_patrol_spot_name',
-        				name:'spot_name',
-        				maxLength:20,
-        				maxLengthText:'长度不得超出{0}',
-        				anchor:'50%'
-        		 },{
-        			fieldLabel:'所属建筑/项目',
-        			id:'fa_patrol_company_code',
-        			name:'company_code',
-        			xtype:'combo',
-        			store:getManufacturerId2,
-        			displayField : 'building_name',  
-        	        valueField : 'building_id',
-        	        editable : false,
-        	        anchor:'50%',
-        	        listeners:{ 
-      			      select:function(combo, record,index){
-      			         try{
-      			        	var label= this.value;
-      			 			var query = new Object();
-      			     		query.building_id = label;
-      			     		query.V_LOGINNAME = V_LOGINNAME;
-      			     		// query.V_PASSWORD =  V_PASSWORD;
-      			     		var jsonstr = Ext.JSON.encode(query);
-      			         	myStore2.getProxy().extraParams = {
-      			         		queryJson : jsonstr
-      			         	};
-      			         	Ext.getCmp('PatrolCheckListPageToolbar2').moveFirst();
-      			         }
-      			         catch(ex){
-      			           Ext.MessageBox.alert("错误","数据加载失败。");
-      			         }
-      			      }
-      		        }   
-        		},{
-        			xtype:'textfield',
-        			fieldLabel:'点位地址',
-        			id: 'fa_patrol_spot_address',
-        			name:'spot_address',
-        			maxLength:30,
-        			maxLengthText:'长度不得超出{0}',
-        			anchor:'50%'
-        		}]
-	        },{
-	        	columnWidth:.55,
-                xtype: 'fieldset',
-                layout:'form',
-//                defaults: {anchor: '95%'},
-                style: 'margin-left: 5px;padding-left: 5px;border:0px solid #B5B8C8!important;',
-                items:[
-                	{
-            	    	 xtype:'textareafield',
-            	         grow:true,
-            	         height: 60,
-            	         id: 'fa_patrol_point_message',
-            	         name:'message',
-            	         fieldLabel:'备注',
-            	         anchor:'50%'
-            		},{
-            			xtype:'checkboxgroup',
-                        fieldLabel:'设备类型',
-//                        defaultType:'radiofield',
-                        columns:3,
-                        id:"fa_patrol_spot_type",
-//                        defaults:{
-//                            flex:1
-//                        },
-//                        layout:'hbox',
-            	        items: [
-            	               {boxLabel: '水系统', name: 'fa_patrol_water_type',inputValue:"1",id:'radio88'},
-            	               {boxLabel: '火系统', name: 'fa_patrol_fire_type',inputValue:"2",id:'radio89'},
-            	               {boxLabel: '电气火灾', name: 'fa_patrol_efire_type',inputValue:"3",id:'radio90'},
-            	               {boxLabel: '气体灭火', name: 'fa_patrol_extinguishing_type',inputValue:"4",id:'radio91'},
-            	               {boxLabel: 'RTU', name: 'fa_patrol_rtu_type',inputValue:"5",id:'radio92'},
-            	               {boxLabel: '视频监控', name: 'fa_patrol_view_type',inputValue:"6",id:'radio93'},
-            	               {boxLabel: '其他', name: 'fa_patrol_other_type',inputValue:"7",id:'radio94'},
-            	    ]},{
-            			xtype:'textfield',
-            			id:'fa_patrol_point_queryJson',
-            			name:'queryJson',
-            			hidden:true
-            		},{
-            			xtype:'textfield',
-            			name: 'addURL',
-            			id : 'patrol_point_addURL',
-            			hidden: true
-            		}
-                ]
-	        }
-		]}]
-
-    });
-	
-	var upload_pic = function() {
-		 Ext.create('Ext.window.Window', {
-			id:'patrol_point_pic_win1',
-		    title: '图片上传',
-		    height: 200,
-		    width: 300,
-		    layout: 'fit',
-		    modal:true,
-		    buttons:[
-		    	{
-		    		text:'关闭',
-		    		 handler : function() {
-		    			 Ext.getCmp('patrol_point_pic_win1').destroy();
-		    		 }
-		    	}
-		    ],
-		    closeAction:'destroy',
-		    html:'<iframe  src="test2.jsp" width=300 height=200 frameborder="no"></iframe>'
-		 }).show();
+			autoHeight: true,
+			layout: 'column',
+			border: false,
+			items: [{
+				columnWidth: .45,
+				xtype: 'fieldset',
+				layout: 'form',
+				//                defaults: {anchor: '95%'},
+				style: 'margin-left: 5px;padding-left: 5px;border:0px solid #B5B8C8!important;',
+				items: [
+					{
+						xtype: 'textfield',
+						fieldLabel: '点位名称',
+						id: 'fa_patrol_spot_name',
+						name: 'spot_name',
+						maxLength: 20,
+						maxLengthText: '长度不得超出{0}',
+						anchor: '50%',
+						listeners: {
+							change: function (o, e) {
+								if (e.length > 20) {
+									Ext.getCmp('fa_patrol_spot_name').setValue(e.substring(0,20));
+								}
+							}
+						}
+					}, {
+						fieldLabel: '所属建筑/项目',
+						id: 'fa_patrol_company_code',
+						name: 'company_code',
+						xtype: 'combo',
+						store: getManufacturerId2,
+						displayField: 'building_name',
+						valueField: 'building_id',
+						editable: false,
+						anchor: '50%',
+						listeners: {
+							select: function (combo, record, index) {
+								try {
+									var label = this.value;
+									var query = new Object();
+									query.building_id = label;
+									query.V_LOGINNAME = V_LOGINNAME;
+									// query.V_PASSWORD =  V_PASSWORD;
+									var jsonstr = Ext.JSON.encode(query);
+									myStore2.getProxy().extraParams = {
+										queryJson: jsonstr
+									};
+									Ext.getCmp('PatrolCheckListPageToolbar2').moveFirst();
+								}
+								catch (ex) {
+									Ext.MessageBox.alert("错误", "数据加载失败。");
+								}
+							}
+						}
+					}, {
+						xtype: 'textfield',
+						fieldLabel: '点位地址',
+						id: 'fa_patrol_spot_address',
+						name: 'spot_address',
+						maxLength: 30,
+						maxLengthText: '长度不得超出{0}',
+						anchor: '50%',
+						listeners: {
+							change: function (o, e) {
+								if (e.length > 30) {
+									Ext.getCmp('fa_patrol_spot_address').setValue(e.substring(0,30));
+								}
+							}
+						}
+					}]
+			}, {
+				columnWidth: .55,
+				xtype: 'fieldset',
+				layout: 'form',
+				//                defaults: {anchor: '95%'},
+				style: 'margin-left: 5px;padding-left: 5px;border:0px solid #B5B8C8!important;',
+				items: [
+					{
+						xtype: 'textareafield',
+						grow: true,
+						height: 60,
+						id: 'fa_patrol_point_message',
+						name: 'message',
+						fieldLabel: '备注',
+						anchor: '50%'
+					}, {
+						xtype: 'checkboxgroup',
+						fieldLabel: '设备类型',
+						//                        defaultType:'radiofield',
+						columns: 3,
+						id: "fa_patrol_spot_type",
+						//                        defaults:{
+						//                            flex:1
+						//                        },
+						//                        layout:'hbox',
+						items: [
+							{ boxLabel: '水系统', name: 'fa_patrol_water_type', inputValue: "1", id: 'radio88' },
+							{ boxLabel: '火系统', name: 'fa_patrol_fire_type', inputValue: "2", id: 'radio89' },
+							{ boxLabel: '电气火灾', name: 'fa_patrol_efire_type', inputValue: "3", id: 'radio90' },
+							{ boxLabel: '气体灭火', name: 'fa_patrol_extinguishing_type', inputValue: "4", id: 'radio91' },
+							{ boxLabel: 'RTU', name: 'fa_patrol_rtu_type', inputValue: "5", id: 'radio92' },
+							{ boxLabel: '视频监控', name: 'fa_patrol_view_type', inputValue: "6", id: 'radio93' },
+							{ boxLabel: '其他', name: 'fa_patrol_other_type', inputValue: "7", id: 'radio94' },
+						]
+					}, {
+						xtype: 'textfield',
+						id: 'fa_patrol_point_queryJson',
+						name: 'queryJson',
+						hidden: true
+					}, {
+						xtype: 'textfield',
+						name: 'addURL',
+						id: 'patrol_point_addURL',
+						hidden: true
+					}
+				]
+			}
+			]
+		}]
+
+	});
+
+	var upload_pic = function () {
+		Ext.create('Ext.window.Window', {
+			id: 'patrol_point_pic_win1',
+			title: '图片上传',
+			height: 200,
+			width: 300,
+			layout: 'fit',
+			modal: true,
+			buttons: [
+				{
+					text: '关闭',
+					handler: function () {
+						Ext.getCmp('patrol_point_pic_win1').destroy();
+					}
+				}
+			],
+			closeAction: 'destroy',
+			html: '<iframe  src="test2.jsp" width=300 height=200 frameborder="no"></iframe>'
+		}).show();
+
+	}
 
-		}
-	
 	var patroladUploadForm = Ext.create('Ext.form.Panel', {
 		id: 'patroladUploadForm',
-        layout: 'form',
-//        title:'设备图片:',
-        items:[{
-        layout: 'hbox',
-        items: [{
-                xtype: 'box',//或者xtype: 'component',
-                title:'点位图片',
-                id: 'patrol_upload_picture',
-                width: 110,//图片宽度  
-                height: 110,//图片高度  
-                margin:'0 0 30 150',
-                autoEl: {
-                    tag: 'img',//指定为img标签
-                    src: '../../res/img/common/shangchaun.png',
-                    style : 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);width:110px;height:110px;text-align:center;'
-                },
-                listeners : {
-                            render : function() {
-                                Ext.fly(this.el).on("click",function() {
-//                                upload_pic();
-	                             checkfilename2();
-                            });}
-                }
-                	
-            }
-        ]}]
-    });
-	
+		layout: 'form',
+		//        title:'设备图片:',
+		items: [{
+			layout: 'hbox',
+			items: [{
+				xtype: 'box',//或者xtype: 'component',
+				title: '点位图片',
+				id: 'patrol_upload_picture',
+				width: 110,//图片宽度  
+				height: 110,//图片高度  
+				margin: '0 0 30 150',
+				autoEl: {
+					tag: 'img',//指定为img标签
+					src: '../../res/img/common/shangchaun.png',
+					style: 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);width:110px;height:110px;text-align:center;'
+				},
+				listeners: {
+					render: function () {
+						Ext.fly(this.el).on("click", function () {
+							//                                upload_pic();
+							checkfilename2();
+						});
+					}
+				}
+
+			}
+			]
+		}]
+	});
+
 
 
 	var patroladaddForm = Ext.create('Ext.form.Panel', {
-        id: 'patroladaddForm',
-        layout: 'form',
-//        title:'设备图片:',
-        items:[{
-        layout: 'hbox',
-        items: [{
-                xtype: 'box',//或者xtype: 'component',
-                title:'点位图片',
-                id: 'patrol_add_picture',
-                width: 110,//图片宽度  
-                height: 110,//图片高度  
-                margin:'0 0 30 150',
-                autoEl: {
-                    tag: 'img',//指定为img标签
-                    src: '../../res/img/common/shangchaun.png',
-                    style : 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);width:110px;height:110px;text-align:center;'
-                },
-                listeners : {
-                            render : function() {
-                                Ext.fly(this.el).on("click",function() {
-//                                add_pic();
-								checkfilename();
-
-                });}}
-                	
-            }
-        ]}]
-    });
-	
-	var MaintenanceCheckPanel2 =Ext.create('Ext.grid.Panel', {
-		header :{
-			height:0,
-			border:'0px solid #000000'
+		id: 'patroladaddForm',
+		layout: 'form',
+		//        title:'设备图片:',
+		items: [{
+			layout: 'hbox',
+			items: [{
+				xtype: 'box',//或者xtype: 'component',
+				title: '点位图片',
+				id: 'patrol_add_picture',
+				width: 110,//图片宽度  
+				height: 110,//图片高度  
+				margin: '0 0 30 150',
+				autoEl: {
+					tag: 'img',//指定为img标签
+					src: '../../res/img/common/shangchaun.png',
+					style: 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);width:110px;height:110px;text-align:center;'
+				},
+				listeners: {
+					render: function () {
+						Ext.fly(this.el).on("click", function () {
+							//                                add_pic();
+							checkfilename();
+
+						});
+					}
+				}
+
+			}
+			]
+		}]
+	});
+
+	var MaintenanceCheckPanel2 = Ext.create('Ext.grid.Panel', {
+		header: {
+			height: 0,
+			border: '0px solid #000000'
 		},
-	    id: 'PatrolCheckListPanel2',
-	    store: myStore2,
-	    selModel: sm1,
-	    columns: [
-	    	 { header: '设备编号',  dataIndex: 'device_id',hidden:true, menuDisabled:true },
-	    	 { header: '序号',  dataIndex: 'xh',width:58,align:'center', menuDisabled:true },
-		     { header: '设备名称', dataIndex: 'device_name', width:247,align:'center', menuDisabled:true },
-		     { header: '设备地址', dataIndex: 'unitinfo', width:246,align:'center', menuDisabled:true },
-		     { 
-					text:'设备详情',
-		        	xtype : 'actioncolumn',
-		        	width:210,
-		        	sortable:false,
-		        	align:'center',
-		        	menuDisabled:true,
-		        	items:[{
-		        		icon: '../../res/img/common/tupianbtn.png',
-		        		tooltip: '设备详情',
-		        		handler: function(grid, rowIndex, colIndex) {
-		                    var rec = grid.getStore().getAt(rowIndex);
-//		                    alert(rec.get("dwid"));
-		                    editMaintenance(rec.get("dwid"));
-		                }
-		        	}]
-	    		}
-	    ],
-	    columnLines: true,
-	    height: 195,
-	    width: 785,
-	    bbar: new Ext.PagingToolbar({  
-            store: myStore2,  
-            id:'PatrolCheckListPageToolbar2',
-            displayInfo: true,  
-            pageSize: 5,  
-            prependButtons: true,  
-            displayMsg : '显示第 {0}条到 {1}条记录,总共 {2}条',     
-            emptyMsg : "没有记录",  
-            firstText: '第一页',
-            prevText: '前一页',
-            nextText: '后一页',
-            lastText: '最后一页',
-            refreshText: '刷新',
-
-        }),
-//        frame: true,  
-        border:false,  
-        iconCls: 'icon-grid'
+		id: 'PatrolCheckListPanel2',
+		store: myStore2,
+		selModel: sm1,
+		columns: [
+			{ header: '设备编号', dataIndex: 'device_id', hidden: true, menuDisabled: true },
+			{ header: '序号', dataIndex: 'xh', width: 58, align: 'center', menuDisabled: true },
+			{ header: '设备名称', dataIndex: 'device_name', width: 247, align: 'center', menuDisabled: true },
+			{ header: '设备地址', dataIndex: 'unitinfo', width: 246, align: 'center', menuDisabled: true },
+			{
+				text: '设备详情',
+				xtype: 'actioncolumn',
+				width: 210,
+				sortable: false,
+				align: 'center',
+				menuDisabled: true,
+				items: [{
+					icon: '../../res/img/common/tupianbtn.png',
+					tooltip: '设备详情',
+					handler: function (grid, rowIndex, colIndex) {
+						var rec = grid.getStore().getAt(rowIndex);
+						//		                    alert(rec.get("dwid"));
+						editMaintenance(rec.get("dwid"));
+					}
+				}]
+			}
+		],
+		columnLines: true,
+		height: 195,
+		width: 785,
+		bbar: new Ext.PagingToolbar({
+			store: myStore2,
+			id: 'PatrolCheckListPageToolbar2',
+			displayInfo: true,
+			pageSize: 5,
+			prependButtons: true,
+			displayMsg: '显示第 {0}条到 {1}条记录,总共 {2}条',
+			emptyMsg: "没有记录",
+			firstText: '第一页',
+			prevText: '前一页',
+			nextText: '后一页',
+			lastText: '最后一页',
+			refreshText: '刷新',
+
+		}),
+		//        frame: true,  
+		border: false,
+		iconCls: 'icon-grid'
 	});
-	
-	var MaintenanceCheckPanel3 =Ext.create('Ext.grid.Panel', {
-		header :{
-			height:0,
-			border:'0px solid #000000'
+
+	var MaintenanceCheckPanel3 = Ext.create('Ext.grid.Panel', {
+		header: {
+			height: 0,
+			border: '0px solid #000000'
 		},
-	    id: 'PatrolCheckListPanel3',
-	    store: myStore3,
-	    selModel: sm2,
-	    columns: [
-	    	 { header: '判断',  dataIndex: 'pd',hidden:true, menuDisabled:true },
-	    	 { header: '设备编号',  dataIndex: 'device_id',hidden:true, menuDisabled:true },
-	    	 { header: '序号',  dataIndex: 'xh',width:58,align:'center', menuDisabled:true },
-		     { header: '设备名称', dataIndex: 'device_name', width:247,align:'center', menuDisabled:true },
-		     { header: '设备地址', dataIndex: 'unitinfo', width:246,align:'center', menuDisabled:true },
-		     { 
-					text:'设备详情',
-		        	xtype : 'actioncolumn',
-		        	width:210,
-		        	sortable:false,
-		        	align:'center',
-		        	menuDisabled:true,
-		        	items:[{
-		        		icon: '../../res/img/common/tupianbtn.png',
-		        		tooltip: '设备详情',
-		        		handler: function(grid, rowIndex, colIndex) {
-		                    var rec = grid.getStore().getAt(rowIndex);
-//		                    alert(rec.get("dwid"));
-		                    editMaintenance(rec.get("dwid"));
-		                }
-		        	}]
-	    		}
-	    ],
-	    columnLines: true,
-	    height: 195,
-	    width: 785,
-	    bbar: new Ext.PagingToolbar({  
-            store: myStore3,  
-            id:'PatrolCheckListPageToolbar3',
-            displayInfo: true,  
-            pageSize: 5,  
-            prependButtons: true,  
-            displayMsg : '显示第 {0}条到 {1}条记录,总共 {2}条',     
-            emptyMsg : "没有记录",  
-            firstText: '第一页',
-            prevText: '前一页',
-            nextText: '后一页',
-            lastText: '最后一页',
-            refreshText: '刷新',
-
-        }),
-//        frame: true,  
-        border:false,  
-        iconCls: 'icon-grid'
+		id: 'PatrolCheckListPanel3',
+		store: myStore3,
+		selModel: sm2,
+		columns: [
+			{ header: '判断', dataIndex: 'pd', hidden: true, menuDisabled: true },
+			{ header: '设备编号', dataIndex: 'device_id', hidden: true, menuDisabled: true },
+			{ header: '序号', dataIndex: 'xh', width: 58, align: 'center', menuDisabled: true },
+			{ header: '设备名称', dataIndex: 'device_name', width: 247, align: 'center', menuDisabled: true },
+			{ header: '设备地址', dataIndex: 'unitinfo', width: 246, align: 'center', menuDisabled: true },
+			{
+				text: '设备详情',
+				xtype: 'actioncolumn',
+				width: 210,
+				sortable: false,
+				align: 'center',
+				menuDisabled: true,
+				items: [{
+					icon: '../../res/img/common/tupianbtn.png',
+					tooltip: '设备详情',
+					handler: function (grid, rowIndex, colIndex) {
+						var rec = grid.getStore().getAt(rowIndex);
+						//		                    alert(rec.get("dwid"));
+						editMaintenance(rec.get("dwid"));
+					}
+				}]
+			}
+		],
+		columnLines: true,
+		height: 195,
+		width: 785,
+		bbar: new Ext.PagingToolbar({
+			store: myStore3,
+			id: 'PatrolCheckListPageToolbar3',
+			displayInfo: true,
+			pageSize: 5,
+			prependButtons: true,
+			displayMsg: '显示第 {0}条到 {1}条记录,总共 {2}条',
+			emptyMsg: "没有记录",
+			firstText: '第一页',
+			prevText: '前一页',
+			nextText: '后一页',
+			lastText: '最后一页',
+			refreshText: '刷新',
+
+		}),
+		//        frame: true,  
+		border: false,
+		iconCls: 'icon-grid'
 	});
-	
+
 	var patroluploadWin = Ext.create('Ext.window.Window', {
 		id: 'patroluploadWin',
-	    title: '<div id="patrol_upload_win1">修改巡检点位</div>',
-	    height: 600,
-	    width: 800,
-//	    maximizable: true,
-	    modal: true,
-	    closeAction: 'hide',
-	    items: [
-	    	patrolUploadForm,patroladUploadForm,MaintenanceCheckPanel3],
-	    buttons: [
-	        {
-	        	text: '保存',
-	        	iconCls:'ok_btn',
-	        	handler: function(){
-	        	 if(AllSelectedRecords1.length==1){
-	        		var patrol_point_uploadURL=Ext.getCmp('patrol_point_uploadURL').getValue();
-	        		var fm_patrol_spot_name=Ext.getCmp('fm_patrol_spot_name').getValue();
-	        		var fm_patrol_company_code=Ext.getCmp('fm_patrol_company_code').getValue();
-	        		var fm_patrol_spot_address=Ext.getCmp('fm_patrol_spot_address').getValue();
-//	        		var fm_patrol_equipment_code=Ext.getCmp('fm_patrol_equipment_code').getValue();
-//	        		var fm_patrol_spot_type=patrolUploadForm.form.findField("fm_patrol_spot_type").getGroupValue();
-	        		var fm_patrol_spot_type = Ext.getCmp('fm_patrol_spot_type').getChecked();
-		        	var spot_type='';
-		        	Ext.Array.each(fm_patrol_spot_type, function(item){
-		        		spot_type +=item.inputValue+',';
-		        	});
-	        		var fm_patrol_point_message=Ext.getCmp('fm_patrol_point_message').getValue();
-	        		var fm_patrol_point_id=Ext.getCmp('fm_patrol_point_id').getValue();
-	        		var query = new Object();
-	        		
-	        		query.equipment_code = AllSelectedRecords1[0];
-	        		query.id = fm_patrol_point_id;
-	        		query.spot_name = fm_patrol_spot_name;
-	        		query.company_code = fm_patrol_company_code;
-	        		query.spot_address = fm_patrol_spot_address;
-//	        		query.equipment_code = fm_patrol_equipment_code;
-	        		query.spot_type = spot_type;
-	        		query.remarks = fm_patrol_point_message;
-	        		query.picture_route = patrol_point_uploadURL;
-	        		query.V_LOGINNAME = V_LOGINNAME;
-		        	// query.V_PASSWORD =  V_PASSWORD;
-		        	var jsonstr = Ext.JSON.encode(query);
-		        	Ext.getCmp('fm_patrol_point_queryJson').setValue(jsonstr);
-	        		Ext.getCmp('patrolUploadForm').submit({
-	        			success: function(form, action){
-//	        				uploadPop.hide();
-	        	       		Ext.getCmp('patrol_upload_picture').getEl().dom.src='../../res/img/common/shangchaun.png';
-	        	       		Ext.getCmp('patrolUploadForm').getForm().reset();
-	        	       		Ext.getCmp('patroladUploadForm').getForm().reset();
-//	        	       		uploadPanel.getStore().reload();
-	        				Ext.Msg.alert('系统提示', '保存成功!');
-	        				clear_modify_form();
-	        			},
-	        			failure: function(form, action){
-	        				Ext.Msg.alert('系统提示', '保存失败!');
-	        				clear_modify_form();
-	        			}
-	        		});
-	        	  this.up('window').hide();
-	        	}else{
-	        		if(AllSelectedRecords1.length>1){
-	        			var patrol_point_uploadURL=Ext.getCmp('patrol_point_uploadURL').getValue();
-		        		var fm_patrol_spot_name=Ext.getCmp('fm_patrol_spot_name').getValue();
-		        		var fm_patrol_company_code=Ext.getCmp('fm_patrol_company_code').getValue();
-		        		var fm_patrol_spot_address=Ext.getCmp('fm_patrol_spot_address').getValue();
-//		        		var fm_patrol_equipment_code=Ext.getCmp('fm_patrol_equipment_code').getValue();
-//		        		var fm_patrol_spot_type=patrolUploadForm.form.findField("fm_patrol_spot_type").getGroupValue();
-		        		var fm_patrol_spot_type = Ext.getCmp('fm_patrol_spot_type').getChecked();
-			        	var spot_type='';
-			        	Ext.Array.each(fm_patrol_spot_type, function(item){
-			        		spot_type +=item.inputValue+',';
-			        	});
-		        		var fm_patrol_point_message=Ext.getCmp('fm_patrol_point_message').getValue();
-		        		var fm_patrol_point_id=Ext.getCmp('fm_patrol_point_id').getValue();
-		        		var query = new Object();
-		        		var spot_id = null;
-//	                     var selected = sm1.getSelection( );
-	                     for(var i=0;i<AllSelectedRecords1.length;i++){
-				                if(i==0)
+		title: '<div id="patrol_upload_win1">修改巡检点位</div>',
+		height: 600,
+		width: 800,
+		//	    maximizable: true,
+		modal: true,
+		closeAction: 'hide',
+		items: [
+			patrolUploadForm, patroladUploadForm, MaintenanceCheckPanel3],
+		buttons: [
+			{
+				text: '保存',
+				iconCls: 'ok_btn',
+				handler: function () {
+					if (AllSelectedRecords1.length == 1) {
+						var patrol_point_uploadURL = Ext.getCmp('patrol_point_uploadURL').getValue();
+						var fm_patrol_spot_name = Ext.getCmp('fm_patrol_spot_name').getValue();
+						var fm_patrol_company_code = Ext.getCmp('fm_patrol_company_code').getValue();
+						var fm_patrol_spot_address = Ext.getCmp('fm_patrol_spot_address').getValue();
+						//	        		var fm_patrol_equipment_code=Ext.getCmp('fm_patrol_equipment_code').getValue();
+						//	        		var fm_patrol_spot_type=patrolUploadForm.form.findField("fm_patrol_spot_type").getGroupValue();
+						var fm_patrol_spot_type = Ext.getCmp('fm_patrol_spot_type').getChecked();
+						var spot_type = '';
+						Ext.Array.each(fm_patrol_spot_type, function (item) {
+							spot_type += item.inputValue + ',';
+						});
+						var fm_patrol_point_message = Ext.getCmp('fm_patrol_point_message').getValue();
+						var fm_patrol_point_id = Ext.getCmp('fm_patrol_point_id').getValue();
+						var query = new Object();
+
+						query.equipment_code = AllSelectedRecords1[0];
+						query.id = fm_patrol_point_id;
+						query.spot_name = fm_patrol_spot_name;
+						query.company_code = fm_patrol_company_code;
+						query.spot_address = fm_patrol_spot_address;
+						//	        		query.equipment_code = fm_patrol_equipment_code;
+						query.spot_type = spot_type;
+						query.remarks = fm_patrol_point_message;
+						query.picture_route = patrol_point_uploadURL;
+						query.V_LOGINNAME = V_LOGINNAME;
+						// query.V_PASSWORD =  V_PASSWORD;
+						var jsonstr = Ext.JSON.encode(query);
+						Ext.getCmp('fm_patrol_point_queryJson').setValue(jsonstr);
+						Ext.getCmp('patrolUploadForm').submit({
+							success: function (form, action) {
+								//	        				uploadPop.hide();
+								Ext.getCmp('patrol_upload_picture').getEl().dom.src = '../../res/img/common/shangchaun.png';
+								Ext.getCmp('patrolUploadForm').getForm().reset();
+								Ext.getCmp('patroladUploadForm').getForm().reset();
+								//	        	       		uploadPanel.getStore().reload();
+								Ext.Msg.alert('系统提示', '保存成功!');
+								clear_modify_form();
+							},
+							failure: function (form, action) {
+								Ext.Msg.alert('系统提示', '保存失败!');
+								clear_modify_form();
+							}
+						});
+						this.up('window').hide();
+					} else {
+						if (AllSelectedRecords1.length > 1) {
+							var patrol_point_uploadURL = Ext.getCmp('patrol_point_uploadURL').getValue();
+							var fm_patrol_spot_name = Ext.getCmp('fm_patrol_spot_name').getValue();
+							var fm_patrol_company_code = Ext.getCmp('fm_patrol_company_code').getValue();
+							var fm_patrol_spot_address = Ext.getCmp('fm_patrol_spot_address').getValue();
+							//		        		var fm_patrol_equipment_code=Ext.getCmp('fm_patrol_equipment_code').getValue();
+							//		        		var fm_patrol_spot_type=patrolUploadForm.form.findField("fm_patrol_spot_type").getGroupValue();
+							var fm_patrol_spot_type = Ext.getCmp('fm_patrol_spot_type').getChecked();
+							var spot_type = '';
+							Ext.Array.each(fm_patrol_spot_type, function (item) {
+								spot_type += item.inputValue + ',';
+							});
+							var fm_patrol_point_message = Ext.getCmp('fm_patrol_point_message').getValue();
+							var fm_patrol_point_id = Ext.getCmp('fm_patrol_point_id').getValue();
+							var query = new Object();
+							var spot_id = null;
+							//	                     var selected = sm1.getSelection( );
+							for (var i = 0; i < AllSelectedRecords1.length; i++) {
+								if (i == 0)
 									spot_id = AllSelectedRecords1[i];
 								else
-									spot_id += ","+AllSelectedRecords1[i];
-				               }
-		        		query.id = fm_patrol_point_id;
-		        		query.equipment_code = spot_id;
-		        		query.spot_name = fm_patrol_spot_name;
-		        		query.company_code = fm_patrol_company_code;
-		        		query.spot_address = fm_patrol_spot_address;
-//		        		query.equipment_code = fm_patrol_equipment_code;
-		        		query.spot_type = spot_type;
-		        		query.remarks = fm_patrol_point_message;
-		        		query.picture_route = patrol_point_uploadURL;
-		        		query.V_LOGINNAME = V_LOGINNAME;
-			        	// query.V_PASSWORD =  V_PASSWORD;
-			        	var jsonstr = Ext.JSON.encode(query);
-			        	Ext.getCmp('fm_patrol_point_queryJson').setValue(jsonstr);
-		        		Ext.getCmp('patrolUploadForm').submit({
-		        			success: function(form, action){
-//		        				uploadPop.hide();
-		        	       		Ext.getCmp('patrol_upload_picture').getEl().dom.src='../../res/img/common/shangchaun.png';
-		        	       		Ext.getCmp('patrolUploadForm').getForm().reset();
-		        	       		Ext.getCmp('patroladUploadForm').getForm().reset();
-//		        	       		uploadPanel.getStore().reload();
-		        				Ext.Msg.alert('系统提示', '保存成功!');
-		        				clear_modify_form();
-		        			},
-		        			failure: function(form, action){
-		        				Ext.Msg.alert('系统提示', '保存失败!');
-		        				clear_modify_form();
-		        			}
-		        		});
-			        	
-		        	  this.up('window').hide();
-	        		}
-	        	}
-	         }
-	        },{
-	        	text: '取消',
-	        	handler: function(){
-	        		this.up('window').hide();
-		       		Ext.getCmp('patrol_upload_picture').getEl().dom.src='../../res/img/common/shangchaun.png';
-		       		Ext.getCmp('patrolUploadForm').getForm().reset();
-		       		Ext.getCmp('patroladUploadForm').getForm().reset();
-		       		Ext.getCmp('PatrolpointListPageToolbar').moveFirst();
-	        	}
-	        }]
+									spot_id += "," + AllSelectedRecords1[i];
+							}
+							query.id = fm_patrol_point_id;
+							query.equipment_code = spot_id;
+							query.spot_name = fm_patrol_spot_name;
+							query.company_code = fm_patrol_company_code;
+							query.spot_address = fm_patrol_spot_address;
+							//		        		query.equipment_code = fm_patrol_equipment_code;
+							query.spot_type = spot_type;
+							query.remarks = fm_patrol_point_message;
+							query.picture_route = patrol_point_uploadURL;
+							query.V_LOGINNAME = V_LOGINNAME;
+							// query.V_PASSWORD =  V_PASSWORD;
+							var jsonstr = Ext.JSON.encode(query);
+							Ext.getCmp('fm_patrol_point_queryJson').setValue(jsonstr);
+							Ext.getCmp('patrolUploadForm').submit({
+								success: function (form, action) {
+									//		        				uploadPop.hide();
+									Ext.getCmp('patrol_upload_picture').getEl().dom.src = '../../res/img/common/shangchaun.png';
+									Ext.getCmp('patrolUploadForm').getForm().reset();
+									Ext.getCmp('patroladUploadForm').getForm().reset();
+									//		        	       		uploadPanel.getStore().reload();
+									Ext.Msg.alert('系统提示', '保存成功!');
+									clear_modify_form();
+								},
+								failure: function (form, action) {
+									Ext.Msg.alert('系统提示', '保存失败!');
+									clear_modify_form();
+								}
+							});
+
+							this.up('window').hide();
+						}
+					}
+				}
+			}, {
+				text: '取消',
+				handler: function () {
+					this.up('window').hide();
+					Ext.getCmp('patrol_upload_picture').getEl().dom.src = '../../res/img/common/shangchaun.png';
+					Ext.getCmp('patrolUploadForm').getForm().reset();
+					Ext.getCmp('patroladUploadForm').getForm().reset();
+					Ext.getCmp('PatrolpointListPageToolbar').moveFirst();
+				}
+			}]
 	});
-	
-	
-	
+
+
+
 	var patroladdWin = Ext.create('Ext.window.Window', {
 		id: 'patroladdWin',
-	    title: '增加巡检点位',
-	    height: 600,
-	    width: 800,
-//	    maximizable: true,
-	    modal: true,
-	    closeAction: 'hide',
-	    items: [
-	    	patroladdForm,patroladaddForm,MaintenanceCheckPanel2
-	    ],
-	    buttons: [
-	        {
-	        	text: '保存',
-	        	handler: function(){
-	        		if(AllSelectedRecords.length==1){
-	        		var fa_patrol_spot_name=Ext.getCmp('fa_patrol_spot_name').getValue();
-	        		var fa_patrol_company_code=Ext.getCmp('fa_patrol_company_code').getValue();
-	        		var fa_patrol_spot_address=Ext.getCmp('fa_patrol_spot_address').getValue();
-//	        		var fa_patrol_equipment_code=Ext.getCmp('fa_patrol_equipment_code').getValue();
-	        		var fa_patrol_spot_type = Ext.getCmp('fa_patrol_spot_type').getChecked();
-		        	var spot_type='';
-		        	Ext.Array.each(fa_patrol_spot_type, function(item){
-		        		spot_type +=item.inputValue+',';
-		        	});
-//	        		var fa_patrol_spot_type = patroladdForm.getForm().findField("fa_patrol_spot_type").getGroupValue();
-	        		var fa_patrol_point_message=Ext.getCmp('fa_patrol_point_message').getValue();
-	        		var patrol_point_addURL = Ext.getCmp('patrol_point_addURL').getValue();
-	        		if(patrol_point_addURL == "" || patrol_point_addURL == null){
-	        			Ext.Msg.alert('系统提示', '请上传图标'+fa_patrol_spot_type);
-	        			return;
-	        		}
-	        		var query = new Object();
-	        		query.spot_name = fa_patrol_spot_name;
-	        		query.company_code = fa_patrol_company_code;
-	        		query.spot_address = fa_patrol_spot_address;
-//	        		query.equipment_code = fa_patrol_equipment_code;
-	        		query.spot_type = spot_type;
-	        		query.remarks = fa_patrol_point_message;
-	        		query.picture_route = patrol_point_addURL;
-	        		query.equipment_code = AllSelectedRecords[0];
-	        		query.V_LOGINNAME = V_LOGINNAME;
-		        	// query.V_PASSWORD =  V_PASSWORD;
-		        	var jsonstr = Ext.JSON.encode(query);
-		        	Ext.getCmp('fa_patrol_point_queryJson').setValue(jsonstr);
-		        	Ext.getCmp('patroladdForm').submit({
-	        			success: function(form, action){
-//	        				addPop.hide();
-	        	       		Ext.getCmp('patrol_add_picture').getEl().dom.src='../../res/img/common/shangchaun.png';
-	        	       		Ext.getCmp('patroladdForm').getForm().reset();
-	        	       		Ext.getCmp('patroladaddForm').getForm().reset();
-//	        	       		uploadPanel.getStore().reload();
-	        				Ext.Msg.alert('系统提示', '保存成功!');
-	        				clear_append_form();
-	        			},
-	        			failure: function(form, action){
-	        				Ext.Msg.alert('系统提示', '保存失败!');
-	        				clear_append_form();
-	        				
-	        			}
-	        		});
-	        	  }else{
-	        		  if(AllSelectedRecords.length>1){
-	        			  var fa_patrol_spot_name=Ext.getCmp('fa_patrol_spot_name').getValue();
-	  	        		var fa_patrol_company_code=Ext.getCmp('fa_patrol_company_code').getValue();
-	  	        		var fa_patrol_spot_address=Ext.getCmp('fa_patrol_spot_address').getValue();
-//	  	        		var fa_patrol_equipment_code=Ext.getCmp('fa_patrol_equipment_code').getValue();
-//	  	        		var fa_patrol_spot_type = patroladdForm.getForm().findField("fa_patrol_spot_type").getGroupValue();
-	  	        		var fa_patrol_spot_type = Ext.getCmp('fa_patrol_spot_type').getChecked();
-			        	var spot_type='';
-			        	Ext.Array.each(fa_patrol_spot_type, function(item){
-			        		spot_type +=item.inputValue+',';
-			        	});
-	  	        		var fa_patrol_point_message=Ext.getCmp('fa_patrol_point_message').getValue();
-	  	        		var patrol_point_addURL = Ext.getCmp('patrol_point_addURL').getValue();
-	  	        		if(patrol_point_addURL == "" || patrol_point_addURL == null){
-	  	        			Ext.Msg.alert('系统提示', '请上传图标'+fa_patrol_spot_type);
-	  	        			return;
-	  	        		}
-	  	        		var query = new Object();
-	  	        		query.spot_name = fa_patrol_spot_name;
-	  	        		query.company_code = fa_patrol_company_code;
-	  	        		query.spot_address = fa_patrol_spot_address;
-//	  	        		query.equipment_code = fa_patrol_equipment_code;
-	  	        		query.spot_type = spot_type;
-	  	        		query.remarks = fa_patrol_point_message;
-	  	        		query.picture_route = patrol_point_addURL;
-	  	        		var spot_id = null;
-//	                     var selected = sm1.getSelection( );
-	                     for(var i=0;i<AllSelectedRecords.length;i++){
-				                if(i==0)
+		title: '增加巡检点位',
+		height: 600,
+		width: 800,
+		//	    maximizable: true,
+		modal: true,
+		closeAction: 'hide',
+		items: [
+			patroladdForm, patroladaddForm, MaintenanceCheckPanel2
+		],
+		buttons: [
+			{
+				text: '保存',
+				handler: function () {
+					if (AllSelectedRecords.length == 1) {
+						var fa_patrol_spot_name = Ext.getCmp('fa_patrol_spot_name').getValue();
+						if(fa_patrol_spot_name == "" || fa_patrol_spot_name == null){
+							Ext.Msg.alert('系统提示', '点位名称不能为空!');
+							return;
+						}
+						var fa_patrol_company_code = Ext.getCmp('fa_patrol_company_code').getValue();
+						if(fa_patrol_company_code == "" || fa_patrol_company_code == null){
+							Ext.Msg.alert('系统提示', '请选择所属建筑/项目!');
+							return;
+						}
+						var fa_patrol_spot_address = Ext.getCmp('fa_patrol_spot_address').getValue();
+						if(fa_patrol_spot_address == "" || fa_patrol_spot_address == null){
+							Ext.Msg.alert('系统提示', '点位地址不能为空!');
+							return;
+						}
+						//	        		var fa_patrol_equipment_code=Ext.getCmp('fa_patrol_equipment_code').getValue();
+						var fa_patrol_spot_type = Ext.getCmp('fa_patrol_spot_type').getChecked();
+						var spot_type = '';
+						Ext.Array.each(fa_patrol_spot_type, function (item) {
+							spot_type += item.inputValue + ',';
+						});
+						//	        		var fa_patrol_spot_type = patroladdForm.getForm().findField("fa_patrol_spot_type").getGroupValue();
+						var fa_patrol_point_message = Ext.getCmp('fa_patrol_point_message').getValue();
+						var patrol_point_addURL = Ext.getCmp('patrol_point_addURL').getValue();
+						if (patrol_point_addURL == "" || patrol_point_addURL == null) {
+							Ext.Msg.alert('系统提示', '请上传图标' + fa_patrol_spot_type);
+							return;
+						}
+						var query = new Object();
+						query.spot_name = fa_patrol_spot_name;
+						query.company_code = fa_patrol_company_code;
+						query.spot_address = fa_patrol_spot_address;
+						//	        		query.equipment_code = fa_patrol_equipment_code;
+						query.spot_type = spot_type;
+						query.remarks = fa_patrol_point_message;
+						query.picture_route = patrol_point_addURL;
+						query.equipment_code = AllSelectedRecords[0];
+						query.V_LOGINNAME = V_LOGINNAME;
+						// query.V_PASSWORD =  V_PASSWORD;
+						var jsonstr = Ext.JSON.encode(query);
+						Ext.getCmp('fa_patrol_point_queryJson').setValue(jsonstr);
+						Ext.getCmp('patroladdForm').submit({
+							success: function (form, action) {
+								//	        				addPop.hide();
+								Ext.getCmp('patrol_add_picture').getEl().dom.src = '../../res/img/common/shangchaun.png';
+								Ext.getCmp('patroladdForm').getForm().reset();
+								Ext.getCmp('patroladaddForm').getForm().reset();
+								//	        	       		uploadPanel.getStore().reload();
+								Ext.Msg.alert('系统提示', '保存成功!');
+								clear_append_form();
+							},
+							failure: function (form, action) {
+								Ext.Msg.alert('系统提示', '保存失败!');
+								clear_append_form();
+
+							}
+						});
+					} else {
+						if (AllSelectedRecords.length > 1) {
+							var fa_patrol_spot_name = Ext.getCmp('fa_patrol_spot_name').getValue();
+							var fa_patrol_company_code = Ext.getCmp('fa_patrol_company_code').getValue();
+							var fa_patrol_spot_address = Ext.getCmp('fa_patrol_spot_address').getValue();
+							//	  	        		var fa_patrol_equipment_code=Ext.getCmp('fa_patrol_equipment_code').getValue();
+							//	  	        		var fa_patrol_spot_type = patroladdForm.getForm().findField("fa_patrol_spot_type").getGroupValue();
+							var fa_patrol_spot_type = Ext.getCmp('fa_patrol_spot_type').getChecked();
+							var spot_type = '';
+							Ext.Array.each(fa_patrol_spot_type, function (item) {
+								spot_type += item.inputValue + ',';
+							});
+							var fa_patrol_point_message = Ext.getCmp('fa_patrol_point_message').getValue();
+							var patrol_point_addURL = Ext.getCmp('patrol_point_addURL').getValue();
+							if (patrol_point_addURL == "" || patrol_point_addURL == null) {
+								Ext.Msg.alert('系统提示', '请上传图标' + fa_patrol_spot_type);
+								return;
+							}
+							var query = new Object();
+							query.spot_name = fa_patrol_spot_name;
+							query.company_code = fa_patrol_company_code;
+							query.spot_address = fa_patrol_spot_address;
+							//	  	        		query.equipment_code = fa_patrol_equipment_code;
+							query.spot_type = spot_type;
+							query.remarks = fa_patrol_point_message;
+							query.picture_route = patrol_point_addURL;
+							var spot_id = null;
+							//	                     var selected = sm1.getSelection( );
+							for (var i = 0; i < AllSelectedRecords.length; i++) {
+								if (i == 0)
 									spot_id = AllSelectedRecords[i];
 								else
-									spot_id += ","+AllSelectedRecords[i];
-				               }
-
-	                    query.equipment_code = spot_id;
-	  	        		query.V_LOGINNAME = V_LOGINNAME;
-	  		        	// query.V_PASSWORD =  V_PASSWORD;
-	  		        	var jsonstr = Ext.JSON.encode(query);
-	  		        	Ext.getCmp('fa_patrol_point_queryJson').setValue(jsonstr);
-	  		        	Ext.getCmp('patroladdForm').submit({
-//	  	        			waitTitle: '系统提示',
-//	  	        			waitMsg: '保存中......',
-	  	        			success: function(form, action){
-//	  	        				addPop.hide();
-	  	        	       		Ext.getCmp('patrol_add_picture').getEl().dom.src='../../res/img/common/shangchaun.png';
-	  	        	       		Ext.getCmp('patroladdForm').getForm().reset();
-	  	        	       		Ext.getCmp('patroladaddForm').getForm().reset();
-//	  	        	       		uploadPanel.getStore().reload();
-	  	        				Ext.Msg.alert('系统提示', '保存成功!');
-	  	        				clear_append_form();
-	  	        			},
-	  	        			failure: function(form, action){
-	  	        				Ext.Msg.alert('系统提示', '保存失败!');
-	  	        				clear_append_form();
-	  	        				
-	  	        			}
-	  	        		});  
-	        		  }
-	        	  }
-	          }
-	        },{
-	        	text: '取消',
-	        	handler: function(){
-	        		this.up('window').hide();
-		       		Ext.getCmp('patrol_add_picture').getEl().dom.src='../../res/img/common/shangchaun.png';
-		       		Ext.getCmp('patroladdForm').getForm().reset();
-		       		Ext.getCmp('patroladaddForm').getForm().reset();
-		       		Ext.getCmp('PatrolpointListPageToolbar').moveFirst();
-	        	}
-	        }]
+									spot_id += "," + AllSelectedRecords[i];
+							}
+
+							query.equipment_code = spot_id;
+							query.V_LOGINNAME = V_LOGINNAME;
+							// query.V_PASSWORD =  V_PASSWORD;
+							var jsonstr = Ext.JSON.encode(query);
+							Ext.getCmp('fa_patrol_point_queryJson').setValue(jsonstr);
+							Ext.getCmp('patroladdForm').submit({
+								//	  	        			waitTitle: '系统提示',
+								//	  	        			waitMsg: '保存中......',
+								success: function (form, action) {
+									//	  	        				addPop.hide();
+									Ext.getCmp('patrol_add_picture').getEl().dom.src = '../../res/img/common/shangchaun.png';
+									Ext.getCmp('patroladdForm').getForm().reset();
+									Ext.getCmp('patroladaddForm').getForm().reset();
+									//	  	        	       		uploadPanel.getStore().reload();
+									Ext.Msg.alert('系统提示', '保存成功!');
+									clear_append_form();
+								},
+								failure: function (form, action) {
+									Ext.Msg.alert('系统提示', '保存失败!');
+									clear_append_form();
+
+								}
+							});
+						}
+					}
+				}
+			}, {
+				text: '取消',
+				handler: function () {
+					this.up('window').hide();
+					Ext.getCmp('patrol_add_picture').getEl().dom.src = '../../res/img/common/shangchaun.png';
+					Ext.getCmp('patroladdForm').getForm().reset();
+					Ext.getCmp('patroladaddForm').getForm().reset();
+					Ext.getCmp('PatrolpointListPageToolbar').moveFirst();
+				}
+			}]
 	});
-	
-	var addhtml=function(){ 
-		  var adaddFormhtml = document.getElementById('patroladaddForm');
-		  var title = document.createElement('div');
-		  title.setAttribute('class','Maintenancediv_title');
-		  title.innerHTML='点位图片:';
-		  adaddFormhtml.appendChild(title);
-		 }
-	var uploadhtml=function(){ 
-		  var uploadFormhtml = document.getElementById('patroladUploadForm');
-		  var title = document.createElement('div');
-		  title.setAttribute('class','Maintenancediv_title');
-		  title.innerHTML='点位图片:';
-		  uploadFormhtml.appendChild(title);
-		 }
-	
-	var uploadPop = function(){
+
+	var addhtml = function () {
+		var adaddFormhtml = document.getElementById('patroladaddForm');
+		var title = document.createElement('div');
+		title.setAttribute('class', 'Maintenancediv_title');
+		title.innerHTML = '点位图片:';
+		adaddFormhtml.appendChild(title);
+	}
+	var uploadhtml = function () {
+		var uploadFormhtml = document.getElementById('patroladUploadForm');
+		var title = document.createElement('div');
+		title.setAttribute('class', 'Maintenancediv_title');
+		title.innerHTML = '点位图片:';
+		uploadFormhtml.appendChild(title);
+	}
+
+	var uploadPop = function () {
 		patroluploadWin.show();
-		 uploadhtml();
+		uploadhtml();
 	}
-	var addPop = function(){
-		
+	var addPop = function () {
+
 		AllSelectedRecords.length = 0;
 		var query = new Object();
 		query.V_LOGINNAME = $("#V_LOGINNAME").val();
 		// query.V_PASSWORD =  $("#V_PASSWORD").val();
 		var jsonstr = Ext.JSON.encode(query);
-    	myStore2.getProxy().extraParams = {
-    		queryJson : jsonstr
-    	};
-  
-    	Ext.getCmp('PatrolCheckListPageToolbar2').moveFirst();
+		myStore2.getProxy().extraParams = {
+			queryJson: jsonstr
+		};
+
+		Ext.getCmp('PatrolCheckListPageToolbar2').moveFirst();
 		patroladdWin.show();
 		addhtml();
-    }
-		
-	var chk_sm = function() {
-		if(sm.getCount()==1){
-			var selected = sm.getSelection( );
+	}
+
+	var chk_sm = function () {
+		if (sm.getCount() == 1) {
+			var selected = sm.getSelection();
 			var b = selected[0].raw.equipment_code_list;
 			AllSelectedRecords1 = b.split(",");
 			getManufacturerId2.reload();
 			var div = Ext.getCmp('fm_patrol_company_code');
-			var label= selected[0].raw.id
+			var label = selected[0].raw.id
 			var query = new Object();
-//    		if(label.length>0){
-    		  query.dwid = label;
-//    		}
-    		query.building_id = selected[0].raw.company_code;
-    		query.V_LOGINNAME = V_LOGINNAME;
-    		// query.V_PASSWORD =  V_PASSWORD;
-    		var jsonstr = Ext.JSON.encode(query);
-        	myStore3.getProxy().extraParams = {
-        		queryJson : jsonstr
-        	};
-        	Ext.getCmp('PatrolCheckListPageToolbar3').moveFirst();
-        	uploadPop();
-        	Ext.getCmp('fm_patrol_point_id').setValue(selected[0].raw.id);
+			//    		if(label.length>0){
+			query.dwid = label;
+			//    		}
+			query.building_id = selected[0].raw.company_code;
+			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD =  V_PASSWORD;
+			var jsonstr = Ext.JSON.encode(query);
+			myStore3.getProxy().extraParams = {
+				queryJson: jsonstr
+			};
+			Ext.getCmp('PatrolCheckListPageToolbar3').moveFirst();
+			uploadPop();
+			Ext.getCmp('fm_patrol_point_id').setValue(selected[0].raw.id);
 			Ext.getCmp('fm_patrol_spot_name').setValue(selected[0].raw.spot_name);
 			div.setValue(selected[0].raw.company_code);
 			Ext.getCmp('fm_patrol_spot_address').setValue(selected[0].raw.spot_address);
 			var a = selected[0].raw.spot_type;
-//			if(Number(a) ==1){
-//				var radio = Ext.getCmp('radio81');
-//	            radio.setValue(true);
-//			}else if(Number(a)==2){
-//				var radio = Ext.getCmp('radio82');
-//	            radio.setValue(true);
-//			}else if(Number(a)==3){
-//				var radio = Ext.getCmp('radio83');
-//	            radio.setValue(true);
-//			}else if(Number(a)==4){
-//				var radio = Ext.getCmp('radio84');
-//	            radio.setValue(true);
-//			}else if(Number(a)==5){
-//				var radio = Ext.getCmp('radio85');
-//	            radio.setValue(true);
-//			}else if(Number(a)==6){
-//				var radio = Ext.getCmp('radio86');
-//	            radio.setValue(true);
-//			}else if(Number(a)==7){
-//				var radio = Ext.getCmp('radio87');
-//	            radio.setValue(true);
-//			}
+			//			if(Number(a) ==1){
+			//				var radio = Ext.getCmp('radio81');
+			//	            radio.setValue(true);
+			//			}else if(Number(a)==2){
+			//				var radio = Ext.getCmp('radio82');
+			//	            radio.setValue(true);
+			//			}else if(Number(a)==3){
+			//				var radio = Ext.getCmp('radio83');
+			//	            radio.setValue(true);
+			//			}else if(Number(a)==4){
+			//				var radio = Ext.getCmp('radio84');
+			//	            radio.setValue(true);
+			//			}else if(Number(a)==5){
+			//				var radio = Ext.getCmp('radio85');
+			//	            radio.setValue(true);
+			//			}else if(Number(a)==6){
+			//				var radio = Ext.getCmp('radio86');
+			//	            radio.setValue(true);
+			//			}else if(Number(a)==7){
+			//				var radio = Ext.getCmp('radio87');
+			//	            radio.setValue(true);
+			//			}
 			var arr = a.split(",");
-			for(var i = 0 ;i < arr.length;i++) {
-			    switch(arr[i]) {
-			    case "1":
-			     Ext.getCmp('radio81').setValue(true);
-			     break; 
-			    case "2":
-			     Ext.getCmp('radio82').setValue(true);
-			        break;
-			    case "3":
-				 Ext.getCmp('radio83').setValue(true);
-				    break;
-			    case "4":
-			     Ext.getCmp('radio84').setValue(true);
-			        break;
-			    case "5":
-				 Ext.getCmp('radio85').setValue(true);
-				    break;
-			    case "6":
-				 Ext.getCmp('radio86').setValue(true);
-					break;
-			    case "7":
-				 Ext.getCmp('radio87').setValue(true);
-				    break;
-			    }
-			 }
+			for (var i = 0; i < arr.length; i++) {
+				switch (arr[i]) {
+					case "1":
+						Ext.getCmp('radio81').setValue(true);
+						break;
+					case "2":
+						Ext.getCmp('radio82').setValue(true);
+						break;
+					case "3":
+						Ext.getCmp('radio83').setValue(true);
+						break;
+					case "4":
+						Ext.getCmp('radio84').setValue(true);
+						break;
+					case "5":
+						Ext.getCmp('radio85').setValue(true);
+						break;
+					case "6":
+						Ext.getCmp('radio86').setValue(true);
+						break;
+					case "7":
+						Ext.getCmp('radio87').setValue(true);
+						break;
+				}
+			}
 			Ext.getCmp('fm_patrol_point_message').setValue(selected[0].raw.remarks);
 			Ext.getCmp('patrol_point_uploadURL').setValue(selected[0].raw.picture_route);
 			var formPanel = Ext.getCmp('patroladUploadForm');
 			var imageShow_box = formPanel.down('box[id=patrol_upload_picture]');//预览的图片框对象
-            var imageShow_box_dom = imageShow_box.getEl().dom;
-            imageShow_box_dom.src = baseUrl+(selected[0].raw.picture_route);
-		}else{
-			Ext.Msg.alert('请先选择','请先选择一条记录,再点击修改');
+			var imageShow_box_dom = imageShow_box.getEl().dom;
+			imageShow_box_dom.src = baseUrl + (selected[0].raw.picture_route);
+		} else {
+			Ext.Msg.alert('请先选择', '请先选择一条记录,再点击修改');
 		}
 	}
-	
-	var del_sm = function() {
-		if(sm.getCount()==1){
-			var selected = sm.getSelection( );
+
+	var del_sm = function () {
+		if (sm.getCount() == 1) {
+			var selected = sm.getSelection();
 			var query = new Object();
 			var list = new Array();
 			var o = new Object();
 			o.id = selected[0].raw.id;
 			list.push(o);
 			query.ID_LIST = list;
-			var jsonstr= Ext.JSON.encode(query);
-			Ext.MessageBox.confirm('删除巡检点位','是否删除'+selected[0].raw.spot_name+' 巡检点位?',function(btn){
-				if(btn=='yes'){
+			var jsonstr = Ext.JSON.encode(query);
+			Ext.MessageBox.confirm('删除巡检点位', '是否删除' + selected[0].raw.spot_name + ' 巡检点位?', function (btn) {
+				if (btn == 'yes') {
 					$.ajax({
-			             type:'POST',
-			             url: baseUrl+"iot/inspectionpoints/del",
-			             data: {
-			              queryJson : jsonstr
-			            
-			           },
-			           success: function(result){
-			             
-			                 var json = eval('(' + result + ')');
-			                 if(json.action=='deleteInspectionPoints'){
-			                     if(json.success==true){
-			                       Ext.Msg.alert('操作成功', json.MSG , function(btn,txt){
-			                	      Ext.getCmp('PatrolpointListPanel').getStore().reload();
-			                       }); 
-			                	 }else{
-			                		 Ext.Msg.alert('操作失败', json.MSG , function(btn,txt){
-				                	      Ext.getCmp('PatrolpointListPanel').getStore().reload();
-				                      }); 
-			                	 }
-			                 }
-			             
-			            }
-			            
-			     });
-				
+						type: 'POST',
+						url: baseUrl + "iot/inspectionpoints/del",
+						data: {
+							queryJson: jsonstr
+
+						},
+						success: function (result) {
+
+							var json = eval('(' + result + ')');
+							if (json.action == 'deleteInspectionPoints') {
+								if (json.success == true) {
+									Ext.Msg.alert('操作成功', json.MSG, function (btn, txt) {
+										Ext.getCmp('PatrolpointListPanel').getStore().reload();
+									});
+								} else {
+									Ext.Msg.alert('操作失败', json.MSG, function (btn, txt) {
+										Ext.getCmp('PatrolpointListPanel').getStore().reload();
+									});
+								}
+							}
+
+						}
+
+					});
+
 				}
-			},this);
-		}else{
-			if(sm.getCount()>1){
+			}, this);
+		} else {
+			if (sm.getCount() > 1) {
 				var query = new Object();
 				var list = new Array();
-				for(var i=0;i<sm.getCount();i++){
-					var selected = sm.getSelection( );
+				for (var i = 0; i < sm.getCount(); i++) {
+					var selected = sm.getSelection();
 					var o = new Object();
 					o.id = selected[i].raw.id;
 					list.push(o);
 				}
 				query.ID_LIST = list;
-				
-				var jsonstr= Ext.JSON.encode(query);
-				Ext.MessageBox.confirm('删除巡检点位','是否删除选中的'+sm.getCount()+' 个巡检点位?',function(btn){
-					if(btn=='yes'){
-						
+
+				var jsonstr = Ext.JSON.encode(query);
+				Ext.MessageBox.confirm('删除巡检点位', '是否删除选中的' + sm.getCount() + ' 个巡检点位?', function (btn) {
+					if (btn == 'yes') {
+
 						$.ajax({
-				             type:'POST',
-				             url: baseUrl+"iot/inspectionpoints/del",
-				             data: {
-				              queryJson : jsonstr
-				            
-				           },
-				           success: function(result){
-				             
-				             var json = eval('(' + result + ')');
-				             if(json.action=='deleteInspectionPoints'){
-			                     if(json.success==true){
-			                       Ext.Msg.alert('操作成功', json.MSG , function(btn,txt){
-			                	      Ext.getCmp('PatrolpointListPanel').getStore().reload();
-			                       }); 
-			                	 }else{
-			                		 Ext.Msg.alert('操作失败', json.MSG , function(btn,txt){
-				                	      Ext.getCmp('PatrolpointListPanel').getStore().reload();
-				                      }); 
-			                	 }
-			                  }                     
-				            }
-				     });
-					
+							type: 'POST',
+							url: baseUrl + "iot/inspectionpoints/del",
+							data: {
+								queryJson: jsonstr
+
+							},
+							success: function (result) {
+
+								var json = eval('(' + result + ')');
+								if (json.action == 'deleteInspectionPoints') {
+									if (json.success == true) {
+										Ext.Msg.alert('操作成功', json.MSG, function (btn, txt) {
+											Ext.getCmp('PatrolpointListPanel').getStore().reload();
+										});
+									} else {
+										Ext.Msg.alert('操作失败', json.MSG, function (btn, txt) {
+											Ext.getCmp('PatrolpointListPanel').getStore().reload();
+										});
+									}
+								}
+							}
+						});
+
 					}
-				},this);
-			}else{
-			Ext.Msg.alert('请先选择','至少选择一条记录,再点击删除');
-		}
+				}, this);
+			} else {
+				Ext.Msg.alert('请先选择', '至少选择一条记录,再点击删除');
+			}
 		}
 	}
-	
-	var show_page = function(){
+
+	var show_page = function () {
 		var patrolpoint_title2_input = document.getElementById('patrolpoint_title2_input').value;
 		var patrolpoint_title3_input1 = document.getElementById('patrolpoint_title3_input1').value;
 		var query = new Object();
-		if(patrolpoint_title2_input.length>0){
-		  query.spot_name = patrolpoint_title2_input;
-		  $("#spot_name").val(patrolpoint_title2_input);
+		if (patrolpoint_title2_input.length > 0) {
+			query.spot_name = patrolpoint_title2_input;
+			$("#spot_name").val(patrolpoint_title2_input);
 		}
-		if(patrolpoint_title3_input1.length>0){
-		query.spot_address = patrolpoint_title3_input1;
-		$("#spot_address").val(patrolpoint_title3_input1);
+		if (patrolpoint_title3_input1.length > 0) {
+			query.spot_address = patrolpoint_title3_input1;
+			$("#spot_address").val(patrolpoint_title3_input1);
 		}
 		query.V_LOGINNAME = V_LOGINNAME;
 		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
-    	myStore.getProxy().extraParams = {
-    		queryJson : jsonstr
-    	};
-    	Ext.getCmp('PatrolpointListPageToolbar').moveFirst();
+		myStore.getProxy().extraParams = {
+			queryJson: jsonstr
+		};
+		Ext.getCmp('PatrolpointListPageToolbar').moveFirst();
 	}
-	
-	var reset1 = function(){
+
+	var reset1 = function () {
 		document.getElementById('patrolpoint_title2_input').value = '';
 		document.getElementById('patrolpoint_title3_input1').value = '';
 		$("#spot_name").val("");
 		$("#spot_address").val("");
 		show_page();
 	}
-	
-	 mouseon = function(obj){
+
+	mouseon = function (obj) {
 		var id = obj.id;
-		$("#"+id).removeClass(id);
-		$("#"+id).addClass(id+'_on');
+		$("#" + id).removeClass(id);
+		$("#" + id).addClass(id + '_on');
 	}
-	
-	 mouseoff = function(obj){
+
+	mouseoff = function (obj) {
 		var mid = "patrolpoint_";
-		for(var i=1;i<7;i++){
-			var id = "patrolpoint_title"+i+"_div";
-			$("#"+id).removeClass(id+'_on');
-			$("#"+id).addClass(id);
+		for (var i = 1; i < 7; i++) {
+			var id = "patrolpoint_title" + i + "_div";
+			$("#" + id).removeClass(id + '_on');
+			$("#" + id).addClass(id);
 		}
-		if(menuidx=='m1'){
+		if (menuidx == 'm1') {
 			mid += 'title1_div';
-		$("#"+mid).removeClass(mid);
-		$("#"+mid).addClass(mid+'_on');
+			$("#" + mid).removeClass(mid);
+			$("#" + mid).addClass(mid + '_on');
 		}
-		else if(menuidx=='m2'){
+		else if (menuidx == 'm2') {
 			mid += 'title2_div';
-		$("#"+mid).removeClass(mid);
-		$("#"+mid).addClass(mid+'_on');
+			$("#" + mid).removeClass(mid);
+			$("#" + mid).addClass(mid + '_on');
 		}
-		else if(menuidx=='m3'){
+		else if (menuidx == 'm3') {
 			mid += 'title3_div';
-		$("#"+mid).removeClass(mid);
-		$("#"+mid).addClass(mid+'_on');
+			$("#" + mid).removeClass(mid);
+			$("#" + mid).addClass(mid + '_on');
 		}
-		else if(menuidx=='m4'){
+		else if (menuidx == 'm4') {
 			mid += 'title4_div';
-		$("#"+mid).removeClass(mid);
-		$("#"+mid).addClass(mid+'_on');
+			$("#" + mid).removeClass(mid);
+			$("#" + mid).addClass(mid + '_on');
 		}
-		else if(menuidx=='m5'){
+		else if (menuidx == 'm5') {
 			mid += 'title5_div';
-		$("#"+mid).removeClass(mid);
-		$("#"+mid).addClass(mid+'_on');
+			$("#" + mid).removeClass(mid);
+			$("#" + mid).addClass(mid + '_on');
 		}
-		else if(menuidx=='m6'){
+		else if (menuidx == 'm6') {
 			mid += 'title6_div';
-		$("#"+mid).removeClass(mid);
-		$("#"+mid).addClass(mid+'_on');
+			$("#" + mid).removeClass(mid);
+			$("#" + mid).addClass(mid + '_on');
 		}
 	}
-	
-	 menu_click = function(obj){
+
+	menu_click = function (obj) {
 		var id = obj.id;
-		if(id=='patrolpoint_title1_div'){
+		if (id == 'patrolpoint_title1_div') {
 			menuidx = 'm1';
 			show_page();
 		}
-		else if(id=='patrolpoint_title2_div'){
+		else if (id == 'patrolpoint_title2_div') {
 			menuidx = 'm2';
 			reset1();
 		}
-		else if(id=='patrolpoint_title3_div'){
+		else if (id == 'patrolpoint_title3_div') {
 			menuidx = 'm3';
 			exportbtn_click();
 		}
-		else if(id=='patrolpoint_title4_div'){
+		else if (id == 'patrolpoint_title4_div') {
 			menuidx = 'm4';
 			del_sm();
 		}
-		else if(id=='patrolpoint_title5_div'){
+		else if (id == 'patrolpoint_title5_div') {
 			menuidx = 'm5';
 			addPop();
 		}
-		else if(id=='patrolpoint_title6_div'){
+		else if (id == 'patrolpoint_title6_div') {
 			menuidx = 'm6';
 			chk_sm();
 		}
 	}
-	
-	var piedarHtml = function() {
+
+	var piedarHtml = function () {
 		var maintenanceHtml = document.getElementById('patrolpointHtml');
 		var title = document.createElement('div');
-		title.setAttribute('class','MaintenancePersonTitle');
-		title.innerHTML='巡检点位';
+		title.setAttribute('class', 'MaintenancePersonTitle');
+		title.innerHTML = '巡检点位';
 		maintenanceHtml.appendChild(title);
 		var title2 = document.createElement('div');
-		title2.setAttribute('class','title2_div');
-		title2.innerHTML='点位名称';
+		title2.setAttribute('class', 'title2_div');
+		title2.innerHTML = '点位名称';
 		maintenanceHtml.appendChild(title2);
 		var input = document.createElement('input');
-		input.setAttribute('class','input_class');
-		input.setAttribute('id','patrolpoint_title2_input');
-		input.setAttribute('type','text');
-		input.setAttribute('value','');
+		input.setAttribute('class', 'input_class');
+		input.setAttribute('id', 'patrolpoint_title2_input');
+		input.setAttribute('type', 'text');
+		input.setAttribute('value', '');
 		maintenanceHtml.appendChild(input);
 		var title3 = document.createElement('div');
-		title3.setAttribute('class','title3_div');
-		title3.innerHTML='点位地址';
+		title3.setAttribute('class', 'title3_div');
+		title3.innerHTML = '点位地址';
 		maintenanceHtml.appendChild(title3);
 		var input1 = document.createElement('input');
-		input1.setAttribute('class','input1_class');
-		input1.setAttribute('id','patrolpoint_title3_input1');
-		input1.setAttribute('type','text');
-		input1.setAttribute('value','');
+		input1.setAttribute('class', 'input1_class');
+		input1.setAttribute('id', 'patrolpoint_title3_input1');
+		input1.setAttribute('type', 'text');
+		input1.setAttribute('value', '');
 		maintenanceHtml.appendChild(input1);
 		var title4 = document.createElement('div');
-		title4.setAttribute('class','patrolpoint_title1_div');
-		title4.setAttribute('id','patrolpoint_title1_div');
-		title4.setAttribute('onmouseover',"mouseon(this)");
-		title4.setAttribute('onmouseout',"mouseoff(this)");
-		title4.setAttribute('onclick',"menu_click(this)");
+		title4.setAttribute('class', 'patrolpoint_title1_div');
+		title4.setAttribute('id', 'patrolpoint_title1_div');
+		title4.setAttribute('onmouseover', "mouseon(this)");
+		title4.setAttribute('onmouseout', "mouseoff(this)");
+		title4.setAttribute('onclick', "menu_click(this)");
 		maintenanceHtml.appendChild(title4);
 		var title5 = document.createElement('div');
-		title5.setAttribute('class','patrolpoint_title2_div');
-		title5.setAttribute('id','patrolpoint_title2_div');
-		title5.setAttribute('onmouseover',"mouseon(this)");
-		title5.setAttribute('onmouseout',"mouseoff(this)");
-		title5.setAttribute('onclick',"menu_click(this)");
+		title5.setAttribute('class', 'patrolpoint_title2_div');
+		title5.setAttribute('id', 'patrolpoint_title2_div');
+		title5.setAttribute('onmouseover', "mouseon(this)");
+		title5.setAttribute('onmouseout', "mouseoff(this)");
+		title5.setAttribute('onclick', "menu_click(this)");
 		maintenanceHtml.appendChild(title5);
 		var title6 = document.createElement('div');
-		title6.setAttribute('class','patrolpoint_title3_div');
-		title6.setAttribute('id','patrolpoint_title3_div');
-		title6.setAttribute('onmouseover',"mouseon(this)");
-		title6.setAttribute('onmouseout',"mouseoff(this)");
-		title6.setAttribute('onclick',"menu_click(this)");
+		title6.setAttribute('class', 'patrolpoint_title3_div');
+		title6.setAttribute('id', 'patrolpoint_title3_div');
+		title6.setAttribute('onmouseover', "mouseon(this)");
+		title6.setAttribute('onmouseout', "mouseoff(this)");
+		title6.setAttribute('onclick', "menu_click(this)");
 		maintenanceHtml.appendChild(title6);
 		var title7 = document.createElement('div');
-		title7.setAttribute('class','patrolpoint_title4_div');
-		title7.setAttribute('id','patrolpoint_title4_div');
-		title7.setAttribute('onmouseover',"mouseon(this)");
-		title7.setAttribute('onmouseout',"mouseoff(this)");
-		title7.setAttribute('onclick',"menu_click(this)");
+		title7.setAttribute('class', 'patrolpoint_title4_div');
+		title7.setAttribute('id', 'patrolpoint_title4_div');
+		title7.setAttribute('onmouseover', "mouseon(this)");
+		title7.setAttribute('onmouseout', "mouseoff(this)");
+		title7.setAttribute('onclick', "menu_click(this)");
 		maintenanceHtml.appendChild(title7);
 		var title8 = document.createElement('div');
-		title8.setAttribute('class','patrolpoint_title5_div');
-		title8.setAttribute('id','patrolpoint_title5_div');
-		title8.setAttribute('onmouseover',"mouseon(this)");
-		title8.setAttribute('onmouseout',"mouseoff(this)");
-		title8.setAttribute('onclick',"menu_click(this)");
+		title8.setAttribute('class', 'patrolpoint_title5_div');
+		title8.setAttribute('id', 'patrolpoint_title5_div');
+		title8.setAttribute('onmouseover', "mouseon(this)");
+		title8.setAttribute('onmouseout', "mouseoff(this)");
+		title8.setAttribute('onclick', "menu_click(this)");
 		maintenanceHtml.appendChild(title8);
 		var title9 = document.createElement('div');
-		title9.setAttribute('class','patrolpoint_title6_div');
-		title9.setAttribute('id','patrolpoint_title6_div');
-		title9.setAttribute('onmouseover',"mouseon(this)");
-		title9.setAttribute('onmouseout',"mouseoff(this)");
-		title9.setAttribute('onclick',"menu_click(this)");
+		title9.setAttribute('class', 'patrolpoint_title6_div');
+		title9.setAttribute('id', 'patrolpoint_title6_div');
+		title9.setAttribute('onmouseover', "mouseon(this)");
+		title9.setAttribute('onmouseout', "mouseoff(this)");
+		title9.setAttribute('onclick', "menu_click(this)");
 		maintenanceHtml.appendChild(title9);
 	}
-	
-	var saveFile = function(data, filename){
-	    var save_link = document.createElementNS('http://www.w3.org/1999/xhtml', 'a');
-	    save_link.href = data;
-	    save_link.download = filename;
-	    var event = document.createEvent('MouseEvents');
-	    event.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-	    save_link.dispatchEvent(event);
+
+	var saveFile = function (data, filename) {
+		var save_link = document.createElementNS('http://www.w3.org/1999/xhtml', 'a');
+		save_link.href = data;
+		save_link.download = filename;
+		var event = document.createEvent('MouseEvents');
+		event.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+		save_link.dispatchEvent(event);
 	}
-	
-	var downPng = function(canvas){
+
+	var downPng = function (canvas) {
 		console.log(canvas);
 		var img_data1 = Canvas2Image.saveAsPNG(canvas, true).getAttribute('src');
 		saveFile(img_data1, 'richer.png');
 	}
-	
-	var cutDiv = function(){
+
+	var cutDiv = function () {
 		var content = document.getElementById("patrolpoint_div_ceshi");
 		html2canvas(content, {
-	        onrendered: function(canvas) {
-				 downPng(canvas);
-	        }
-		}); 
-    } 
-	
-	var maintenancelabel = function(){
-		  var maintenance_look_label = document.getElementById('patrolpoint_look_label');
-		  var div3 = document.createElement('div');
-		  div3.setAttribute('id','patrolpoint_div_ceshi');
-		  maintenance_look_label.appendChild(div3);
-		  var div7 = document.createElement('div');
-		  div7.style.width='100%';
-		  div7.style.height='130px';
-		  div7.style.textAlign='center';
-		  div7.style.verticalAlign='middle';
-		  div7.style.background='#fff';
-		  div7.setAttribute('id','patrolpoint_div_ceshi7');
-		  div3.appendChild(div7);
-		  var span = document.createElement('span');
-		  span.style.height='100%';
-		  span.style.display='inline-block';
-		  span.style.verticalAlign='middle';
-		  div7.appendChild(span);
-		  var img = document.createElement('img');
-		  img.width=110;
-		  img.height=100;
-		  img.style.verticalAlign='middle';
-//		  img.src = "../../tp/57988c26-20fd-4782-ac99-3aec6cb4d7ce.png";
-		  img.src = baseUrl+ConfirmStore[0].spot_label_route;
-		  div7.appendChild(img);
-		  var div8 = document.createElement('div');
-		  div8.style.width='100%';
-		  div8.style.height='130px';
-		  div8.style.background='#0082fe';
-		  div8.setAttribute('id','patrolpoint_div_ceshi8');
-		  div3.appendChild(div8);
-		  var div4 = document.createElement('div');
-		  div4.style.textAlign='left';
-		  div4.style.color='#000';
-		  div4.innerHTML='点位名称:'+ConfirmStore[0].spot_name;
-		  div8.appendChild(div4);
-		  var div5 = document.createElement('div');
-		  div5.style.textAlign='left';
-		  div5.style.color='#000';
-		  div5.innerHTML='点位地址:'+ConfirmStore[0].spot_address;
-		  div8.appendChild(div5);
-		  var div6 = document.createElement('div');
-		  div6.style.textAlign='left';
-		  div6.style.color='#000';
-		  div6.innerHTML='点位编号:'+ConfirmStore[0].spot_label_analysis;
-		  div8.appendChild(div6);
-		 }
-	
-	var editRow = function(spot_id){
+			onrendered: function (canvas) {
+				downPng(canvas);
+			}
+		});
+	}
+
+	var maintenancelabel = function () {
+		var maintenance_look_label = document.getElementById('patrolpoint_look_label');
+		var div3 = document.createElement('div');
+		div3.setAttribute('id', 'patrolpoint_div_ceshi');
+		maintenance_look_label.appendChild(div3);
+		var div7 = document.createElement('div');
+		div7.style.width = '100%';
+		div7.style.height = '130px';
+		div7.style.textAlign = 'center';
+		div7.style.verticalAlign = 'middle';
+		div7.style.background = '#fff';
+		div7.setAttribute('id', 'patrolpoint_div_ceshi7');
+		div3.appendChild(div7);
+		var span = document.createElement('span');
+		span.style.height = '100%';
+		span.style.display = 'inline-block';
+		span.style.verticalAlign = 'middle';
+		div7.appendChild(span);
+		var img = document.createElement('img');
+		img.width = 110;
+		img.height = 100;
+		img.style.verticalAlign = 'middle';
+		//		  img.src = "../../tp/57988c26-20fd-4782-ac99-3aec6cb4d7ce.png";
+		img.src = baseUrl + ConfirmStore[0].spot_label_route;
+		div7.appendChild(img);
+		var div8 = document.createElement('div');
+		div8.style.width = '100%';
+		div8.style.height = '130px';
+		div8.style.background = '#0082fe';
+		div8.setAttribute('id', 'patrolpoint_div_ceshi8');
+		div3.appendChild(div8);
+		var div4 = document.createElement('div');
+		div4.style.textAlign = 'left';
+		div4.style.color = '#000';
+		div4.innerHTML = '点位名称:' + ConfirmStore[0].spot_name;
+		div8.appendChild(div4);
+		var div5 = document.createElement('div');
+		div5.style.textAlign = 'left';
+		div5.style.color = '#000';
+		div5.innerHTML = '点位地址:' + ConfirmStore[0].spot_address;
+		div8.appendChild(div5);
+		var div6 = document.createElement('div');
+		div6.style.textAlign = 'left';
+		div6.style.color = '#000';
+		div6.innerHTML = '点位编号:' + ConfirmStore[0].spot_label_analysis;
+		div8.appendChild(div6);
+	}
+
+	var editRow = function (spot_id) {
 		var spot_id = spot_id;
 		Ext.create('Ext.window.Window', {
-			id:'patrolpoint_data_win',
-		    height: 300,
-		    width: 250,
-		    layout: 'fit',
-		    modal:true,
-		    buttons:[
-		    	{
-		    		text:'下载',
-		    		handler : function () {
-		    			cutDiv();
-		    		 }
-		    	},{
-		    		text:'关闭',
-		    		 handler : function() {
-		    			 Ext.getCmp('patrolpoint_data_win').destroy();
-		    		 }
-		    	}
-		    ],
-		    closeAction:'destroy',
-		    html:'<div id="patrolpoint_look_label"></div>'
+			id: 'patrolpoint_data_win',
+			height: 300,
+			width: 250,
+			layout: 'fit',
+			modal: true,
+			buttons: [
+				{
+					text: '下载',
+					handler: function () {
+						cutDiv();
+					}
+				}, {
+					text: '关闭',
+					handler: function () {
+						Ext.getCmp('patrolpoint_data_win').destroy();
+					}
+				}
+			],
+			closeAction: 'destroy',
+			html: '<div id="patrolpoint_look_label"></div>'
 		}).show();
 		var query = new Object();
 		query.V_LOGINNAME = $("#V_LOGINNAME").val();
 		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.id = spot_id;
 		$.ajax({
-	        type:'POST',
-	        url: baseUrl+"iot/inspectionpoints/getList1",
-	        data: {
-	        	queryJson : Ext.JSON.encode(query)
-	    	 },
-	        success: function(result){
-	            var json = eval('(' + result + ')');
-	            if(json.action=='getInspectionPointsList'){
-	                ConfirmStore = json.RESULT;
-	                maintenancelabel(ConfirmStore);
-	       
-	            }
-	        } 
-	    });
+			type: 'POST',
+			url: baseUrl + "iot/inspectionpoints/getList1",
+			data: {
+				queryJson: Ext.JSON.encode(query)
+			},
+			success: function (result) {
+				var json = eval('(' + result + ')');
+				if (json.action == 'getInspectionPointsList') {
+					ConfirmStore = json.RESULT;
+					maintenancelabel(ConfirmStore);
+
+				}
+			}
+		});
 	}
-	
-	var maintenancedevice = function(){
+
+	var maintenancedevice = function () {
 		var maintenance_look_device = document.getElementById('patrolpoint_look_device');
 		var div7 = document.createElement('div');
-		  div7.style.width='400px';
-		  div7.style.height='400px';
-		  div7.style.textAlign='center';
-		  div7.style.verticalAlign='middle';
-//		  div7.style.background='#fff';
-		  div7.setAttribute('id','patrolpoint_div_ceshi10');
-		  maintenance_look_device.appendChild(div7);
-		if(ConfirmStore[0].picture_route){
+		div7.style.width = '400px';
+		div7.style.height = '400px';
+		div7.style.textAlign = 'center';
+		div7.style.verticalAlign = 'middle';
+		//		  div7.style.background='#fff';
+		div7.setAttribute('id', 'patrolpoint_div_ceshi10');
+		maintenance_look_device.appendChild(div7);
+		if (ConfirmStore[0].picture_route) {
 			var img = document.createElement('img');
-			img.width=400;
-			img.height=400;
-			img.src = baseUrl+ConfirmStore[0].picture_route;
-			img.setAttribute('class','maintenance_look_device_img');
+			img.width = 400;
+			img.height = 400;
+			img.src = baseUrl + ConfirmStore[0].picture_route;
+			img.setAttribute('class', 'maintenance_look_device_img');
 			div7.appendChild(img);
-		}else{
+		} else {
 			var span = document.createElement('span');
-			  span.style.height='100%';
-			  span.style.display='inline-block';
-			  span.style.verticalAlign='middle';
-			  div7.appendChild(span);
+			span.style.height = '100%';
+			span.style.display = 'inline-block';
+			span.style.verticalAlign = 'middle';
+			div7.appendChild(span);
 			var img = document.createElement('img');
-			img.width=110;
-			img.height=110;
-			img.style.verticalAlign='middle';
+			img.width = 110;
+			img.height = 110;
+			img.style.verticalAlign = 'middle';
 			img.src = '../../res/img/common/shangchaun.png';
-			img.setAttribute('class','maintenance_look_device_img');
-			img.setAttribute('onclick',"menu_click(this)");
+			img.setAttribute('class', 'maintenance_look_device_img');
+			img.setAttribute('onclick', "menu_click(this)");
 			div7.appendChild(img);
 		}
 		var div4 = document.createElement('div');
-		div4.style.textAlign='center';
-		div4.innerHTML=ConfirmStore[0].remarks;
+		div4.style.textAlign = 'center';
+		div4.innerHTML = ConfirmStore[0].remarks;
 		maintenance_look_device.appendChild(div4);
 	}
-	
-	var editMaintenance = function(spot_id){
+
+	var editMaintenance = function (spot_id) {
 		var spot_id = spot_id;
 		Ext.create('Ext.window.Window', {
-			id:'patrolpoint_data_win1',
-		    height: 500,
-		    width: 400,
-		    layout: 'fit',
-		    modal:true,
-		    buttons:[
-		    	{
-		    		text:'关闭',
-		    		 handler : function() {
-		    			 Ext.getCmp('patrolpoint_data_win1').destroy();
-		    		 }
-		    	}
-		    ],
-		    closeAction:'destroy',
-		    html:'<div id="patrolpoint_look_device"></div>'
+			id: 'patrolpoint_data_win1',
+			height: 500,
+			width: 400,
+			layout: 'fit',
+			modal: true,
+			buttons: [
+				{
+					text: '关闭',
+					handler: function () {
+						Ext.getCmp('patrolpoint_data_win1').destroy();
+					}
+				}
+			],
+			closeAction: 'destroy',
+			html: '<div id="patrolpoint_look_device"></div>'
 		}).show();
 		var query = new Object();
 		query.V_LOGINNAME = $("#V_LOGINNAME").val();
 		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.id = spot_id;
 		$.ajax({
-	        type:'POST',
-	        url: baseUrl+"iot/inspectionpoints/getList1",
-	        data: {
-	        	queryJson : Ext.JSON.encode(query)
-	    	 },
-	        success: function(result){
-	            var json = eval('(' + result + ')');
-	            if(json.action=='getInspectionPointsList'){
-	                ConfirmStore = json.RESULT;
-	                maintenancedevice(ConfirmStore);
-	       
-	            }
-	        } 
-	    });
+			type: 'POST',
+			url: baseUrl + "iot/inspectionpoints/getList1",
+			data: {
+				queryJson: Ext.JSON.encode(query)
+			},
+			success: function (result) {
+				var json = eval('(' + result + ')');
+				if (json.action == 'getInspectionPointsList') {
+					ConfirmStore = json.RESULT;
+					maintenancedevice(ConfirmStore);
+
+				}
+			}
+		});
 	}
-	
+
 	var MaintenancePanel = Ext.create('Ext.grid.Panel', {
-		header :{
-			height:0,
-			border:'0px solid #000000'
+		header: {
+			height: 0,
+			border: '0px solid #000000'
 		},
-	    id: 'PatrolpointListPanel',
-	    store: myStore,
-	    selModel: sm,
-	    columns: [
-	    	 { header: 'ID',  dataIndex: 'id',hidden:true, menuDisabled:true },
-	    	 { header: 'equipment_code_list',  dataIndex: 'equipment_code_list',hidden:true, menuDisabled:true },
-	    	 { header: '图片路径',  dataIndex: 'picture_route',hidden:true, menuDisabled:true },
-	    	 { header: '序号',  dataIndex: 'xh', width:37, menuDisabled:true },
-		     { header: '点位名称', dataIndex: 'spot_name', width:300,align:'center', menuDisabled:true },
-//		     { header: '所属建筑/项目', dataIndex: 'building_name', width:300,align:'center', menuDisabled:true },
-		     { 
-					text:'点位标签',
-		        	xtype : 'actioncolumn',
-		        	width:150,
-		        	sortable:false,
-		        	align:'center',
-		        	menuDisabled:true,
-		        	items:[{
-		        		icon: '../../res/img/common/chakanbtn.png',
-		        		tooltip: '点位标签',
-		        		handler: function(grid, rowIndex, colIndex) {
-		                    var rec = grid.getStore().getAt(rowIndex);
-		                    editRow(rec.get("id"));
-		                }
-		        	}]
-	    		},
-		     { header: '点位地址', dataIndex: 'spot_address', width:300,align:'center', menuDisabled:true },
-		     { 
-					text:'对应对象',
-		        	xtype : 'actioncolumn',
-		        	width:150,
-		        	sortable:false,
-		        	align:'center',
-		        	menuDisabled:true,
-		        	items:[{
-		        		icon: '../../res/img/common/chakanbtn.png',
-		        		tooltip: '对应对象',
-		        		handler: function(grid, rowIndex, colIndex) {
-		                    var rec = grid.getStore().getAt(rowIndex);
-//		                    $("#checkRecord_id").val(rec.get("id"));
-		                    modifywin(rec.get("id"));
-		                    
-		                    var label = rec.get("id");
-		                    var query = new Object();
-//		                    alert(label);
-		                    if(label.length>0){
-		                      query.id = label;
-		                    }
-		                    query.V_LOGINNAME = V_LOGINNAME;
-		                    // query.V_PASSWORD =  V_PASSWORD;
-		                    var jsonstr = Ext.JSON.encode(query);
-		                       myStore1.getProxy().extraParams = {
-		                        queryJson : jsonstr
-		                       };
-		                       myStore1.reload();
-		                }
-		        	}]
-	    		},
-//		     { header: '设备类型', dataIndex: 'type_name',width:100, align:'center', menuDisabled:true },
-		     { header: '最新改动时间', dataIndex: 'latest_change_time',width:350, align:'center', menuDisabled:true },
-		     { header: '备注',  dataIndex: 'remarks',hidden:true, menuDisabled:true },
-		     { header: '类型值',  dataIndex: 'spot_type',hidden:true, menuDisabled:true },
-		     
-		     { 
-					text:'点位详情',
-		        	xtype : 'actioncolumn',
-		        	width:150,
-		        	sortable:false,
-		        	align:'center',
-		        	menuDisabled:true,
-		        	items:[{
-		        		icon: '../../res/img/common/tupianbtn.png',
-		        		tooltip: '点位详情',
-		        		handler: function(grid, rowIndex, colIndex) {
-		                    var rec = grid.getStore().getAt(rowIndex);
-		                    editMaintenance(rec.get("id"));
-		                }
-		        	}]
-	    		}
-		     
-	    ],
-	    columnLines: true,
-	    height: maxHeight,
-	    width: '100%',
-	    bbar: new Ext.PagingToolbar({  
-            store: myStore,  
-            id:'PatrolpointListPageToolbar',
-            displayInfo: true,  
-            pageSize: countPerPage,  
-            prependButtons: true,  
-            displayMsg : '显示第 {0}条到 {1}条记录,总共 {2}条',     
-            emptyMsg : "没有记录",  
-            firstText: '第一页',
-            prevText: '前一页',
-            nextText: '后一页',
-            lastText: '最后一页',
-            refreshText: '刷新',
-
-        }),
-//        frame: true,  
-        border:false,  
-        iconCls: 'icon-grid',
+		id: 'PatrolpointListPanel',
+		store: myStore,
+		selModel: sm,
+		columns: [
+			{ header: 'ID', dataIndex: 'id', hidden: true, menuDisabled: true },
+			{ header: 'equipment_code_list', dataIndex: 'equipment_code_list', hidden: true, menuDisabled: true },
+			{ header: '图片路径', dataIndex: 'picture_route', hidden: true, menuDisabled: true },
+			{ header: '序号', dataIndex: 'xh', width: 37, menuDisabled: true },
+			{ header: '点位名称', dataIndex: 'spot_name', width: 300, align: 'center', menuDisabled: true },
+			//		     { header: '所属建筑/项目', dataIndex: 'building_name', width:300,align:'center', menuDisabled:true },
+			{
+				text: '点位标签',
+				xtype: 'actioncolumn',
+				width: 150,
+				sortable: false,
+				align: 'center',
+				menuDisabled: true,
+				items: [{
+					icon: '../../res/img/common/chakanbtn.png',
+					tooltip: '点位标签',
+					handler: function (grid, rowIndex, colIndex) {
+						var rec = grid.getStore().getAt(rowIndex);
+						editRow(rec.get("id"));
+					}
+				}]
+			},
+			{ header: '点位地址', dataIndex: 'spot_address', width: 300, align: 'center', menuDisabled: true },
+			{
+				text: '对应对象',
+				xtype: 'actioncolumn',
+				width: 150,
+				sortable: false,
+				align: 'center',
+				menuDisabled: true,
+				items: [{
+					icon: '../../res/img/common/chakanbtn.png',
+					tooltip: '对应对象',
+					handler: function (grid, rowIndex, colIndex) {
+						var rec = grid.getStore().getAt(rowIndex);
+						//		                    $("#checkRecord_id").val(rec.get("id"));
+						modifywin(rec.get("id"));
+
+						var label = rec.get("id");
+						var query = new Object();
+						//		                    alert(label);
+						if (label.length > 0) {
+							query.id = label;
+						}
+						query.V_LOGINNAME = V_LOGINNAME;
+						// query.V_PASSWORD =  V_PASSWORD;
+						var jsonstr = Ext.JSON.encode(query);
+						myStore1.getProxy().extraParams = {
+							queryJson: jsonstr
+						};
+						myStore1.reload();
+					}
+				}]
+			},
+			//		     { header: '设备类型', dataIndex: 'type_name',width:100, align:'center', menuDisabled:true },
+			{ header: '最新改动时间', dataIndex: 'latest_change_time', width: 350, align: 'center', menuDisabled: true },
+			{ header: '备注', dataIndex: 'remarks', hidden: true, menuDisabled: true },
+			{ header: '类型值', dataIndex: 'spot_type', hidden: true, menuDisabled: true },
+
+			{
+				text: '点位详情',
+				xtype: 'actioncolumn',
+				width: 150,
+				sortable: false,
+				align: 'center',
+				menuDisabled: true,
+				items: [{
+					icon: '../../res/img/common/tupianbtn.png',
+					tooltip: '点位详情',
+					handler: function (grid, rowIndex, colIndex) {
+						var rec = grid.getStore().getAt(rowIndex);
+						editMaintenance(rec.get("id"));
+					}
+				}]
+			}
+
+		],
+		columnLines: true,
+		height: maxHeight,
+		width: '100%',
+		bbar: new Ext.PagingToolbar({
+			store: myStore,
+			id: 'PatrolpointListPageToolbar',
+			displayInfo: true,
+			pageSize: countPerPage,
+			prependButtons: true,
+			displayMsg: '显示第 {0}条到 {1}条记录,总共 {2}条',
+			emptyMsg: "没有记录",
+			firstText: '第一页',
+			prevText: '前一页',
+			nextText: '后一页',
+			lastText: '最后一页',
+			refreshText: '刷新',
+
+		}),
+		//        frame: true,  
+		border: false,
+		iconCls: 'icon-grid',
 	});
-	
-	MaintenanceCheckPanel1 =Ext.create('Ext.grid.Panel', {
-		header :{
-			height:0,
-			border:'0px solid #000000'
+
+	MaintenanceCheckPanel1 = Ext.create('Ext.grid.Panel', {
+		header: {
+			height: 0,
+			border: '0px solid #000000'
 		},
-	    id: 'PatrolCheckListPanel1',
-	    store: myStore1,
-//	    selModel: sm1,
-	    columns: [
-	    	 { header: 'ID',  dataIndex: 'id',hidden:true, menuDisabled:true },
-	    	 { header: '点位ID',  dataIndex: 'spot_id',hidden:true, menuDisabled:true },
-	    	 { header: '设备编号',  dataIndex: 'equipment_code',hidden:true, menuDisabled:true },
-	    	 { header: '序号',  dataIndex: 'xh',width:48,align:'center', menuDisabled:true },
-		     { header: '设备名称', dataIndex: 'device_name', width:150,align:'center', menuDisabled:true },
-		     { header: '设备地址', dataIndex: 'unitinfo', width:150,align:'center', menuDisabled:true },
-		     { 
-					text:'设备详情',
-		        	xtype : 'actioncolumn',
-		        	width:150,
-		        	sortable:false,
-		        	align:'center',
-		        	menuDisabled:true,
-		        	items:[{
-		        		icon: '../../res/img/common/tupianbtn.png',
-		        		tooltip: '设备详情',
-		        		handler: function(grid, rowIndex, colIndex) {
-		                    var rec = grid.getStore().getAt(rowIndex);
-//		                    alert(rec.get("dwid"));
-		                    editMaintenance(rec.get("spot_id"));
-		                }
-		        	}]
-	    		}
-	    ],
-	    columnLines: true,
-	    height: 380,
-	    width: 490,
-	    bbar: new Ext.PagingToolbar({  
-            store: myStore1,  
-            id:'PatrolCheckListPageToolbar1',
-            displayInfo: true,  
-            pageSize: 10,  
-            prependButtons: true,  
-            displayMsg : '显示第 {0}条到 {1}条记录,总共 {2}条',     
-            emptyMsg : "没有记录",  
-            firstText: '第一页',
-            prevText: '前一页',
-            nextText: '后一页',
-            lastText: '最后一页',
-            refreshText: '刷新',
-
-        }),
-//        frame: true,  
-        border:false,  
-        iconCls: 'icon-grid'
+		id: 'PatrolCheckListPanel1',
+		store: myStore1,
+		//	    selModel: sm1,
+		columns: [
+			{ header: 'ID', dataIndex: 'id', hidden: true, menuDisabled: true },
+			{ header: '点位ID', dataIndex: 'spot_id', hidden: true, menuDisabled: true },
+			{ header: '设备编号', dataIndex: 'equipment_code', hidden: true, menuDisabled: true },
+			{ header: '序号', dataIndex: 'xh', width: 48, align: 'center', menuDisabled: true },
+			{ header: '设备名称', dataIndex: 'device_name', width: 150, align: 'center', menuDisabled: true },
+			{ header: '设备地址', dataIndex: 'unitinfo', width: 150, align: 'center', menuDisabled: true },
+			{
+				text: '设备详情',
+				xtype: 'actioncolumn',
+				width: 150,
+				sortable: false,
+				align: 'center',
+				menuDisabled: true,
+				items: [{
+					icon: '../../res/img/common/tupianbtn.png',
+					tooltip: '设备详情',
+					handler: function (grid, rowIndex, colIndex) {
+						var rec = grid.getStore().getAt(rowIndex);
+						//		                    alert(rec.get("dwid"));
+						editMaintenance(rec.get("spot_id"));
+					}
+				}]
+			}
+		],
+		columnLines: true,
+		height: 380,
+		width: 490,
+		bbar: new Ext.PagingToolbar({
+			store: myStore1,
+			id: 'PatrolCheckListPageToolbar1',
+			displayInfo: true,
+			pageSize: 10,
+			prependButtons: true,
+			displayMsg: '显示第 {0}条到 {1}条记录,总共 {2}条',
+			emptyMsg: "没有记录",
+			firstText: '第一页',
+			prevText: '前一页',
+			nextText: '后一页',
+			lastText: '最后一页',
+			refreshText: '刷新',
+
+		}),
+		//        frame: true,  
+		border: false,
+		iconCls: 'icon-grid'
 	});
-	
-	modifywin1=Ext.create('Ext.window.Window', {
-	    title: '<div id="patrol_upload_win">对应对象</div>',
-	    id:'patrol_point_modify_win1',
-	    height: 450,
-	    width: 510,
-	    modal: true,
-	    layout:'fit',
-	    items: [MaintenanceCheckPanel1],
-	    buttons:[
-	    	{
-	    		text:'关闭',
-	    		 handler : function() {
-	    			 Ext.getCmp('patrol_point_modify_win1').close();
-	    		 }
-	    	}
-	    ],
-	    closeAction:'hide'
+
+	modifywin1 = Ext.create('Ext.window.Window', {
+		title: '<div id="patrol_upload_win">对应对象</div>',
+		id: 'patrol_point_modify_win1',
+		height: 450,
+		width: 510,
+		modal: true,
+		layout: 'fit',
+		items: [MaintenanceCheckPanel1],
+		buttons: [
+			{
+				text: '关闭',
+				handler: function () {
+					Ext.getCmp('patrol_point_modify_win1').close();
+				}
+			}
+		],
+		closeAction: 'hide'
 	})
-	
-	var modifywin = function(){
-		modifywin1.show();    
-    }
-	
-	
-	var piebar = Ext.create('Ext.panel.Panel',{
-		id:'patrolpointHtml',
-		width:'100%',
-		height:188,
-		region:'north',
-		layout:'form',
-		defaults:{  
-            border:false
-        }         	
+
+	var modifywin = function () {
+		modifywin1.show();
+	}
+
+
+	var piebar = Ext.create('Ext.panel.Panel', {
+		id: 'patrolpointHtml',
+		width: '100%',
+		height: 188,
+		region: 'north',
+		layout: 'form',
+		defaults: {
+			border: false
+		}
 	});
-	new Ext.create('Ext.panel.Panel',{
-		width:'100%',
+	new Ext.create('Ext.panel.Panel', {
+		width: '100%',
 		id: 'PatrolpointPiebar',
-		layout:'border',
-		items:[
-			piebar,MaintenancePanel
+		layout: 'border',
+		items: [
+			piebar, MaintenancePanel
 		],
-	    renderTo: Ext.getBody()
-	    
+		renderTo: Ext.getBody()
+
 	});
 	myStore.reload();
-	$(window).resize(function(){
-    	body_resize();
-    });
+	$(window).resize(function () {
+		body_resize();
+	});
 	piedarHtml();
 	body_resize();
 });

+ 24 - 0
YtIoT.iml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/WebRoot/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/WebRoot" relative="/" />
+        </webroots>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="lib" level="project" />
+  </component>
+</module>

+ 3 - 0
out/artifacts/YtIoT_Web_exploded/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+

BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/DPAction.cgi


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/DPAction2.cgi


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/DPActionTest.cgi


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/WebAction.bak.cgi


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/WebAction.cgi


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/WebAction2.cgi


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/WebAction3.cgi


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/demo.cgi


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/demo2.cgi


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/demo3.cgi


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/cgi/videoact.cgi


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/filter/HTMLFilter.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/filter/XssEncode.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/filter/XssFilter1.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/filter/XssHttpServletRequestWrapper.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/CommonUtil/BaseController.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/EfAnalysis/dao/YtiotTEfAnalysisDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/EfAnalysis/dao/YtiotTEfAnalysisDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/EfAnalysis/service/YtiotTEfAnalysisService.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/EfAnalysis/service/YtiotTEfAnalysisServicesImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/MyException/FileUploadException.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotTAdminDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotTAdminDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotTAdminVerDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotTAdminVerDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotVUserCompanyDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotVUserCompanyDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotVUserphoneDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/dao/YtiotVUserphoneDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/service/YtiotTAdminService.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/service/YtiotTAdminServicesImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/service/YtiotVUserCompanyService.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/admin/service/YtiotVUserCompanyServiceImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarm/dao/YtiotVAlarmDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarm/dao/YtiotVAlarmDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarm/service/YtiotVAlarmService.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarm/service/YtiotVAlarmServiceImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarmpackages/dao/YtiotTcAlarmPackagesDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarmpackages/dao/YtiotTcAlarmPackagesDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarmpackageszb/dao/YtiotTcAlarmPackagesZbDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/alarmpackageszb/dao/YtiotTcAlarmPackagesZbDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/annotion/AutoLog.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/area/dao/YtiotTAreaDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/area/dao/YtiotTAreaDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/area/dao/YtiotTAreaverDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/area/dao/YtiotTAreaverDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/area/service/YtiotTAreaService.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/area/service/YtiotTAreaServicesImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/aspect/AutoLogAspect$1.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/aspect/AutoLogAspect.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/auth/TokenAuthBO.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/auth/TokenAuthEnum.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/auth/TokenAuthService.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/building/dao/YtiotTBuildingDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/building/dao/YtiotTBuildingDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/building/dao/YtiotTBuildingverDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/building/dao/YtiotTBuildingverDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/building/service/YtiotTBuildingService.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/building/service/YtiotTBuildingServicesImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/dao/YtiotTCompanyDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/dao/YtiotTCompanyDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/dao/YtiotTCompanyVerDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/dao/YtiotTCompanyVerDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/dao/YtiotVCompanyDao.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/dao/YtiotVCompanyDaoImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/service/YtiotTCompanyService.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/service/YtiotTCompanyServicesImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/service/YtiotVCompanyService.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/company/service/YtiotVCompanyServiceImpl.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/AdminController.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/AlarmViewController.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/AnalysisViewController.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/AreaController.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/BuildingController.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/CheckRecord2Controller.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/CheckRecordController.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/CompanyController.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/CompanyViewController.class


BIN
out/artifacts/YtIoT_Web_exploded/WEB-INF/classes/cn/com/usky/iot/controller/DataViewController.class


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff