css

.idea/workspace.xml

@@ -2,6 +2,33 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="92e76c55-ad95-4e21-b088-a7137f395ba7" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/static/js/jjjs.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/QRcodeList.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/QRcodeList.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/addDevice.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/addDevice.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/addFile.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/addFile.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/addLink.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/addLink.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/addText.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/addText.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/addVideo.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/addVideo.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/depMaintain.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/depMaintain.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/imageAtlas.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/imageAtlas.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/imageText.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/imageText.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/pureText.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/pureText.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/recordAdmin.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/recordAdmin.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/admin/recordTemplate.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/admin/recordTemplate.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/editQRcode/addDevice.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/addDevice.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/editQRcode/addFile.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/addFile.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/editQRcode/addLink.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/addLink.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/editQRcode/addText.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/addText.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/editQRcode/addVideo.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/addVideo.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/editQRcode/editQRcode.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/editQRcode.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/editQRcode/imageAtlas.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/imageAtlas.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/editQRcode/imageText.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/imageText.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/editQRcode/pureText.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/pureText.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/editQRcode/recordAdmin.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/recordAdmin.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/editpulic.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/editpulic.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/js/pulic.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/pulic.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/static/js/recordTemplate.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/recordTemplate.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -16,24 +43,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/static/js/editpulic.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1200">
-              <caret line="78" column="31" selection-start-line="78" selection-start-column="31" selection-end-line="78" selection-end-column="31" />
-              <folding>
-                <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/pulic.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-3642">
-              <caret line="320" column="16" selection-start-line="320" selection-start-column="9" selection-end-line="320" selection-end-column="16" />
+            <state relative-caret-position="724">
+              <caret line="612" column="4" selection-start-line="612" selection-start-column="4" selection-end-line="612" selection-end-column="4" />
               <folding>
                 <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
               </folding>
@@ -41,67 +54,38 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/editQRcode/editQRcode.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="367">
-              <caret line="431" column="75" selection-start-line="431" selection-start-column="65" selection-end-line="431" selection-end-column="75" />
-              <folding>
-                <element signature="n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#script#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#script#1;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#script#2;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#script#3;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#script#4;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#script#5;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#script#7;n#body#0;n#html#0;n#!!top" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/editQRcode/addDevice.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="262">
-              <caret line="100" column="29" lean-forward="true" selection-start-line="100" selection-start-column="12" selection-end-line="100" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="405">
-              <caret line="628" column="38" selection-start-line="628" selection-start-column="38" selection-end-line="628" selection-end-column="38" />
+            <state relative-caret-position="280">
+              <caret line="41" column="27" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="27" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/QRcode/addDevice.html">
+        <entry file="file://$PROJECT_DIR$/pages/QRcode/chooseRecord.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="229">
-              <caret line="97" column="29" selection-start-line="97" selection-start-column="29" selection-end-line="97" selection-end-column="29" />
+            <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>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/QRcode/addLink.html">
+        <entry file="file://$PROJECT_DIR$/pages/QRcode/depMaintain.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="261">
-              <caret line="94" column="29" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" />
+            <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>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/editQRcode/addLink.html">
+        <entry file="file://$PROJECT_DIR$/pages/QRcode/QRcodeList.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1077">
-              <caret line="97" column="29" selection-start-line="97" selection-start-column="29" selection-end-line="97" selection-end-column="29" />
+            <state relative-caret-position="399">
+              <caret line="89" column="24" lean-forward="true" selection-start-line="87" selection-start-column="15" selection-end-line="89" selection-end-column="24" />
             </state>
           </provider>
         </entry>
@@ -109,12 +93,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="309">
-              <caret line="322" column="107" selection-start-line="322" selection-start-column="107" selection-end-line="322" selection-end-column="107" />
+            <state relative-caret-position="251">
+              <caret line="19" column="37" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="37" />
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/index.html">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -132,8 +121,26 @@
       <find>delete</find>
       <find>unfold</find>
       <find>index_data</find>
-      <find>depID</find>
       <find>deviceItem</find>
+      <find>QRcodeDetaileID</find>
+      <find>QRcodePureText</find>
+      <find>getPageEdit</find>
+      <find>QRcodeImageText</find>
+      <find>edituploadImageAtlas</find>
+      <find>edituploadImage</find>
+      <find>edituploadFile</find>
+      <find>editlinkFun</find>
+      <find>editDevice</find>
+      <find>editRecord</find>
+      <find>QRcodeindex</find>
+      <find>pageRelationId</find>
+      <find>editPureTextTitleName</find>
+      <find>a_stetaBtn</find>
+      <find>checkUrl</find>
+      <find>pageRelationIdFun</find>
+      <find>stateItme</find>
+      <find>departmentId</find>
+      <find>depID</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -143,32 +150,36 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/pages/QRcode/Jurisdiction.html" />
-        <option value="$PROJECT_DIR$/pages/QRcode/QRcodeList.html" />
-        <option value="$PROJECT_DIR$/pages/editQRcode/addText.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/addQRcode.html" />
-        <option value="$PROJECT_DIR$/pages/QRcode/pureText.html" />
-        <option value="$PROJECT_DIR$/pages/QRcode/imageAtlas.html" />
-        <option value="$PROJECT_DIR$/pages/QRcode/addFile.html" />
-        <option value="$PROJECT_DIR$/pages/QRcode/addVideo.html" />
-        <option value="$PROJECT_DIR$/pages/QRcode/imageText.html" />
-        <option value="$PROJECT_DIR$/pages/editQRcode/imageText.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/addQRcode.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/editQRcode.html" />
-        <option value="$PROJECT_DIR$/pages/editQRcode/imageAtlas.html" />
+        <option value="$PROJECT_DIR$/static/js/editpulic.js" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/addText.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/pureText.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/imageText.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/imageAtlas.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/addFile.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/imageAtlas.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/addLink.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/addVideo.html" />
-        <option value="$PROJECT_DIR$/pages/QRcode/addText.html" />
-        <option value="$PROJECT_DIR$/pages/editQRcode/recordAdmin.html" />
-        <option value="$PROJECT_DIR$/pages/QRcode/recordAdmin.html" />
-        <option value="$PROJECT_DIR$/static/js/QRcode.js" />
-        <option value="$PROJECT_DIR$/static/js/editpulic.js" />
-        <option value="$PROJECT_DIR$/static/js/pulic.js" />
         <option value="$PROJECT_DIR$/pages/editQRcode/addDevice.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/recordAdmin.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/addDevice.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/addFile.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/addLink.html" />
-        <option value="$PROJECT_DIR$/pages/editQRcode/addLink.html" />
+        <option value="$PROJECT_DIR$/static/js/jjjs.js" />
+        <option value="$PROJECT_DIR$/pages/QRcode/addVideo.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/imageText.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/pureText.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/recordAdmin.html" />
+        <option value="$PROJECT_DIR$/static/js/pulic.js" />
+        <option value="$PROJECT_DIR$/pages/QRcode/addText.html" />
+        <option value="$PROJECT_DIR$/static/js/QRcode.js" />
+        <option value="$PROJECT_DIR$/static/js/state.js" />
+        <option value="$PROJECT_DIR$/pages/admin/recordTemplate.html" />
         <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
+        <option value="$PROJECT_DIR$/pages/QRcode/depMaintain.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/QRcodeList.html" />
       </list>
     </option>
   </component>
@@ -200,7 +211,7 @@
               <item name="admin" type="b2602c69:ProjectViewProjectNode" />
               <item name="admin" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="editQRcode" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="admin" type="b2602c69:ProjectViewProjectNode" />
@@ -261,12 +272,12 @@
       <updated>1555581172311</updated>
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
-      <workItem from="1555841941143" duration="40320000" />
+      <workItem from="1555841941143" duration="74170000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="48694000" />
+    <option name="totallyTimeSpent" value="82544000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -295,9 +306,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/js/base64.js">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -305,113 +313,130 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/index.html">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/Jurisdiction.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="355">
+          <caret line="105" column="69" selection-start-line="105" selection-start-column="69" selection-end-line="105" selection-end-column="69" />
+          <folding>
+            <element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#form#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#1;n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addText.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/editQRcode.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1127">
-          <caret line="132" column="58" selection-start-line="132" selection-start-column="53" selection-end-line="132" selection-end-column="58" />
+        <state relative-caret-position="333">
+          <caret line="439" column="86" selection-start-line="439" selection-start-column="76" selection-end-line="439" selection-end-column="86" />
+          <folding>
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#iframe#0;n#div#3;n#div#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#iframe#0;n#div#5;n#div#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/chooseRecord.html">
+    <entry file="file://$PROJECT_DIR$/static/js/editpulic.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="329">
-          <caret line="27" column="24" selection-start-line="27" selection-start-column="17" selection-end-line="27" selection-end-column="24" />
+        <state relative-caret-position="480">
+          <caret line="32" column="60" selection-start-line="32" selection-start-column="60" selection-end-line="32" selection-end-column="60" />
+          <folding>
+            <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/addFile.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/pureText.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="505">
-          <caret line="157" column="44" selection-start-line="157" selection-start-column="44" selection-end-line="157" selection-end-column="44" />
+        <state relative-caret-position="56">
+          <caret line="32" column="12" lean-forward="true" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/addVideo.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addText.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="505">
-          <caret line="112" column="44" selection-start-line="112" selection-start-column="44" selection-end-line="112" selection-end-column="44" />
+        <state relative-caret-position="400">
+          <caret line="96" column="96" lean-forward="true" selection-start-line="96" selection-start-column="11" selection-end-line="96" selection-end-column="96" />
+          <folding>
+            <element signature="n#style#0;n#div#5;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/imageAtlas.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="505">
-          <caret line="182" column="44" selection-start-line="182" selection-start-column="44" selection-end-line="182" selection-end-column="44" />
+        <state relative-caret-position="645">
+          <caret line="191" column="13" lean-forward="true" selection-start-line="191" selection-start-column="13" selection-end-line="191" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/Jurisdiction.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageText.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="355">
-          <caret line="105" column="69" selection-start-line="105" selection-start-column="69" selection-end-line="105" selection-end-column="69" />
-          <folding>
-            <element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#form#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#1;n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
+        <state relative-caret-position="305">
+          <caret line="137" column="16" selection-start-line="137" selection-start-column="16" selection-end-line="137" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/QRcodeList.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addFile.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="655">
-          <caret line="107" column="38" selection-start-line="107" selection-start-column="38" selection-end-line="107" selection-end-column="38" />
+        <state relative-caret-position="388">
+          <caret line="149" column="112" selection-start-line="149" selection-start-column="112" selection-end-line="149" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/pureText.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageAtlas.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="778">
-          <caret line="111" column="44" selection-start-line="111" selection-start-column="31" selection-end-line="111" selection-end-column="44" />
+        <state relative-caret-position="366">
+          <caret line="167" column="11" lean-forward="true" selection-start-line="161" selection-start-column="7" selection-end-line="167" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/imageText.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addVideo.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="673">
-          <caret line="163" column="11" selection-start-line="163" selection-start-column="11" selection-end-line="163" selection-end-column="11" />
+        <state relative-caret-position="9">
+          <caret line="101" column="197" selection-start-line="101" selection-start-column="197" selection-end-line="101" selection-end-column="197" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/depMaintain.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addDevice.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-7" />
+        <state relative-caret-position="297">
+          <caret line="136" column="25" selection-start-line="136" selection-start-column="25" selection-end-line="136" selection-end-column="25" />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageText.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/recordAdmin.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="178" column="73" selection-start-line="178" selection-start-column="73" selection-end-line="178" selection-end-column="73" />
+        <state relative-caret-position="1785">
+          <caret line="117" column="33" selection-start-line="117" selection-start-column="33" selection-end-line="117" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageAtlas.html">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addDevice.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="256">
-          <caret line="205" column="41" lean-forward="true" selection-start-line="204" selection-start-column="28" selection-end-line="205" selection-end-column="41" />
+        <state relative-caret-position="319">
+          <caret line="113" column="25" selection-start-line="113" selection-start-column="25" selection-end-line="113" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addFile.html">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addFile.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="175" column="33" lean-forward="true" selection-start-line="175" selection-start-column="33" selection-end-line="175" selection-end-column="33" />
+        <state relative-caret-position="-414">
+          <caret line="56" column="78" selection-start-line="56" selection-start-column="78" selection-end-line="56" selection-end-column="78" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addVideo.html">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addLink.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="363">
-          <caret line="126" column="31" lean-forward="true" selection-start-line="126" selection-start-column="31" selection-end-line="126" selection-end-column="31" />
+        <state relative-caret-position="552">
+          <caret line="81" column="96" selection-start-line="81" selection-start-column="96" selection-end-line="81" selection-end-column="96" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addLink.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="771">
-          <caret line="148" column="65" selection-start-line="148" selection-start-column="65" selection-end-line="148" selection-end-column="65" />
+        <state relative-caret-position="454">
+          <caret line="139" column="11" lean-forward="true" selection-start-line="133" selection-start-column="8" selection-end-line="139" selection-end-column="11" />
         </state>
       </provider>
     </entry>
@@ -439,106 +464,132 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/pureText.html">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addVideo.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="447">
-          <caret line="81" column="10" lean-forward="true" selection-start-line="78" selection-start-column="8" selection-end-line="81" selection-end-column="10" />
+        <state relative-caret-position="139">
+          <caret line="42" column="55" lean-forward="true" selection-start-line="42" selection-start-column="55" selection-end-line="42" selection-end-column="55" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/recordAdmin.html">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/imageText.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="43" column="99" selection-start-line="43" selection-start-column="99" selection-end-line="43" selection-end-column="99" />
+        <state relative-caret-position="267">
+          <caret line="131" column="18" lean-forward="true" selection-start-line="131" selection-start-column="18" selection-end-line="131" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/pureText.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-428">
+          <caret line="43" column="78" selection-start-line="43" selection-start-column="78" selection-end-line="43" selection-end-column="78" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/recordAdmin.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="489">
-          <caret line="43" column="99" selection-start-line="43" selection-start-column="99" selection-end-line="43" selection-end-column="99" />
+        <state relative-caret-position="1119">
+          <caret line="126" column="15" selection-start-line="126" selection-start-column="15" selection-end-line="126" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/editQRcode.html">
+    <entry file="file://$PROJECT_DIR$/static/js/jjjs.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="367">
-          <caret line="431" column="75" selection-start-line="431" selection-start-column="65" selection-end-line="431" selection-end-column="75" />
+        <state relative-caret-position="120">
+          <caret line="8" column="25" lean-forward="true" selection-start-line="8" selection-end-line="8" selection-end-column="25" />
           <folding>
-            <element signature="n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#script#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#script#1;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#script#2;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#script#3;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#script#4;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#script#5;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#script#7;n#body#0;n#html#0;n#!!top" />
+            <element signature="n#!!doc" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/editpulic.js">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="468">
+          <caret line="146" column="70" selection-start-line="146" selection-start-column="70" selection-end-line="146" selection-end-column="70" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/admin/recordTemplate.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1200">
-          <caret line="78" column="31" selection-start-line="78" selection-start-column="31" selection-end-line="78" selection-end-column="31" />
+        <state relative-caret-position="421">
+          <caret line="76" column="84" selection-start-line="76" selection-start-column="84" selection-end-line="76" selection-end-column="84" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/state.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="251">
+          <caret line="143" column="28" selection-start-line="143" selection-start-column="28" selection-end-line="143" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/pulic.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="724">
+          <caret line="612" column="4" selection-start-line="612" selection-start-column="4" selection-end-line="612" selection-end-column="4" />
           <folding>
             <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
+    <entry file="file://$PROJECT_DIR$/index.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="309">
-          <caret line="322" column="107" selection-start-line="322" selection-start-column="107" selection-end-line="322" selection-end-column="107" />
-        </state>
+        <state relative-caret-position="-9082" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addDevice.html">
+    <entry file="file://$PROJECT_DIR$/pages/admin/updateMangorSelection.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-689" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/admin/changeStategroup.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="262">
-          <caret line="100" column="29" lean-forward="true" selection-start-line="100" selection-start-column="12" selection-end-line="100" selection-end-column="29" />
+        <state relative-caret-position="639">
+          <caret line="62" column="136" selection-start-line="62" selection-start-column="124" selection-end-line="62" selection-end-column="136" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/addDevice.html">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/chooseRecord.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
-          <caret line="97" column="29" selection-start-line="97" selection-start-column="29" selection-end-line="97" selection-end-column="29" />
+        <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/addLink.html">
+    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="94" column="29" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" />
+        <state relative-caret-position="251">
+          <caret line="19" column="37" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addLink.html">
+    <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-28" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/depMaintain.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1077">
-          <caret line="97" column="29" selection-start-line="97" selection-start-column="29" selection-end-line="97" selection-end-column="29" />
+        <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$/static/js/pulic.js">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/QRcodeList.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3642">
-          <caret line="320" column="16" selection-start-line="320" selection-start-column="9" selection-end-line="320" selection-end-column="16" />
-          <folding>
-            <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
-          </folding>
+        <state relative-caret-position="399">
+          <caret line="89" column="24" lean-forward="true" 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/recordTemplate.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="628" column="38" selection-start-line="628" selection-start-column="38" selection-end-line="628" selection-end-column="38" />
+        <state relative-caret-position="280">
+          <caret line="41" column="27" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="27" />
         </state>
       </provider>
     </entry>

pages/QRcode/QRcodeList.html

@@ -85,9 +85,9 @@
                 <a title="复制" class="a_btn" lay-event="copy" href="javascript:;">
                     <i class="fa fa-copy"></i>
                 </a>
-                <a title="下载二维码" class="a_btn" lay-event="downloadQRcode" href="javascript:;">
-                    <i class="fa fa-cloud-download"></i>
-                </a>
+                <!--<a title="下载二维码" class="a_btn" lay-event="downloadQRcode" href="javascript:;">-->
+                    <!--<i class="fa fa-cloud-download"></i>-->
+                <!--</a>-->
                 <a title="二维码" class="a_btn" lay-event="QRcode" href="javascript:;">
                     <i class="fa fa-qrcode"></i>
                 </a>

pages/QRcode/addDevice.html

@@ -41,7 +41,7 @@
                 设备铭牌名称：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入设备铭牌名称" class="layui-input textName">
+                <input type="text" placeholder="请输入设备铭牌名称" class="layui-input textName" lay-verify="required">
             </div>
         </div>
         <div class="layui-form-item">
@@ -50,21 +50,13 @@
                 <a href="javascript:;" class="layui-btn layui-btn-normal addLink">添加其他参数</a>
             </div>
             <div class="layui-input-block" id="link_items">
-                <!--<div class="link_item">-->
-                    <!--<input type="text" placeholder="参数名称">-->
-                    <!--<input type="text" placeholder="参数内容">-->
-                    <!--<span class="operation">-->
-                        <!--<i class="fa fa-long-arrow-up moveUp"></i>-->
-                        <!--<i class="fa fa-long-arrow-down moveDown"></i>-->
-                        <!--<i class="fa fa-trash-o deleteLink"></i>-->
-                    <!--</span>-->
-                <!--</div>-->
+
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="equipmentBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn equipmentBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -80,8 +72,8 @@
             var mnum = num++;
             var str =`
                <div class="link_item" index-data="${mnum}">
-                    <input type="text" placeholder="参数名称" class="equipmentName" oninput="parent.deviceNameFun(this.value,${mnum})">
-                    <input type="text" placeholder="参数内容" class="equipmentContent" oninput="parent.deviceContentFun(this.value,${mnum})">
+                    <input type="text" placeholder="参数名称" lay-verify="required" class="equipmentName" oninput="parent.deviceNameFun(this.value,${mnum})">
+                    <input type="text" placeholder="参数内容" lay-verify="required" class="equipmentContent" oninput="parent.deviceContentFun(this.value,${mnum})">
                     <span class="operation">
                         <i class="fa fa-long-arrow-up moveUp"></i>
                         <i class="fa fa-long-arrow-down moveDown"></i>
@@ -116,14 +108,10 @@
                 layer.msg('已经移至最低点', {icon: 8});
             }
         });
-        $('body').on("click",".equipmentBtn",function () {
+        form.on('submit(equipmentBtn)', function(){
             var equipmentNameArray = [] , equipmenItem = $('.link_item');
             var equipmentobj = {paramContent:"",paramName:'',pageId:'',title:'',zIndex:''};
             var  num = 0;
-            if ($('.textName').val() === "") {
-                layer.msg('设备铭牌信息不能为空');
-                return false;
-            }
             equipmenItem.each(function () {
                 equipmentobj = {};
                 equipmentobj.title = $('.textName').val();
@@ -151,7 +139,8 @@
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
-            })
+            });
+            return false;
         });
     });
 </script>

pages/QRcode/addFile.html

@@ -54,7 +54,7 @@
                 文件名称：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入文件名称" class="layui-input textName" oninput="pureTextTitles(this.value)">
+                <input type="text" placeholder="请输入文件名称" lay-verify="required" class="layui-input textName" oninput="pureTextTitles(this.value)">
             </div>
         </div>
         <div class="layui-form-item">
@@ -68,10 +68,10 @@
                 </button>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="fileBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn fileBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -130,13 +130,9 @@
             $(this).parent().attr("file-size","");
             $(this).parent().find('.fileName').val("");
         });
-        $('body').on("click",".fileBtn",function () {
+        form.on('submit(fileBtn)', function(){
             var fileItemArray = [] , fileItem = $('.fileItem');
             var fileItemobj = {fileName:"",filePath:'',pageId:sessionStorage.getItem("QRcodeID"),title:$('.textName').val(),fileSize:''};
-            if ($('.textName').val() === "") {
-                layer.msg('文件信息不能为空');
-                return false;
-            }
             fileItem.each(function () {
                 fileItemobj = {};
                 fileItemobj.title = $('.textName').val();
@@ -165,6 +161,7 @@
                     layer.msg('网络错误，请检查网络');
                 }
             })
+            return false;
         });
     });
 </script>

pages/QRcode/addLink.html

@@ -41,13 +41,13 @@
                 链接标题：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入链接标题" class="layui-input textName">
+                <input type="text" placeholder="请输入链接标题" class="layui-input textName" lay-verify="required">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">链接备注：</label>
             <div class="layui-input-block">
-                <textarea class="layui-textarea" placeholder="提醒内容" name="content" lay-verify="content" id="LAY_demo_editor" style="resize: none"></textarea>
+                <textarea class="layui-textarea" placeholder="提醒内容" name="content" lay-verify="required" id="LAY_demo_editor" style="resize: none"></textarea>
             </div>
         </div>
         <div class="layui-form-item">
@@ -59,10 +59,10 @@
 
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="linkBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn linkBtn" disabled>提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -78,8 +78,8 @@
             var mnum = num++;
             var str =`
                <div class="link_item" index-data="${mnum}">
-                    <input type="text" placeholder="链接名称" class="linkName" onblur="linkName(this.value,this.previousSibling.value)" oninput="parent.linkFun(this.value,${mnum})">
-                    <input type="text" placeholder="链接地址" class="linkUrl" onblur="linkName(this.nextSibling.value,this.value),checkUrl(this)" oninput="parent.titleFun(this.value,${mnum})">
+                    <input type="text" placeholder="链接名称" class="linkName" lay-verify="required" oninput="parent.linkFun(this.value,${mnum})">
+                    <input type="text" placeholder="链接地址" class="linkUrl" lay-verify="linkverify" oninput="parent.titleFun(this.value,${mnum})">
                     <span class="operation">
                         <i class="fa fa-long-arrow-up moveUp"></i>
                         <i class="fa fa-long-arrow-down moveDown"></i>
@@ -113,34 +113,17 @@
                 layer.msg('已经移至最低点', {icon: 8});
             }
         });
-        window.checkUrl = function(obj){
-            var strReg = "(https|http)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]";
-            var re = new RegExp(strReg);
-            if(!re.test(obj.value)) {
-                layer.alert('请输入合法的链接地址');
-                $(obj).val("");
-                $(".linkBtn").attr("disabled",'disabled')
-            }else {
-                $(".linkBtn").removeAttr("disabled")
+        form.verify({
+            linkverify: function(value, item){
+                if(!new RegExp("(https|http)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]").test(value)){
+                    return '请输入合法的链接地址';
+                }
             }
-        };
-        window.linkName = function (val,url) {
-            console.log()
-          if (val === "" || url === ""){
-              layer.msg('链接名称或链接地址不能为空');
-              $(".linkBtn").attr("disabled",'disabled')
-          }else {
-              $(".linkBtn").removeAttr("disabled")
-          }
-        };
-        $('body').on("click",".linkBtn",function () {
+        });
+        form.on('submit(linkBtn)', function(){
             var linkItemArray = [] , linkItem = $('.link_item');
             var linkItemobj = {linkName:"",linkUrl:'',pageId:'',title:'',remark:'',zIndex:''};
             var  num = 0;
-            if ($('.textName').val() === "") {
-                layer.msg('链接信息不能为空');
-                return false;
-            }
             linkItem.each(function () {
                 linkItemobj = {};
                 linkItemobj.title = $('.textName').val();
@@ -170,6 +153,7 @@
                     layer.msg('网络错误，请检查网络');
                 }
             })
+            return false;
         });
     });
 </script>

pages/QRcode/addText.html

@@ -39,13 +39,13 @@
                 二维码名称：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入二维码名称" class="layui-input QRcodeName">
+                <input type="text" placeholder="请输入二维码名称" class="layui-input QRcodeName" lay-verify="required">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">二维码颜色：</label>
             <div class="layui-input-block">
-                <select name="interest" lay-filter="color">
+                <select name="interest" lay-verify="required">
                     <option value=""></option>
                     <option value="0">蓝色</option>
                     <option value="1">黑色</option>
@@ -56,20 +56,20 @@
         <div class="layui-form-item">
             <label class="layui-form-label">提醒开关：</label>
             <div class="layui-input-block">
-                <input type="checkbox" name="close" lay-skin="switch" lay-text="开|关" lay-filter="switch">
+                <input type="checkbox" name="close" lay-skin="switch" lay-text="开|关">
             </div>
         </div>
         <div class="showOrhide">
             <div class="layui-form-item">
                 <label class="layui-form-label">提醒日期：</label>
                 <div class="layui-input-block">
-                    <input type="text" name="date" id="date" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
+                    <input type="text" name="date" id="date" placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">提醒周期：</label>
                 <div class="layui-input-block">
-                    <select name="interest" lay-filter="aihao">
+                    <select name="interest">
                         <option value=""></option>
                         <option value="0">周一</option>
                         <option value="1">一个月</option>
@@ -83,20 +83,20 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">提醒内容：</label>
                 <div class="layui-input-block">
-                    <textarea class="layui-textarea" placeholder="提醒内容" name="content" lay-verify="content" id="LAY_demo_editor" style="resize: none"></textarea>
+                    <textarea class="layui-textarea" placeholder="提醒内容" name="content" id="LAY_demo_editor" style="resize: none"></textarea>
                 </div>
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">备注：</label>
             <div class="layui-input-block">
-                <textarea class="layui-textarea" placeholder="备注" name="content" lay-verify="content" id="LAY_editor" style="resize: none"></textarea>
+                <textarea class="layui-textarea" placeholder="备注" name="content" lay-verify="required" id="LAY_editor" style="resize: none"></textarea>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="formQRcode">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn a_stetaBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -126,17 +126,13 @@
         form.on("select(color)",function (data) {
            color = data.elem[data.elem.selectedIndex].text;
         });
-        $('body').on("click",".a_stetaBtn",function () {
+        form.on('submit(formQRcode)', function(){
             var QRcodeInfo = {
                 colorType:color,
                 departmentId:sessionStorage.getItem("depID") == ""?"root" : sessionStorage.getItem("depID"),
                 remark:$('#LAY_editor').val(),
                 title:$('.QRcodeName').val(),
             };
-            if ($('.QRcodeName').val() === "" || $('#LAY_editor').val()=== "" || color === "") {
-                layer.msg('二维码信息不能为空');
-                return false;
-            }
             $.ajax({
                 url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addPage',
                 type:'post',
@@ -149,7 +145,6 @@
                         parent.QRcodeName($('.QRcodeName').val())
                     }else if(res.code === '439'){
                         layer.msg($('.QRcodeName').val()+'已经存在二维码列表');
-
                     }else {
                         layer.msg('新建失败，请检查信息');
                     }
@@ -157,7 +152,8 @@
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
-            })
+            });
+            return false;
         });
     });
 </script>

pages/QRcode/addVideo.html

@@ -41,7 +41,7 @@
                 视频名称：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入视频名称" class="layui-input textName">
+                <input type="text" placeholder="请输入视频名称" class="layui-input textName" lay-verify="required">
             </div>
         </div>
         <div class="layui-form-item">
@@ -53,10 +53,10 @@
                 </button>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="videoBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn videoBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -95,12 +95,8 @@
                 layer.msg('请检查网络！');
             }
         });
-        $('body').on("click",".videoBtn",function () {
+        form.on('submit(videoBtn)', function(){
             var videoItemobj = [{videoName:videoName,videoUrl:videoUrl,pageId:sessionStorage.getItem("QRcodeID"),title:$('.textName').val()}];
-            if ($('.textName').val() === "") {
-                layer.msg('视频信息不能为空');
-                return false;
-            }
             $.ajax({
                 url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addVideo',
                 type:'post',
@@ -120,6 +116,7 @@
                     layer.msg('网络错误，请检查网络');
                 }
             })
+            return false;
         });
     });
 </script>

pages/QRcode/depMaintain.html

@@ -59,11 +59,11 @@
         function selectStateFun(){
             // /api/template/v1/getRecordTemplateList
             $.ajax({
-                url: 'http://apptest.jieweizhineng.com/api/swagger/api/status/v1/selectStatusList/'+sessionStorage.getItem("departmentId"),
+                url: 'http://apptest.jieweizhineng.com/api/swagger/api/status/v1/selectStatusList/'+sessionStorage.getItem("depID"),
                 method: 'get',
                 dataType: 'json',
                 data: {
-                    departmentId:sessionStorage.getItem("departmentId")
+                    departmentId:sessionStorage.getItem("depID")
                 },
                 success: function (res) {
                     console.log(res,'oo');

pages/QRcode/imageAtlas.html

@@ -44,7 +44,7 @@
                 图集标题：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入图集标题" class="layui-input textName" oninput="pureTextTitles(this.value)">
+                <input type="text" placeholder="请输入图集标题" lay-verify="required" class="layui-input textName" oninput="pureTextTitles(this.value)">
             </div>
         </div>
         <div class="layui-form-item">
@@ -58,10 +58,10 @@
                 </button>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="imageAtlasBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn imageAtlasBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -98,8 +98,8 @@
                         <div class="imageAtlas_tiem" index-data="${muns}" img-name="${res.data.fileName}" img-url="${res.data.fullURL}">
                             <img src="${res.data.fullURL}" alt="" class="image2">
                             <div class="imageText">
-                                <input type="text" placeholder="输入图片标题" class="imageTitle">
-                                <input type="text" placeholder="输入图片链接" onblur="checkUrl(this)" class="imageLinking">
+                                <input type="text" placeholder="输入图片标题" class="imageTitle" lay-verify="required">
+                                <input type="text" placeholder="输入图片链接" onblur="checkUrl(this)" class="imageLinking" lay-verify="required">
                             </div>
                             <span class="operation">
                                 <i class="fa fa-long-arrow-up moveUp"></i>
@@ -154,7 +154,7 @@
                 $(".linkBtn").removeAttr("disabled")
             }
         };
-        $('body').on("click",".imageAtlasBtn",function () {
+        form.on('submit(imageAtlasBtn)', function(){
             var imageAtlasArray = [] , imageAtlas_tiem = $('.imageAtlas_tiem'),num = 0;
             var imageAtlas = {imageName:"",imageUrl:'',pageId:sessionStorage.getItem("QRcodeID"),title:$('.textName').val(),imageTitle:'',imageLinking:''};
             if ($('.textName').val() === "") {
@@ -189,8 +189,10 @@
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
-            })
+            });
+            return false;
         });
+
     });
 </script>
 </body>

pages/QRcode/imageText.html

@@ -42,7 +42,7 @@
                 图文标题：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入图片名称" class="layui-input textName" oninput="pureTextTitles(this.value)">
+                <input type="text" placeholder="请输入图片名称" lay-verify="required" class="layui-input textName" oninput="pureTextTitles(this.value)">
             </div>
         </div>
         <div class="layui-form-item">
@@ -65,10 +65,10 @@
                 </div>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="imageTextBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn imageTextBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -130,9 +130,9 @@
             var content = editor.txt.html();
             parent.textInfo(content)
         }, false);
-        $('body').on("click",".imageTextBtn",function () {
+        form.on('submit(imageTextBtn)', function(){
             base64Text = base64.encode(editor.txt.html());
-            if ($('.textName').val() === "" || editor.txt.text() === "" || imageName ==="" || imageUrl === "") {
+            if (editor.txt.text() === "" || imageName ==="" || imageUrl === "") {
                 layer.msg('图文信息不能为空');
                 return false;
             }
@@ -161,8 +161,8 @@
                     layer.msg('网络错误，请检查网络');
                 }
             })
+            return false;
         });
-
     });
 </script>
 </body>

pages/QRcode/pureText.html

@@ -35,13 +35,13 @@
 
 <body>
 <div class="weadmin-body">
-    <form class="layui-form">
+    <div class="layui-form">
         <div class="layui-form-item">
             <label class="layui-form-label">
                 文本标题：
             </label>
             <div class="layui-input-block steta_grouds" id="steta_grouds">
-                <input type="text" placeholder="请输入文本标题" class="layui-input textName" oninput="pureTextTitles(this.value)">
+                <input type="text" placeholder="请输入文本标题" lay-verify="required" class="layui-input textName" oninput="pureTextTitles(this.value)">
             </div>
         </div>
         <div class="layui-form-item">
@@ -52,9 +52,9 @@
                 </div>
             </div>
         </div>
-    </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn pureTextSubmit">提交</button>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="pureTextSubmit">提交</button>
+        </div>
     </div>
     <span class="text" style="display: none"></span>
 </div>
@@ -68,7 +68,6 @@
     layui.use(['form','layer','jquery','laydate'], function(){
         var form = layui.form,
             $ = layui.jquery,
-            laydate= layui.laydate,
             layer = layui.layer;
         form.render();
         var base64 = new Base64();
@@ -84,12 +83,7 @@
         document.getElementById('editor').addEventListener('click', function () {
             parent.onFocus()
         }, false);
-        // $("body").on('click','.pureTextSubmit',function () {
-        //     var content = editor.txt.text();
-        //     base64Text = base64.encode(editor.txt.html());
-        //     console.log(base64Text,'content')
-        // });
-        $('body').on("click",".pureTextSubmit",function () {
+        form.on('submit(pureTextSubmit)', function(){
             base64Text = base64.encode(editor.txt.html());
             console.log(base64Text,'base64Text')
             var QRcodeInfo = {
@@ -97,7 +91,7 @@
                 pageId:sessionStorage.getItem("QRcodeID"),
                 title:$('.textName').val(),
             };
-            if ($('.textName').val() === "" || editor.txt.text() === "") {
+            if (editor.txt.text() === "") {
                 layer.msg('纯文本信息不能为空');
                 return false;
             }
@@ -118,7 +112,8 @@
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
-            })
+            });
+            return false;
         });
     });
 </script>

pages/QRcode/recordAdmin.html

@@ -41,7 +41,7 @@
                 记录管理名称：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入设备铭牌名称" class="layui-input recordName" oninput="recordTextTitles(this.value)">
+                <input type="text" placeholder="请输入设备铭牌名称" class="layui-input recordName" lay-verify="required" oninput="recordTextTitles(this.value)">
             </div>
         </div>
         <div class="layui-form-item">
@@ -56,15 +56,7 @@
                         </tr>
                     </thead>
                     <tbody class="tbodys">
-                        <!--<tr class="text-c">-->
-                            <!--<td>苹果记录</td>-->
-                            <!--<td>-->
-                                <!--<span class="cursor_p">111</span>-->
-                            <!--</td>-->
-                            <!--<td>-->
-                                <!--<i class="fa fa-trash-o cursor_p"></i>-->
-                            <!--</td>-->
-                        <!--</tr>-->
+
                     </tbody>
                 </table>
             </div>
@@ -72,10 +64,10 @@
                 <a href="javascript:;" class="layui-btn layui-btn-normal addRecord">添加其他参数</a>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="recordBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn recordBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -94,7 +86,7 @@
             parent.onFocus();
             parent.addrecord(title)
         };
-        $('body').on("click",".recordBtn",function () {
+        form.on('submit(recordBtn)', function(){
             var recordTemplate = [] , tr = $('.tbodys tr');
             var recordTemplateobj = {organizationId:"",organizationName:'',pageId:'',recordName:'',stepIndex:'',templateId:'',templateName:''};
             var  num = 0;
@@ -132,7 +124,8 @@
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
-            })
+            });
+            return false;
         });
     });
 </script>

pages/admin/recordTemplate.html

@@ -74,7 +74,7 @@
                 <button class="layui-btn addState"><i class="layui-icon"></i>添加记录模版</button>
                 <span class="fr" style="line-height:40px"></span>
             </div>
-            <table class="layui-table" id="stateRemind" lay-filter="stateItme"></table>
+            <table class="layui-table" id="stateRemind" lay-filter="recordTemplateID"></table>
             <div id="pageItem" style="text-align: right"></div>
             <!--操作-->
             <script type="text/html" id="barDemo">

pages/editQRcode/addDevice.html

@@ -41,7 +41,7 @@
                 设备铭牌名称：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入设备铭牌名称" class="layui-input textName">
+                <input type="text" placeholder="请输入设备铭牌名称" class="layui-input textName" lay-verify="required">
             </div>
         </div>
         <div class="layui-form-item">
@@ -61,10 +61,10 @@
                 <!--</div>-->
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="equipmentBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn equipmentBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -75,16 +75,16 @@
             laydate= layui.laydate,
             layer = layui.layer;
         form.render();
-        if (sessionStorage.getItem('module') == 'true') {
-            QRcodeDevice();
+        if (sessionStorage.getItem('QRcodeIDs') !=""){
+            QRcodeDevice(sessionStorage.getItem('QRcodeIDs'))
         }
-        var num = 0,bums = 0;
+        var num = 0,bums = 0,delateDevice = [];
         $("body").on('click','.addLink',function () {
             var mnum = bums++ +1;
             var str =`
                <div class="link_item" index-data="${mnum}">
-                    <input type="text" placeholder="参数名称" class="equipmentName" oninput="parent.deviceNameFun(this.value,${mnum})">
-                    <input type="text" placeholder="参数内容" class="equipmentContent" oninput="parent.deviceContentFun(this.value,${mnum})">
+                    <input type="text" placeholder="参数名称" lay-verify="required" class="equipmentName" oninput="parent.deviceNameFun(this.value,${mnum})">
+                    <input type="text" placeholder="参数内容" lay-verify="required" class="equipmentContent" oninput="parent.deviceContentFun(this.value,${mnum})">
                     <span class="operation">
                         <i class="fa fa-long-arrow-up moveUp"></i>
                         <i class="fa fa-long-arrow-down moveDown"></i>
@@ -97,9 +97,21 @@
             parent.addDevice(mnum)
         });
         $('body').on('click','.deleteLink',function () {
+            var equipmentobj = {id:'',deleteFlag:false,paramContent:"",paramName:'',parentId:'',title:'',zIndex:''};
             $(this).parent().parent().remove();
             parent.onFocus();
-            parent.deleteDevice($(this).parent().parent().attr('index-data'))
+            parent.deleteDevice($(this).parent().parent().attr('index-data'));
+            if ($(this).parent().parent().attr('link-id') != "") {
+                equipmentobj = {};
+                equipmentobj.title = $('.textName').val();
+                equipmentobj.parentId = sessionStorage.getItem("QRcodeIDs");
+                equipmentobj.paramName = $(this).parent().parent().find('.equipmentName').val();
+                equipmentobj.paramContent = $(this).parent().parent().find('.equipmentContent').val();
+                equipmentobj.deleteFlag = false;
+                equipmentobj.id = $(this).parent().parent().attr('device-id');
+                equipmentobj.zIndex = num++ +1;
+                delateDevice.push(equipmentobj)
+            }
         });
         // 上移
         $("body") .on("click",".moveUp",function () {
@@ -119,58 +131,63 @@
                 layer.msg('已经移至最低点', {icon: 8});
             }
         });
-        $('body').on("click",".equipmentBtn",function () {
+        form.on('submit(equipmentBtn)', function(){
             var equipmentNameArray = [] , equipmenItem = $('.link_item');
-            var equipmentobj = {paramContent:"",paramName:'',pageId:'',title:'',zIndex:''};
+            var equipmentobj = {id:'',deleteFlag:false,paramContent:"",paramName:'',parentId:'',title:'',zIndex:''};
             var  num = 0;
-            if ($('.textName').val() === "") {
-                layer.msg('设备铭牌信息不能为空');
-                return false;
+            if (delateDevice != []) {
+                for (var j = 0; j < delateDevice.length; j++) {
+                    equipmentNameArray.push(delateDevice[j])
+                }
             }
             equipmenItem.each(function () {
                 equipmentobj = {};
                 equipmentobj.title = $('.textName').val();
-                equipmentobj.pageId = sessionStorage.getItem("QRcodeID");
+                equipmentobj.parentId = sessionStorage.getItem("QRcodeIDs");
                 equipmentobj.paramName = $(this).find('.equipmentName').val();
                 equipmentobj.paramContent = $(this).find('.equipmentContent').val();
+                equipmentobj.deleteFlag = false;
+                equipmentobj.id = $(this).attr('device-id');
                 equipmentobj.zIndex = num++ +1;
                 equipmentNameArray.push(equipmentobj)
             });
             $.ajax({
-                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addEquipment',
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/updateEquipment',
                 type:'post',
                 data:JSON.stringify(equipmentNameArray),
                 contentType:'application/json;charset=utf-8',
                 dataType:'json',
                 success:function (res) {
                     if (res.code === '200'){
+                        parent.onFocus();
                         parent.pageRelationIdFun(res.data);
-                        layer.msg('设备铭牌新增成功');
+                        layer.msg('设备铭牌修改成功');
                     }else {
-                        layer.msg('设备铭牌新增失败，请检查信息');
+                        layer.msg('设备铭牌修改失败，请检查信息');
                     }
                 },
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
             })
+            return false;
         });
         // 数据回显
-        function QRcodeDevice() {
+        function QRcodeDevice(id) {
             $.ajax({
                 url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageEdit/'+sessionStorage.getItem('QRcodeDetaileID'),
                 type: 'get',
                 dataType: 'json',
                 success: function (res) {
                     for (var i = 0; i < res.data.pageItemList.length; i++) {
-                        if (res.data.pageItemList[i].pageRelation.businessType == "EQUIPMENT") {
+                        if (res.data.pageItemList[i].pageRelation.businessType == "EQUIPMENT" && res.data.pageItemList[i].pageRelation.businessId == id) {
                             for (var j = 0; j < res.data.pageItemList[i].equipmentList.length; j++) {
                                 $('.textName').val(res.data.pageItemList[i].equipmentList[j].title);
                                 bums = j;
                                 var str =`
-                                   <div class="link_item" index-data="${bums}">
-                                        <input type="text" placeholder="参数名称" value="${res.data.pageItemList[i].equipmentList[j].paramName}" class="equipmentName" oninput="parent.deviceNameFun(this.value,${bums})">
-                                        <input type="text" placeholder="参数内容" value="${res.data.pageItemList[i].equipmentList[j].paramContent}" class="equipmentContent" oninput="parent.deviceContentFun(this.value,${bums})">
+                                   <div class="link_item" index-data="${bums}" device-id="${id}">
+                                        <input type="text" placeholder="参数名称" value="${res.data.pageItemList[i].equipmentList[j].paramName}" class="equipmentName" oninput="parent.deviceNameFun(this.value,${bums})" lay-verify="required">
+                                        <input type="text" placeholder="参数内容" value="${res.data.pageItemList[i].equipmentList[j].paramContent}" class="equipmentContent" oninput="parent.deviceContentFun(this.value,${bums})" lay-verify="required">
                                         <span class="operation">
                                             <i class="fa fa-long-arrow-up moveUp"></i>
                                             <i class="fa fa-long-arrow-down moveDown"></i>

pages/editQRcode/addFile.html

@@ -54,7 +54,7 @@
                 文件名称：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入文件名称" class="layui-input textName" oninput="pureTextTitles(this.value)">
+                <input type="text" placeholder="请输入文件名称" class="layui-input textName" lay-verify="required" oninput="pureTextTitles(this.value)">
             </div>
         </div>
         <div class="layui-form-item">
@@ -68,10 +68,10 @@
                 </button>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="fileBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn fileBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -82,14 +82,14 @@
             upload= layui.upload,
             layer = layui.layer;
         form.render();
-        if (sessionStorage.getItem('module') == 'true') {
-            QRcodeFile();
+        if (sessionStorage.getItem('QRcodeIDs') !=""){
+            QRcodeFile(sessionStorage.getItem('QRcodeIDs'))
         }
         window.pureTextTitles = function (title) {
             parent.onFocus();
             parent.pureTextTitle(title)
         };
-        var index,num = 0,fileSize,bums =0;
+        var index,num = 0,fileSize,bums =0,delatefiles =[];
         var uploadInst = upload.render({
             elem: '#upload1'
             ,url: 'http://apptest.jieweizhineng.com/api/swagger/api/common/v1/uploadFile'
@@ -125,6 +125,7 @@
             }
         });
         $('body').on('click','.deleteLink',function () {
+            var fileItemobj = {id:'',fileName:"",filePath:'',deleteFlag:'',parentId:'',title:'',fileSize:''};
             $(this).parent().remove();
             var index_data  = $(this).parent().attr('index-data');
             parent.onFocus();
@@ -132,56 +133,72 @@
             $(this).parent().attr("file-path","");
             $(this).parent().attr("file-size","");
             $(this).parent().find('.fileName').val("");
+            if ($(this).parent().parent().attr('file-id') != "") {
+                fileItemobj = {};
+                fileItemobj.title = $('.textName').val();
+                fileItemobj.parentId = sessionStorage.getItem("QRcodeIDs");
+                fileItemobj.fileName = $(this).parent().find('.fileName').val();
+                fileItemobj.filePath = $(this).parent().attr('file-path');
+                fileItemobj.fileSize = $(this).parent().attr('file-size');
+                fileItemobj.id = $(this).parent().attr('file-id');
+                fileItemobj.deleteFlag = true;
+                delatefiles.push(fileItemobj)
+            }
         });
-        $('body').on("click",".fileBtn",function () {
+        form.on('submit(fileBtn)', function(){
             var fileItemArray = [] , fileItem = $('.fileItem');
-            var fileItemobj = {fileName:"",filePath:'',pageId:sessionStorage.getItem("QRcodeID"),title:$('.textName').val(),fileSize:''};
-            if ($('.textName').val() === "") {
-                layer.msg('文件信息不能为空');
-                return false;
+            var fileItemobj = {id:'',fileName:"",filePath:'',deleteFlag:false,parentId:'',title:'',fileSize:''};
+            if (delatefiles != []) {
+                for (var j = 0; j < delatefiles.length; j++) {
+                    fileItemArray.push(delatefiles[j])
+                }
             }
             fileItem.each(function () {
                 fileItemobj = {};
                 fileItemobj.title = $('.textName').val();
-                fileItemobj.pageId = sessionStorage.getItem("QRcodeID");
+                fileItemobj.parentId = sessionStorage.getItem("QRcodeIDs");
                 fileItemobj.fileName = $(this).find('.fileName').val();
                 fileItemobj.filePath = $(this).attr('file-path');
                 fileItemobj.fileSize = $(this).attr('file-size');
+                fileItemobj.id = $(this).attr('file-id');
+                fileItemobj.deleteFlag = false;
                 fileItemArray.push(fileItemobj)
             });
             $.ajax({
-                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addFile',
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/updateFile',
                 type:'post',
                 data:JSON.stringify(fileItemArray),
                 contentType:'application/json;charset=utf-8',
                 dataType:'json',
                 success:function (res) {
                     if (res.code === '200'){
+                        parent.onFocus();
                         parent.pageRelationIdFun(res.data);
-                        layer.msg('文件新增成功');
+                        layer.msg('文件修改成功');
                     }else {
-                        layer.msg('文件新增失败，请检查信息');
+                        layer.msg('文件修改失败，请检查信息');
                     }
                 },
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
             })
+            return false;
         });
         // 数据回显
-        function QRcodeFile() {
+        function QRcodeFile(id) {
             $.ajax({
                 url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageEdit/'+sessionStorage.getItem('QRcodeDetaileID'),
                 type: 'get',
                 dataType: 'json',
                 success: function (res) {
                     for (var i = 0; i < res.data.pageItemList.length; i++) {
-                        if (res.data.pageItemList[i].pageRelation.businessType == "FILE") {
+                        if (res.data.pageItemList[i].pageRelation.businessType == "FILE" && res.data.pageItemList[i].pageRelation.businessId == id) {
                             for (var j = 0; j < res.data.pageItemList[i].fileList.length; j++) {
                                 $('.textName').val(res.data.pageItemList[i].fileList[j].title);
                                 bums = j;
                                 var str = `
-                             <div class="fileItem" index-data="${bums}" file-path="${res.data.pageItemList[i].fileList[j].filePath}" file-size="${res.data.pageItemList[i].fileList[j].fileSize}">
+                             <div class="fileItem" index-data="${bums}" file-path="${res.data.pageItemList[i].fileList[j].filePath}" file-size="${res.data.pageItemList[i].fileList[j].fileSize}" file-id="${res.data.pageItemList[i].fileList[j].id}">
                                 <input type="text" class="layui-input fileName" value="${res.data.pageItemList[i].fileList[j].fileName}" disabled>
                                 <i class="fa fa-trash-o deleteLink"></i>
                              </div>`;

pages/editQRcode/addLink.html

@@ -41,13 +41,13 @@
                 链接标题：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入链接标题" class="layui-input textName">
+                <input type="text" placeholder="请输入链接标题" class="layui-input textName" lay-verify="required">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">链接备注：</label>
             <div class="layui-input-block">
-                <textarea class="layui-textarea" placeholder="提醒内容" name="content" lay-verify="content" id="LAY_demo_editor" style="resize: none"></textarea>
+                <textarea class="layui-textarea" placeholder="提醒内容" name="content" lay-verify="required" id="LAY_demo_editor" style="resize: none"></textarea>
             </div>
         </div>
         <div class="layui-form-item">
@@ -59,10 +59,10 @@
 
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="linkBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn linkBtn" disabled>提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -73,16 +73,16 @@
             laydate= layui.laydate,
             layer = layui.layer;
         form.render();
-        if (sessionStorage.getItem('module') == 'true') {
-            QRcodeLink();
+        if (sessionStorage.getItem('QRcodeIDs') !=""){
+            QRcodeLink(sessionStorage.getItem('QRcodeIDs'))
         }
-        var num = 0,bums = 0;
+        var num = 0,bums = 0,delateLinks = [];
         $("body").on('click','.addLink',function () {
             var mnum = bums++ +1;
             var str =`
                <div class="link_item" index-data="${mnum}">
-                    <input type="text" placeholder="链接名称" class="linkName" onblur="linkName(this.value,this.previousSibling.value)" oninput="parent.linkFun(this.value,${mnum})">
-                    <input type="text" placeholder="链接地址" class="linkUrl" onblur="linkName(this.nextSibling.value,this.value),checkUrl(this)" oninput="parent.titleFun(this.value,${mnum})">
+                    <input type="text" placeholder="链接名称" class="linkName" lay-verify="required" onblur="linkName(this.value,this.previousSibling.value)" oninput="parent.linkFun(this.value,${mnum})">
+                    <input type="text" placeholder="链接地址" class="linkUrl" lay-verify="linkverify" onblur="linkName(this.nextSibling.value,this.value),checkUrl(this)" oninput="parent.titleFun(this.value,${mnum})">
                     <span class="operation">
                         <i class="fa fa-long-arrow-up moveUp"></i>
                         <i class="fa fa-long-arrow-down moveDown"></i>
@@ -94,9 +94,24 @@
             parent.addlink(mnum)
         });
         $('body').on('click','.deleteLink',function () {
+            var linkItemobj = {id:'',linkName:"",linkUrl:'',parentId:'',title:'',remark:'',zIndex:'',deleteFlag:""};
             $(this).parent().parent().remove();
             parent.onFocus();
-            parent.deletaLink($(this).parent().parent().attr('index-data'))
+            parent.deletaLink($(this).parent().parent().attr('index-data'));
+            if ($(this).parent().parent().attr('link-id') != "") {
+                linkItemobj = {};
+                linkItemobj.title = $('.textName').val();
+                linkItemobj.parentId = sessionStorage.getItem("QRcodeIDs");
+                linkItemobj.linkName = $(this).parent().parent().find('.linkName').val();
+                linkItemobj.linkUrl = $(this).parent().parent().find('.linkUrl').val();
+                linkItemobj.remark = $('#LAY_demo_editor').val();
+                linkItemobj.id = $(this).parent().parent().attr('link-id');
+                linkItemobj.deleteFlag = true;
+                linkItemobj.zIndex = num++ +1;
+                delateLinks.push(linkItemobj)
+                console.log(delateLinks,'delateImageatlas')
+            }
+
         })
         // 上移
         $("body") .on("click",".moveUp",function () {
@@ -116,81 +131,73 @@
                 layer.msg('已经移至最低点', {icon: 8});
             }
         });
-        window.checkUrl = function(obj){
-            var strReg = "(https|http)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]";
-            var re = new RegExp(strReg);
-            if(!re.test(obj.value)) {
-                layer.alert('请输入合法的链接地址');
-                $(obj).val("");
-                $(".linkBtn").attr("disabled",'disabled')
-            }else {
-                $(".linkBtn").removeAttr("disabled")
+        form.verify({
+            linkverify: function(value, item){
+                if(!new RegExp("(https|http)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]").test(value)){
+                    return '请输入合法的链接地址';
+                }
             }
-        };
-        window.linkName = function (val,url) {
-            console.log()
-          if (val === "" || url === ""){
-              layer.msg('链接名称或链接地址不能为空');
-              $(".linkBtn").attr("disabled",'disabled')
-          }else {
-              $(".linkBtn").removeAttr("disabled")
-          }
-        };
-        $('body').on("click",".linkBtn",function () {
+        });
+        form.on('submit(linkBtn)', function(){
             var linkItemArray = [] , linkItem = $('.link_item');
-            var linkItemobj = {linkName:"",linkUrl:'',pageId:'',title:'',remark:'',zIndex:''};
+            var linkItemobj = {id:'',linkName:"",linkUrl:'',parentId:'',title:'',remark:'',zIndex:'',deleteFlag:""};
             var  num = 0;
-            if ($('.textName').val() === "") {
-                layer.msg('链接信息不能为空');
-                return false;
+            if (delateLinks != []) {
+                for (var j = 0; j < delateLinks.length; j++) {
+                    linkItemArray.push(delateLinks[j])
+                }
             }
             linkItem.each(function () {
                 linkItemobj = {};
                 linkItemobj.title = $('.textName').val();
-                linkItemobj.pageId = sessionStorage.getItem("QRcodeID");
+                linkItemobj.parentId = sessionStorage.getItem("QRcodeIDs");
                 linkItemobj.linkName = $(this).find('.linkName').val();
                 linkItemobj.linkUrl = $(this).find('.linkUrl').val();
                 linkItemobj.remark = $('#LAY_demo_editor').val();
+                linkItemobj.id = $(this).attr('link-id');
+                linkItemobj.deleteFlag = false;
                 linkItemobj.zIndex = num++ +1;
                 linkItemArray.push(linkItemobj)
             });
             $.ajax({
-                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addLinks',
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/updateLinks',
                 type:'post',
                 data:JSON.stringify(linkItemArray),
                 contentType:'application/json;charset=utf-8',
                 dataType:'json',
                 success:function (res) {
                     if (res.code === '200'){
+                        parent.onFocus();
                         parent.pageRelationIdFun(res.data);
-                        layer.msg('链接新增成功');
+                        layer.msg('链接修改成功');
                     }else {
-                        layer.msg('链接新增失败，请检查信息');
+                        layer.msg('链接修改失败，请检查信息');
                     }
                 },
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
-            })
+            });
+            return false;
         });
         // QRcodeLink
         // 数据回显
-        function QRcodeLink() {
+        function QRcodeLink(id) {
             $.ajax({
                 url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageEdit/'+sessionStorage.getItem('QRcodeDetaileID'),
                 type: 'get',
                 dataType: 'json',
                 success: function (res) {
                     for (var i = 0; i < res.data.pageItemList.length; i++) {
-                        if (res.data.pageItemList[i].pageRelation.businessType == "LINKS") {
+                        if (res.data.pageItemList[i].pageRelation.businessType == "LINKS" && res.data.pageItemList[i].pageRelation.businessId == id) {
                             for (var j = 0; j < res.data.pageItemList[i].linksList.length; j++) {
                                 $('.textName').val(res.data.pageItemList[i].linksList[j].title);
                                 $('#LAY_demo_editor').val(res.data.pageItemList[i].linksList[j].remark);
                                 bums = j;
                                 var str =`
-                               <div class="link_item" index-data="${bums}">
-                                    <input type="text" placeholder="链接名称" value="${res.data.pageItemList[i].linksList[j].linkName}" class="linkName" onblur="linkName(this.value,this.previousSibling.value)" oninput="parent.linkFun(this.value,${bums})">
-                                    <input type="text" placeholder="链接地址" value="${res.data.pageItemList[i].linksList[j].linkUrl}" class="linkUrl" onblur="linkName(this.nextSibling.value,this.value),checkUrl(this)" oninput="parent.titleFun(this.value,${bums})">
+                               <div class="link_item" index-data="${bums}" link-id="${res.data.pageItemList[i].linksList[j].id}">
+                                    <input type="text" placeholder="链接名称" value="${res.data.pageItemList[i].linksList[j].linkName}" class="linkName" onblur="linkName(this.value,this.previousSibling.value)" oninput="parent.linkFun(this.value,${bums})" lay-verify="required">
+                                    <input type="text" placeholder="链接地址" value="${res.data.pageItemList[i].linksList[j].linkUrl}" class="linkUrl" onblur="linkName(this.nextSibling.value,this.value),checkUrl(this)" oninput="parent.titleFun(this.value,${bums})" lay-verify="linkverify">
                                     <span class="operation">
                                         <i class="fa fa-long-arrow-up moveUp"></i>
                                         <i class="fa fa-long-arrow-down moveDown"></i>

pages/editQRcode/addText.html

@@ -39,13 +39,13 @@
                 二维码名称：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入二维码名称" class="layui-input QRcodeName">
+                <input type="text" placeholder="请输入二维码名称" lay-verify="required" class="layui-input QRcodeName">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">二维码颜色：</label>
             <div class="layui-input-block">
-                <select name="interest" lay-filter="color" class="colorType">
+                <select name="interest" lay-filter="color" lay-verify="required" class="colorType">
                     <option value=""></option>
                     <option value="蓝色">蓝色</option>
                     <option value="黑色">黑色</option>
@@ -63,7 +63,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">提醒日期：</label>
                 <div class="layui-input-block">
-                    <input type="text" name="date" id="date" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
+                    <input type="text" name="date" id="date" placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
@@ -83,29 +83,28 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">提醒内容：</label>
                 <div class="layui-input-block">
-                    <textarea class="layui-textarea" placeholder="提醒内容" name="content" lay-verify="content" id="LAY_demo_editor" style="resize: none"></textarea>
+                    <textarea class="layui-textarea" placeholder="提醒内容" name="content" id="LAY_demo_editor" style="resize: none"></textarea>
                 </div>
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">备注：</label>
             <div class="layui-input-block">
-                <textarea class="layui-textarea" placeholder="备注" name="content" lay-verify="content" id="LAY_editor" style="resize: none"></textarea>
+                <textarea class="layui-textarea" placeholder="备注" name="content" lay-verify="required" id="LAY_editor" style="resize: none"></textarea>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn a_stetaBtn" lay-submit lay-filter="formQRcode">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn a_stetaBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
 <script src="../../static/js/jedate.min.js"></script>
 <script>
-    layui.use(['form','layer','jquery','laydate'], function(){
+    layui.use(['form','layer','jquery'], function(){
         var form = layui.form,
             $ = layui.jquery,
-            laydate= layui.laydate,
             layer = layui.layer;
         QRcodeDetaile();
         form.render();
@@ -127,39 +126,39 @@
         form.on("select(color)",function (data) {
            color = data.elem[data.elem.selectedIndex].text;
         });
-        $('body').on("click",".a_stetaBtn",function () {
+        var id = '';
+        form.on('submit(formQRcode)', function(){
             var QRcodeInfo = {
                 colorType:color,
                 departmentId:sessionStorage.getItem("depID") == ""?"root" : sessionStorage.getItem("depID"),
                 remark:$('#LAY_editor').val(),
                 title:$('.QRcodeName').val(),
+                id:id,
+                _method:'put'
             };
-            if ($('.QRcodeName').val() === "" || $('#LAY_editor').val()=== "" || color === "") {
-                layer.msg('二维码信息不能为空');
-                return false;
-            }
             $.ajax({
-                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addPage',
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/updatePage',
                 type:'post',
                 data:QRcodeInfo,
                 dataType:'json',
                 success:function (res) {
                     if (res.code === '200'){
                         sessionStorage.setItem("QRcodeID",res.data);
-                        layer.msg('新建成功');
+                        layer.msg('修改成功');
                         parent.QRcodeName($('.QRcodeName').val())
 
                     }else if(res.code === '439'){
                         layer.msg($('.QRcodeName').val()+'已经存在二维码列表');
 
                     }else {
-                        layer.msg('新建失败，请检查信息');
+                        layer.msg('修改失败，请检查信息');
                     }
                 },
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
-            })
+            });
+            return false;
         });
         function QRcodeDetaile() {
             $.ajax({
@@ -170,6 +169,7 @@
                     $('.QRcodeName').val(res.data.page.title);
                     $('.colorType').val(res.data.page.colorType);
                     $('#LAY_editor').val(res.data.page.remark);
+                    id = res.data.page.id;
                     form.render();
                 },
                 error:function () {

pages/editQRcode/addVideo.html

@@ -41,7 +41,7 @@
                 视频名称：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入视频名称" class="layui-input textName">
+                <input type="text" placeholder="请输入视频名称" class="layui-input textName" lay-verify="required">
             </div>
         </div>
         <div class="layui-form-item">
@@ -53,10 +53,10 @@
                 </button>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="videoBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn videoBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -67,8 +67,8 @@
             upload= layui.upload,
             layer = layui.layer;
         form.render();
-        if (sessionStorage.getItem('module') == 'true') {
-            QRcodeVideo();
+        if (sessionStorage.getItem('QRcodeIDs') !=""){
+            QRcodeVideo(sessionStorage.getItem('QRcodeIDs'))
         }
         var index,videoName,videoUrl;
         var uploadInst = upload.render({
@@ -98,42 +98,41 @@
                 layer.msg('请检查网络！');
             }
         });
-        $('body').on("click",".videoBtn",function () {
-            var videoItemobj = [{videoName:videoName,videoUrl:videoUrl,pageId:sessionStorage.getItem("QRcodeID"),title:$('.textName').val()}];
-            if ($('.textName').val() === "") {
-                layer.msg('视频信息不能为空');
-                return false;
-            }
+        form.on('submit(videoBtn)', function(){
+            var videoItemobj = [{id:$('.videoName').attr('video-id'),deleteFlag:false,videoName:videoName,videoUrl:videoUrl,parentId:sessionStorage.getItem("QRcodeID"),title:$('.textName').val()}];
             $.ajax({
-                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addVideo',
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/updateVideo',
                 type:'post',
                 data:JSON.stringify(videoItemobj),
                 contentType:'application/json;charset=utf-8',
                 dataType:'json',
                 success:function (res) {
                     if (res.code === '200'){
+                        parent.onFocus();
                         parent.pageRelationIdFun(res.data);
-                        layer.msg('视频新增成功');
+                        layer.msg('视频修改成功');
                     }else {
-                        layer.msg('视频新增失败，请检查信息');
+                        layer.msg('视频修改失败，请检查信息');
                     }
                 },
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
-            })
+            });
+            return false;
         });
         // 数据回显
-        function QRcodeVideo() {
+        function QRcodeVideo(id) {
             $.ajax({
                 url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageEdit/'+sessionStorage.getItem('QRcodeDetaileID'),
                 type: 'get',
                 dataType: 'json',
                 success: function (res) {
                     for (var i = 0; i < res.data.pageItemList.length; i++) {
-                        if (res.data.pageItemList[i].pageRelation.businessType == "VIDEO") {
+                        if (res.data.pageItemList[i].pageRelation.businessType == "VIDEO" && res.data.pageItemList[i].pageRelation.businessId == id) {
                             $('.textName').val(res.data.pageItemList[i].videoList[0].title);
-                            $('.videoName').val(res.data.pageItemList[i].videoList[0].videoName)
+                            $('.videoName').val(res.data.pageItemList[i].videoList[0].videoName);
+                            $('.videoName').attr('video-id',res.data.pageItemList[i].videoList[0].id)
                         }
                     }
                 },

pages/editQRcode/editQRcode.html

@@ -113,36 +113,36 @@
                 </div>
                 <!--&lt;!&ndash;纯文本&ndash;&gt;-->
                 <div class="pam-us1 state-pw hides">
-                     <iframe frameborder="0" id="iframe1" name="iframe1" marginheight="0" marginwidth="0" src="pureText.html" style="width: 100%;height: 640px;"></iframe>
+                     <iframe frameborder="0" class="iframe1" id="iframe1" name="iframe1" marginheight="0" marginwidth="0" src="pureText.html" style="width: 100%;height: 640px;"></iframe>
                 </div>
                 <!--&lt;!&ndash;图文&ndash;&gt;-->
                 <div class="pam-us2 state-pw hides">
-                    <iframe frameborder="0" id="iframe2" name="iframe2" marginheight="0" marginwidth="0" src="imageText.html" style="width: 100%;height: 460px;"></iframe>
+                    <iframe frameborder="0" class="iframe2" id="iframe2" name="iframe2" marginheight="0" marginwidth="0" src="imageText.html" style="width: 100%;height: 460px;"></iframe>
                 </div>
                 <!--&lt;!&ndash;图集 &ndash;&gt;-->
                 <div class="pam-us3 hides state-pw">
-                    <iframe frameborder="0" id="iframe3" name="iframe3" marginheight="0" marginwidth="0" scrolling="auto" src="imageAtlas.html" style="width: 100%;height: 480px;"></iframe>
+                    <iframe frameborder="0" class="iframe3" id="iframe3" name="iframe3" marginheight="0" marginwidth="0" scrolling="auto" src="imageAtlas.html" style="width: 100%;height: 480px;"></iframe>
                 </div>
                 <!--&lt;!&ndash;文件&ndash;&gt;-->
                 <div class="pam-us4 hides state-pw">
-                    <iframe frameborder="0" id="iframe4" name="iframe4" marginheight="0" marginwidth="0" scrolling="no" src="addFile.html" style="width:100%;height: 380px;"></iframe>
+                    <iframe frameborder="0" class="iframe4" id="iframe4" name="iframe4" marginheight="0" marginwidth="0" scrolling="no" src="addFile.html" style="width:100%;height: 380px;"></iframe>
                 </div>
                 <!--&lt;!&ndash;链接&ndash;&gt;-->
                 <div class="pam-us5 hides state-pw">
-                    <iframe frameborder="0" id="iframe5" name="iframe5" marginheight="0" marginwidth="0" scrolling="no" src="addLink.html" style="width:100%;height: 380px;"></iframe>
+                    <iframe frameborder="0" class="iframe5" id="iframe5" name="iframe5" marginheight="0" marginwidth="0" scrolling="no" src="addLink.html" style="width:100%;height: 380px;"></iframe>
                 </div>
                 <!--&lt;!&ndash;视频&ndash;&gt;-->
                 <div class="pam-us6 hides state-pw">
-                     <iframe frameborder="0" id="iframe6" name="iframe6" marginheight="0" marginwidth="0" scrolling="auto" src="addVideo.html" style="width:100%;height: 380px;"></iframe>
+                     <iframe frameborder="0" class="iframe6" id="iframe6" name="iframe6" marginheight="0" marginwidth="0" scrolling="auto" src="addVideo.html" style="width:100%;height: 380px;"></iframe>
                 </div>
 
                 <!--&lt;!&ndash;设备名牌 &ndash;&gt;-->
                 <div class="pam-us7 hides state-pw">
-                    <iframe frameborder="0" marginheight="0" id="iframe7" name="iframe7" marginwidth="0" scrolling="auto" src="addDevice.html" style="width:100%;height: 380px;"></iframe>
+                    <iframe frameborder="0" class="iframe7" marginheight="0" id="iframe7" name="iframe7" marginwidth="0" scrolling="auto" src="addDevice.html" style="width:100%;height: 380px;"></iframe>
                 </div>
                 <!--&lt;!&ndash;记录管理&ndash;&gt;-->
                 <div class="pam-us8 hides state-pw">
-                    <iframe frameborder="0" marginheight="0" id="iframe8" name="iframe8" marginwidth="0" scrolling="yes" src="recordAdmin.html" style="width:100%;height: 380px;"></iframe>
+                    <iframe frameborder="0" marginheight="0" class="iframe8" id="iframe8" name="iframe8" marginwidth="0" scrolling="yes" src="recordAdmin.html" style="width:100%;height: 380px;"></iframe>
                 </div>
             </div>
         </div>
@@ -150,7 +150,7 @@
     </div>
 </div>
 <script id="temp-1" type="text/template">
-    <div class="block rela  yx1 xt1749246 customfield  boxs sortable-dragging onbg" dataid="" is_stop="0" is_unfold="1" code="customfield" index="1" sort="1" draggable="true">
+    <div class="block rela  yx1 xt1749246 customfield  boxs sortable-dragging onbg edits pureText" dataid="" is_stop="0" is_unfold="1" code="customfield" index="1" sort="1" draggable="true">
         <div class="green_layer">
  <span class="module_icon_white text-center" style="padding-top: 10px"> <i class="clicon-module-maintain text-white fa fa-file-text-o font_sizeI"></i>
  <div class="p-a-0 text-white" style="margin-top:5px;font-size: 12px;text-align: center;">纯文本</div></span>
@@ -190,7 +190,7 @@
     </div>
 </script>
 <script id="temp-2" type="text/template">
-    <div class="block rela  yx2 xt1749244 rich_text boxs sortable-dragging" dataid="" is_stop="0" is_unfold="1" code="rich_text" index="2" sort="2" draggable="true">
+    <div class="block rela  yx2 xt1749244 rich_text boxs sortable-dragging edits imageTexts" dataid="" is_stop="0" is_unfold="1" code="rich_text" index="2" sort="2" draggable="true">
         <div class="green_layer">
     <span class="module_icon_white text-center paddinfTop">
         <i class="clicon-module-imgtxt text-white iconfont font_sizeI">&#59131;</i>
@@ -237,7 +237,7 @@
     </div>
 </script>
 <script id="temp-3" type="text/template">
-    <div class="block rela  yx3 xt1749602 picture  boxs sortable-dragging" dataid="1749602" is_stop="0" is_unfold="1" code="picture" index="3" sort="3" draggable="true">
+    <div class="block rela  yx3 xt1749602 picture edits  boxs sortable-dragging imageAtlase" dataid="1749602" is_stop="0" is_unfold="1" code="picture" index="3" sort="3" draggable="true">
         <div class="green_layer">
     <span class="module_icon_white text-center paddinfTop">
          <i class="clicon-module-imgtxt text-white iconfont font_sizeI">&#59121;</i>
@@ -282,7 +282,7 @@
     </div>
 </script>
 <script id="temp-4" type="text/template">
-    <div class="block rela yx6 xt1749858 file boxs sortable-dragging" dataid="1749818" is_stop="0" is_unfold="1" code="links" index="4" sort="4" draggable="true">
+    <div class="block rela yx6 xt1749858 edits file boxs sortable-dragging fileText" dataid="1749818" is_stop="0" is_unfold="1" code="links" index="4" sort="4" draggable="true">
         <div class="green_layer">
     <span class="module_icon_white text-center paddinfTop">
         <i class="clicon-module-file text-white font_sizeI iconfont" style="font-size: 25px">&#59452;</i>
@@ -320,7 +320,7 @@
     </div>
 </script>
 <script id="temp-5" type="text/template">
-    <div class="block rela  yx4 xt1749818 links  boxs sortable-dragging" dataid="1749857" is_stop="0" is_unfold="1" code="customfield" index="5" sort="5" draggable="true">
+    <div class="block rela  yx4 xt1749818 edits links  boxs sortable-dragging linkItem" dataid="1749857" is_stop="0" is_unfold="1" code="customfield" index="5" sort="5" draggable="true">
         <div class="green_layer">
     <span class="module_icon_white text-center paddinfTop">
         <i class="clicon-module-link text-white font_sizeI iconfont" style="font-size: 25px">&#59127;</i>
@@ -357,7 +357,7 @@
     </div>
 </script>
 <script id="temp-6" type="text/template">
-    <div class="block rela yx6 xt1749858 file  boxs sortable-dragging" dataid="1749858" is_stop="0" is_unfold="1" code="file" index="6" sort="6" draggable="true">
+    <div class="block rela yx6 xt1749858 edits file  boxs sortable-dragging videoItem" dataid="1749858" is_stop="0" is_unfold="1" code="file" index="6" sort="6" draggable="true">
         <div class="green_layer">
              <span class="module_icon_white text-center paddinfTop">
                 <i class="clicon-module-link text-grey font_sizeI iconfont" style="font-size: 25px">&#59424;</i>
@@ -400,7 +400,7 @@
     </div>
 </script>
 <script id="temp-7" type="text/template">
-    <div class="block rela yx7 xt1749865 sucai boxs sortable-dragging" dataid="1749865" is_stop="0" is_unfold="1" code="sucai" index="7" sort="7" draggable="true">
+    <div class="block rela yx7 xt1749865 edits sucai boxs sortable-dragging deviceItem" dataid="1749865" is_stop="0" is_unfold="1" code="sucai" index="7" sort="7" draggable="true">
         <div class="green_layer">
              <span class="module_icon_white text-center paddinfTop">
                 <i class="clicon-module-link text-grey font_sizeI fa fa-cubes" style="font-size: 25px"></i>
@@ -437,7 +437,7 @@
     </div>
 </script>
 <script id="temp-8" type="text/template">
-    <div class="block rela yx8 xt1749867 vcard boxs sortable-dragging" dataid="1749867" is_stop="0" is_unfold="1" code="vcard" index="8" sort="8" draggable="true">
+    <div class="block rela yx8 xt1749867 edits vcard boxs sortable-dragging recordItem" dataid="1749867" is_stop="0" is_unfold="1" code="vcard" index="8" sort="8" draggable="true">
         <div class="green_layer">
              <span class="module_icon_white text-center paddinfTop">
                 <i class="clicon-module-link text-grey font_sizeI fa fa-wpforms" style="font-size: 25px"></i>
@@ -475,6 +475,8 @@
 <script src="../../static/js/jquery1.7.2.js"></script>
 <script src="../../static/js/jquery-ui-1.9.2.custom.min.js"></script>
 <script src="../../static/js/swiper.js"></script>
+<script src="../../static/js/base64.js"></script>
+<script src="//unpkg.com/wangeditor/release/wangEditor.min.js" charset="utf-8"></script>
 <script src="../../static/js/pulic.js"></script>
 <script src="../../static/js/editpulic.js"></script>
 <script type="text/javascript">

pages/editQRcode/imageAtlas.html

@@ -44,7 +44,7 @@
                 图集标题：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入图集标题" class="layui-input textName" oninput="pureTextTitles(this.value)">
+                <input type="text" placeholder="请输入图集标题" class="layui-input textName" lay-verify="required" oninput="pureTextTitles(this.value)">
             </div>
         </div>
         <div class="layui-form-item">
@@ -58,10 +58,10 @@
                 </button>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="imageAtlasBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn imageAtlasBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -76,10 +76,10 @@
             parent.onFocus();
             parent.pureTextTitle(title)
         };
-        if (sessionStorage.getItem('module') == 'true') {
-            QRcodeImageAtle();
+        if (sessionStorage.getItem('QRcodeIDs') !=""){
+            QRcodeImageAtle(sessionStorage.getItem('QRcodeIDs'))
         }
-        var index,num = 0,bums = 0;
+        var index,num = 0,bums = 0,delateImageatlas = [];
         var uploadInst = upload.render({
             elem: '#upload1'
             ,url: 'http://apptest.jieweizhineng.com/api/swagger/api/common/v1/uploadFile'
@@ -100,8 +100,8 @@
                         <div class="imageAtlas_tiem" index-data="${muns}" img-name="${res.data.fileName}" img-url="${res.data.fullURL}">
                             <img src="${res.data.fullURL}" alt="" class="image2">
                             <div class="imageText">
-                                <input type="text" placeholder="输入图片标题" class="imageTitle">
-                                <input type="text" placeholder="输入图片链接" onblur="checkUrl(this)" class="imageLinking">
+                                <input type="text" placeholder="输入图片标题" class="imageTitle" lay-verify="required">
+                                <input type="text" placeholder="输入图片链接" class="imageLinking" lay-verify="linkverify">
                             </div>
                             <span class="operation">
                                 <i class="fa fa-long-arrow-up moveUp"></i>
@@ -120,12 +120,26 @@
             }
         });
         $('body').on('click','.deleteLink',function () {
+            var imageAtlas = {id:'',deleteFlag:false,imageName:"",imageUrl:'',parentId:"",title:"",imageTitle:'',imageLinking:''};
             $(this).parent().parent().remove();
             var index_data  = $(this).parent().parent().attr('index-data');
             $(this).parent().parent().attr("img-name","");
             $(this).parent().parent().attr("img-url","");
             parent.onFocus();
             parent.deleteImageAtlas(index_data);
+            if ($(this).parent().parent().attr('image-id') != "") {
+                imageAtlas.id =$(this).parent().parent();
+                imageAtlas.imageLinking = $(this).parent().parent().find('.imageLinking').val();
+                imageAtlas.imageTitle = $(this).parent().parent().find('.imageTitle').val();
+                imageAtlas.title = $('.textName').val();
+                imageAtlas.parentId = sessionStorage.getItem("QRcodeIDs");
+                imageAtlas.imageName = $(this).parent().parent().attr('img-name');
+                imageAtlas.imageUrl = $(this).parent().parent().attr('img-url');
+                imageAtlas.id = $(this).parent().parent().attr('image-id');
+                imageAtlas.deleteFlag = true;
+                delateImageatlas.push(imageAtlas);
+                console.log(delateImageatlas,'delateImageatlas')
+            }
         });
         // 上移
         $("body") .on("click",".moveUp",function () {
@@ -145,72 +159,73 @@
                 layer.msg('已经移至最低点', {icon: 8});
             }
         });
-        window.checkUrl = function(obj){
-            var strReg = "(https|http)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]";
-            var re = new RegExp(strReg);
-            if(!re.test(obj.value)) {
-                layer.alert('请输入合法的链接地址');
-                $(obj).val("");
-                $(".linkBtn").attr("disabled",'disabled')
-            }else {
-                $(".linkBtn").removeAttr("disabled")
+        form.verify({
+            linkverify: function(value, item){
+                if(!new RegExp("(https|http)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]").test(value)){
+                    return '请输入合法的链接地址';
+                }
             }
-        };
-        $('body').on("click",".imageAtlasBtn",function () {
-            var imageAtlasArray = [] , imageAtlas_tiem = $('.imageAtlas_tiem'),num = 0;
-            var imageAtlas = {imageName:"",imageUrl:'',pageId:sessionStorage.getItem("QRcodeID"),title:$('.textName').val(),imageTitle:'',imageLinking:''};
-            if ($('.textName').val() === "") {
-                layer.msg('图集信息不能为空');
-                return false;
+        });
+        form.on('submit(imageAtlasBtn)', function(){
+            var imageAtlasArray = [] , imageAtlas_tiem = $('.imageAtlas_tiem');
+            var imageAtlas = {id:'',deleteFlag:false,imageName:"",imageUrl:'',parentId:"",title:"",imageTitle:'',imageLinking:''};
+            if (delateImageatlas != []) {
+                for (var j = 0; j < delateImageatlas.length; j++) {
+                    imageAtlasArray.push(delateImageatlas[j])
+                }
             }
             imageAtlas_tiem.each(function () {
                 imageAtlas = {};
                 imageAtlas.imageLinking = $(this).find('.imageLinking').val();
                 imageAtlas.imageTitle = $(this).find('.imageTitle').val();
                 imageAtlas.title = $('.textName').val();
-                imageAtlas.pageId = sessionStorage.getItem("QRcodeID");
+                imageAtlas.parentId = sessionStorage.getItem("QRcodeIDs");
                 imageAtlas.imageName = $(this).attr('img-name');
                 imageAtlas.imageUrl = $(this).attr('img-url');
+                imageAtlas.id = $(this).attr('image-id');
+                imageAtlas.deleteFlag = false;
                 imageAtlasArray.push(imageAtlas)
             });
             $.ajax({
-                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addPicture',
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/updatePicture',
                 type:'post',
                 data:JSON.stringify(imageAtlasArray),
                 contentType:'application/json;charset=utf-8',
                 dataType:'json',
                 success:function (res) {
                     if (res.code === '200'){
+                        parent.onFocus();
                         parent.pageRelationIdFun(res.data);
-                        layer.msg('图集新增成功');
+                        layer.msg('图集修改成功');
                     }else {
-                        layer.msg('图集新增失败，请检查信息');
+                        layer.msg('图集修改失败，请检查信息');
                     }
                 },
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
-            })
+            });
+            return false;
         });
         // 数据回显
-        function QRcodeImageAtle() {
+        function QRcodeImageAtle(id) {
             $.ajax({
                 url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageEdit/'+sessionStorage.getItem('QRcodeDetaileID'),
                 type: 'get',
                 dataType: 'json',
                 success: function (res) {
                     for (var i = 0; i < res.data.pageItemList.length; i++) {
-                        if (res.data.pageItemList[i].pageRelation.businessType == "PICTURE") {
+                        if (res.data.pageItemList[i].pageRelation.businessType == "PICTURE" && res.data.pageItemList[i].pageRelation.businessId == id) {
                             $('.textName').val(res.data.pageItemList[i].pictureList[0].title);
                             for (var j = 0; j < res.data.pageItemList[i].pictureList.length; j++) {
                                 bums = j;
                                 console.log(bums,'bums');
                                 var str = `
-                                <div class="imageAtlas_tiem" index-data="${j}" img-name="${res.data.pageItemList[i].pictureList[j].imageName}" img-url="${res.data.pageItemList[i].pictureList[j].imageUrl}">
+                                <div class="imageAtlas_tiem" index-data="${j}" img-name="${res.data.pageItemList[i].pictureList[j].imageName}" img-url="${res.data.pageItemList[i].pictureList[j].imageUrl}" image-id="${res.data.pageItemList[i].pictureList[j].id}">
                                     <img src="${res.data.pageItemList[i].pictureList[j].imageUrl}" alt="" class="image2">
                                     <div class="imageText">
-                                        <input type="text" placeholder="输入图片标题" class="imageTitle" value="${res.data.pageItemList[i].pictureList[j].imageTitle}">
-                                        <input type="text" placeholder="输入图片链接" value="${res.data.pageItemList[i].pictureList[j].imageLinking}" onblur="checkUrl(this)" class="imageLinking">
+                                        <input type="text" placeholder="输入图片标题" lay-verify="required" class="imageTitle" value="${res.data.pageItemList[i].pictureList[j].imageTitle}">
+                                        <input type="text" placeholder="输入图片链接" lay-verify="linkverify" value="${res.data.pageItemList[i].pictureList[j].imageLinking}" class="imageLinking">
                                     </div>
                                     <span class="operation">
                                         <i class="fa fa-long-arrow-up moveUp"></i>

pages/editQRcode/imageText.html

@@ -42,7 +42,7 @@
                 图文标题：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入图片名称" class="layui-input textName" oninput="pureTextTitles(this.value)">
+                <input type="text" placeholder="请输入图片名称" lay-verify="required" class="layui-input textName" oninput="pureTextTitles(this.value)">
             </div>
         </div>
         <div class="layui-form-item">
@@ -65,10 +65,10 @@
                 </div>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="imageTextBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn imageTextBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -85,8 +85,8 @@
             upload = layui.upload,
             layer = layui.layer;
         form.render();
-        if (sessionStorage.getItem('module') == 'true') {
-            QRcodeImageText();
+        if (sessionStorage.getItem('QRcodeIDs') !=""){
+            QRcodeImageText(sessionStorage.getItem('QRcodeIDs'))
         }
         window.pureTextTitles = function (title) {
             parent.onFocus();
@@ -133,9 +133,9 @@
             var content = editor.txt.html();
             parent.textInfo(content)
         }, false);
-        $('body').on("click",".imageTextBtn",function () {
+        form.on('submit(imageTextBtn)', function(){
             base64Text = base64.encode(editor.txt.html());
-            if ($('.textName').val() === "" || editor.txt.text() === "" || imageName ==="" || imageUrl === "") {
+            if (editor.txt.text() === "" || imageName ==="" || imageUrl === "") {
                 layer.msg('图文信息不能为空');
                 return false;
             }
@@ -143,36 +143,39 @@
                 data:base64Text,
                 imageName:imageName,
                 imageUrl:imageUrl,
-                pageId:sessionStorage.getItem("QRcodeID"),
+                id:sessionStorage.getItem("QRcodeIDs"),
                 title:$('.textName').val(),
+                _method:'put'
             };
             $.ajax({
-                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addImageText',
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/updateImageText',
                 type:'post',
                 data:QRcodeInfo,
                 dataType:'json',
                 success:function (res) {
                     if (res.code === '200'){
+                        parent.onFocus();
                         parent.pageRelationIdFun(res.data);
-                        layer.msg('图文新增成功');
+                        layer.msg('图文修改成功');
                     }else {
-                        layer.msg('图文新增失败，请检查信息');
+                        layer.msg('图文修改失败，请检查信息');
                     }
                 },
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
-            })
+            });
+            return false;
         });
         // 数据回显
-        function QRcodeImageText() {
+        function QRcodeImageText(id) {
             $.ajax({
                 url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageEdit/'+sessionStorage.getItem('QRcodeDetaileID'),
                 type: 'get',
                 dataType: 'json',
                 success: function (res) {
                     for (var i = 0; i < res.data.pageItemList.length; i++) {
-                        if (res.data.pageItemList[i].imageText != null) {
+                        if (res.data.pageItemList[i].imageText != null && res.data.pageItemList[i].imageText.id == id) {
                             var str = base64.decode(res.data.pageItemList[i].imageText.dataContent);
                             $('.textName').val(res.data.pageItemList[i].imageText.title);
                             $('.image1').attr('src',res.data.pageItemList[i].imageText.imageUrl);

pages/editQRcode/pureText.html

@@ -41,7 +41,7 @@
                 文本标题：
             </label>
             <div class="layui-input-block steta_grouds" id="steta_grouds">
-                <input type="text" placeholder="请输入文本标题" class="layui-input textName" oninput="pureTextTitles(this.value)">
+                <input type="text" placeholder="请输入文本标题" lay-verify="required" class="layui-input textName" oninput="pureTextTitles(this.value)">
             </div>
         </div>
         <div class="layui-form-item">
@@ -52,11 +52,12 @@
                 </div>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="pureTextSubmit">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn pureTextSubmit">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
+    <span id="pureTextID" style="display: none;"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
 <script src="//unpkg.com/wangeditor/release/wangEditor.min.js" charset="utf-8"></script>
@@ -73,9 +74,6 @@
         form.render();
         var base64 = new Base64();
         var base64Text="";
-        if (sessionStorage.getItem('module') == 'true') {
-            QRcodePureText();
-        }
         window.pureTextTitles = function (title) {
             parent.onFocus();
             parent.pureTextTitle(title)
@@ -87,44 +85,50 @@
         document.getElementById('editor').addEventListener('click', function () {
             parent.onFocus()
         }, false);
-        $('body').on("click",".pureTextSubmit",function () {
+        if (sessionStorage.getItem('QRcodeIDs') !=""){
+            QRcodePureText(sessionStorage.getItem('QRcodeIDs'))
+        }
+        form.on('submit(pureTextSubmit)', function(){
             base64Text = base64.encode(editor.txt.html());
             var QRcodeInfo = {
                 data:base64Text,
-                pageId:sessionStorage.getItem("QRcodeID"),
+                id:sessionStorage.getItem("QRcodeIDs"),
                 title:$('.textName').val(),
+                _method:'put'
             };
-            if ($('.textName').val() === "" || editor.txt.text() === "") {
+            if (editor.txt.text() === "") {
                 layer.msg('纯文本信息不能为空');
                 return false;
             }
             $.ajax({
-                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addText',
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/updateText',
                 type:'post',
                 data:QRcodeInfo,
                 dataType:'json',
                 success:function (res) {
                     if (res.code === '200'){
+                        parent.onFocus();
                         parent.pageRelationIdFun(res.data);
-                        layer.msg('文本新增成功');
+                        layer.msg('文本修改成功');
                     }else {
-                        layer.msg('文本新增失败，请检查信息');
+                        layer.msg('文本修改失败，请检查信息');
                     }
                 },
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
-            })
+            });
+            return false;
         });
         // 数据回显
-        function QRcodePureText() {
+        function QRcodePureText(id) {
             $.ajax({
                 url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageEdit/'+sessionStorage.getItem('QRcodeDetaileID'),
                 type: 'get',
                 dataType: 'json',
                 success: function (res) {
                     for (var i = 0; i < res.data.pageItemList.length; i++) {
-                        if (res.data.pageItemList[i].textVo != null) {
+                        if (res.data.pageItemList[i].textVo != null && res.data.pageItemList[i].textVo.id ==id) {
                             var str = base64.decode(res.data.pageItemList[i].textVo.dataContent);
                             $('.textName').val(res.data.pageItemList[i].textVo.title);
                             editor.txt.html(str)

pages/editQRcode/recordAdmin.html

@@ -41,7 +41,7 @@
                 记录管理名称：
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入设备铭牌名称" class="layui-input recordName" oninput="recordTextTitles(this.value)">
+                <input type="text" placeholder="请输入设备铭牌名称" lay-verify="required" class="layui-input recordName" oninput="recordTextTitles(this.value)">
             </div>
         </div>
         <div class="layui-form-item">
@@ -72,10 +72,10 @@
                 <a href="javascript:;" class="layui-btn layui-btn-normal addRecord">添加其他参数</a>
             </div>
         </div>
+        <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+            <button  class="layui-btn" lay-submit lay-filter="recordBtn">提交</button>
+        </div>
     </form>
-    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn recordBtn">提交</button>
-    </div>
     <span class="text" style="display: none"></span>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
@@ -86,53 +86,114 @@
             laydate= layui.laydate,
             layer = layui.layer;
         form.render();
+        if (sessionStorage.getItem('QRcodeIDs') !=""){
+            QRcoderecord(sessionStorage.getItem('QRcodeIDs'))
+        }
         $("body").on('click','.addRecord',function () {
             var tbodys = $(".tbodys");
             parent.depMaintainFun(tbodys);
         });
+        var delateRecords = [],recordNum = 0;
+        $("body").on('click','.delateRecord',function () {
+            var recordTemplateobj = {deleteFlag:false,id:'',organizationId:"",organizationName:'',parentId:'',recordName:'',stepIndex:'',templateId:'',templateName:''};
+            $(this).parent().parent().remove();
+            if ($(this).parent().parent().attr('link-id') != "") {
+                recordTemplateobj = {};
+                recordTemplateobj.parentId = sessionStorage.getItem("QRcodeIDs");
+                recordTemplateobj.organizationId =  $(this).parent().parent().attr('parent-id') +','+ $(this).attr("son-id");
+                recordTemplateobj.organizationName =  $(this).parent().parent().find('.cursor_p').html();
+                recordTemplateobj.stepIndex = recordNum++ +1;
+                recordTemplateobj.recordName = $('.recordName').val();
+                recordTemplateobj.templateId =  $(this).parent().parent().find('.depsName').attr('dep-id');
+                recordTemplateobj.templateName =  $(this).parent().parent().find(".depsName").html();
+                recordTemplateobj.deleteFlag = true;
+                recordTemplateobj.id =  $(this).parent().parent().attr('record-id');
+                delateRecords.push(recordTemplateobj)
+            }
+        });
         window.recordTextTitles = function (title) {
             parent.onFocus();
             parent.addrecord(title)
         };
-        $('body').on("click",".recordBtn",function () {
+        form.on('submit(recordBtn)', function(){
             var recordTemplate = [] , tr = $('.tbodys tr');
-            var recordTemplateobj = {organizationId:"",organizationName:'',pageId:'',recordName:'',stepIndex:'',templateId:'',templateName:''};
+            var recordTemplateobj = {deleteFlag:false,id:'',organizationId:"",organizationName:'',parentId:'',recordName:'',stepIndex:'',templateId:'',templateName:''};
             var  num = 0;
             if ($('.recordName').val() === "") {
                 layer.msg('记录模版信息不能为空');
                 return false;
             }
+            if (delateRecords != []) {
+                for (var j = 0; j < delateRecords.length; j++) {
+                    recordTemplate.push(delateRecords[j])
+                }
+            }
             tr.each(function () {
                 recordTemplateobj = {};
-                recordTemplateobj.pageId = sessionStorage.getItem("QRcodeID");
+                recordTemplateobj.parentId = sessionStorage.getItem("QRcodeIDs");
                 recordTemplateobj.organizationId = $(this).attr('parent-id') +','+ $(this).attr("son-id");
                 recordTemplateobj.organizationName = $(this).find('.cursor_p').html();
                 recordTemplateobj.stepIndex = num++ +1;
                 recordTemplateobj.recordName = $('.recordName').val();
                 recordTemplateobj.templateId = $(this).find('.depsName').attr('dep-id');
                 recordTemplateobj.templateName = $(this).find(".depsName").html();
+                recordTemplateobj.deleteFlag = false;
+                recordTemplateobj.id = $(this).attr('record-id');
                 recordTemplate.push(recordTemplateobj)
             });
             console.log(recordTemplate,'recordTemplate');
             $.ajax({
-                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addPageRecord',
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/updatePageRecord',
                 type:'post',
                 data:JSON.stringify(recordTemplate),
                 contentType:'application/json;charset=utf-8',
                 dataType:'json',
                 success:function (res) {
                     if (res.code === '200'){
+                        parent.onFocus();
                         parent.pageRelationIdFun(res.data);
-                        layer.msg('记录模版新增成功');
+                        layer.msg('记录模版修改成功');
                     }else {
-                        layer.msg('记录模版新增失败，请检查信息');
+                        layer.msg('记录模版修改失败，请检查信息');
                     }
                 },
                 error:function () {
                     layer.msg('网络错误，请检查网络');
                 }
             })
+            return false;
         });
+        // 数据回显
+        function QRcoderecord(id) {
+            $.ajax({
+                url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageEdit/'+sessionStorage.getItem('QRcodeDetaileID'),
+                type: 'get',
+                dataType: 'json',
+                success: function (res) {
+                    for (var i = 0; i < res.data.pageItemList.length; i++) {
+                        if (res.data.pageItemList[i].pageRelation.businessType == "RECORD" && res.data.pageItemList[i].pageRelation.businessId == id) {
+                            $('.recordName').val(res.data.pageItemList[i].pageRecordList[0].recordName)
+                            for (var j = 0; j < res.data.pageItemList[i].pageRecordList.length; j++) {
+                                var str = `
+                                     <tr class="text-c" son-id="${res.data.pageItemList[i].pageRecordList[j].organizationId}" parent-id="${res.data.pageItemList[i].pageRecordList[j].parentId}" record-id="${res.data.pageItemList[i].pageRecordList[j].id}">
+                                        <td class="depsName" dep-id="${res.data.pageItemList[i].pageRecordList[j].templateId}">${res.data.pageItemList[i].pageRecordList[j].templateName}</td>
+                                        <td>
+                                            <span class="cursor_p">${res.data.pageItemList[i].pageRecordList[j].organizationName}</span>
+                                        </td>
+                                        <td>
+                                            <i class="fa fa-trash-o cursor_p delateRecord"></i>
+                                        </td>
+                                     </tr>`;
+                                $(".tbodys").append(str);
+                            }
+                        }
+                    }
+                },
+                error:function () {
+                    layer.msg('请检查网络', {icon: 2});
+                }
+            });
+        }
     });
 </script>
 </body>

static/js/QRcode.js

@@ -173,7 +173,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
             };
             layer.alert('确认要复制记录模板吗？',{icon: 8}, function(index){
                 $.ajax({
-                    url: 'http://apptest.jieweizhineng.com/api/swagger/api/status/v1/copyStatus/'+obj.data.id,
+                    url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/copyPage/'+obj.data.id,
                     method: 'post',
                     dataType: 'json',
                     data: content,
@@ -222,6 +222,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                             var b = new Base64();
                             body.find('.edit_head_title').html(res.data.page.title);
                             var newArray =[];
+                            console.log(res.data,'res.data')
                             for (var j = 0; j < res.data.pageItemList.length; j++) {
                                 if (res.data.pageItemList[j].pageRelation.zIndex == j+1){
                                     newArray.push(res.data.pageItemList[j])
@@ -242,7 +243,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                                         $(this).attr("sort",i+1);
                                         $(this).attr("module",i+1);
                                     });
-                                    iframeWindow.editPureTextTitleName(data_id,newArray[i].textVo.title,str);
+                                    iframeWindow.editPureTextTitleName(data_id,newArray[i].textVo.title,newArray[i].textVo.id,newArray[i].pageRelation.id,str);
                                 }
                                 // 图文
                                 if (newArray[i].imageText != null) {
@@ -257,7 +258,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                                         $(this).attr("sort",i+1);
                                         $(this).attr("module",i+1)
                                     });
-                                    iframeWindow.edituploadImage(data_id,newArray[i].imageText.title,newArray[i].imageText.imageUrl,str);
+                                    iframeWindow.edituploadImage(data_id,newArray[i].imageText.title,newArray[i].imageText.imageUrl,newArray[i].imageText.id,newArray[i].pageRelation.id,str);
                                 }
                                 // 图集
                                 if (newArray[i].pictureList != null) {
@@ -271,7 +272,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                                         $(this).attr("sort",i+1);
                                         $(this).attr("module",i+1)
                                     });
-                                    iframeWindow.edituploadImageAtlas(data_id,newArray[i].pictureList);
+                                    iframeWindow.edituploadImageAtlas(data_id,newArray[i].pictureList,newArray[i].pageRelation.businessId,newArray[i].pageRelation.id);
                                 }
                                 // 文件
                                 if (newArray[i].fileList != null) {
@@ -285,7 +286,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                                         $(this).attr("sort",i+1);
                                         $(this).attr("module",i+1)
                                     });
-                                    iframeWindow.edituploadFile(data_id,newArray[i].fileList)
+                                    iframeWindow.edituploadFile(data_id,newArray[i].fileList,newArray[i].pageRelation.businessId,newArray[i].pageRelation.id)
                                 }
                                 // 链接
                                 if (newArray[i].linksList !=null) {
@@ -299,7 +300,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                                         $(this).attr("sort",i+1);
                                         $(this).attr("module",i+1)
                                     });
-                                    iframeWindow.editlinkFun(data_id,newArray[i].linksList)
+                                    iframeWindow.editlinkFun(data_id,newArray[i].linksList,newArray[i].pageRelation.businessId,newArray[i].pageRelation.id)
                                 }
                                 // 视频
                                 if (newArray[i].videoList !=null) {
@@ -313,7 +314,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                                         $(this).attr("sort",i+1);
                                         $(this).attr("module",i+1)
                                     });
-                                    iframeWindow.editaddVideo(data_id,newArray[i].videoList[0].videoUrl)
+                                    iframeWindow.editaddVideo(data_id,newArray[i].videoList[0].videoUrl,newArray[i].pageRelation.businessId,newArray[i].pageRelation.id)
                                 }
                                 // 设备铭牌editDevice
                                 if (newArray[i].equipmentList !=null) {
@@ -327,12 +328,24 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                                         $(this).attr("sort",i+1);
                                         $(this).attr("module",i+1)
                                     });
-                                    iframeWindow.editDevice(data_id,newArray[i].equipmentList)
+                                    iframeWindow.editDevice(data_id,newArray[i].equipmentList,newArray[i].pageRelation.businessId,newArray[i].pageRelation.id)
                                 }
-                                layer.close(indexk);
                                 // 记录模版
-
+                                if (newArray[i].pageRecordList !=null) {
+                                    var _modeltemp = '';
+                                    var data_id =creatuuid(12,36);
+                                    _modeltemp = body.find('#temp-8').html();
+                                    body.find('.module_box').children('div.b-g').last().before(_modeltemp);
+                                    body.find(".reisze-now").css("height",$(".reisze-now").height()+250+'px');
+                                    body.find('.module_box').children('.sortable-dragging').last().attr("dataid",data_id);
+                                    body.find("#module_box .sortable-dragging").each(function(i,p){
+                                        $(this).attr("sort",i+1);
+                                        $(this).attr("module",i+1)
+                                    });
+                                    iframeWindow.editRecord(data_id,newArray[i].pageRecordList,newArray[i].pageRelation.businessId,newArray[i].pageRelation.id)
+                                }
                             }
+                            layer.close(indexk);
                         },
                         error:function () {
                             layer.msg('请检查网络', {icon: 2});
@@ -340,8 +353,8 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                     });
 
                 },
-                yes: function (index, layero) {
-
+                cancel: function(index, layero){
+                    table.reload('idQRcode');
                 }
             })
         } else if (obj.event === "delete"){
@@ -389,9 +402,8 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
             success: function (layero, index) {
                 var body = layer.getChildFrame('body', index);
             },
-            yes: function (index, layero) {
-
-
+            cancel: function(index, layero){
+                table.reload('idQRcode');
             }
         })
     })

static/js/editpulic.js

@@ -1,5 +1,28 @@
+$('.module_box').on('click','.edits',function(){
+    if($('#pageFlag').val()!=''&&eval($('#pageFlag').val())) {
+        if ($(this).hasClass("pureText") == true && $(this).is('[module]') == true) {
+            sessionStorage.setItem('QRcodeIDs', $(this).attr('QRcodeIDs'))
+        } else if ($(this).hasClass("imageTexts") == true && $(this).is('[module]') == true) {
+            sessionStorage.setItem('QRcodeIDs', $(this).attr('QRcodeIDs'))
+        } else if ($(this).hasClass("imageAtlase") == true && $(this).is('[module]') == true) {
+            sessionStorage.setItem('QRcodeIDs', $(this).attr('QRcodeIDs'))
+        }else if ($(this).hasClass("fileText") == true && $(this).is('[module]') == true) {
+            sessionStorage.setItem('QRcodeIDs', $(this).attr('QRcodeIDs'))
+        }else if ($(this).hasClass("linkItem") == true && $(this).is('[module]') == true) {
+            sessionStorage.setItem('QRcodeIDs', $(this).attr('QRcodeIDs'))
+        }else if ($(this).hasClass("videoItem") == true && $(this).is('[module]') == true) {
+            sessionStorage.setItem('QRcodeIDs', $(this).attr('QRcodeIDs'))
+        }else if ($(this).hasClass("deviceItem") == true && $(this).is('[module]') == true) {
+            sessionStorage.setItem('QRcodeIDs', $(this).attr('QRcodeIDs'))
+        }else if ($(this).hasClass("recordItem") == true && $(this).is('[module]') == true) {
+            sessionStorage.setItem('QRcodeIDs', $(this).attr('QRcodeIDs'))
+        }
+    }
+});
 // 纯文本title，图文title
-function editPureTextTitleName(dataID,title,str) {
+function editPureTextTitleName(dataID,title,id,pageRelationId,str) {
+        $("[dataId*="+dataID+"]").attr("QRcodeIDs",id);
+        $("[dataId*="+dataID+"]").attr("pageRelationId",pageRelationId);
         $("[dataId*="+dataID+"]").find('.empty_block').removeClass('block_b');
         $("[dataId*="+dataID+"]").find('.empty_block').addClass('hides');
         $("[dataId*="+dataID+"]").find('.message_preview').removeClass('hides');
@@ -7,7 +30,9 @@ function editPureTextTitleName(dataID,title,str) {
         $("[dataId*="+dataID+"]").find('.message_preview').find('.preview_content').html(str);
 }
 // 图文
-function edituploadImage(dataID,title,img,str) {
+function edituploadImage(dataID,title,img,id,pageRelationId,str) {
+        $("[dataId*="+dataID+"]").attr("QRcodeIDs",id);
+        $("[dataId*="+dataID+"]").attr("pageRelationId",pageRelationId);
         $("[dataId*="+dataID+"]").find('.empty_block').removeClass('block_b');
         $("[dataId*="+dataID+"]").find('.empty_block').addClass('hides');
         $("[dataId*="+dataID+"]").find('.message_preview').removeClass('hides');
@@ -19,7 +44,6 @@ function edituploadImage(dataID,title,img,str) {
 // 图集
 var cur=0;var timer = null;
 function editlunbo(){
-    console.log('jijlai ')
     var mySwiper = new Swiper('.swiper-container',{
         autoplay: {
             delay: 2500,
@@ -27,11 +51,14 @@ function editlunbo(){
         },
     });
 }
-function edituploadImageAtlas(dataID,pictureList) {
+function edituploadImageAtlas(dataID,pictureList,id,pageRelationId) {
+        $("[dataId*="+dataID+"]").attr("QRcodeIDs",id);
+        $("[dataId*="+dataID+"]").attr("pageRelationId",pageRelationId);
         $("[dataId*="+dataID+"]").find('.empty_block').removeClass('block_b');
         $("[dataId*="+dataID+"]").find('.empty_block').addClass('hides');
         $("[dataId*="+dataID+"]").find('.message_preview').removeClass('hides');
         for (var u = 0;u < pictureList.length; u++) {
+            $("[dataId*="+dataID+"]").attr("parentId",pictureList[u].parentId);
             $("[dataId*=" + dataID + "]").find('.message_preview').find('.aum-p').html(pictureList[u].title);
             $("[dataId*=" + dataID + "]").find('.message_preview').find('.banner_img').find('.swiper-wrapper').append(`<div index-data="${u}" class="swiper-slide"><img src="${pictureList[u].imageUrl}" alt=""></div>`);
             editlunbo()
@@ -39,7 +66,9 @@ function edituploadImageAtlas(dataID,pictureList) {
 }
 // 文件
 
-function edituploadFile(dataID,fileArray) {
+function edituploadFile(dataID,fileArray,id,pageRelationId) {
+        $("[dataId*="+dataID+"]").attr("QRcodeIDs",id);
+        $("[dataId*="+dataID+"]").attr("pageRelationId",pageRelationId);
         $("[dataId*="+dataID+"]").find('.empty_block').removeClass('block_b');
         $("[dataId*="+dataID+"]").find('.empty_block').addClass('hides');
         $("[dataId*="+dataID+"]").find('.message_preview').removeClass('hides');
@@ -47,11 +76,12 @@ function edituploadFile(dataID,fileArray) {
         $("[dataId*=" + dataID + "]").find('.message_preview').find('.aum-p').html(fileArray[u].title);
         $("[dataId*="+dataID+"]").find('.message_preview').find('.fileItem').append(`<li class="li_list empty" index-data="${u}"><p class="list_name" style="font-weight: 300">${fileArray[u].fileName}</p></li>`);
     }
-
 }
 // 链接
 // 链接和内容回显
-function editlinkFun(dataID,linkArray) {
+function editlinkFun(dataID,linkArray,id,pageRelationId) {
+    $("[dataId*="+dataID+"]").attr("QRcodeIDs",id);
+    $("[dataId*="+dataID+"]").attr("pageRelationId",pageRelationId);
     for (var u = 0;u < linkArray.length; u++) {
         $("[dataId*="+dataID+"]").find('.empty_block').removeClass('block_b');
         $("[dataId*="+dataID+"]").find('.empty_block').addClass('hides');
@@ -63,14 +93,18 @@ function editlinkFun(dataID,linkArray) {
     }
 }
 // 视频
-function editaddVideo(dataID,videoUrl) {
+function editaddVideo(dataID,videoUrl,id,pageRelationId) {
+        $("[dataId*="+dataID+"]").attr("QRcodeIDs",id);
+        $("[dataId*="+dataID+"]").attr("pageRelationId",pageRelationId);
         $("[dataId*="+dataID+"]").find('.empty_block').removeClass('block_b');
         $("[dataId*="+dataID+"]").find('.empty_block').addClass('hides');
         $("[dataId*="+dataID+"]").find('.message_preview').removeClass('hides');
         $("[dataId*="+dataID+"]").find('.message_preview').find('.videoItem video>source').attr("src",videoUrl);
 }
 // 设备铭牌
-function editDevice(dataID,DeviceArray) {
+function editDevice(dataID,DeviceArray,id,pageRelationId) {
+        $("[dataId*="+dataID+"]").attr("QRcodeIDs",id);
+        $("[dataId*="+dataID+"]").attr("pageRelationId",pageRelationId);
         $("[dataId*="+dataID+"]").find('.empty_block').removeClass('block_b');
         $("[dataId*="+dataID+"]").find('.empty_block').addClass('hides');
         $("[dataId*="+dataID+"]").find('.message_preview').removeClass('hides');
@@ -82,3 +116,14 @@ function editDevice(dataID,DeviceArray) {
         </li>`);
     }
 }
+// 记录模版
+function editRecord(dataID,RecordArray,id,pageRelationId) {
+    $("[dataId*="+dataID+"]").attr("QRcodeIDs",id);
+    $("[dataId*="+dataID+"]").attr("pageRelationId",pageRelationId);
+    $("[dataId*="+dataID+"]").find('.empty_block').removeClass('block_b');
+    $("[dataId*="+dataID+"]").find('.empty_block').addClass('hides');
+    $("[dataId*="+dataID+"]").find('.message_preview').removeClass('hides');
+    for (var u = 0;u < RecordArray.length; u++) {
+        $("[dataId*="+dataID+"]").find('.message_preview').find('.aum-p').html(RecordArray[u].recordName);
+    }
+}

static/js/jjjs.js

@@ -0,0 +1,27 @@
+// if ($(this).hasClass("pureText") == true && $(this).is('[module]') == true) {
+// console.log($(this).attr("QRcodeDedetaileID"));
+var iframeWindow = window['iframe1'];
+iframeWindow.QRcodePureText();
+// }else if ($(this).hasClass("imageTexts") == true && $(this).is('[module]') == true) {
+//     var iframeWindow = window['iframe2'];
+//     iframeWindow.QRcodeImageText();
+// }
+parent.location.reload();
+
+
+lay-verify="required"
+
+
+    <button  class="layui-btn" lay-submit lay-filter="formQRcode">提交</button>
+
+form.on('submit(formQRcode)', function(){
+
+    return false;
+});
+form.verify({
+    linkverify: function(value, item){
+        if(!new RegExp("(https|http)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]").test(value)){
+            return '请输入合法的链接地址';
+        }
+    }
+});

static/js/pulic.js

@@ -32,7 +32,6 @@ $(function (){
     });
     $('.module_box').on('click','.sortable-dragging',function(){
         if($('#pageFlag').val()!=''&&eval($('#pageFlag').val())){
-            sessionStorage.setItem('module',$(this).is('[module]'));
             $('.yw-an-rela').removeClass('hides').addClass('shows');
             $(this).addClass('onbg').siblings('.sortable-dragging').removeClass('onbg');
             var left =$(this).offset().left;
@@ -42,7 +41,7 @@ $(function (){
             var _tab = $(this).attr('index');
             loadht($(this).attr('dataId'),_tab);
         }else{
-            $('.yw-an-rela').show();
+            $('.yw-an-rela').removeClass('hides').addClass('shows');
             layer.alert('请先编辑新增二维码!', {icon: 7});
         }
     });
@@ -62,9 +61,11 @@ $(function() {
                  */
                 $(this).attr("sort",i+1);
             });
+            console.log('jinaliooooooo')
             // 支持拖拽的保存
             var array = [];
             $("#module_box .sortable-dragging").each(function(i,p){
+                console.log('jinaliooooooo1')
                 var relationId = $(this).attr('pageRelationId');
                 if(relationId){
                     var zIndex = $(this).attr("sort");
@@ -73,6 +74,7 @@ $(function() {
                 }
             });
             if(array.length != 0 ){
+                console.log('jinlaixiabaioa')
                 QRcodeindex(array);
             }
         }
@@ -571,7 +573,7 @@ function QRcodeindex(array) {
         data:JSON.stringify(array),
         dataType: "json",
         success:function (res) {
-            console.log(res)
+            console.log(res,'xiabiao')
         },
         error:function () {
 
@@ -604,4 +606,9 @@ function QRcodeIndexas() {
             }
         })
     }
+}
+// 刷新tabel
+function Refresh() {
+    console.log('Refresh')
+    table.reload('idQRcode')
 }

static/js/recordTemplate.js

@@ -31,6 +31,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
     var belpID = 'root';
     delpFun();
     function delpFun(){
+        sessionStorage.setItem("departmentId",'root');
         $.ajax({
             url:'http://apptest.jieweizhineng.com/api/section/getlist',
             method:'get',
@@ -46,6 +47,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     });
                     eleTree.on("nodeClick(data)",function(d) {
                         belpID =  d.data.currentData.id;
+                        sessionStorage.setItem("departmentId",d.data.currentData.id);
                         $('.stetaName').val("");
                         var info={
                             statusContent: '',
@@ -150,8 +152,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
         getStateList(info)
     });
     // 监听状态table
-    table.on('tool(stateItme)', function(obj) {
-        sessionStorage.setItem("departmentId",obj.data.id);
+    table.on('tool(recordTemplateID)', function(obj) {
         if( obj.event === "move"){
 
         } else if (obj.event === "copy"){
@@ -298,7 +299,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                                              <div class="a_T a_operation" style="width: 15%">
                                                  <span class="moveUp">上移</span>
                                                  <span class="moveDown">下移</span>
-                                                 <span class="edit_record ${res.data.inputList[j].inputType == "checkbox"? "ww" : "a_hide"}">编辑</span>
+                                                 <span class="edit_record ${res.data.inputList[j].inputType == "checkbox" || res.data.inputList[j].inputType == "radio"? "" : "a_hide"}">编辑</span>
                                                  <span class="delete_record_term">删除</span>
                                              </div>
                                              <!--<input type="text" class="inputJson" style="display: none;" value="${json}">-->