Apple vor 6 Jahren
Ursprung
Commit
17222de86d

+ 277 - 91
.idea/workspace.xml

@@ -2,7 +2,36 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="92e76c55-ad95-4e21-b088-a7137f395ba7" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/Jurisdiction.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/addDevice.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/addFile.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/addLink.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/addText.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/addVideo.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/chooseRecord.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/depMaintain.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/editQRcode.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/imageAtlas.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/imageText.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/pureText.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/editQRcode/recordAdmin.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/static/js/editpulic.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/Jurisdiction.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/Jurisdiction.html" 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/addQRcode.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/addQRcode.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/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$/static/js/QRcode.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/QRcode.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/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -14,12 +43,17 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/QRcode/pureText.html">
+        <entry file="file://$PROJECT_DIR$/static/js/editpulic.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="278">
-              <caret line="93" column="15" lean-forward="true" selection-start-line="93" selection-start-column="15" selection-end-line="93" selection-end-column="15" />
+            <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>
@@ -27,8 +61,8 @@
       <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="368">
-              <caret line="290" column="20" selection-start-line="290" selection-start-column="20" selection-end-line="290" selection-end-column="20" />
+            <state relative-caret-position="354">
+              <caret line="323" column="33" selection-start-line="323" selection-start-column="33" selection-end-line="323" selection-end-column="33" />
               <folding>
                 <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
               </folding>
@@ -37,56 +71,48 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/QRcode/Jurisdiction.html">
+        <entry file="file://$PROJECT_DIR$/pages/editQRcode/editQRcode.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="408">
-              <caret line="78" column="40" selection-start-line="78" selection-start-column="40" selection-end-line="78" selection-end-column="40" />
+            <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#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#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/admin/addrecordTemplate.html">
+        <entry file="file://$PROJECT_DIR$/pages/editQRcode/addDevice.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-7378" />
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5854">
-              <caret line="558" column="25" selection-start-line="558" selection-start-column="19" selection-end-line="558" selection-end-column="25" />
+            <state relative-caret-position="361">
+              <caret line="86" column="133" selection-start-line="86" selection-start-column="133" selection-end-line="86" selection-end-column="133" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
+        <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="394">
-              <caret line="131" column="76" selection-start-line="131" selection-start-column="76" selection-end-line="131" selection-end-column="76" />
+            <state relative-caret-position="345">
+              <caret line="451" column="68" selection-start-line="451" selection-start-column="68" selection-end-line="451" selection-end-column="68" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/QRcode/addQRcode.html">
+        <entry file="file://$PROJECT_DIR$/pages/editQRcode/addLink.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2709">
-              <caret line="55" column="145" selection-start-line="55" selection-start-column="139" selection-end-line="55" selection-end-column="145" />
-              <folding>
-                <element signature="n#div#1;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#2;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#3;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#4;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#5;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#6;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#7;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
-              </folding>
+            <state relative-caret-position="298">
+              <caret line="77" column="9" lean-forward="true" selection-start-line="75" selection-start-column="8" selection-end-line="77" selection-end-column="9" />
             </state>
           </provider>
         </entry>
@@ -94,8 +120,8 @@
       <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="399">
-              <caret line="156" column="70" selection-start-line="156" selection-start-column="26" selection-end-line="156" selection-end-column="70" />
+            <state relative-caret-position="533">
+              <caret line="322" column="107" selection-start-line="322" selection-start-column="107" selection-end-line="322" selection-end-column="107" />
             </state>
           </provider>
         </entry>
@@ -106,6 +132,7 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="HTML File" />
+        <option value="JavaScript File" />
       </list>
     </option>
   </component>
@@ -115,6 +142,9 @@
       <find>yw-an-rela</find>
       <find>delete</find>
       <find>unfold</find>
+      <find>index_data</find>
+      <find>depID</find>
+      <find>deviceItem</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -123,23 +153,37 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/pages/QRcode/addQRcode.html" />
-        <option value="$PROJECT_DIR$/pages/QRcode/addDevice.html" />
+        <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/addDevice.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/addFile.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/addLink.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/addVideo.html" />
-        <option value="$PROJECT_DIR$/pages/QRcode/imageAtlas.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$/pages/editQRcode/pureText.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/addFile.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$/pages/QRcode/Jurisdiction.html" />
+        <option value="$PROJECT_DIR$/static/js/QRcode.js" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/addDevice.html" />
+        <option value="$PROJECT_DIR$/static/js/editpulic.js" />
         <option value="$PROJECT_DIR$/static/js/pulic.js" />
         <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
-        <option value="$PROJECT_DIR$/pages/QRcode/addText.html" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
+  <component name="ProjectFrameBounds" fullScreen="true">
     <option name="x" value="48" />
     <option name="y" value="23" />
     <option name="width" value="1392" />
@@ -167,6 +211,12 @@
               <item name="admin" type="b2602c69:ProjectViewProjectNode" />
               <item name="admin" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
+              <item name="editQRcode" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
               <item name="QRcode" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -193,6 +243,11 @@
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
   </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/pages/editQRcode" />
+    </key>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -215,31 +270,33 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1555581172311</updated>
-      <workItem from="1555581173970" duration="6031000" />
+      <workItem from="1555581173970" duration="6979000" />
+      <workItem from="1555736815328" duration="1395000" />
+      <workItem from="1555841941143" duration="39368000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="6031000" />
+    <option name="totallyTimeSpent" value="47742000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1440" height="900" extended-state="6" />
+    <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Favorites" side_tool="true" />
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24947146" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32891566" />
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -249,121 +306,250 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/addDevice.html">
+    <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 relative-caret-position="453">
-          <caret line="140" column="40" selection-start-line="140" selection-start-column="40" selection-end-line="140" selection-end-column="40" />
+        <state>
+          <caret column="15" selection-start-column="9" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/index.html">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addText.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/chooseRecord.html">
+      <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>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/addFile.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="438">
-          <caret line="154" column="40" selection-start-line="154" selection-start-column="40" selection-end-line="154" selection-end-column="40" />
+        <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>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/addLink.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="438">
-          <caret line="158" column="40" selection-start-line="158" selection-start-column="40" selection-end-line="158" selection-end-column="40" />
+        <state relative-caret-position="505">
+          <caret line="161" column="44" selection-start-line="161" selection-start-column="44" selection-end-line="161" selection-end-column="44" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/addVideo.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="111" column="59" selection-start-line="111" selection-start-column="59" selection-end-line="111" selection-end-column="59" />
+        <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>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/imageAtlas.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="438">
-          <caret line="179" column="40" selection-start-line="179" selection-start-column="40" selection-end-line="179" selection-end-column="40" />
+        <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>
+      </provider>
+    </entry>
+    <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/QRcode/QRcodeList.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/pureText.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>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/imageText.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="438">
-          <caret line="150" column="40" selection-start-line="150" selection-start-column="40" selection-end-line="150" selection-end-column="40" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/recordAdmin.html">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/depMaintain.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-7" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageText.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="438">
-          <caret line="121" column="40" selection-start-line="121" selection-start-column="40" selection-end-line="121" selection-end-column="40" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageAtlas.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-7378" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/pureText.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addFile.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="278">
-          <caret line="93" column="15" lean-forward="true" selection-start-line="93" selection-start-column="15" selection-end-line="93" selection-end-column="15" />
+        <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addVideo.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addDevice.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="143" column="38" lean-forward="true" selection-start-line="143" selection-start-column="24" selection-end-line="143" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addLink.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="298">
+          <caret line="77" column="9" lean-forward="true" selection-start-line="75" selection-start-column="8" selection-end-line="77" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.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>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/addQRcode.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2709">
-          <caret line="55" column="145" selection-start-line="55" selection-start-column="139" selection-end-line="55" selection-end-column="145" />
+        <state relative-caret-position="483">
+          <caret line="306" column="50" lean-forward="true" selection-start-line="306" selection-start-column="27" selection-end-line="306" selection-end-column="50" />
           <folding>
+            <element signature="n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
             <element signature="n#div#1;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
             <element signature="n#div#2;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
             <element signature="n#div#3;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
             <element signature="n#div#4;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
             <element signature="n#div#5;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
             <element signature="n#div#6;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="n#div#7;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
+            <element signature="n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
+            <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#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#6;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>
-    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/pureText.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="156" column="70" selection-start-line="156" selection-start-column="26" selection-end-line="156" selection-end-column="70" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/Jurisdiction.html">
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/recordAdmin.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>
+      </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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addDevice.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="361">
+          <caret line="86" column="133" selection-start-line="86" selection-start-column="133" selection-end-line="86" selection-end-column="133" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/editQRcode.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="78" column="40" selection-start-line="78" selection-start-column="40" selection-end-line="78" selection-end-column="40" />
+        <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#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#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>
+    <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>
     <entry file="file://$PROJECT_DIR$/static/js/pulic.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="290" column="20" selection-start-line="290" selection-start-column="20" selection-end-line="290" selection-end-column="20" />
+        <state relative-caret-position="354">
+          <caret line="323" column="33" selection-start-line="323" selection-start-column="33" selection-end-line="323" selection-end-column="33" />
           <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$/static/js/recordTemplate.js">
+    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5854">
-          <caret line="558" column="25" selection-start-line="558" selection-start-column="19" selection-end-line="558" selection-end-column="25" />
+        <state relative-caret-position="533">
+          <caret line="322" column="107" selection-start-line="322" selection-start-column="107" selection-end-line="322" selection-end-column="107" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
+    <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="394">
-          <caret line="131" column="76" selection-start-line="131" selection-start-column="76" selection-end-line="131" selection-end-column="76" />
+        <state relative-caret-position="345">
+          <caret line="451" column="68" selection-start-line="451" selection-start-column="68" selection-end-line="451" selection-end-column="68" />
         </state>
       </provider>
     </entry>

+ 37 - 5
pages/QRcode/Jurisdiction.html

@@ -57,13 +57,14 @@
             <div class="layui-input-block">
                 <div class="option_content">
                     <textarea name="desc" placeholder="点击选择用户组" class="layui-textarea hides textarea"></textarea>
+                    <span class="textareaID" style="display: none;"></span>
                     <input type="text" placeholder="请输入四位密码" class="layui-input hides passInput">
                 </div>
             </div>
         </div>
     </form>
     <div class="layui-form-item" style="text-align: center;padding-top: 50px">
-        <button  class="layui-btn pureTextSubmit">提交</button>
+        <button  class="layui-btn JurisdictionSubmit">提交</button>
     </div>
     <span class="text" style="display: none"></span>
 </div>
@@ -75,21 +76,52 @@
             laydate= layui.laydate,
             layer = layui.layer;
         form.render();
+        var indexType = '',permissionValue = '',index;
         $("body").on("click",'.options>span',function () {
-            var index = $(this).index();
+            index = $(this).index();
+            indexType = index +1;
             if (index == 0) {
                 $(".textarea").hide();
                 $('.passInput').hide();
-                return;
+                permissionValue = "";
             } else if (index == 1) {
                 $(".textarea").show();
                 $('.passInput').hide();
-                return;
+                permissionValue = $('.textareaID').html();
             }else if (index == 2) {
                 $(".textarea").hide();
                 $('.passInput').show();
-                return;
+                permissionValue = $('.passInput').val();
             }
+        });
+        $('body').on("click",'.JurisdictionSubmit',function () {
+            if (index == 0) {
+                permissionValue = "";
+            } else if (index == 1) {
+                permissionValue = $('.textareaID').html();
+            }else if (index == 2) {
+                permissionValue = $('.passInput').val();
+            }
+            $.ajax({
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/setPagePermission',
+                type:'post',
+                data:{
+                    id:sessionStorage.getItem("QRcodeID"),
+                    permissionType:indexType,
+                    permissionValue:permissionValue,
+                    _method:'put'
+                },
+                dataType:'json',
+                success:function (res) {
+                    console.log(res,'res')
+                },
+                error:function () {
+
+                }
+            })
+        });
+        $("body").on("click",'.textarea',function () {
+                parent.userGroup();
         })
     });
 </script>

+ 1 - 0
pages/QRcode/QRcodeList.html

@@ -105,6 +105,7 @@
     </div>
 </div>
 <script src="../../lib/layui/layui.js" charset="utf-8"></script>
+<script src="../../static/js/base64.js"></script>
 <script src="../../static/js/QRcode.js"></script>
 </body>
 

+ 1 - 0
pages/QRcode/addDevice.html

@@ -141,6 +141,7 @@
                 success:function (res) {
                     if (res.code === '200'){
                         parent.pageRelationIdFun(res.data);
+                        parent.QRcodeIndexas();
                         layer.msg('设备铭牌新增成功');
                     }else {
                         layer.msg('设备铭牌新增失败,请检查信息');

+ 1 - 0
pages/QRcode/addFile.html

@@ -155,6 +155,7 @@
                 success:function (res) {
                     if (res.code === '200'){
                         parent.pageRelationIdFun(res.data);
+                        parent.QRcodeIndexas();
                         layer.msg('文件新增成功');
                     }else {
                         layer.msg('文件新增失败,请检查信息');

+ 1 - 0
pages/QRcode/addLink.html

@@ -159,6 +159,7 @@
                 success:function (res) {
                     if (res.code === '200'){
                         parent.pageRelationIdFun(res.data);
+                        parent.QRcodeIndexas();
                         layer.msg('链接新增成功');
                     }else {
                         layer.msg('链接新增失败,请检查信息');

+ 13 - 13
pages/QRcode/addQRcode.html

@@ -159,7 +159,7 @@
                     </div>
                 </div>
                 <!--文件-->
-                <div class="block rela yx6 xt1749858 file boxs sortable-dragging" dataid="" is_stop="0" pageRelationId="" is_unfold="1" code="file" index="4" sort="6">
+                <div class="block rela yx6 xt1749858 file boxs sortable-dragging" dataid="" is_stop="0" pageRelationId="" is_unfold="1" code="file" index="4" sort="4">
                     <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>
@@ -189,7 +189,7 @@
                     <div class="boxline"></div>
                 </div>
                 <!--链接-->
-                <div class="block rela  yx4 xt1749818 links  boxs sortable-dragging" dataid="" is_stop="0"  pageRelationId="" is_unfold="1" code="links" index="5" sort="4">
+                <div class="block rela  yx4 xt1749818 links  boxs sortable-dragging" dataid="" is_stop="0"  pageRelationId="" is_unfold="1" code="links" index="5" sort="5">
                     <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>
@@ -407,7 +407,7 @@
     </div>
 </div>
 <script id="temp-1" type="text/template">
-    <div class="block rela yx1 xt1749857 customfield sortable-dragging" 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" 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>
@@ -427,9 +427,9 @@
       <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>
-        <div class="pos-abt empty_block_tip text-grey">
-            (请修改)
-        </div>
+            <div class="pos-abt empty_block_tip text-grey">
+                (请修改)
+            </div>
         </div>
         <!-- 预览 -->
         <div class="message_preview  hides">
@@ -447,7 +447,7 @@
     </div>
 </script>
 <script id="temp-2" type="text/template">
-    <div class="block rela  yx2 xt1749244 rich_text 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" 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>
@@ -494,7 +494,7 @@
     </div>
 </script>
 <script id="temp-3" type="text/template">
-    <div class="block rela  yx3 xt1749602 picture 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  boxs sortable-dragging" 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>
@@ -539,7 +539,7 @@
     </div>
 </script>
 <script id="temp-4" type="text/template">
-    <div class="block rela  yx4 xt1749818 links sortable-dragging" dataid="1749818" is_stop="0" is_unfold="1" code="links" index="4" sort="4" draggable="true">
+    <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="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>
@@ -577,7 +577,7 @@
     </div>
 </script>
 <script id="temp-5" type="text/template">
-    <div class="block rela yx5 xt1749857 customfield  sortable-dragging" dataid="1749857" is_stop="0" is_unfold="1" code="customfield" index="5" sort="5" draggable="true">
+    <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="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>
@@ -614,7 +614,7 @@
     </div>
 </script>
 <script id="temp-6" type="text/template">
-    <div class="block rela yx6 xt1749858 file sortable-dragging" dataid="1749858" is_stop="0" is_unfold="1" code="file" index="6" sort="6" draggable="true">
+    <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="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>
@@ -657,7 +657,7 @@
     </div>
 </script>
 <script id="temp-7" type="text/template">
-    <div class="block rela yx7 xt1749865 sucai sortable-dragging" dataid="1749865" is_stop="0" is_unfold="1" code="sucai" index="7" sort="7" draggable="true">
+    <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="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>
@@ -694,7 +694,7 @@
     </div>
 </script>
 <script id="temp-8" type="text/template">
-    <div class="block rela yx8 xt1749867 vcard sortable-dragging" dataid="1749867" is_stop="0" is_unfold="1" code="vcard" index="8" sort="8" draggable="true">
+    <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="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>

+ 0 - 1
pages/QRcode/addText.html

@@ -147,7 +147,6 @@
                         sessionStorage.setItem("QRcodeID",res.data);
                         layer.msg('新建成功');
                         parent.QRcodeName($('.QRcodeName').val())
-
                     }else if(res.code === '439'){
                         layer.msg($('.QRcodeName').val()+'已经存在二维码列表');
 

+ 1 - 0
pages/QRcode/addVideo.html

@@ -110,6 +110,7 @@
                 success:function (res) {
                     if (res.code === '200'){
                         parent.pageRelationIdFun(res.data);
+                        parent.QRcodeIndexas();
                         layer.msg('视频新增成功');
                     }else {
                         layer.msg('视频新增失败,请检查信息');

+ 1 - 0
pages/QRcode/imageAtlas.html

@@ -180,6 +180,7 @@
                 success:function (res) {
                     if (res.code === '200'){
                         parent.pageRelationIdFun(res.data);
+                        parent.QRcodeIndexas();
                         layer.msg('图集新增成功');
                     }else {
                         layer.msg('图集新增失败,请检查信息');

+ 3 - 1
pages/QRcode/imageText.html

@@ -144,13 +144,14 @@
                 title:$('.textName').val(),
             };
             $.ajax({
-                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addText',
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addImageText',
                 type:'post',
                 data:QRcodeInfo,
                 dataType:'json',
                 success:function (res) {
                     if (res.code === '200'){
                         parent.pageRelationIdFun(res.data);
+                        parent.QRcodeIndexas();
                         layer.msg('图文新增成功');
                     }else {
                         layer.msg('图文新增失败,请检查信息');
@@ -161,6 +162,7 @@
                 }
             })
         });
+
     });
 </script>
 </body>

+ 1 - 0
pages/QRcode/pureText.html

@@ -109,6 +109,7 @@
                 success:function (res) {
                     if (res.code === '200'){
                         parent.pageRelationIdFun(res.data);
+                        parent.QRcodeIndexas();
                         layer.msg('文本新增成功');
                     }else {
                         layer.msg('文本新增失败,请检查信息');

+ 6 - 4
pages/QRcode/recordAdmin.html

@@ -41,7 +41,7 @@
                 记录管理名称:
             </label>
             <div class="layui-input-block steta_grouds">
-                <input type="text" placeholder="请输入设备铭牌名称" class="layui-input recordName">
+                <input type="text" placeholder="请输入设备铭牌名称" class="layui-input recordName" oninput="recordTextTitles(this.value)">
             </div>
         </div>
         <div class="layui-form-item">
@@ -90,9 +90,10 @@
             var tbodys = $(".tbodys");
             parent.depMaintainFun(tbodys);
         });
-        // $('body').on('click','.deleteLink',function () {
-        //     $(this).parent().parent().remove();
-        // });
+        window.recordTextTitles = function (title) {
+            parent.onFocus();
+            parent.addrecord(title)
+        };
         $('body').on("click",".recordBtn",function () {
             var recordTemplate = [] , tr = $('.tbodys tr');
             var recordTemplateobj = {organizationId:"",organizationName:'',pageId:'',recordName:'',stepIndex:'',templateId:'',templateName:''};
@@ -122,6 +123,7 @@
                 success:function (res) {
                     if (res.code === '200'){
                         parent.pageRelationIdFun(res.data);
+                        parent.QRcodeIndexas();
                         layer.msg('记录模版新增成功');
                     }else {
                         layer.msg('记录模版新增失败,请检查信息');

+ 130 - 0
pages/editQRcode/Jurisdiction.html

@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+        .layui-form-label{
+            width: 100px;
+        }
+        .layui-input-block{
+            margin-left: 138px;
+        }
+        .w-e-toolbar{
+            padding: 0 !important;
+        }
+        .w-e-toolbar .w-e-menu{
+            padding: 5px 4px !important;
+        }
+        .options{
+            line-height: 38px;
+        }
+        .options span{
+            margin: 0 10px;
+            font-size: 16px;
+            color: #333;
+            cursor: pointer;
+        }
+    </style>
+</head>
+
+<body>
+<div class="weadmin-body">
+    <form class="layui-form">
+        <div class="layui-form-item">
+            <label class="layui-form-label">
+                手机用户:
+            </label>
+            <div class="layui-input-block options">
+                <span style="margin: 0">所有人可见</span>
+                <span>用户组</span>
+                <span>密码</span>
+            </div>
+            <div class="layui-input-block">
+                <div class="option_content">
+                    <textarea name="desc" placeholder="点击选择用户组" class="layui-textarea hides textarea"></textarea>
+                    <span class="textareaID" style="display: none;"></span>
+                    <input type="text" placeholder="请输入四位密码" class="layui-input hides passInput">
+                </div>
+            </div>
+        </div>
+    </form>
+    <div class="layui-form-item" style="text-align: center;padding-top: 50px">
+        <button  class="layui-btn JurisdictionSubmit">提交</button>
+    </div>
+    <span class="text" style="display: none"></span>
+</div>
+<script src="../../lib/layui/layui.js" charset="utf-8"></script>
+<script>
+    layui.use(['form','layer','jquery','laydate'], function(){
+        var form = layui.form,
+            $ = layui.jquery,
+            laydate= layui.laydate,
+            layer = layui.layer;
+        form.render();
+        var indexType = '',permissionValue = '',index;
+        $("body").on("click",'.options>span',function () {
+            index = $(this).index();
+            indexType = index +1;
+            if (index == 0) {
+                $(".textarea").hide();
+                $('.passInput').hide();
+                permissionValue = "";
+            } else if (index == 1) {
+                $(".textarea").show();
+                $('.passInput').hide();
+                permissionValue = $('.textareaID').html();
+            }else if (index == 2) {
+                $(".textarea").hide();
+                $('.passInput').show();
+                permissionValue = $('.passInput').val();
+            }
+        });
+        $('body').on("click",'.JurisdictionSubmit',function () {
+            if (index == 0) {
+                permissionValue = "";
+            } else if (index == 1) {
+                permissionValue = $('.textareaID').html();
+            }else if (index == 2) {
+                permissionValue = $('.passInput').val();
+            }
+            $.ajax({
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/setPagePermission',
+                type:'post',
+                data:{
+                    id:sessionStorage.getItem("QRcodeID"),
+                    permissionType:indexType,
+                    permissionValue:permissionValue,
+                    _method:'put'
+                },
+                dataType:'json',
+                success:function (res) {
+                    console.log(res,'res')
+                },
+                error:function () {
+
+                }
+            })
+        });
+        $("body").on("click",'.textarea',function () {
+                parent.userGroup();
+        })
+    });
+</script>
+</body>
+
+</html>

+ 193 - 0
pages/editQRcode/addDevice.html

@@ -0,0 +1,193 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font-awesome.min.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+        .layui-form-label{
+            width: 100px;
+        }
+        .layui-input-block{
+            margin-left: 138px;
+        }
+        .w-e-toolbar{
+            padding: 0 !important;
+        }
+        .w-e-toolbar .w-e-menu{
+            padding: 5px 4px !important;
+        }
+    </style>
+</head>
+
+<body>
+<div class="weadmin-body">
+    <form class="layui-form">
+        <div class="layui-form-item">
+            <label class="layui-form-label">
+                设备铭牌名称:
+            </label>
+            <div class="layui-input-block steta_grouds">
+                <input type="text" placeholder="请输入设备铭牌名称" class="layui-input textName">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">参数介绍</label>
+            <div class="layui-input-block">
+                <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>
+    </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>
+<script>
+    layui.use(['form','layer','jquery','laydate'], function(){
+        var form = layui.form,
+            $ = layui.jquery,
+            laydate= layui.laydate,
+            layer = layui.layer;
+        form.render();
+        if (sessionStorage.getItem('module') == 'true') {
+            QRcodeDevice();
+        }
+        var num = 0,bums = 0;
+        $("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})">
+                    <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>`;
+
+            $("#link_items").append(str);
+            parent.onFocus();
+            parent.addDevice(mnum)
+        });
+        $('body').on('click','.deleteLink',function () {
+            $(this).parent().parent().remove();
+            parent.deleteDevice($(this).parent().parent().attr('index-data'))
+        });
+        // 上移
+        $("body") .on("click",".moveUp",function () {
+            var index = $(this).parent().parent();
+            if(index.index() != 0){
+                index.prev().before(index);
+            }else {
+                layer.msg('已经移至最高点', {icon: 8});
+            }
+        });
+        // 下移
+        $("body") .on("click",".moveDown",function () {
+            var index = $(this).parent().parent();
+            if(index.index() != $(".link_item").length-1){
+                index.next().after(index);
+            }else {
+                layer.msg('已经移至最低点', {icon: 8});
+            }
+        });
+        $('body').on("click",".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();
+                equipmentobj.pageId = sessionStorage.getItem("QRcodeID");
+                equipmentobj.paramName = $(this).find('.equipmentName').val();
+                equipmentobj.paramContent = $(this).find('.equipmentContent').val();
+                equipmentobj.zIndex = num++ +1;
+                equipmentNameArray.push(equipmentobj)
+            });
+            $.ajax({
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addEquipment',
+                type:'post',
+                data:JSON.stringify(equipmentNameArray),
+                contentType:'application/json;charset=utf-8',
+                dataType:'json',
+                success:function (res) {
+                    if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
+                        layer.msg('设备铭牌新增成功');
+                    }else {
+                        layer.msg('设备铭牌新增失败,请检查信息');
+                    }
+                },
+                error:function () {
+                    layer.msg('网络错误,请检查网络');
+                }
+            })
+        });
+        // 数据回显
+        function QRcodeDevice() {
+            $.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") {
+                            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})">
+                                        <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>`;
+                                $("#link_items").append(str);
+                            }
+                        }
+                    }
+                },
+                error:function () {
+                    layer.msg('请检查网络', {icon: 2});
+                }
+            });
+        }
+    });
+</script>
+</body>
+
+</html>

+ 202 - 0
pages/editQRcode/addFile.html

@@ -0,0 +1,202 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>添加分类</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font-awesome.min.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+        .layui-form-label{
+            width: 100px;
+        }
+        .layui-input-block{
+            margin-left: 138px;
+        }
+        .w-e-toolbar{
+            padding: 0 !important;
+        }
+        .w-e-toolbar .w-e-menu{
+            padding: 5px 4px !important;
+        }
+        .fileItem{
+            margin-bottom: 15px;
+        }
+        .fileItem input{
+            width: 90%;
+            display: inline-block;
+        }
+        .deleteLink{
+            margin-left: 15px;
+            position: relative;
+            top: 2px;
+            font-size: 20px;
+        }
+    </style>
+</head>
+
+<body>
+<div class="weadmin-body">
+    <form class="layui-form">
+        <div class="layui-form-item">
+            <label class="layui-form-label">
+                文件名称:
+            </label>
+            <div class="layui-input-block steta_grouds">
+                <input type="text" placeholder="请输入文件名称" class="layui-input textName" oninput="pureTextTitles(this.value)">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">文件:</label>
+            <div class="layui-input-block">
+                <div class="fileItems">
+
+                </div>
+                <button type="button" class="layui-btn" id="upload1">
+                    <i class="layui-icon">&#xe67c;</i>上传文件
+                </button>
+            </div>
+        </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>
+<script>
+    layui.use(['form','layer','jquery','upload'], function(){
+        var form = layui.form,
+            $ = layui.jquery,
+            upload= layui.upload,
+            layer = layui.layer;
+        form.render();
+        if (sessionStorage.getItem('module') == 'true') {
+            QRcodeFile();
+        }
+        window.pureTextTitles = function (title) {
+            parent.onFocus();
+            parent.pureTextTitle(title)
+        };
+        var index,num = 0,fileSize,bums =0;
+        var uploadInst = upload.render({
+            elem: '#upload1'
+            ,url: 'http://apptest.jieweizhineng.com/api/swagger/api/common/v1/uploadFile'
+            ,accept: 'file'
+            ,exts: 'zip|rar|doc|docx|xls|xlsx|ppt|pptx|pdf|dwg|vsd|wps|wpt|dot|et|ett|xlt|dps|dpt|pot|pps'
+            ,before: function(obj){
+                index = layer.load(2);
+                obj.preview(function(index, file, result){
+
+                });
+            }
+            ,done: function(res){
+                //上传成功
+                layer.close(index)
+                if(res.code == 200){
+                    fileSize = parent.renderSize(res.data.size);
+                    var muns = bums++ +1;
+                    parent.onFocus();
+                    parent.uploadFile(res.data.fileName,muns);
+                    var str = `
+                     <div class="fileItem" index-data="${muns}" file-path="${res.data.fullURL}" file-size="${fileSize}">
+                        <input type="text" class="layui-input fileName" value="${res.data.fileName}" disabled>
+                        <i class="fa fa-trash-o deleteLink"></i>
+                     </div>`;
+                    $('.fileItems').append(str);
+                    return layer.msg('上传成功');
+                }
+                //如果上传失败
+                layer.msg('上传失败');
+            }
+            ,error: function(){
+                layer.msg('请检查网络!');
+            }
+        });
+        $('body').on('click','.deleteLink',function () {
+            $(this).parent().remove();
+            var index_data  = $(this).parent().attr('index-data');
+            parent.onFocus();
+            parent.deleteFile(index_data);
+            $(this).parent().attr("file-path","");
+            $(this).parent().attr("file-size","");
+            $(this).parent().find('.fileName').val("");
+        });
+        $('body').on("click",".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();
+                fileItemobj.pageId = sessionStorage.getItem("QRcodeID");
+                fileItemobj.fileName = $(this).find('.fileName').val();
+                fileItemobj.filePath = $(this).attr('file-path');
+                fileItemobj.fileSize = $(this).attr('file-size');
+                fileItemArray.push(fileItemobj)
+            });
+            $.ajax({
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addFile',
+                type:'post',
+                data:JSON.stringify(fileItemArray),
+                contentType:'application/json;charset=utf-8',
+                dataType:'json',
+                success:function (res) {
+                    if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
+                        layer.msg('文件新增成功');
+                    }else {
+                        layer.msg('文件新增失败,请检查信息');
+                    }
+                },
+                error:function () {
+                    layer.msg('网络错误,请检查网络');
+                }
+            })
+        });
+        // 数据回显
+        function QRcodeFile() {
+            $.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") {
+                            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}">
+                                <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>`;
+                                $('.fileItems').append(str);
+                            }
+                        }
+                    }
+                },
+                error:function () {
+                    layer.msg('请检查网络', {icon: 2});
+                }
+            });
+        }
+    });
+</script>
+</body>
+
+</html>

+ 213 - 0
pages/editQRcode/addLink.html

@@ -0,0 +1,213 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font-awesome.min.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+        .layui-form-label{
+            width: 100px;
+        }
+        .layui-input-block{
+            margin-left: 138px;
+        }
+        .w-e-toolbar{
+            padding: 0 !important;
+        }
+        .w-e-toolbar .w-e-menu{
+            padding: 5px 4px !important;
+        }
+    </style>
+</head>
+
+<body>
+<div class="weadmin-body">
+    <form class="layui-form">
+        <div class="layui-form-item">
+            <label class="layui-form-label">
+                链接标题:
+            </label>
+            <div class="layui-input-block steta_grouds">
+                <input type="text" placeholder="请输入链接标题" class="layui-input textName">
+            </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>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">链接</label>
+            <div class="layui-input-block">
+                <a href="javascript:;" class="layui-btn layui-btn-normal addLink">添加其他链接</a>
+            </div>
+            <div class="layui-input-block" id="link_items">
+
+            </div>
+        </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>
+<script>
+    layui.use(['form','layer','jquery','laydate'], function(){
+        var form = layui.form,
+            $ = layui.jquery,
+            laydate= layui.laydate,
+            layer = layui.layer;
+        form.render();
+        if (sessionStorage.getItem('module') == 'true') {
+            QRcodeLink();
+        }
+        var num = 0,bums = 0;
+        $("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})">
+                    <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>`;
+            $("#link_items").append(str);
+            parent.onFocus();
+            parent.addlink(mnum)
+        });
+        $('body').on('click','.deleteLink',function () {
+            $(this).parent().parent().remove();
+            parent.deletaLink($(this).parent().parent().attr('index-data'))
+        })
+        // 上移
+        $("body") .on("click",".moveUp",function () {
+            var index = $(this).parent().parent();
+            if(index.index() != 0){
+                index.prev().before(index);
+            }else {
+                layer.msg('已经移至最高点', {icon: 8});
+            }
+        });
+        // 下移
+        $("body") .on("click",".moveDown",function () {
+            var index = $(this).parent().parent();
+            if(index.index() != $(".link_item").length-1){
+                index.next().after(index);
+            }else {
+                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")
+            }
+        };
+        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 () {
+            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();
+                linkItemobj.pageId = sessionStorage.getItem("QRcodeID");
+                linkItemobj.linkName = $(this).find('.linkName').val();
+                linkItemobj.linkUrl = $(this).find('.linkUrl').val();
+                linkItemobj.remark = $('#LAY_demo_editor').val();
+                linkItemobj.zIndex = num++ +1;
+                linkItemArray.push(linkItemobj)
+            });
+            $.ajax({
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addLinks',
+                type:'post',
+                data:JSON.stringify(linkItemArray),
+                contentType:'application/json;charset=utf-8',
+                dataType:'json',
+                success:function (res) {
+                    if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
+                        layer.msg('链接新增成功');
+                    }else {
+                        layer.msg('链接新增失败,请检查信息');
+                    }
+                },
+                error:function () {
+                    layer.msg('网络错误,请检查网络');
+                }
+            })
+        });
+        // QRcodeLink
+        // 数据回显
+        function QRcodeLink() {
+            $.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") {
+                            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})">
+                                    <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>`;
+                                $("#link_items").append(str);
+                            }
+                        }
+                    }
+                },
+                error:function () {
+                    layer.msg('请检查网络', {icon: 2});
+                }
+            });
+        }
+    });
+</script>
+</body>
+
+</html>

+ 184 - 0
pages/editQRcode/addText.html

@@ -0,0 +1,184 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <link rel="stylesheet" href="../../static/skin/jedate.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+        .layui-form-label{
+            width: 100px;
+        }
+        .layui-input-block{
+            margin-left: 138px;
+        }
+        .showOrhide{
+            display: none;
+        }
+    </style>
+</head>
+
+<body>
+<div class="weadmin-body">
+    <form class="layui-form">
+        <div class="layui-form-item">
+            <label class="layui-form-label">
+                二维码名称:
+            </label>
+            <div class="layui-input-block steta_grouds">
+                <input type="text" placeholder="请输入二维码名称" 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">
+                    <option value=""></option>
+                    <option value="蓝色">蓝色</option>
+                    <option value="黑色">黑色</option>
+                    <option value="绿色">绿色</option>
+                </select>
+            </div>
+        </div>
+        <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">
+            </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">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">提醒周期:</label>
+                <div class="layui-input-block">
+                    <select name="interest" lay-filter="aihao">
+                        <option value=""></option>
+                        <option value="0">周一</option>
+                        <option value="1">一个月</option>
+                        <option value="2">两周</option>
+                        <option value="2">三周</option>
+                        <option value="2">三个月</option>
+                        <option value="2">一年</option>
+                    </select>
+                </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>
+                </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>
+            </div>
+        </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(){
+        var form = layui.form,
+            $ = layui.jquery,
+            laydate= layui.laydate,
+            layer = layui.layer;
+        QRcodeDetaile();
+        form.render();
+        jeDate("#date",{
+            format: "YYYY-MM-DD",
+            theme:{bgcolor:"#00A1CB",pnColor:"#00CCFF"},
+        });
+        form.on("switch(switch)",function (data) {
+            console.log("data",data)
+            console.log(data.elem.checked)
+            if (data.elem.checked === true) {
+                $(".showOrhide").show();
+            }else {
+                $(".showOrhide").hide();
+            }
+
+        });
+        var color = "";
+        form.on("select(color)",function (data) {
+           color = data.elem[data.elem.selectedIndex].text;
+        });
+        $('body').on("click",".a_stetaBtn",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',
+                data:QRcodeInfo,
+                dataType:'json',
+                success:function (res) {
+                    if (res.code === '200'){
+                        sessionStorage.setItem("QRcodeID",res.data);
+                        layer.msg('新建成功');
+                        parent.QRcodeName($('.QRcodeName').val())
+
+                    }else if(res.code === '439'){
+                        layer.msg($('.QRcodeName').val()+'已经存在二维码列表');
+
+                    }else {
+                        layer.msg('新建失败,请检查信息');
+                    }
+                },
+                error:function () {
+                    layer.msg('网络错误,请检查网络');
+                }
+            })
+        });
+        function QRcodeDetaile() {
+            $.ajax({
+                url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageEdit/'+sessionStorage.getItem('QRcodeDetaileID'),
+                type: 'get',
+                dataType: 'json',
+                success: function (res) {
+                    $('.QRcodeName').val(res.data.page.title);
+                    $('.colorType').val(res.data.page.colorType);
+                    $('#LAY_editor').val(res.data.page.remark);
+                    form.render();
+                },
+                error:function () {
+                    layer.msg('请检查网络', {icon: 2});
+                }
+            });
+        }
+    });
+</script>
+</body>
+
+</html>

+ 149 - 0
pages/editQRcode/addVideo.html

@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>添加分类</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+        .layui-form-label{
+            width: 100px;
+        }
+        .layui-input-block{
+            margin-left: 138px;
+        }
+        .w-e-toolbar{
+            padding: 0 !important;
+        }
+        .w-e-toolbar .w-e-menu{
+            padding: 5px 4px !important;
+        }
+    </style>
+</head>
+
+<body>
+<div class="weadmin-body">
+    <form class="layui-form">
+        <div class="layui-form-item">
+            <label class="layui-form-label">
+                视频名称:
+            </label>
+            <div class="layui-input-block steta_grouds">
+                <input type="text" placeholder="请输入视频名称" class="layui-input textName">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">视频:</label>
+            <div class="layui-input-block">
+                <input type="text" class="layui-input videoName" style="margin-bottom: 15px" disabled placeholder="视频名称">
+                <button type="button" class="layui-btn" id="upload1">
+                    <i class="layui-icon">&#xe67c;</i>上传视频
+                </button>
+            </div>
+        </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>
+<script>
+    layui.use(['form','layer','jquery','upload'], function(){
+        var form = layui.form,
+            $ = layui.jquery,
+            upload= layui.upload,
+            layer = layui.layer;
+        form.render();
+        if (sessionStorage.getItem('module') == 'true') {
+            QRcodeVideo();
+        }
+        var index,videoName,videoUrl;
+        var uploadInst = upload.render({
+            elem: '#upload1'
+            ,url: 'http://apptest.jieweizhineng.com/api/swagger/api/common/v1/uploadFile'
+            ,accept: 'video'
+            ,before: function(obj){
+                index = layer.load(2);
+                obj.preview(function(index, file, result){
+                    $('.videoName').val(file.name);
+                });
+            }
+            ,done: function(res){
+                //上传成功
+                layer.close(index);
+                if(res.code == 200){
+                    parent.onFocus();
+                    parent.addVideo(res.data.fullURL);
+                    videoUrl = res.data.fullURL;
+                    videoName = res.data.fileName;
+                    return layer.msg('上传成功');
+                }
+                //如果上传失败
+                layer.msg('上传失败');
+            }
+            ,error: function(){
+                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;
+            }
+            $.ajax({
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addVideo',
+                type:'post',
+                data:JSON.stringify(videoItemobj),
+                contentType:'application/json;charset=utf-8',
+                dataType:'json',
+                success:function (res) {
+                    if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
+                        layer.msg('视频新增成功');
+                    }else {
+                        layer.msg('视频新增失败,请检查信息');
+                    }
+                },
+                error:function () {
+                    layer.msg('网络错误,请检查网络');
+                }
+            })
+        });
+        // 数据回显
+        function QRcodeVideo() {
+            $.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") {
+                            $('.textName').val(res.data.pageItemList[i].videoList[0].title);
+                            $('.videoName').val(res.data.pageItemList[i].videoList[0].videoName)
+                        }
+                    }
+                },
+                error:function () {
+                    layer.msg('请检查网络', {icon: 2});
+                }
+            });
+        }
+    });
+</script>
+</body>
+
+</html>

+ 101 - 0
pages/editQRcode/chooseRecord.html

@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <link rel="stylesheet" href="../../static/css/eleTree.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+    </style>
+</head>
+
+<body>
+<div class="weadmin-body">
+    <div class="eleTree ele1" lay-filter="methods"></div>
+    <span class="deptext" style="display: none;"></span>
+</div>
+<script src="../../lib/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript">
+    layui.config({
+        base: '../../lib/layui/lay/mymodules/'
+        ,version: '101100'
+    }).use('eleTree');
+    layui.use(['form','layer','eleTree','jquery'], function(){
+        var form = layui.form,
+            admin = layui.admin,
+            layer = layui.layer,
+            eleTree = layui.eleTree,
+            $=layui.jquery;
+        form.render();
+        delpFun();
+        function delpFun(){
+            var parentNodeMax,parentNode,sonNodes,sonNode,sonNodeArray=[],sonNodeStr,sonNodeID,sonNodeIDStr,sonNodeIDAarray = [],parentID;
+            $.ajax({
+                url:'http://apptest.jieweizhineng.com/api/section/getlist',
+                method:'get',
+                dataType: 'json',
+                success:function (res) {
+                    console.log(res,'res');
+                    parentNodeMax = res.data.label;
+                    if(res.code === 0){
+                        var data = [res.data];
+                        var ele = eleTree.render({
+                            elem: '.ele1',
+                            data:data ,
+                            showCheckbox:true,
+                            defaultExpandAll:true,
+                            // lazy: true,
+                        });
+                        eleTree.on("nodeChecked(methods)",function(d) {
+                            console.log(d.data);
+                            parentNode = d.data.parentData.data.label;
+                            parentID = d.data.parentData.data.id;
+                            sonNodes = ele.getChecked(true,false);
+                            console.log(sonNodes,'sonNodes');
+                            sonNodeIDStr = "";
+                            sonNodeIDAarray = [];
+                            sonNodeStr = "";
+                            sonNodeArray = [];
+                            for (var i = 0; i < sonNodes.length; i++) {
+                                sonNode = sonNodes[i].label;
+                                sonNodeID = sonNodes[i].id;
+                                sonNodeIDAarray.push(sonNodeID);
+                                sonNodeArray.push(sonNode)
+                            }
+                            sonNodeStr = sonNodeArray.join(',');
+                            sonNodeIDStr = sonNodeIDAarray.join(',');
+                            $('.deptext').html(`${parentNode},${sonNodeStr}`);
+                            $('.deptext').attr("sonNode-id",sonNodeIDStr);
+                            $('.deptext').attr("parentID",parentID);
+                            // sessionStorage.setItem('sonNode-id',sonNodeIDStr)
+                            // sessionStorage.setItem('parentID',parentID)
+                        });
+                    }else{
+                        layer.msg('请检查网路', {icon: 2});
+                    }
+                },
+                error:function (err) {
+                    layer.msg('请检查网路', {icon: 2});
+                }
+            })
+
+        }
+
+    });
+</script>
+</body>
+
+</html>

+ 97 - 0
pages/editQRcode/depMaintain.html

@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>维护部门</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+    </style>
+</head>
+<body>
+<div class="weadmin-body">
+    <form class="layui-form a_formContet">
+        <div class="layui-form-item">
+            <label class="layui-form-label">
+                <span class="we-red">*</span>模板名称
+            </label>
+            <div class="layui-input-block">
+                <select name="" id="" class="contrller" lay-filter="depName">
+                    <option value="">请选择</option>
+                </select>
+                <input type="text" style="display: none;" class="depsName" id-data="">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">
+                维护部门
+            </label>
+            <div class="layui-input-block a_itmes">
+                <input type="text" id="depName" value="" placeholder="维护部门" name="depName" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+    </form>
+</div>
+<script src="../../lib/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript">
+    layui.extend({
+        admin: '{/}../../static/js/admin'
+    });
+    layui.use(['form','layer','admin','jquery'], function(){
+        var form = layui.form,
+            admin = layui.admin,
+            layer = layui.layer,
+            $=layui.jquery;
+        form.render();
+        selectStateFun();
+        function selectStateFun(){
+            // /api/template/v1/getRecordTemplateList
+            $.ajax({
+                url: 'http://apptest.jieweizhineng.com/api/swagger/api/status/v1/selectStatusList/'+sessionStorage.getItem("departmentId"),
+                method: 'get',
+                dataType: 'json',
+                data: {
+                    departmentId:sessionStorage.getItem("departmentId")
+                },
+                success: function (res) {
+                    console.log(res,'oo');
+                    for (var i = 0; i < res.data.length; i++) {
+                        var str = `<option value="${res.data[i].id}">${res.data[i].statusContent}</option>`;
+                        $(".contrller").append(str);
+                        form.render();
+                    }
+                },
+                error:function () {
+
+                }
+            })
+        }
+        form.on('select(depName)', function(data){
+            var value = data.elem[data.elem.selectedIndex].text;
+            var id = data.value;
+            console.log(value,id);
+            $('.depsName').val(value);
+            $('.depsName').attr('id-data',id);
+            // $(this).parent().parent().find(".a_stateName").attr("checkbox-boole",data.elem.checked)
+        });
+        // 维护部门
+        $("body").on('click','#depName',function () {
+            parent.delFun();
+        })
+    });
+</script>
+</body>
+
+</html>

+ 494 - 0
pages/editQRcode/editQRcode.html

@@ -0,0 +1,494 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font-awesome.min.css">
+    <link rel="stylesheet" href="../../static/css/font.css">
+    <link rel="stylesheet" href="../../static/css/page-edit-sucai-bootstrap_d66488e.css">
+    <link rel="stylesheet" href="../../static/css/page_for_productedit_bootstrap_ab3ecc6.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <link rel="stylesheet" href="../../static/css/swiper.min.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+        body{
+            background: #f0f0f0;
+        }
+        .EjectNewQRcode{
+            position: absolute;
+            display: inline-block;
+            width: 50px;
+            height: 30px;
+            cursor: pointer;
+            bottom: 5px;
+            right: 0;
+        }
+    </style>
+</head>
+<body>
+<div class="weadmin-body" style="padding-left: 50px">
+    <div style="display: none;">
+        <input id="pageId" type="hidden" value="61cc63ca7ca841669330ef54f0e6bd3b">
+        <input id="departmentId" type="hidden" value="root">
+        <input id="dataId" type="hidden" value="">
+        <!-- 标识二维码基本信息的录入:未录入(false),已录入(true) -->
+        <input id="pageFlag" type="hidden" value="false">
+    </div>
+    <div class="pubw box rela" style="background: none;margin-left: auto;margin-right: auto;margin-top: 14px!important;">
+        <div class="edit_head pointer">
+            <div class="edit_head_title" title="新增二维码" remark_title="">新增二维码</div>
+            <i class="EjectNewQRcode"></i>
+        </div>
+        <div class="fl view rela" id="view" style="height: 100%;margin-bottom:50px;margin-top: 10px;position: relative;">
+            <div class="QRcode_modular_items module_box" id="module_box">
+                <div class="b-g"></div>
+            </div>
+            <!--模块-->
+            <div class="addItem rela ">
+                <div class="addModule dno" style="display: block !important;">
+                    <p class="cet addTitle clsdirTitle ">选择信息展示模块</p>
+                    <ul class="clearfix">
+                        <li md="26|纯文本|picture|clicon-module-rotate-imgs" title="纯文本" index_data="1">
+                            <!--<i class="fa clicon-module-rotate-imgs"></i>-->
+                            <i class="fa fa-file-text-o font_sizeIs"></i>
+                            <p>纯文本</p>
+                        </li>
+                        <li md="1|图文|rich_text|clicon-module-imgtxt" title="图文" index_data="2">
+                            <i class="iconfont font_sizeIs">&#59131;</i>
+                            <p>图文</p>
+                        </li>
+                        <li md="5|图集|album|clicon-module-rotate-imgs" title="图集" index_data="3">
+                            <i class="iconfont font_sizeIs">&#59121;</i>
+                            <p>图集</p>
+                        </li>
+                        <li md="4|文件|file|clicon-module-file" title="文件" index_data="4">
+                            <i class="iconfont font_sizeIs">&#59452;</i>
+                            <p>文件</p>
+                        </li>
+                        <li md="9|链接|links|clicon-module-link" title="链接" index_data="5">
+                            <i class="font_sizeIs iconfont">&#59127;</i>
+                            <p>链接</p>
+                        </li>
+                        <li md="18|视频|sucai|clicon-module-material2" title="视频" index_data="6">
+                            <i class="font_sizeIs iconfont">&#59424;</i>
+                            <p>视频</p>
+                        </li>
+                        <li md="21|设备名牌|customfield|clicon-module-custom-settings" title="设备名牌" index_data="7">
+                            <i class="font_sizeIs fa fa-cubes"></i>
+                            <p>设备名牌</p>
+                        </li>
+                        <li md="16|记录管理|vcard|clicon-module-card" title="记录管理" index_data="8">
+                            <i class="font_sizeIs fa fa-wpforms"></i>
+                            <p>记录管理</p>
+                        </li>
+                        <!--<li class="show_more_item" title="更多" style="text-align: center;width: 100%;"><em class="s-m-item"></em></li>-->
+                        <div class="cl"></div>
+                    </ul>
+                    <p class="cet addTitle mt10 addTitle1">添加记录功能模块</p>
+                </div>
+                <!--<p class="loading abso cet" style="display: none !important;">正在载入数据...</p>-->
+                <div class="cl"></div>
+            </div>
+        </div>
+        <!--操作-->
+        <!--纯文本-->
+        <div class="">
+            <div class="fl ifun rela yw-an-rela" id="ifun">
+                <div class="close abso ahd" onclick="remove(this);">×</div>
+                <div class="arrow abso" style="top: 33px;"></div>
+                <!--描述:二维码-->
+                <div class="pam-us0 state-pw hides">
+                    <iframe frameborder="0" id="iframe0" name="iframe0" src="addText.html" style="width: 100%;height: 380px;"></iframe>
+                </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>
+                </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>
+                </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>
+                </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>
+                </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>
+                </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>
+                </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>
+                </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>
+                </div>
+            </div>
+        </div>
+        <!--图文-->
+    </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="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>
+            <div class="btn_group">
+                <div class="group_item fl">
+                    <s class="icon state unfold" title="点击权限"></s>
+                    <span>权限</span>
+                </div>
+                <div class="group_item fl">
+                    <s class="icon delete" title="点击删除"></s>
+                    <span>删除</span>
+                </div>
+            </div>
+        </div>
+        <div class="empty_block pos-abt white block_b">
+  <span class="module_icon_white text-center">
+      <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>
+        <div class="pos-abt empty_block_tip text-grey">
+            (请修改)
+        </div>
+        </div>
+        <!-- 预览 -->
+        <div class="message_preview  hides">
+            <div class="preview_list_box not_title">
+                <p class="aum-p"> </p>
+                <ul class="preview_list preview_list_customfield">
+                    <li class="li_list">
+                        <div class="not_title preview_content">
+                            <p></p>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </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="green_layer">
+    <span class="module_icon_white text-center paddinfTop">
+        <i class="clicon-module-imgtxt text-white iconfont font_sizeI">&#59131;</i>
+        <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">图文</div>
+    </span>
+            <div class="btn_group">
+                <div class="group_item fl">
+                    <s class="icon state unfold" title="点击权限"></s>
+                    <span>权限</span>
+                </div>
+                <div class="group_item fl">
+                    <s class="icon delete" title="点击删除"></s>
+                    <span>删除</span>
+                </div>
+            </div>
+        </div>
+        <div class="empty_block pos-abt white block_b">
+    <span class="module_icon_white text-center paddinfTop">
+        <i class="clicon-module-imgtxt text-white iconfont font_sizeI">&#59131;</i>
+        <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">图文</div>
+    </span>
+            <div class="pos-abt empty_block_tip text-grey">
+                (请修改)
+            </div>
+        </div>
+        <!--预览 -->
+        <div class="message_preview hides">
+            <div class="preview_list_box not_title">
+                <p class="aum-p"></p>
+                <ul class="not_title upload_tips upload-mus">
+                    <li class="">
+                        <img src="" alt="" class="image1">
+                    </li>
+                </ul>
+                <ul class="preview_list preview_list_customfield">
+                    <li class="li_list">
+                        <div class="not_title preview_content">
+                            <p></p>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </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="green_layer">
+    <span class="module_icon_white text-center paddinfTop">
+         <i class="clicon-module-imgtxt text-white iconfont font_sizeI">&#59121;</i>
+        <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">图集</div>
+    </span>
+            <div class="btn_group">
+                <div class="group_item fl">
+                    <s class="icon state unfold" title="点击权限"></s>
+                    <span>权限</span>
+                </div>
+                <div class="group_item fl">
+                    <s class="icon delete" title="点击删除"></s>
+                    <span>删除</span>
+                </div>
+            </div>
+        </div>
+        <div class="empty_block pos-abt white block_b">
+    <span class="module_icon_white text-center paddinfTop">
+         <i class="clicon-module-imgtxt text-white iconfont font_sizeI">&#59121;</i>
+        <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">图集</div>
+    </span>
+            <div class="pos-abt empty_block_tip text-grey">
+                (请修改)
+            </div>
+        </div>
+        <!--预览 -->
+        <div class="message_preview hides">
+            <div class="preview_list_box not_title">
+                <p class="aum-p"></p>
+                <ul class="not_title upload_tips banner_img" style=" width: 320px;">
+                    <!-- 此处轮播图 -->
+                    <li>
+                        <div class="swiper-container">
+                            <div class="swiper-wrapper">
+
+                            </div>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </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="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>
+        <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">文件</div>
+    </span>
+            <div class="btn_group">
+                <div class="group_item fl">
+                    <s class="icon state unfold" title="点击权限"></s>
+                    <span>权限</span>
+                </div>
+                <div class="group_item fl">
+                    <s class="icon delete" title="点击删除"></s>
+                    <span>删除</span>
+                </div>
+            </div>
+        </div>
+        <div class="empty_block pos-abt white block_b">
+            <span class="module_icon_white text-center paddinfTop">
+                <i class="clicon-module-file text-white font_sizeI iconfont" style="font-size: 25px">&#59452;</i>
+                <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">文件</div>
+            </span>
+            <div class="pos-abt empty_block_tip text-grey">
+                (请修改)
+            </div>
+        </div>
+        <!--预览 -->
+        <div class="message_preview hides">
+            <p class="message_title no_line aum-p"></p>
+            <div class="preview_list_box not_title">
+                <ul class="preview_list preview_list_file fileItem">
+
+                </ul>
+            </div>
+        </div>
+    </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="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>
+        <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">链接</div>
+    </span>
+            <div class="btn_group">
+                <div class="group_item fl">
+                    <s class="icon state unfold" title="点击权限"></s>
+                    <span>权限</span>
+                </div>
+                <div class="group_item fl">
+                    <s class="icon delete" title="点击删除"></s>
+                    <span>删除</span>
+                </div>
+            </div>
+        </div>
+        <div class="empty_block pos-abt white">
+             <span class="module_icon_white text-center paddinfTop">
+                <i class="clicon-module-link text-white font_sizeI iconfont" style="font-size: 25px">&#59127;</i>
+                <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">链接</div>
+            </span>
+            <div class="pos-abt empty_block_tip text-grey">
+                (请修改)
+            </div>
+        </div>
+        <!--预览 -->
+        <div class="message_preview hides">
+            <div class="preview_list_box not_title">
+                <ul class="preview_list preview_list_links links">
+
+                </ul>
+            </div>
+        </div>
+    </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="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>
+                <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">视频</div>
+            </span>
+            <div class="btn_group">
+                <div class="group_item fl">
+                    <s class="icon state unfold" title="点击权限"></s>
+                    <span>权限</span>
+                </div>
+                <div class="group_item fl">
+                    <s class="icon delete" title="点击删除"></s>
+                    <span>删除</span>
+                </div>
+            </div>
+        </div>
+        <div class="empty_block pos-abt  white block_b ">
+             <span class="module_icon_white text-center paddinfTop">
+                <i class="clicon-module-link text-grey font_sizeI iconfont" style="font-size: 25px">&#59424;</i>
+            <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">视频</div>
+            </span>
+            <div class="pos-abt empty_block_tip text-grey">
+                (请修改)
+            </div>
+        </div>
+        <!-- 预览 -->
+        <div class="message_preview hides">
+            <div class="preview_list_box not_title">
+                <p class="aum-p"> </p>
+                <div class=" am-slider-default" data-am-flexslider="" id="demo-slider-0">
+                    <ul class="am-slides videoItem">
+                        <video style="width:100%; height:auto;max-height: 174px;" controls="controls">
+                            <source src=""></source>
+                        </video>
+                        <br />
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </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="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>
+                <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">设备铭牌</div>
+            </span>
+            <div class="btn_group">
+                <div class="group_item fl">
+                    <s class="icon state unfold" title="点击权限"></s>
+                    <span>权限</span>
+                </div>
+                <div class="group_item fl">
+                    <s class="icon delete" title="点击删除"></s>
+                    <span>删除</span>
+                </div>
+            </div>
+        </div>
+        <div class="empty_block pos-abt white block_b">
+             <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>
+                <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">设备铭牌</div>
+            </span>
+            <div class="pos-abt empty_block_tip text-grey">
+                (请修改)
+            </div>
+        </div>
+        <!-- 预览 -->
+        <div class="message_preview hides">
+            <div class="preview_list_box not_title">
+                <ul class="preview_list preview_list_customfield deviceItem">
+
+                </ul>
+            </div>
+        </div>
+    </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="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>
+                <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">记录管理</div>
+            </span>
+            <div class="btn_group">
+                <div class="group_item fl">
+                    <s class="icon state unfold" title="点击权限"></s>
+                    <span>权限</span>
+                </div>
+                <div class="group_item fl">
+                    <s class="icon delete" title="点击删除"></s>
+                    <span>删除</span>
+                </div>
+            </div>
+        </div>
+        <div class="empty_block pos-abt white block_b">
+            <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>
+                <div class="p-a-0 text-white" style="margin-top:2px;font-size: 12px;text-align: center;">记录管理</div>
+            </span>
+            <div class="pos-abt empty_block_tip text-grey">
+                (请修改)
+            </div>
+        </div>
+        <!-- 预览 -->
+        <div class="message_preview message-preview-a hides">
+            <div class="preview_list_box not_title">
+                <p class="aum-p"> </p>
+            </div>
+        </div>
+    </div>
+</script>
+<script src="../../lib/layui/layui.js" charset="utf-8"></script>
+<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/pulic.js"></script>
+<script src="../../static/js/editpulic.js"></script>
+<script type="text/javascript">
+    layui.extend({
+        admin: '{/}../../static/js/admin'
+    });
+    layui.use(['form','layer','admin','jquery'], function(){
+        var form = layui.form,
+            admin = layui.admin,
+            layer = layui.layer,
+            $=layui.jquery;
+        form.render();
+    });
+</script>
+</body>
+
+</html>

+ 235 - 0
pages/editQRcode/imageAtlas.html

@@ -0,0 +1,235 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>添加分类</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font-awesome.min.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+        .layui-form-label{
+            width: 100px;
+        }
+        .layui-input-block{
+            margin-left: 138px;
+        }
+        .w-e-toolbar{
+            padding: 0 !important;
+        }
+        .w-e-toolbar .w-e-menu{
+            padding: 5px 4px !important;
+        }
+        .operation i{
+            margin: 0 3px;
+        }
+    </style>
+</head>
+
+<body>
+<div class="weadmin-body" style="padding: 20px 0">
+    <form class="layui-form">
+        <div class="layui-form-item">
+            <label class="layui-form-label">
+                图集标题:
+            </label>
+            <div class="layui-input-block steta_grouds">
+                <input type="text" placeholder="请输入图集标题" class="layui-input textName" oninput="pureTextTitles(this.value)">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">图集:</label>
+            <div class="layui-input-block">
+                <div class="imageAtlas_items">
+
+                </div>
+                <button type="button" class="layui-btn" id="upload1">
+                    <i class="layui-icon">&#xe67c;</i>上传图片
+                </button>
+            </div>
+        </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>
+<script>
+    layui.use(['form','layer','jquery','upload'], function(){
+        var form = layui.form,
+            $ = layui.jquery,
+            upload= layui.upload,
+            layer = layui.layer;
+        form.render();
+        window.pureTextTitles = function (title) {
+            parent.onFocus();
+            parent.pureTextTitle(title)
+        };
+        if (sessionStorage.getItem('module') == 'true') {
+            QRcodeImageAtle();
+        }
+        var index,num = 0,bums = 0;
+        var uploadInst = upload.render({
+            elem: '#upload1'
+            ,url: 'http://apptest.jieweizhineng.com/api/swagger/api/common/v1/uploadFile'
+            ,before: function(obj){
+                index = layer.load(2);
+                obj.preview(function(index, file, result){
+
+                });
+            }
+            ,done: function(res){
+                //上传成功
+                layer.close(index);
+                if(res.code == 200){
+                    var muns = bums++ +1;
+                    parent.onFocus();
+                    parent.uploadImageAtlas(res.data.fullURL,muns);
+                    var str = `
+                        <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">
+                            </div>
+                            <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>`;
+                    $('.imageAtlas_items').append(str);
+                    return layer.msg('上传成功');
+                }
+                //如果上传失败
+                layer.msg('上传失败');
+            }
+            ,error: function(){
+                layer.msg('请检查网络!');
+            }
+        });
+        $('body').on('click','.deleteLink',function () {
+            $(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);
+        });
+        // 上移
+        $("body") .on("click",".moveUp",function () {
+            var index = $(this).parent().parent();
+            if(index.index() != 0){
+                index.prev().before(index);
+            }else {
+                layer.msg('已经移至最高点', {icon: 8});
+            }
+        });
+        // 下移
+        $("body") .on("click",".moveDown",function () {
+            var index = $(this).parent().parent();
+            if(index.index() != $(".imageAtlas_tiem").length-1){
+                index.next().after(index);
+            }else {
+                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")
+            }
+        };
+        $('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;
+            }
+            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.imageName = $(this).attr('img-name');
+                imageAtlas.imageUrl = $(this).attr('img-url');
+                imageAtlasArray.push(imageAtlas)
+            });
+            $.ajax({
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addPicture',
+                type:'post',
+                data:JSON.stringify(imageAtlasArray),
+                contentType:'application/json;charset=utf-8',
+                dataType:'json',
+                success:function (res) {
+                    if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
+                        layer.msg('图集新增成功');
+                    }else {
+                        layer.msg('图集新增失败,请检查信息');
+                    }
+                },
+                error:function () {
+                    layer.msg('网络错误,请检查网络');
+                }
+            })
+        });
+        // 数据回显
+        function QRcodeImageAtle() {
+            $.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") {
+                            $('.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}">
+                                    <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">
+                                    </div>
+                                    <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>`;
+                                $('.imageAtlas_items').append(str);
+                            }
+                        }
+                    }
+                },
+                error:function () {
+                    layer.msg('请检查网络', {icon: 2});
+                }
+            });
+        }
+    });
+</script>
+</body>
+
+</html>

+ 193 - 0
pages/editQRcode/imageText.html

@@ -0,0 +1,193 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>添加分类</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+        .layui-form-label{
+            width: 100px;
+        }
+        .layui-input-block{
+            margin-left: 138px;
+        }
+        .w-e-toolbar{
+            padding: 0 !important;
+        }
+        .w-e-toolbar .w-e-menu{
+            padding: 5px 4px !important;
+        }
+
+    </style>
+</head>
+
+<body>
+<div class="weadmin-body">
+    <form class="layui-form">
+        <div class="layui-form-item">
+            <label class="layui-form-label">
+                图文标题:
+            </label>
+            <div class="layui-input-block steta_grouds">
+                <input type="text" placeholder="请输入图片名称" class="layui-input textName" oninput="pureTextTitles(this.value)">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">图片:</label>
+            <div class="layui-input-block">
+                <button type="button" class="layui-btn" id="upload1">
+                    <i class="layui-icon">&#xe67c;</i>上传图片
+                </button>
+                <div class="layui-upload-list hides">
+                    <img class="layui-upload-img image1" id="image1">
+                    <i id="delete_i" class="iconfont">&#59037;</i>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">图文内容:</label>
+            <div class="layui-input-block">
+                <div id="editor">
+
+                </div>
+            </div>
+        </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>
+<script src="//unpkg.com/wangeditor/release/wangEditor.min.js" charset="utf-8"></script>
+<script src="../../static/js/base64.js"></script>
+<script>
+    var E = window.wangEditor;
+    var editor = new E('#editor');
+    // 或者 var editor = new E( document.getElementById('editor') )
+    editor.create();
+    layui.use(['form','layer','jquery','upload'], function(){
+        var form = layui.form,
+            $ = layui.jquery,
+            upload = layui.upload,
+            layer = layui.layer;
+        form.render();
+        if (sessionStorage.getItem('module') == 'true') {
+            QRcodeImageText();
+        }
+        window.pureTextTitles = function (title) {
+            parent.onFocus();
+            parent.pureTextTitle(title)
+        };
+        var base64 = new Base64();
+        var base64Text="";
+        //图片上传
+        var index,imageName,imageUrl;
+        var uploadInst = upload.render({
+            elem: '#upload1'
+            ,url: 'http://apptest.jieweizhineng.com/api/swagger/api/common/v1/uploadFile'
+            ,before: function(obj){
+                index = layer.load(2);
+                obj.preview(function(index, file, result){
+                    parent.onFocus();
+                    $('.layui-upload-list').removeClass("hides");
+                    $('#image1').attr('src', result);
+                    parent.uploadImage(result);
+                });
+            }
+            ,done: function(res){
+                //上传成功
+                layer.close(index)
+                if(res.code == 200){
+                    imageName = res.data.fileName;
+                    imageUrl = res.data.fullURL;
+                    return layer.msg('上传成功');
+                }
+                //如果上传失败
+                layer.msg('上传失败');
+            }
+            ,error: function(){
+                layer.msg('请检查网络!');
+            }
+        });
+        $('body').on('click','#delete_i',function () {
+            $('.layui-upload-list').addClass("hides");
+            $('#image1').attr('src','');
+            imageName ="";imageUrl="";
+            parent.deleteImage()
+        });
+        document.getElementById('editor').addEventListener('input', function () {
+            var content = editor.txt.html();
+            parent.textInfo(content)
+        }, false);
+        $('body').on("click",".imageTextBtn",function () {
+            base64Text = base64.encode(editor.txt.html());
+            if ($('.textName').val() === "" || editor.txt.text() === "" || imageName ==="" || imageUrl === "") {
+                layer.msg('图文信息不能为空');
+                return false;
+            }
+            var QRcodeInfo = {
+                data:base64Text,
+                imageName:imageName,
+                imageUrl:imageUrl,
+                pageId:sessionStorage.getItem("QRcodeID"),
+                title:$('.textName').val(),
+            };
+            $.ajax({
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addImageText',
+                type:'post',
+                data:QRcodeInfo,
+                dataType:'json',
+                success:function (res) {
+                    if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
+                        layer.msg('图文新增成功');
+                    }else {
+                        layer.msg('图文新增失败,请检查信息');
+                    }
+                },
+                error:function () {
+                    layer.msg('网络错误,请检查网络');
+                }
+            })
+        });
+        // 数据回显
+        function QRcodeImageText() {
+            $.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) {
+                            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);
+                            $('.layui-upload-list').removeClass('hides');
+                            editor.txt.html(str)
+                        }
+                    }
+                },
+                error:function () {
+                    layer.msg('请检查网络', {icon: 2});
+                }
+            });
+        }
+    });
+</script>
+</body>
+
+</html>

+ 143 - 0
pages/editQRcode/pureText.html

@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+        .layui-form-label{
+            width: 100px;
+        }
+        .layui-input-block{
+            margin-left: 138px;
+        }
+        .w-e-toolbar{
+            padding: 0 !important;
+        }
+        .w-e-toolbar .w-e-menu{
+            padding: 5px 4px !important;
+        }
+    </style>
+</head>
+
+<body>
+<div class="weadmin-body">
+    <form 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)">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">文本内容:</label>
+            <div class="layui-input-block">
+                <div id="editor">
+
+                </div>
+            </div>
+        </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>
+</div>
+<script src="../../lib/layui/layui.js" charset="utf-8"></script>
+<script src="//unpkg.com/wangeditor/release/wangEditor.min.js" charset="utf-8"></script>
+<script src="../../static/js/base64.js"></script>
+<script>
+    var E = window.wangEditor;
+    var editor = new E('#editor');
+    editor.create();
+    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();
+        var base64Text="";
+        if (sessionStorage.getItem('module') == 'true') {
+            QRcodePureText();
+        }
+        window.pureTextTitles = function (title) {
+            parent.onFocus();
+            parent.pureTextTitle(title)
+        };
+        document.getElementById('editor').addEventListener('input', function () {
+            var content = editor.txt.html();
+            parent.pureTextTitleName(content)
+        }, false);
+        document.getElementById('editor').addEventListener('click', function () {
+            parent.onFocus()
+        }, false);
+        $('body').on("click",".pureTextSubmit",function () {
+            base64Text = base64.encode(editor.txt.html());
+            var QRcodeInfo = {
+                data:base64Text,
+                pageId:sessionStorage.getItem("QRcodeID"),
+                title:$('.textName').val(),
+            };
+            if ($('.textName').val() === "" || editor.txt.text() === "") {
+                layer.msg('纯文本信息不能为空');
+                return false;
+            }
+            $.ajax({
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addText',
+                type:'post',
+                data:QRcodeInfo,
+                dataType:'json',
+                success:function (res) {
+                    if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
+                        layer.msg('文本新增成功');
+                    }else {
+                        layer.msg('文本新增失败,请检查信息');
+                    }
+                },
+                error:function () {
+                    layer.msg('网络错误,请检查网络');
+                }
+            })
+        });
+        // 数据回显
+        function QRcodePureText() {
+            $.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) {
+                            var str = base64.decode(res.data.pageItemList[i].textVo.dataContent);
+                            $('.textName').val(res.data.pageItemList[i].textVo.title);
+                            editor.txt.html(str)
+                        }
+                    }
+                },
+                error:function () {
+                    layer.msg('请检查网络', {icon: 2});
+                }
+            });
+        }
+    });
+</script>
+</body>
+
+</html>

+ 140 - 0
pages/editQRcode/recordAdmin.html

@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../static/css/font-awesome.min.css">
+    <link rel="stylesheet" href="../../static/css/weadmin.css">
+    <link rel="stylesheet" href="../../static/css/style.css">
+    <!-- 让IE8/9支持媒体查询,从而兼容栅格 -->
+    <!--[if lt IE 9]>
+    <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <style>
+        html{
+            overflow-y: auto;
+        }
+        .layui-form-label{
+            width: 100px;
+        }
+        .layui-input-block{
+            margin-left: 138px;
+        }
+        .w-e-toolbar{
+            padding: 0 !important;
+        }
+        .w-e-toolbar .w-e-menu{
+            padding: 5px 4px !important;
+        }
+    </style>
+</head>
+
+<body>
+<div class="weadmin-body">
+    <form class="layui-form">
+        <div class="layui-form-item">
+            <label class="layui-form-label">
+                记录管理名称:
+            </label>
+            <div class="layui-input-block steta_grouds">
+                <input type="text" placeholder="请输入设备铭牌名称" class="layui-input recordName" oninput="recordTextTitles(this.value)">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">记录模板</label>
+            <div class="layui-input-block">
+                <table class="layui-table table-bordered table-bg">
+                    <thead>
+                        <tr class="text-c">
+                            <th>记录模板</th>
+                            <th>维护部门</th>
+                            <th>操作</th>
+                        </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>
+            <div class="layui-input-block" style="margin-top: 10px">
+                <a href="javascript:;" class="layui-btn layui-btn-normal addRecord">添加其他参数</a>
+            </div>
+        </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>
+<script>
+    layui.use(['form','layer','jquery','laydate'], function(){
+        var form = layui.form,
+            $ = layui.jquery,
+            laydate= layui.laydate,
+            layer = layui.layer;
+        form.render();
+        $("body").on('click','.addRecord',function () {
+            var tbodys = $(".tbodys");
+            parent.depMaintainFun(tbodys);
+        });
+        window.recordTextTitles = function (title) {
+            parent.onFocus();
+            parent.addrecord(title)
+        };
+        $('body').on("click",".recordBtn",function () {
+            var recordTemplate = [] , tr = $('.tbodys tr');
+            var recordTemplateobj = {organizationId:"",organizationName:'',pageId:'',recordName:'',stepIndex:'',templateId:'',templateName:''};
+            var  num = 0;
+            if ($('.recordName').val() === "") {
+                layer.msg('记录模版信息不能为空');
+                return false;
+            }
+            tr.each(function () {
+                recordTemplateobj = {};
+                recordTemplateobj.pageId = sessionStorage.getItem("QRcodeID");
+                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();
+                recordTemplate.push(recordTemplateobj)
+            });
+            console.log(recordTemplate,'recordTemplate');
+            $.ajax({
+                url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addPageRecord',
+                type:'post',
+                data:JSON.stringify(recordTemplate),
+                contentType:'application/json;charset=utf-8',
+                dataType:'json',
+                success:function (res) {
+                    if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
+                        layer.msg('记录模版新增成功');
+                    }else {
+                        layer.msg('记录模版新增失败,请检查信息');
+                    }
+                },
+                error:function () {
+                    layer.msg('网络错误,请检查网络');
+                }
+            })
+        });
+    });
+</script>
+</body>
+
+</html>

+ 150 - 97
static/js/QRcode.js

@@ -12,11 +12,12 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
         laypage	= layui.laypage,
         table	= layui.table;
     var addQRcode = '../../pages/QRcode/addQRcode.html';
-    var updateHtml = '../../pages/admin/updateState.html';
+    var updateHtml = '../../pages/editQRcode/editQRcode.html';
     // 部门
     var belpID = 'root';
     delpFun();
     function delpFun(){
+        sessionStorage.setItem("depID",'root');
         $.ajax({
             url:'http://apptest.jieweizhineng.com/api/section/getlist',
             method:'get',
@@ -66,14 +67,12 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
     };
     getStateList(info);
     function getStateList(res) {
-        // var index = layer.load(2);
         $.ajax({
             url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageList',
             method: 'get',
             dataType: 'json',
             data: res,
             success: function (data) {
-                console.log(data,'title')
                 laypage.render({
                     elem: 'pageItem',
                     count: data.count,
@@ -144,6 +143,26 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
 
         getStateList(info)
     });
+    // 生成uid
+    function creatuuid(len, radix) { // len位数,radix基数
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+        var uuid = [], i;
+        radix = radix || chars.length;
+        if (len) {
+            for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random()*radix];
+        } else {
+            var r;
+            uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+            uuid[14] = '4';
+            for (i = 0; i < 36; i++) {
+                if (!uuid[i]) {
+                    r = 0 | Math.random()*16;
+                    uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+                }
+            }
+        }
+        return uuid.join('');
+    }
     // 监听状态table
     table.on('tool(stateItme)', function(obj) {
         if( obj.event === "move"){
@@ -161,10 +180,10 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                     success: function (res) {
                         if (res.code === '200'){
                             layer.msg('复制成功', {icon: 1});
-                            table.reload('idstetaTable');
+                            table.reload('idQRcode');
                         } else{
                             layer.msg('复制失败', {icon: 2});
-                            table.reload('idstetaTable');
+                            table.reload('idQRcode');
                         }
                         layer.close(index);
                     },
@@ -177,118 +196,152 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
         } else if (obj.event === "edit"){
             var objID =obj.data;
             var delobj=[];
+            sessionStorage.setItem("QRcodeDetaileID",obj.data.id);
             layer.open({
                 type: 2,
-                id: 'updateState',
-                title:'修改状态和提醒设置',
+                id: 'updateQRcode',
+                title:'修改二维码',
                 shadeClose: true,
                 scrollbar:true,
                 shade: 0.3,
                 maxmin: true,
                 skin: 'oaBtn',
-                btn: ['确认', '取消'],
-                area: ['500px', '500px'],
+                area: ['100%', '100%'],
                 content: updateHtml,
                 success: function (layero, index) {
+                    var indexk = layer.load(2);
                     var body = layer.getChildFrame('body', index);
-                    body.find('#stetaName').val(obj.data.statusContent);
+                    body.find('#pageFlag').val('true');
+                    var iframeWindow = window['layui-layer-iframe'+ index];
                     $.ajax({
-                        url: 'http://apptest.jieweizhineng.com/api/swagger/api/status/v1/getStatusItemList/'+obj.data.id,
-                        method: 'get',
+                        url: 'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/getPageEdit/'+obj.data.id,
+                        type: 'get',
                         dataType: 'json',
                         success: function (res) {
-                            for (var i=0;i<res.data.length;i++){
-                                var str =`
-                                        <div class="a_itme" id-data="${res.data[i].id}" delete-flay="true">
-                                            <div class="a_colour">
-                                           <span color_data="${res.data[i].statusColor}" style="background: ${res.data[i].statusColor}"></span>
-                                            </div>
-                                            <div class="a_modle">
-                                                <i class="pointedSpan"></i>
-                                                <b class="a_continue">继续</b>
-                                                <b class="a_complete">完成</b>
-                                                <span></span>
-                                                <span></span>
-                                            </div>
-                                            <div class="a_delete">
-                                                <i class="layui-icon layui-icon-delete"></i>
-                                            </div>
-                                      <input type="text" value="${res.data[i].statusContent}" placeholder="请输入状态名称" name="username" required="" lay-verify="required" autocomplete="off" class="layui-input a_steta">
-                                  </div>`;
-                                body.find(".a_itmes").append(str)
+                            var indexk = layer.load(2);
+                            var b = new Base64();
+                            body.find('.edit_head_title').html(res.data.page.title);
+                            var newArray =[];
+                            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])
+                                }
+                            }
+                            console.log(newArray,'newArray')
+                            for (var i = 0; i < newArray.length; i++) {
+                                // 文本
+                                if (newArray[i].textVo != null) {
+                                    var str = b.decode(newArray[i].textVo.dataContent);
+                                    var _modeltemp = '';
+                                    var data_id =creatuuid(12,36);
+                                    _modeltemp = body.find('#temp-1').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.editPureTextTitleName(data_id,newArray[i].textVo.title,str);
+                                }
+                                // 图文
+                                if (newArray[i].imageText != null) {
+                                    var str = b.decode(newArray[i].imageText.dataContent);
+                                    var _modeltemp = '';
+                                    var data_id =creatuuid(12,36);
+                                    _modeltemp = body.find('#temp-2').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.edituploadImage(data_id,newArray[i].imageText.title,newArray[i].imageText.imageUrl,str);
+                                }
+                                // 图集
+                                if (newArray[i].pictureList != null) {
+                                    var _modeltemp = '';
+                                    var data_id =creatuuid(12,36);
+                                    _modeltemp = body.find('#temp-3').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.edituploadImageAtlas(data_id,newArray[i].pictureList);
+                                }
+                                // 文件
+                                if (newArray[i].fileList != null) {
+                                    var _modeltemp = '';
+                                    var data_id =creatuuid(12,36);
+                                    _modeltemp = body.find('#temp-4').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.edituploadFile(data_id,newArray[i].fileList)
+                                }
+                                // 链接
+                                if (newArray[i].linksList !=null) {
+                                    var _modeltemp = '';
+                                    var data_id =creatuuid(12,36);
+                                    _modeltemp = body.find('#temp-5').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.editlinkFun(data_id,newArray[i].linksList)
+                                }
+                                // 视频
+                                if (newArray[i].videoList !=null) {
+                                    var _modeltemp = '';
+                                    var data_id =creatuuid(12,36);
+                                    _modeltemp = body.find('#temp-6').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.editaddVideo(data_id,newArray[i].videoList[0].videoUrl)
+                                }
+                                // 设备铭牌editDevice
+                                if (newArray[i].equipmentList !=null) {
+                                    var _modeltemp = '';
+                                    var data_id =creatuuid(12,36);
+                                    _modeltemp = body.find('#temp-7').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.editDevice(data_id,newArray[i].equipmentList)
+                                }
+                                layer.close(indexk);
+                                // 记录模版
+
                             }
                         },
                         error:function () {
                             layer.msg('请检查网络', {icon: 2});
                         }
                     });
-                    body.delegate('.a_delete','click',function () {
-                        if (body.find(".a_itmes .a_itme").length === 1) {
-                            return;
-                        }else {
-                            var id = $(this).parent().attr("id-data"),
-                                deleteFlay = $(this).parent().attr("delete-flay");
-                            var sonterm = {deleteFlag:deleteFlay,id:id,statusColor:'',statusContent:'',zIndex:''};
-                            delobj.push(sonterm)
-                        }
 
-                    })
                 },
                 yes: function (index, layero) {
-                    var body = layer.getChildFrame('body', index);
-                    var item = body.find('.a_itmes .a_itme');
-                    var a_colour = body.find('.a_colour');
-                    var arr = [];
-                    var ID = [];
-                    var json =[];
-                    var color =[];
-                    var obj = {deleteFlag:'false',id:'',statusColor:'',statusContent:'',zIndex:''};
-                    a_colour.each(function () {
-                        var value = $(this).find('span').attr("color_data");
-                        color.push(value);
-                    });
-                    item.each(function () {
-                        var value = $(this).find('input').val();
-                        var ids = $(this).attr("id-data");
-                        arr.push(value);
-                        ID.push(ids)
-                    });
-                    for (var i = 0; i < arr.length; i++) {
-                        obj = {};
-                        obj.deleteFlag = false;
-                        obj.id = ID[i];
-                        obj.statusColor = color[i];
-                        obj.statusContent = arr[i];
-                        obj.zIndex = i+1;
-                        delobj.push(obj)
-                    }
-                    console.log(delobj,"delobj")
-                    var updateStetaInfo = {
-                        id:objID.id,
-                        statusContent:body.find('#stetaName').val(),
-                        statusItems:delobj,
-                        _method:'put'
-                    };
-                    $.ajax({
-                        url:'http://apptest.jieweizhineng.com/api/swagger/api/status/v1/updateStatus',
-                        method:'POST',
-                        dataType: 'json',
-                        data: updateStetaInfo,
-                        success:function (res) {
-                            if(res.code === '200'){
-                                layer.msg('修改成功', {icon: 1});
-                                table.reload('idstetaTable');
-                                layer.close(index);
-                            }else{
-                                layer.msg('修改失败', {icon: 2});
-                                table.reload('idstetaTable');
-                                layer.close(index);
-                            }
-                        },
-                        error:function (err) {
-                            layer.close(index);
-                        }
-                    })
+
                 }
             })
         } else if (obj.event === "delete"){
@@ -304,10 +357,10 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                     success: function (res) {
                         if (res.code === '200'){
                             layer.msg('删除成功', {icon: 1});
-                            table.reload('idstetaTable');
+                            table.reload('idQRcode');
                         } else{
                             layer.msg('删除失败', {icon: 2});
-                            table.reload('idstetaTable');
+                            table.reload('idQRcode');
                         }
                         layer.close(index);
                     },

+ 84 - 0
static/js/editpulic.js

@@ -0,0 +1,84 @@
+// 纯文本title,图文title
+function editPureTextTitleName(dataID,title,str) {
+        $("[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('.aum-p').html(title);
+        $("[dataId*="+dataID+"]").find('.message_preview').find('.preview_content').html(str);
+}
+// 图文
+function edituploadImage(dataID,title,img,str) {
+        $("[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('.aum-p').html(title);
+        $("[dataId*="+dataID+"]").find('.message_preview').find('.image1').attr('src',img);
+        $("[dataId*="+dataID+"]").find('.message_preview').find('.image1').css({width:'318px',height:'100px'});
+        $("[dataId*="+dataID+"]").find('.message_preview').find('.preview_content').html(str)
+}
+// 图集
+var cur=0;var timer = null;
+function editlunbo(){
+    console.log('jijlai ')
+    var mySwiper = new Swiper('.swiper-container',{
+        autoplay: {
+            delay: 2500,
+            disableOnInteraction: false,
+        },
+    });
+}
+function edituploadImageAtlas(dataID,pictureList) {
+        $("[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 + "]").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()
+        }
+}
+// 文件
+
+function edituploadFile(dataID,fileArray) {
+        $("[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 < fileArray.length; u++) {
+        $("[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) {
+    for (var u = 0;u < linkArray.length; u++) {
+        $("[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(".links").append(`<li class="li_list" index-data="${u}">
+            <p class="list_name preview-p" style="font-weight: normal">${linkArray[u].linkName}</p>
+            <span class="field_type preview-p link_url">${linkArray[u].linkUrl}</span>
+        </li>`);
+    }
+}
+// 视频
+function editaddVideo(dataID,videoUrl) {
+        $("[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) {
+        $("[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 < DeviceArray.length; u++) {
+        $("[dataId*=" + dataID + "]").find('.message_preview').find('.deviceItem').append(
+            `<li class="li_list" index-data="${u}">
+            <p class="list_name preview-p" style="font-weight: normal">${DeviceArray[u].paramName}</p>
+            <span class="field_type preview-p link_url">${DeviceArray[u].paramContent}</span>
+        </li>`);
+    }
+}

+ 98 - 39
static/js/pulic.js

@@ -32,6 +32,7 @@ $(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;
@@ -39,7 +40,6 @@ $(function (){
             $('.pam-us0').addClass('hides').removeClass('shows');
             $('.yw-an-rela').css('top',top+'px').css('display','block');
             var _tab = $(this).attr('index');
-            console.log(_tab,'_tab')
             loadht($(this).attr('dataId'),_tab);
         }else{
             $('.yw-an-rela').show();
@@ -62,20 +62,19 @@ $(function() {
                  */
                 $(this).attr("sort",i+1);
             });
-
             // 支持拖拽的保存
-            // var array = [];
-            // $("#module_box .sortable-dragging").each(function(i,p){
-            //     var relationId = $(this).attr('relationid');
-            //     if(relationId){
-            //         var zIndex = $(this).attr("sort");
-            //         var html ={id:relationId, zIndex:zIndex};
-            //         array.push(html);
-            //     }
-            // });
-            // if(array.length != 0 ){
-            //     updateIndex(array);
-            // }
+            var array = [];
+            $("#module_box .sortable-dragging").each(function(i,p){
+                var relationId = $(this).attr('pageRelationId');
+                if(relationId){
+                    var zIndex = $(this).attr("sort");
+                    var html ={pageRelationId:relationId, zIndex:zIndex};
+                    array.push(html);
+                }
+            });
+            if(array.length != 0 ){
+                QRcodeindex(array);
+            }
         }
     });
     $(".boxs" ).disableSelection();
@@ -171,25 +170,29 @@ $(function() {
     $('.module_box').on('click','.icon.unfold',function(event){
         stopBubble(event);
         console.log(event,'event')
-        var eliment = $(this).parents('.sortable-dragging');
-        var relationId = eliment.attr('pageRelationId');
-        // if(relationId){
-        layer.open({
-            type: 2,
-            id: 'addJuid',
-            title: '增加权限',
-            shadeClose: true,
-            scrollbar: true,
-            shade: 0.3,
-            maxmin: true,
-            skin: 'oaBtn',
-            area: ['500px', '500px'],
-            content: '../../pages/QRcode/Jurisdiction.html',
+        if($('#pageFlag').val()!=''&&eval($('#pageFlag').val())) {
+            var eliment = $(this).parents('.sortable-dragging');
+            var relationId = eliment.attr('pageRelationId');
+            if(relationId){
+            layer.open({
+                type: 2,
+                id: 'addJuid',
+                title: '增加权限',
+                shadeClose: true,
+                scrollbar: true,
+                shade: 0.3,
+                maxmin: true,
+                skin: 'oaBtn',
+                area: ['500px', '500px'],
+                content: '../../pages/QRcode/Jurisdiction.html',
 
-        });
-            // layer.full(index);
+            });
+            layer.full(index);
 
-        // }
+            }
+        }else {
+            layer.alert('请先编辑新增二维码!', {icon: 7});
+        }
     });
 });
 // 删除二维码新建信息
@@ -302,13 +305,13 @@ function userGroup() {
         },
         yes: function (index, layero) {
             var body1 = layer.getChildFrame('body', 0);
-            // var body = layer.getChildFrame('body', index);
-            // var value = body.find('.deptext').html();
-            // var sonNodeID = body.find(".deptext").attr("sonNode-id");
-            // var parentID = body.find(".deptext").attr("parentID");
-            // body1.find('#depName').val(value);
-            // body1.find('#depName').attr("sonNode-id",sonNodeID);
-            // body1.find('#depName').attr("parentID",parentID);
+            var body = layer.getChildFrame('body', index);
+            var value = body.find('.deptext').html();
+            var sonNodeID = body.find(".deptext").attr("sonNode-id");
+            var parentID = body.find(".deptext").attr("parentID");
+            body1.find('.textarea').val(value);
+            body1.find('.textareaID').html(sonNodeID);
+            body1.find('.textarea').attr("parentID",parentID);
             layer.close(index);
         }
     })
@@ -318,13 +321,13 @@ var dataID,sortable,sortableID;
 function onFocus() {
      dataID = $('#dataId').val(),
      sortable = $('.sortable-dragging');
+     console.log(dataID,sortable,'sortable')
      sortable.each(function () {
         $(this).attr('dataId');
         if ($(this).attr('dataId') === dataID) {
             sortableID = $(this).attr('dataId')
         }
     });
-
 }
 // 二维码名称
 function QRcodeName(text) {
@@ -385,6 +388,7 @@ function textInfo(content) {
 // 图集
 var cur=0;var timer = null;
 function lunbo(){
+    console.log('jijlai ')
     var mySwiper = new Swiper('.swiper-container',{
         autoplay: {
             delay: 2500,
@@ -528,6 +532,7 @@ function deviceContentFun(text,index) {
 }
 // 删除
 function deleteDevice(index) {
+    console.log(sortableID,dataID,'dataIDdataIDdataID',index);
     if (sortableID === dataID){
         $("[dataId*="+dataID+"]").find('.empty_block').removeClass('block_b');
         $("[dataId*="+dataID+"]").find('.empty_block').addClass('hides');
@@ -537,6 +542,17 @@ function deleteDevice(index) {
         return false;
     }
 }
+// 记录模版
+function addrecord(title) {
+    if (sortableID === dataID){
+        $("[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('.aum-p').html(title)
+    }else {
+        return false;
+    }
+}
 // 给二维码模块添加模块id
 function pageRelationIdFun(id) {
     if (sortableID === dataID){
@@ -545,3 +561,46 @@ function pageRelationIdFun(id) {
         return false;
     }
 }
+// 更新二维码索引下标
+function QRcodeindex(array) {
+    $.ajax({
+        url: "http://apptest.jieweizhineng.com/api/swagger/api/page/v1/updateIndex",
+        type:'post',
+        contentType:'application/json;charset=utf-8',
+        data:JSON.stringify(array),
+        dataType: "json",
+        success:function (res) {
+            console.log(res)
+        },
+        error:function () {
+
+        }
+    })
+}
+// 点击保存更新二维码下标
+function QRcodeIndexas() {
+    var array = [],num = 0;
+    $("#module_box .sortable-dragging").each(function(i,p){
+        var relationId = $(this).attr('pageRelationId');
+        if(relationId){
+            var zIndex = num ++ +1;
+            var html ={pageRelationId:relationId, zIndex:zIndex};
+            array.push(html);
+        }
+    });
+    if(array.length != 0 ){
+        $.ajax({
+            url: "http://apptest.jieweizhineng.com/api/swagger/api/page/v1/updateIndex",
+            type:'post',
+            contentType:'application/json;charset=utf-8',
+            data:JSON.stringify(array),
+            dataType: "json",
+            success:function (res) {
+                console.log(res)
+            },
+            error:function () {
+
+            }
+        })
+    }
+}

+ 10 - 11
static/js/recordTemplate.js

@@ -448,8 +448,8 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                         }else {
                             inputItems =""
                         }
-                        inputList.businessType = businessType == undefined ? "" : businessType;
-                        inputList.inputItems = inputItems == "" ? "" : JSON.parse(inputItems);
+                        inputList.businessType = businessType == undefined ? " " : businessType;
+                        inputList.inputItems = inputItems == "" ? [] : JSON.parse(inputItems);
                         inputList.inputName = value;
                         inputList.inputType = inputType;
                         inputList.isEchart = isEchart;
@@ -491,9 +491,9 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     });
                     var updateStetaInfo = {
                         templateName:body.find(".TemplateName").val(),
-                        remark:body.find(".Templatereamk").val(),
-                        statusContent:body.find(".textContent").val(),
-                        statusName:body.find(".textName").val(),
+                        remark:body.find(".Templatereamk").val() == ""? " ":body.find(".Templatereamk").val(),
+                        statusContent:body.find(".textContent").val() ==" "? "" : body.find(".textContent").val(),
+                        statusName:body.find(".textName").val() == ""? " " : body.find(".textName").val(),
                         departmentId:belpID,
                         checkItemList:checkItemArray,
                         inputList:recordArray,
@@ -629,7 +629,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                         inputItems =""
                     }
                     inputList.businessType = businessType == undefined ? "" : businessType;
-                    inputList.inputItems = inputItems == "" ? "" : JSON.parse(inputItems);
+                    inputList.inputItems = inputItems == "" ? [] : JSON.parse(inputItems);
                     inputList.inputName = value;
                     inputList.inputType = inputType;
                     inputList.isEchart = isEchart;
@@ -657,15 +657,14 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     checkItemArray.push(checkItemList)
                 });
                 var addStetaInfo = {
-                    templateName:body.find(".TemplateName").val(),
-                    remark:body.find(".Templatereamk").val(),
-                    statusContent:body.find(".textContent").val(),
-                    statusName:body.find(".textName").val(),
+                    templateName:body.find(".TemplateName").val() == ""? "":body.find(".TemplateName").val(),
+                    remark:body.find(".Templatereamk").val() == "" ? "":body.find(".Templatereamk").val(),
+                    statusContent:body.find(".textContent").val() == ""?"":body.find(".textContent").val(),
+                    statusName:body.find(".textName").val() == "" ? "" :body.find(".textName").val() == "",
                     departmentId:belpID,
                     checkItemList:checkItemArray,
                     inputList:recordArray,
                     recordStatusList:recordStatusList,
-
                 };
                 $.ajax({
                     method:'post',