code

.idea/workspace.xml

@@ -2,36 +2,7 @@
 <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/" />
@@ -58,11 +29,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/static/js/pulic.js">
           <provider selected="true" editor-type-id="text-editor">
-            <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" />
+            <state relative-caret-position="309">
+              <caret line="320" column="16" selection-start-line="320" selection-start-column="9" selection-end-line="320" selection-end-column="16" />
               <folding>
                 <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
               </folding>
@@ -93,21 +64,12 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/editQRcode/addDevice.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="361">
+            <state relative-caret-position="-71">
               <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$/static/js/recordTemplate.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <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/editQRcode/addLink.html">
           <provider selected="true" editor-type-id="text-editor">
@@ -120,7 +82,7 @@
       <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="533">
+            <state relative-caret-position="309">
               <caret line="322" column="107" selection-start-line="322" selection-start-column="107" selection-end-line="322" selection-end-column="107" />
             </state>
           </provider>
@@ -178,8 +140,8 @@
         <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$/static/js/pulic.js" />
       </list>
     </option>
   </component>
@@ -272,12 +234,12 @@
       <updated>1555581172311</updated>
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
-      <workItem from="1555841941143" duration="39368000" />
+      <workItem from="1555841941143" duration="39627000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="47742000" />
+    <option name="totallyTimeSpent" value="48001000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -492,13 +454,6 @@
         </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="367">
@@ -529,27 +484,34 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/pulic.js">
+    <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="-2711">
+          <caret line="451" column="68" selection-start-line="451" selection-start-column="68" selection-end-line="451" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addDevice.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-71">
+          <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$/static/js/QRcode.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="533">
+        <state relative-caret-position="309">
           <caret line="322" column="107" selection-start-line="322" selection-start-column="107" selection-end-line="322" selection-end-column="107" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
+    <entry file="file://$PROJECT_DIR$/static/js/pulic.js">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="309">
+          <caret line="320" column="16" selection-start-line="320" selection-start-column="9" selection-end-line="320" selection-end-column="16" />
+          <folding>
+            <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

pages/QRcode/addDevice.html

@@ -95,6 +95,7 @@
         });
         $('body').on('click','.deleteLink',function () {
             $(this).parent().parent().remove();
+            parent.onFocus();
             parent.deleteDevice($(this).parent().parent().attr('index-data'))
         });
         // 上移

pages/QRcode/addLink.html

@@ -92,6 +92,7 @@
         });
         $('body').on('click','.deleteLink',function () {
             $(this).parent().parent().remove();
+            parent.onFocus();
             parent.deletaLink($(this).parent().parent().attr('index-data'))
         })
         // 上移

pages/editQRcode/addDevice.html

@@ -98,6 +98,7 @@
         });
         $('body').on('click','.deleteLink',function () {
             $(this).parent().parent().remove();
+            parent.onFocus();
             parent.deleteDevice($(this).parent().parent().attr('index-data'))
         });
         // 上移

pages/editQRcode/addLink.html

@@ -95,6 +95,7 @@
         });
         $('body').on('click','.deleteLink',function () {
             $(this).parent().parent().remove();
+            parent.onFocus();
             parent.deletaLink($(this).parent().parent().attr('index-data'))
         })
         // 上移

static/js/pulic.js

@@ -319,9 +319,10 @@ function userGroup() {
 // 内容联动
 var dataID,sortable,sortableID;
 function onFocus() {
+    console.log('ress')
      dataID = $('#dataId').val(),
      sortable = $('.sortable-dragging');
-     console.log(dataID,sortable,'sortable')
+     console.log(dataID,'sortable')
      sortable.each(function () {
         $(this).attr('dataId');
         if ($(this).attr('dataId') === dataID) {