css

.idea/workspace.xml

@@ -2,7 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="92e76c55-ad95-4e21-b088-a7137f395ba7" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/pages/ztree/ztree.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/ztree/ztree.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/OnSiteInspection/list.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/static/js/OnSiteInspection.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/QRcode.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/QRcode.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/admin.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/admin.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/recordTemplate.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/recordTemplate.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/state.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/state.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -18,84 +25,54 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="251">
-              <caret line="537" column="33" selection-start-line="537" selection-start-column="33" selection-end-line="537" selection-end-column="33" />
-              <folding>
-                <element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#2;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#3;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#4;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#5;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#6;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#textarea#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#!!top" expanded="true" />
-              </folding>
+            <state relative-caret-position="401">
+              <caret line="101" column="15" lean-forward="true" selection-start-line="98" selection-start-column="12" selection-end-line="101" selection-end-column="15" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
+        <entry file="file://$PROJECT_DIR$/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="616">
-              <caret line="418" column="73" selection-start-line="418" selection-start-column="73" selection-end-line="418" selection-end-column="73" />
+            <state relative-caret-position="-942">
+              <caret line="70" column="46" selection-start-line="70" selection-start-column="46" selection-end-line="70" selection-end-column="46" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/static/js/state.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="498">
-              <caret line="284" column="21" selection-start-line="284" selection-start-column="21" selection-end-line="284" selection-end-column="21" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pages/ztree/ztree.html">
+        <entry file="file://$PROJECT_DIR$/pages/OnSiteInspection/list.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="122">
-              <caret line="46" column="23" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+            <state relative-caret-position="-12">
+              <caret line="75" column="58" selection-start-line="75" selection-start-column="58" selection-end-line="75" selection-end-column="58" />
               <folding>
-                <element signature="n#style#0;n#input#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#form#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#1;n#div#0;n#form#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#form#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/static/css/zTreeStyle.css">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-582">
-              <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/index.html">
+        <entry file="file://$PROJECT_DIR$/static/js/state.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="543">
-              <caret line="169" column="28" selection-start-line="169" selection-start-column="28" selection-end-line="169" selection-end-column="28" />
+            <state relative-caret-position="388">
+              <caret line="89" column="14" lean-forward="true" selection-start-line="86" selection-start-column="12" selection-end-line="89" selection-end-column="14" />
+              <folding>
+                <element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/static/js/OnSiteInspection.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-96">
-              <caret line="170" column="75" selection-start-line="170" selection-start-column="75" selection-end-line="170" selection-end-column="75" />
+            <state relative-caret-position="645">
+              <caret line="132" column="10" selection-start-line="132" selection-start-column="10" selection-end-line="132" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -103,17 +80,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/admin.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="596">
-              <caret line="523" column="60" selection-start-line="523" selection-start-column="60" selection-end-line="523" selection-end-column="60" />
+            <state relative-caret-position="8311">
+              <caret line="556" column="24" selection-start-line="556" selection-start-column="24" selection-end-line="556" selection-end-column="24" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
+        <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1465">
-              <caret line="394" column="93" selection-start-line="394" selection-start-column="93" selection-end-line="394" selection-end-column="93" />
+            <state relative-caret-position="-263">
+              <caret line="45" column="50" selection-start-line="45" selection-start-column="50" selection-end-line="45" selection-end-column="50" />
             </state>
           </provider>
         </entry>
@@ -123,8 +100,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="JavaScript File" />
         <option value="HTML File" />
+        <option value="JavaScript File" />
       </list>
     </option>
   </component>
@@ -199,14 +176,16 @@
         <option value="$PROJECT_DIR$/pages/admin/addstate.html" />
         <option value="$PROJECT_DIR$/pages/admin/addrecordTemplate.html" />
         <option value="$PROJECT_DIR$/pages/admin/list.html" />
-        <option value="$PROJECT_DIR$/index.html" />
         <option value="$PROJECT_DIR$/static/css/zTreeStyle.css" />
-        <option value="$PROJECT_DIR$/static/js/QRcode.js" />
-        <option value="$PROJECT_DIR$/static/js/admin.js" />
         <option value="$PROJECT_DIR$/pages/admin/updateRecordTemplate.html" />
+        <option value="$PROJECT_DIR$/pages/ztree/ztree.html" />
+        <option value="$PROJECT_DIR$/index.html" />
+        <option value="$PROJECT_DIR$/static/js/admin.js" />
+        <option value="$PROJECT_DIR$/pages/OnSiteInspection/list.html" />
         <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
         <option value="$PROJECT_DIR$/static/js/state.js" />
-        <option value="$PROJECT_DIR$/pages/ztree/ztree.html" />
+        <option value="$PROJECT_DIR$/static/js/OnSiteInspection.js" />
+        <option value="$PROJECT_DIR$/static/js/QRcode.js" />
       </list>
     </option>
   </component>
@@ -219,7 +198,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -252,6 +230,18 @@
             <path>
               <item name="admin" type="b2602c69:ProjectViewProjectNode" />
               <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+              <item name="OnSiteInspection" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+              <item name="QRcode" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
               <item name="static" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -264,6 +254,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -305,18 +296,19 @@
       <updated>1555581172311</updated>
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
-      <workItem from="1555841941143" duration="114633000" />
+      <workItem from="1555841941143" duration="115268000" />
+      <workItem from="1556432139569" duration="12008000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="123007000" />
+    <option name="totallyTimeSpent" value="135650000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24947146" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18322763" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -400,47 +392,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/chooseRecord.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="142">
-          <caret line="27" column="24" selection-start-line="27" selection-start-column="17" selection-end-line="27" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/depMaintain.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="542">
-          <caret line="61" column="129" selection-start-line="61" selection-start-column="129" selection-end-line="61" selection-end-column="129" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/QRcodeList.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="89" column="24" selection-start-line="87" selection-start-column="15" selection-end-line="89" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/js/ztree/jquery.ztree.core.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/static/js/ztree/jquery.ztree.excheck.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/pureText.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="634">
-          <caret line="114" column="15" lean-forward="true" selection-start-line="86" selection-start-column="12" selection-end-line="114" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="142" column="68" lean-forward="true" selection-start-line="142" selection-start-column="24" selection-end-line="142" selection-end-column="68" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/editQRcode/pureText.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="259">
@@ -522,13 +479,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/jjjs.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="31" column="1" lean-forward="true" selection-start-line="29" selection-end-line="31" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/jjjs.js" />
     <entry file="file://$PROJECT_DIR$/pages/editQRcode/recordAdmin.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="737">
@@ -602,103 +553,146 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/list.html">
+    <entry file="file://$PROJECT_DIR$/static/fonts/iconfont.svg">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/login.html">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="80" column="95" selection-start-line="80" selection-start-column="95" selection-end-line="80" selection-end-column="95" />
+        <state relative-caret-position="6270">
+          <caret line="418" column="73" selection-start-line="418" selection-start-column="73" selection-end-line="418" selection-end-column="73" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/fonts/iconfont.svg">
-      <provider selected="true" editor-type-id="images" />
+    <entry file="file://$PROJECT_DIR$/pages/ztree/ztree.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="945">
+          <caret line="63" column="10" lean-forward="true" selection-start-line="63" selection-start-column="10" selection-end-line="63" selection-end-column="10" />
+          <folding>
+            <element signature="n#style#0;n#input#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/static/css/zTreeStyle.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-582">
-          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
+        <state relative-caret-position="225">
+          <caret line="15" selection-start-line="15" selection-end-line="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/login.html">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/pages/admin/list.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="156">
+          <caret line="62" column="83" lean-forward="true" selection-start-line="62" selection-start-column="83" selection-end-line="62" selection-end-column="83" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/index.html">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/QRcodeList.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="543">
-          <caret line="169" column="28" selection-start-line="169" selection-start-column="28" selection-end-line="169" selection-end-column="28" />
+        <state relative-caret-position="489">
+          <caret line="95" column="20" lean-forward="true" selection-start-line="93" selection-start-column="16" selection-end-line="95" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
+    <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="251">
-          <caret line="537" column="33" selection-start-line="537" selection-start-column="33" selection-end-line="537" selection-end-column="33" />
+        <state relative-caret-position="15">
+          <caret line="394" column="93" selection-start-line="394" selection-start-column="93" selection-end-line="394" selection-end-column="93" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/pureText.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="473">
+          <caret line="71" column="22" lean-forward="true" selection-start-line="71" selection-start-column="8" selection-end-line="71" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/chooseRecord.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="405">
+          <caret line="27" column="33" lean-forward="true" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
           <folding>
-            <element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#2;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#3;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#4;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#5;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#6;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#textarea#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/admin.js">
+    <entry file="file://$PROJECT_DIR$/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="596">
-          <caret line="523" column="60" selection-start-line="523" selection-start-column="60" selection-end-line="523" selection-end-column="60" />
+        <state relative-caret-position="-942">
+          <caret line="70" column="46" selection-start-line="70" selection-start-column="46" selection-end-line="70" selection-end-column="46" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/depMaintain.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-96">
-          <caret line="170" column="75" selection-start-line="170" selection-start-column="75" selection-end-line="170" selection-end-column="75" />
+        <state relative-caret-position="765">
+          <caret line="51" column="40" lean-forward="true" selection-start-line="51" selection-start-column="14" selection-end-line="51" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="418" column="73" selection-start-line="418" selection-start-column="73" selection-end-line="418" selection-end-column="73" />
+        <state relative-caret-position="625">
+          <caret line="155" column="25" lean-forward="true" selection-start-line="155" selection-start-column="12" selection-end-line="155" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
+    <entry file="file://$PROJECT_DIR$/pages/OnSiteInspection/list.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1465">
-          <caret line="394" column="93" selection-start-line="394" selection-start-column="93" selection-end-line="394" selection-end-column="93" />
+        <state relative-caret-position="-12">
+          <caret line="75" column="58" selection-start-line="75" selection-start-column="58" selection-end-line="75" selection-end-column="58" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#form#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#form#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#form#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/state.js">
+    <entry file="file://$PROJECT_DIR$/static/js/admin.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="498">
-          <caret line="284" column="21" selection-start-line="284" selection-start-column="21" selection-end-line="284" selection-end-column="21" />
+        <state relative-caret-position="8311">
+          <caret line="556" column="24" selection-start-line="556" selection-start-column="24" selection-end-line="556" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/ztree/ztree.html">
+    <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="122">
-          <caret line="46" column="23" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
+        <state relative-caret-position="401">
+          <caret line="101" column="15" lean-forward="true" selection-start-line="98" selection-start-column="12" selection-end-line="101" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/state.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="388">
+          <caret line="89" column="14" lean-forward="true" selection-start-line="86" selection-start-column="12" selection-end-line="89" selection-end-column="14" />
           <folding>
-            <element signature="n#style#0;n#input#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-263">
+          <caret line="45" column="50" selection-start-line="45" selection-start-column="50" selection-end-line="45" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/OnSiteInspection.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="645">
+          <caret line="132" column="10" selection-start-line="132" selection-start-column="10" selection-end-line="132" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

index.html

@@ -65,12 +65,12 @@
 									<cite>二维码列表</cite>
 								</a>
 							</li>
-							<!--<li>-->
-								<!--<a _href="./pages/admin/rule.html">-->
-									<!--<i class="iconfont">&#xe6a7;</i>-->
-									<!--<cite>权限管理</cite>-->
-								<!--</a>-->
-							<!--</li>-->
+							<li>
+								<a _href="./pages/OnSiteInspection/list.html">
+									<i class="iconfont">&#xe6a7;</i>
+									<cite>巡检记录</cite>
+								</a>
+							</li>
 						</ul>
 					</li>
 					<li>

pages/OnSiteInspection/list.html

@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font-awesome.min.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <link rel="stylesheet" href="../../static/css/eleTree.css">
+    <!-- 让IE8/9支持媒体查询，从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        .layui-main1:after {
+            clear: both;
+            content: " ";
+            display: table;
+        }
+        .left, .right_main {
+            float: left;
+        }
+        .layui-main1 {
+            padding-left: 210px;
+        }
+        .right_main {
+            width: 100%;
+        }
+        .left {
+            width: 200px;
+            left: 20px;
+            top: 60px;
+            padding: 0;
+        }
+    </style>
+</head>
+
+<body>
+<div class="weadmin-nav">
+			<span class="layui-breadcrumb">
+				<a href="">首页</a>
+				<a href="">二维码管理</a>
+				<a>
+          		<cite>状态和信息提醒设置</cite></a>
+      		</span>
+    <a class="layui-btn layui-btn-sm" style="line-height:1.6em;margin-top:3px;float:right" href="javascript:location.replace(location.href);" title="刷新">
+        <i class="layui-icon" style="line-height:30px">&#xe669;</i>
+    </a>
+</div>
+<div class="weadmin-body">
+    <div class="layui-main1">
+        <div class="left left-nav1">
+            <div class="eleTree ele1" lay-filter="data"></div>
+        </div>
+        <div class="right_main">
+            <form class="a_seach layui-form">
+                <div class="layui-form-item" style="margin-bottom: 0">
+                    <div class="layui-input-inline">
+                        <select name="interest" lay-filter="aihao" id="changeSelect">
+                             <option value="">请选择记录模版信息</option>
+                        </select>
+                    </div>
+                    <div class="layui-input-inline" style="width: 300px;">
+                         <input type="text" name="title" style="width: 300px;"  placeholder="起止时间" autocomplete="off"  class="layui-input" id="startTime">
+                    </div>
+                    <div class="layui-input-inline">
+                        <button class="layui-btn" lay-submit lay-filter="seachOnSiteins">查询</button>
+                    </div>
+                </div>
+            </form>
+            <div class="weadmin-block" style="height: 40px;">
+                <span class="fr" style="line-height:40px"></span>
+            </div>
+            <table class="layui-table" id="OnSiteInspection" lay-filter="OnSiteInspection"></table>
+            <div id="pageItem" style="text-align: right"></div>
+            <!--操作-->
+            <script type="text/html" id="barDemo">
+                <a title="预览" class="a_btn" lay-event="preview" href="javascript:;">
+                    <i class="fa fa-eye"></i>
+                </a>
+                <a title="删除" class="a_btn" lay-event="delete" href="javascript:;">
+                    <i class="fa fa-trash-o"></i>
+                </a>
+            </script>
+        </div>
+    </div>
+</div>
+<script src="../../lib/layui/layui.js" charset="utf-8"></script>
+<script src="../../static/js/OnSiteInspection.js"></script>
+<script>
+    layui.use(['form','jquery'], function(){
+        var  form = layui.form,$ = layui.jquery;
+        form.render('select');
+        recordFun();
+        function recordFun() {
+            $.ajax({
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/template/v1/selectRecordTemplateList/'+sessionStorage.getItem('ztreeDepid'),
+                type:'get',
+                dataType:'json',
+                success:function (res) {
+                    console.log(res,'resppppp')
+                    if (res.code === '200') {
+                        for (var i = 0; i < res.data.length; i++) {
+                            var str = `<option value="${res.data[i].id}">${res.data[i].templateName}</option>`;
+                            $("#changeSelect").append(str);
+                            form.render('select');
+                        }
+                    }
+                },
+                error:function () {
+
+                }
+            })
+        }
+    })
+</script>
+</body>
+</html>

static/js/OnSiteInspection.js

@@ -0,0 +1,180 @@
+
+layui.config({
+    base: '../../lib/layui/lay/mymodules/'
+    ,version: '101100'
+}).use('eleTree');
+layui.extend({
+    admin: '{/}../../static/js/admin'
+});
+layui.use(['jquery','eleTree','table','laypage','admin','laydate','form'], function(){
+    var $= layui.jquery,
+        eleTree	= layui.eleTree,
+        laypage	= layui.laypage,
+        form = layui.form,
+        laydate = layui.laydate,
+        table	= layui.table;
+        laydate.render({
+            elem: '#startTime'
+            ,type: 'datetime'
+            ,range: '至'
+            ,format: 'yyyy-M-d'
+        });
+    // 时间
+    function DateFun(){
+        var date = new Date();
+        var seperator1 = "-";
+        var year = date.getFullYear();
+        var month = date.getMonth() + 1;
+        var strDate = date.getDate();
+        if (month >= 1 && month <= 9) {
+            month = "0" + month;
+        }
+        if (strDate >= 0 && strDate <= 9) {
+            strDate = "0" + strDate;
+        }
+        var currentdate = year + seperator1 + month + seperator1 + strDate;
+        return currentdate;
+    }
+    // 部门
+    var belpID = 'root';
+    delpFun();
+    sessionStorage.setItem("ztreeDepid",'root');
+    function delpFun(){
+        $.ajax({
+            url:'http://apptest.jieweizhineng.com/api/section/getlist',
+            method:'get',
+            dataType: 'json',
+            data: {
+
+            },
+            success:function (res) {
+                if(res.code === 0){
+                    var data = [res.data];
+                    eleTree.render({
+                        elem: '.ele1',
+                        data:data ,
+                        defaultExpandAll:true,
+                        // showCheckbox: true,
+                    });
+                    eleTree.on("nodeClick(data)",function(d) {
+                        belpID =  d.data.currentData.id;
+                        sessionStorage.setItem("ztreeDepid",d.data.currentData.id);
+                        $('#changeSelect').val("");
+                        $('#startTime').val("");
+                        form.render('select');
+                        var info={
+                            startTime:getPreMonth(DateFun()),
+                            endTime:DateFun(),
+                            templateId: $("#changeSelect").val(),
+                            departmentId: d.data.currentData.id,
+                            pageId: '',
+                            pageNumber: '1',
+                            pageSize: '1',
+                        };
+                        getStateList(info);
+                    })
+                }else{
+                    layer.msg('请检查网路', {icon: 2});
+                }
+            },
+            error:function (err) {
+                layer.msg('请检查网路', {icon: 2});
+            }
+        })
+
+    }
+    var info={
+        startTime:getPreMonth(DateFun()),
+        endTime:DateFun(),
+        templateId: '',
+        departmentId: belpID,
+        pageId: ''
+    };
+    getStateList(info);
+    function getStateList(res) {
+        var index = layer.load(2);
+        table.render({
+            elem: '#OnSiteInspection',
+            url: 'http://apptest.jieweizhineng.com/api/swagger/api/record/v1/getRecordList',
+            id: 'OnSiteInspectionID',
+            method: 'get',
+            loading: true,
+            page: true,
+            cols: [[
+                {field: 'title', title: '二维码名称', align: 'center'},
+                {field: 'name', title: '记录添加人', align: 'center'},
+                {field: 'createDate', title: '记录时间', align: 'center'},
+                {field: 'templateName', title: '模板名称', align: 'center'},
+                {title: ' 操作', align: 'center', toolbar: '#barDemo'}
+            ]],
+            where: {
+                startTime: res.startTime,
+                endTime: res.endTime,
+                templateId: res.templateId,
+                departmentId: res.departmentId,
+                pageId: res.pageId
+            },
+            request: {
+                pageName: 'pageNumber' //页码的参数名称，默认：page
+                , limitName: 'pageSize' //每页数据量的参数名，默认：limit
+            },
+            response: {
+                statusName: 'code'
+                , statusCode: 200,
+                countName: 'count',
+                dataName: 'data'
+            },
+            done: function (res, curr, count) {
+                layer.close(index);
+                if (res.code === '200') {
+                    $('.fr').html('共有数据：' + res.count + ' 条')
+                }
+            }
+        })
+    }
+    // 监听状态table
+    table.on('tool(OnSiteInspection)', function(obj) {
+        if (obj.event === "delete"){
+            var content ={
+                _method:'DELETE'
+            };
+            layer.alert('确认要删除吗？',{icon: 8}, function(index){
+                $.ajax({
+                    url: 'http://apptest.jieweizhineng.com/api/swagger/api/record/v1/removeRecord/'+obj.data.id,
+                    method: 'post',
+                    dataType: 'json',
+                    data: content,
+                    success: function (res) {
+                        if (res.code === '200'){
+                            layer.msg('删除成功', {icon: 1});
+                            table.reload('OnSiteInspectionID');
+                        } else{
+                            layer.msg('删除失败', {icon: 2});
+                            table.reload('OnSiteInspectionID');
+                        }
+                        layer.close(index);
+                    },
+                    error:function () {
+                        layer.msg('请检查网络', {icon: 2});
+                        layer.close(index);
+                    }
+                });
+            });
+        }
+    });
+    // 查询
+    form.on('submit(seachOnSiteins)', function() {
+        var time = $("#startTime").val();
+        var changeSelect = $("#changeSelect").val();
+        var TimeArray =time.split("至");
+        var Info = {
+            startTime: time == ""? getPreMonth(DateFun()) : TimeArray[0],
+            endTime: time == ""? DateFun() : TimeArray[1],
+            templateId: changeSelect,
+            departmentId: belpID,
+            pageId: ''
+        };
+        getStateList(Info);
+        return false;
+    })
+});

static/js/QRcode.js

@@ -44,8 +44,6 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                             statusContent: '',
                             departmentId: d.data.currentData.id,
                             deleteStatus: 'false',
-                            pageNumber: '1',
-                            pageSize: '1',
                         };
                         getStateList(info);
                     })
@@ -63,58 +61,42 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
         title: $('.stetaName').val(),
         departmentId: belpID,
         deleteStatus: 'false',
-        pageNumber: '1',
-        pageSize: '1',
     };
     getStateList(info);
     function getStateList(res) {
-        $.ajax({
+        var index = layer.load(2);
+        table.render({
+            elem: '#stateRemind',
             url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageList',
+            id: 'idQRcode',
             method: 'get',
-            dataType: 'json',
-            data: res,
-            success: function (data) {
-                laypage.render({
-                    elem: 'pageItem',
-                    count: data.count,
-                    limit: 10,
-                    layout: ['count', 'prev', 'page', 'next', 'skip'],
-                    jump: function(obj, first) {
-                        var index = layer.load(2);
-                        table.render({
-                            elem: '#stateRemind',
-                            url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageList',
-                            id: 'idQRcode',
-                            method: 'get',
-                            loading: true,
-                            cols: [[
-                                {field: 'title', title: '二维码名称', align: 'center'}
-                                , {field: 'createDate', title: '创建日期', align: 'center'}
-                                , {title: ' 操作', align: 'center', toolbar: '#barDemo'}
-                            ]],
-                            where: {
-                                title: res.title,
-                                departmentId: res.departmentId,
-                                deleteStatus: res.deleteStatus,
-                                pageNumber: obj.curr,
-                                pageSize: obj.limit,
-                            },
-
-                            response: {
-                                statusName: 'code'
-                                , statusCode: 200,
-                                countName: 'count',
-                                dataName: 'data'
-                            },
-                            done: function (res, curr, count) {
-                                layer.close(index);
-                                if (res.code === '200') {
-                                    $('.fr').html('共有数据：'+res.count+' 条')
-                                }
-                            }
-                        });
-                    }
-                })
+            loading: true,
+            page:true,
+            cols: [[
+                {field: 'title', title: '二维码名称', align: 'center'}
+                , {field: 'createDate', title: '创建日期', align: 'center'}
+                , {title: ' 操作', align: 'center', toolbar: '#barDemo'}
+            ]],
+            where: {
+                title: res.title,
+                departmentId: res.departmentId,
+                deleteStatus: res.deleteStatus,
+            },
+            request: {
+                pageName: 'pageNumber' //页码的参数名称，默认：page
+                ,limitName: 'pageSize' //每页数据量的参数名，默认：limit
+            },
+            response: {
+                statusName: 'code'
+                , statusCode: 200,
+                countName: 'count',
+                dataName: 'data'
+            },
+            done: function (res, curr, count) {
+                layer.close(index);
+                if (res.code === '200') {
+                    $('.fr').html('共有数据：'+res.count+' 条')
+                }
             }
         });
     }
@@ -128,17 +110,13 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
             info={
                 statusContent: $('.stetaName').val(),
                 departmentId: root,
-                deleteStatus: 'false',
-                pageNumber: '1',
-                pageSize: '1',
+                deleteStatus: 'false'
             };
         }else {
             info={
                 statusContent: $('.stetaName').val(),
                 departmentId: belpID,
-                deleteStatus: 'false',
-                pageNumber: '1',
-                pageSize: '1',
+                deleteStatus: 'false'
             };
         }
 

static/js/admin.js

@@ -530,5 +530,31 @@ layui.define(['jquery', 'form', 'layer', 'element'], function(exports) {
 				})
 			}
 		});
+	};
+	// 时间格式化
+	window.getPreMonth = function (date) {
+		var arr = date.split('-');
+		var year = arr[0]; //获取当前日期的年份
+		var month = arr[1]; //获取当前日期的月份
+		var day = arr[2]; //获取当前日期的日
+		var days = new Date(year, month, 0);
+		days = days.getDate(); //获取当前日期中月的天数
+		var year2 = year;
+		var month2 = parseInt(month) - 1;
+		if (month2 == 0) {
+			year2 = parseInt(year2) - 1;
+			month2 = 12;
+		}
+		var day2 = day;
+		var days2 = new Date(year2, month2, 0);
+		days2 = days2.getDate();
+		if (day2 > days2) {
+			day2 = days2;
+		}
+		if (month2 < 10) {
+			month2 = '0' + month2;
+		}
+		var t2 = year2-1 + '-' + month2 + '-' + day2;
+		return t2;
 	}
-});
+});

static/js/recordTemplate.js

@@ -78,53 +78,41 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
     };
     getStateList(info);
     function getStateList(res) {
-        $.ajax({
+        var index = layer.load(2);
+        table.render({
+            elem: '#stateRemind',
             url: 'http://apptest.jieweizhineng.com/api/swagger/api/template/v1/getRecordTemplateList',
+            id: 'recordTemplateID',
             method: 'get',
-            dataType: 'json',
-            data: res,
-            success: function (data) {
-                laypage.render({
-                    elem: 'pageItem',
-                    count: data.count,
-                    limit: 10,
-                    layout: ['count', 'prev', 'page', 'next', 'skip'],
-                    jump: function(obj, first) {
-                        var index = layer.load(2);
-                        table.render({
-                            elem: '#stateRemind',
-                            url: 'http://apptest.jieweizhineng.com/api/swagger/api/template/v1/getRecordTemplateList',
-                            id: 'recordTemplateID',
-                            method: 'get',
-                            loading: true,
-                            cols: [[
-                                {field: 'templateName', title: '模版名称', align: 'center'}
-                                , {field: 'createDate', title: '创建日期', align: 'center'}
-                                , {title: ' 操作', align: 'center', toolbar: '#barDemo'}
-                            ]],
-                            where: {
-                                templateName: res.statusContent,
-                                departmentId: res.departmentId,
-                                deleteStatus: res.deleteStatus,
-                                pageNumber: obj.curr,
-                                pageSize: obj.limit,
-                            },
-
-                            response: {
-                                statusName: 'code'
-                                , statusCode: 200,
-                                countName: 'count',
-                                dataName: 'data'
-                            },
-                            done: function (res, curr, count) {
-                                layer.close(index);
-                                if (res.code === '200') {
-                                    $('.fr').html('共有数据：'+res.count+' 条')
-                                }
-                            }
-                        });
-                    }
-                })
+            loading: true,
+            page:true,
+            cols: [[
+                {field: 'templateName', title: '模版名称', align: 'center'}
+                , {field: 'createDate', title: '创建日期', align: 'center'}
+                , {title: ' 操作', align: 'center', toolbar: '#barDemo'}
+            ]],
+            where: {
+                templateName: res.statusContent,
+                departmentId: res.departmentId,
+                deleteStatus: res.deleteStatus
+            },
+            request: {
+                pageName: 'pageNumber' //页码的参数名称，默认：page
+                ,limitName: 'pageSize' //每页数据量的参数名，默认：limit
+             },
+            response: {
+                // pageNumber: 'pageNumber', //页码的参数名称，默认：page
+                // pageSize : 'limitName', //每页数据量的参数名，默认：limit
+                statusName: 'code'
+                , statusCode: 200,
+                countName: 'count',
+                dataName: 'data'
+            },
+            done: function (res, curr, count) {
+                layer.close(index);
+                if (res.code === '200') {
+                    $('.fr').html('共有数据：'+res.count+' 条')
+                }
             }
         });
     }

static/js/state.js

@@ -66,53 +66,39 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
     };
     getStateList(info);
     function getStateList(res) {
-        $.ajax({
+        var index = layer.load(2);
+        table.render({
+            elem: '#stateRemind',
             url: 'http://apptest.jieweizhineng.com/api/swagger/api/status/v1/getStatusList',
+            id: 'idstetaTable',
             method: 'get',
-            dataType: 'json',
-            data: res,
-            success: function (data) {
-                laypage.render({
-                    elem: 'pageItem',
-                    count: data.count,
-                    limit: 10,
-                    layout: ['count', 'prev', 'page', 'next', 'skip'],
-                    jump: function(obj, first) {
-                        var index = layer.load(2);
-                        table.render({
-                            elem: '#stateRemind',
-                            url: 'http://apptest.jieweizhineng.com/api/swagger/api/status/v1/getStatusList',
-                            id: 'idstetaTable',
-                            method: 'get',
-                            loading: true,
-                            cols: [[
-                                {field: 'statusContent', title: '状态名称', align: 'center'}
-                                , {field: 'createDate', title: '创建日期', align: 'center'}
-                                , {title: ' 操作', align: 'center', toolbar: '#barDemo'}
-                            ]],
-                            where: {
-                                statusContent: res.statusContent,
-                                departmentId: res.departmentId,
-                                deleteStatus: res.deleteStatus,
-                                pageNumber: obj.curr,
-                                pageSize: obj.limit,
-                            },
-
-                            response: {
-                                statusName: 'code'
-                                , statusCode: 200,
-                                countName: 'count',
-                                dataName: 'data'
-                            },
-                            done: function (res, curr, count) {
-                                layer.close(index);
-                                if (res.code === '200') {
-                                    $('.fr').html('共有数据：'+res.count+' 条')
-                                }
-                            }
-                        });
-                    }
-                })
+            loading: true,
+            page:true,
+            cols: [[
+                {field: 'statusContent', title: '状态名称', align: 'center'}
+                , {field: 'createDate', title: '创建日期', align: 'center'}
+                , {title: ' 操作', align: 'center', toolbar: '#barDemo'}
+            ]],
+            where: {
+                statusContent: res.statusContent,
+                departmentId: res.departmentId,
+                deleteStatus: res.deleteStatus
+            },
+            request: {
+                pageName: 'pageNumber' //页码的参数名称，默认：page
+                ,limitName: 'pageSize' //每页数据量的参数名，默认：limit
+            },
+            response: {
+                statusName: 'code'
+                , statusCode: 200,
+                countName: 'count',
+                dataName: 'data'
+            },
+            done: function (res, curr, count) {
+                layer.close(index);
+                if (res.code === '200') {
+                    $('.fr').html('共有数据：'+res.count+' 条')
+                }
             }
         });
     }