cheshi

.idea/workspace.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="92e76c55-ad95-4e21-b088-a7137f395ba7" name="Default Changelist" comment="">
-      <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/" />
@@ -29,10 +29,10 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="309">
+            <state relative-caret-position="-3642">
               <caret line="320" column="16" selection-start-line="320" selection-start-column="9" selection-end-line="320" selection-end-column="16" />
               <folding>
                 <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
@@ -64,8 +64,35 @@
       <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="-71">
-              <caret line="86" column="133" selection-start-line="86" selection-start-column="133" selection-end-line="86" selection-end-column="133" />
+            <state relative-caret-position="262">
+              <caret line="100" column="29" lean-forward="true" selection-start-line="100" selection-start-column="12" selection-end-line="100" selection-end-column="29" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="405">
+              <caret line="628" column="38" selection-start-line="628" selection-start-column="38" selection-end-line="628" selection-end-column="38" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/QRcode/addDevice.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="229">
+              <caret line="97" column="29" selection-start-line="97" selection-start-column="29" selection-end-line="97" selection-end-column="29" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/QRcode/addLink.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="261">
+              <caret line="94" column="29" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" />
             </state>
           </provider>
         </entry>
@@ -73,8 +100,8 @@
       <file pinned="false" current-in-tab="false">
         <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 relative-caret-position="-1077">
+              <caret line="97" column="29" selection-start-line="97" selection-start-column="29" selection-end-line="97" selection-end-column="29" />
             </state>
           </provider>
         </entry>
@@ -121,9 +148,7 @@
         <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/imageText.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/imageText.html" />
@@ -132,16 +157,18 @@
         <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$/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/recordTemplate.js" />
         <option value="$PROJECT_DIR$/static/js/pulic.js" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/addDevice.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/addDevice.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/addLink.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/addLink.html" />
+        <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
       </list>
     </option>
   </component>
@@ -234,12 +261,12 @@
       <updated>1555581172311</updated>
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
-      <workItem from="1555841941143" duration="39627000" />
+      <workItem from="1555841941143" duration="40320000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="48001000" />
+    <option name="totallyTimeSpent" value="48694000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -302,13 +329,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/addLink.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <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="505">
@@ -388,20 +408,6 @@
         </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">
@@ -484,30 +490,44 @@
         </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="-2711">
-          <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="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/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 relative-caret-position="262">
+          <caret line="100" column="29" lean-forward="true" selection-start-line="100" selection-start-column="12" selection-end-line="100" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addDevice.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="309">
-          <caret line="322" column="107" selection-start-line="322" selection-start-column="107" selection-end-line="322" selection-end-column="107" />
+        <state relative-caret-position="229">
+          <caret line="97" column="29" selection-start-line="97" selection-start-column="29" selection-end-line="97" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addLink.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="261">
+          <caret line="94" column="29" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addLink.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1077">
+          <caret line="97" column="29" selection-start-line="97" selection-start-column="29" selection-end-line="97" selection-end-column="29" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/static/js/pulic.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="309">
+        <state relative-caret-position="-3642">
           <caret line="320" column="16" selection-start-line="320" selection-start-column="9" selection-end-line="320" selection-end-column="16" />
           <folding>
             <element signature="n#style#0;n#p#0;n#li#0;n#!!top" expanded="true" />
@@ -515,5 +535,12 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="405">
+          <caret line="628" column="38" selection-start-line="628" selection-start-column="38" selection-end-line="628" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

static/js/recordTemplate.js

@@ -626,7 +626,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                         inputItems = $(this).find(".inputJson").val();
 
                     }else {
-                        inputItems =""
+                        inputItems = ""
                     }
                     inputList.businessType = businessType == undefined ? "" : businessType;
                     inputList.inputItems = inputItems == "" ? [] : JSON.parse(inputItems);