Apple 6 år sedan
förälder
incheckning
e9805ea798

+ 12 - 0
.idea/admin.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

+ 4 - 0
.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

+ 6 - 0
.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

+ 8 - 0
.idea/modules.xml

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

+ 6 - 0
.idea/vcs.xml

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

+ 375 - 0
.idea/workspace.xml

@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="92e76c55-ad95-4e21-b088-a7137f395ba7" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/pages/QRcode/Jurisdiction.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/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/" />
+    <ignored path="$PROJECT_DIR$/tmp/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/QRcode/pureText.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>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/static/js/pulic.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="368">
+              <caret line="290" column="20" selection-start-line="290" selection-start-column="20" selection-end-line="290" selection-end-column="20" />
+              <folding>
+                <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/QRcode/Jurisdiction.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" />
+              <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" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-7378" />
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="5854">
+              <caret line="558" column="25" selection-start-line="558" selection-start-column="19" selection-end-line="558" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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" />
+              <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>
+          </provider>
+        </entry>
+      </file>
+      <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>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="HTML File" />
+      </list>
+    </option>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>remove</find>
+      <find>yw-an-rela</find>
+      <find>delete</find>
+      <find>unfold</find>
+    </findStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <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/pureText.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/addText.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/imageAtlas.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/imageText.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/recordAdmin.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/Jurisdiction.html" />
+        <option value="$PROJECT_DIR$/static/js/pulic.js" />
+        <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
+    <option name="x" value="48" />
+    <option name="y" value="23" />
+    <option name="width" value="1392" />
+    <option name="height" value="877" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+              <item name="QRcode" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="js" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="DefaultHtmlFileTemplate" value="HTML File" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <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="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="92e76c55-ad95-4e21-b088-a7137f395ba7" name="Default Changelist" comment="" />
+      <created>1555581172311</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1555581172311</updated>
+      <workItem from="1555581173970" duration="5884000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="5884000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="0" width="1440" height="900" extended-state="6" />
+    <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 anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <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="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" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addDevice.html">
+      <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>
+      </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>
+      </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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="363">
+          <caret line="144" column="40" selection-start-line="144" selection-start-column="40" selection-end-line="144" selection-end-column="40" />
+        </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>
+      </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>
+      </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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/recordAdmin.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-7378" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/pureText.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>
+      </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" />
+          <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>
+      </provider>
+    </entry>
+    <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/Jurisdiction.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" />
+          <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" />
+          </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" />
+          <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">
+      <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>
+      </provider>
+    </entry>
+  </component>
+</project>

+ 98 - 0
pages/QRcode/Jurisdiction.html

@@ -0,0 +1,98 @@
+<!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>
+                    <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>
+    </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",'.options>span',function () {
+            var index = $(this).index();
+            if (index == 0) {
+                $(".textarea").hide();
+                $('.passInput').hide();
+                return;
+            } else if (index == 1) {
+                $(".textarea").show();
+                $('.passInput').hide();
+                return;
+            }else if (index == 2) {
+                $(".textarea").hide();
+                $('.passInput').show();
+                return;
+            }
+        })
+    });
+</script>
+</body>
+
+</html>

+ 1 - 1
pages/QRcode/addDevice.html

@@ -139,8 +139,8 @@
                 contentType:'application/json;charset=utf-8',
                 dataType:'json',
                 success:function (res) {
-                    console.log(res,"res")
                     if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
                         layer.msg('设备铭牌新增成功');
                     }else {
                         layer.msg('设备铭牌新增失败,请检查信息');

+ 1 - 1
pages/QRcode/addFile.html

@@ -153,8 +153,8 @@
                 contentType:'application/json;charset=utf-8',
                 dataType:'json',
                 success:function (res) {
-                    console.log(res,"res")
                     if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
                         layer.msg('文件新增成功');
                     }else {
                         layer.msg('文件新增失败,请检查信息');

+ 1 - 1
pages/QRcode/addLink.html

@@ -157,8 +157,8 @@
                 contentType:'application/json;charset=utf-8',
                 dataType:'json',
                 success:function (res) {
-                    console.log(res,"res")
                     if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
                         layer.msg('链接新增成功');
                     }else {
                         layer.msg('链接新增失败,请检查信息');

+ 8 - 8
pages/QRcode/addQRcode.html

@@ -53,7 +53,7 @@
         <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">
                 <!--text-->
-                <div class="block rela  yx1 xt1749246 customfield  boxs sortable-dragging onbg" dataid="" is_stop="0" is_unfold="1" code="customfield" index="1" sort="1">
+                <div class="block rela  yx1 xt1749246 customfield  boxs sortable-dragging onbg" dataid="" pageRelationId="" is_stop="0" is_unfold="1" code="customfield" index="1" sort="1">
                     <div class="blue_layer">
                         <span class="module_icon_white text-center">
                             <i class="clicon-module-maintain text-white fa fa-file-text-o font_sizeI"></i>
@@ -87,7 +87,7 @@
                     <div class="boxline"></div>
                 </div>
                 <!--图文-->
-                <div class="block rela  yx2 xt1749244 rich_text boxs sortable-dragging" dataid="1749244" is_stop="0" is_unfold="1" code="rich_text" index="2" sort="2">
+                <div class="block rela  yx2 xt1749244 rich_text boxs sortable-dragging" dataid="" pageRelationId="" is_stop="0" is_unfold="1" code="rich_text" index="2" sort="2">
                     <div class="green_layer">
                         <span class="module_icon_white text-center paddinfTop">
                             <i class="clicon-module-imgtxt text-white iconfont font_sizeI">&#59131;</i>
@@ -123,7 +123,7 @@
                     </div>
                 </div>
                 <!--图集-->
-                <div class="block rela  yx3 xt1749602 picture  boxs sortable-dragging" dataid="79TBP86QPL" is_stop="0" is_unfold="1" code="picture" index="3" sort="3">
+                <div class="block rela  yx3 xt1749602 picture  boxs sortable-dragging" dataid="" pageRelationId="" is_stop="0" is_unfold="1" code="picture" index="3" sort="3">
                     <div class="green_layer">
                         <span class="module_icon_white text-center paddinfTop">
                              <i class="clicon-module-imgtxt text-white iconfont font_sizeI">&#59121;</i>
@@ -159,7 +159,7 @@
                     </div>
                 </div>
                 <!--文件-->
-                <div class="block rela yx6 xt1749858 file boxs sortable-dragging" dataid="1749858" is_stop="0" 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="6">
                     <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="1749818" is_stop="0" 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="4">
                     <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>
@@ -219,7 +219,7 @@
                     <div class="boxline"></div>
                 </div>
                 <!--视频-->
-                <div class="block rela yx6 xt1749858 file  boxs sortable-dragging" dataid="HK2GQ6IJYI" is_stop="0" is_unfold="1" code="file" index="6" sort="6">
+                <div class="block rela yx6 xt1749858 file  boxs sortable-dragging" dataid="" is_stop="0" pageRelationId="" is_unfold="1" code="file" index="6" sort="6">
                     <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>
@@ -254,7 +254,7 @@
 
                 </div>
                 <!--设备名牌-->
-                <div class="block rela yx7 xt1749865 sucai boxs sortable-dragging" dataid="STK7PFCLS0" is_stop="0" is_unfold="1" code="sucai" index="7" sort="7">
+                <div class="block rela yx7 xt1749865 sucai boxs sortable-dragging" dataid="" is_stop="0" pageRelationId="" is_unfold="1" code="sucai" index="7" sort="7">
                     <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>
@@ -283,7 +283,7 @@
 
                 </div>
                 <!--记录管理-->
-                <div class="block rela yx8 xt1749867 vcard boxs sortable-dragging" dataid="0HTDP9TFR1" is_stop="0" is_unfold="1" code="vcard" index="8" sort="8">
+                <div class="block rela yx8 xt1749867 vcard boxs sortable-dragging" dataid="" is_stop="0" pageRelationId="" is_unfold="1" code="vcard" index="8" sort="8">
                     <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

@@ -143,7 +143,6 @@
                 data:QRcodeInfo,
                 dataType:'json',
                 success:function (res) {
-                    console.log(res,"res")
                     if (res.code === '200'){
                         sessionStorage.setItem("QRcodeID",res.data);
                         layer.msg('新建成功');

+ 1 - 1
pages/QRcode/addVideo.html

@@ -108,8 +108,8 @@
                 contentType:'application/json;charset=utf-8',
                 dataType:'json',
                 success:function (res) {
-                    console.log(res,"res")
                     if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
                         layer.msg('视频新增成功');
                     }else {
                         layer.msg('视频新增失败,请检查信息');

+ 1 - 1
pages/QRcode/imageAtlas.html

@@ -178,8 +178,8 @@
                 contentType:'application/json;charset=utf-8',
                 dataType:'json',
                 success:function (res) {
-                    console.log(res,"res")
                     if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
                         layer.msg('图集新增成功');
                     }else {
                         layer.msg('图集新增失败,请检查信息');

+ 1 - 1
pages/QRcode/imageText.html

@@ -149,8 +149,8 @@
                 data:QRcodeInfo,
                 dataType:'json',
                 success:function (res) {
-                    console.log(res,"res")
                     if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
                         layer.msg('图文新增成功');
                     }else {
                         layer.msg('图文新增失败,请检查信息');

+ 1 - 1
pages/QRcode/pureText.html

@@ -107,8 +107,8 @@
                 data:QRcodeInfo,
                 dataType:'json',
                 success:function (res) {
-                    console.log(res,"res")
                     if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
                         layer.msg('文本新增成功');
                     }else {
                         layer.msg('文本新增失败,请检查信息');

+ 1 - 1
pages/QRcode/recordAdmin.html

@@ -120,8 +120,8 @@
                 contentType:'application/json;charset=utf-8',
                 dataType:'json',
                 success:function (res) {
-                    console.log(res,"res")
                     if (res.code === '200'){
+                        parent.pageRelationIdFun(res.data);
                         layer.msg('记录模版新增成功');
                     }else {
                         layer.msg('记录模版新增失败,请检查信息');

+ 78 - 14
static/js/pulic.js

@@ -140,36 +140,62 @@ $(function() {
             layer.close(index);
             $('.yw-an-rela').addClass('hides').removeClass('shows');
             eliment.remove();
-            var relationId = eliment.attr('relationid');
+            var relationId = eliment.attr('pageRelationId');
             if(relationId){
-                // $.get(getContextPath() + '/system/page/logicRemove.html', {relationId:relationId}, function(data){
-                // });
+                deleteModular(relationId)
             }
         });
     });
+    // 删除模块
+    function deleteModular(id){
+        var content ={
+            _method:'DELETE',
+            pageRelationId:id
+        };
+        $.ajax({
+            url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/removePagePermission/'+id,
+            type:'post',
+            data:content,
+            dataType:'json',
+            success:function (res) {
+                console.log(res)
+            },
+            error: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('relationid');
-        if(relationId){
-            var index =top.layer.open({
-                type: 2,
-                title: '增加权限',
-                content: getContextPath()+"/system/page/toPer.html?pageId="+ relationId,
-                area: ['600px', '600px'],
-            });
-            layer.full(index);
+        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);
+
+        // }
     });
 });
 // 删除二维码新建信息
 function remove(obj){
     $(obj).parents(".yw-an-rela").hide();
+
 }
 // 文件大小
 var unitArr = new Array("Bytes","KB","MB","GB","TB","PB","EB","ZB","YB"); //文件大小的单位
@@ -257,6 +283,36 @@ function delFun() {
         }
     })
 }
+// 选择用户组
+function userGroup() {
+    layer.open({
+        type: 2,
+        id: 'chooseRecord',
+        title:'选择用户组',
+        shadeClose: true,
+        scrollbar:true,
+        shade: 0.3,
+        maxmin: true,
+        skin: 'oaBtn',
+        btn: ['确认', '取消'],
+        area: ['500px', '500px'],
+        content: 'chooseRecord.html',
+        success: function (layero, index) {
+            var body = layer.getChildFrame('body', index);
+        },
+        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);
+            layer.close(index);
+        }
+    })
+}
 // 内容联动
 var dataID,sortable,sortableID;
 function onFocus() {
@@ -480,4 +536,12 @@ function deleteDevice(index) {
     }else {
         return false;
     }
-}
+}
+// 给二维码模块添加模块id
+function pageRelationIdFun(id) {
+    if (sortableID === dataID){
+        $("[dataId*="+dataID+"]").attr("pageRelationId",id)
+    }else {
+        return false;
+    }
+}

+ 1 - 1
static/js/recordTemplate.js

@@ -556,7 +556,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
         layer.open({
             type: 2,
             id: 'addTemplate',
-            title:'添加状态和提醒设置',
+            title:'添加记录模版',
             shadeClose: true,
             scrollbar:true,
             shade: 0.3,