css

.idea/workspace.xml

@@ -2,17 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="92e76c55-ad95-4e21-b088-a7137f395ba7" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/pages/ztree/ztree.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/css/zTreeStyle.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/images/loading.gif" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/images/zTreeStandard.gif" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/images/zTreeStandard.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/ztree/jquery.ztree.core.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/ztree/jquery.ztree.excheck.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/imageAtlas.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/imageAtlas.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/admin/addrecordTemplate.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/admin/addrecordTemplate.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/admin/list.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/admin/list.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/admin/updateRecordTemplate.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/admin/updateRecordTemplate.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/editQRcode/addDevice.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/addDevice.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/editQRcode/addFile.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/addFile.html" afterDir="false" />
@@ -20,14 +9,7 @@
       <change beforePath="$PROJECT_DIR$/pages/editQRcode/addVideo.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/addVideo.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/editQRcode/imageAtlas.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/imageAtlas.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/editQRcode/imageText.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/imageText.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/editQRcode/pureText.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/pureText.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/editQRcode/recordAdmin.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/recordAdmin.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/QRcode.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/QRcode.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/admin.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/admin.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/editpulic.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/editpulic.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/jjjs.js" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/static/js/recordTemplate.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/recordTemplate.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/state.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/state.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -41,19 +23,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/static/js/state.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="535">
-              <caret line="279" column="53" selection-start-line="279" selection-start-column="53" selection-end-line="279" selection-end-column="53" />
-            </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="560">
-              <caret line="684" column="49" selection-start-line="684" selection-start-column="49" selection-end-line="684" selection-end-column="49" />
+            <state relative-caret-position="542">
+              <caret line="392" column="63" lean-forward="true" selection-start-line="392" selection-start-column="63" selection-end-line="392" selection-end-column="63" />
               <folding>
                 <element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
@@ -78,10 +51,67 @@
         </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/imageText.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="450">
+              <caret line="146" column="66" selection-start-line="146" selection-start-column="66" selection-end-line="146" selection-end-column="66" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageAtlas.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="185">
+              <caret line="171" column="105" selection-start-line="171" selection-start-column="105" selection-end-line="171" selection-end-column="105" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/editQRcode/addVideo.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="233">
+              <caret line="102" column="121" selection-start-line="102" selection-start-column="121" selection-end-line="102" selection-end-column="121" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/editQRcode/addText.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="15">
+              <caret line="135" column="18" selection-start-line="135" selection-start-column="16" selection-end-line="135" selection-end-column="18" />
+              <folding>
+                <element signature="n#style#0;n#div#5;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </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">
+            <state relative-caret-position="341">
+              <caret line="148" column="80" selection-start-line="148" selection-start-column="80" selection-end-line="148" selection-end-column="80" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/editQRcode/addFile.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="263">
+              <caret line="154" column="80" selection-start-line="154" selection-start-column="80" selection-end-line="154" selection-end-column="80" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pages/editQRcode/addDevice.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1118">
-              <caret line="421" column="56" selection-start-line="421" selection-start-column="56" selection-end-line="421" selection-end-column="56" />
+            <state relative-caret-position="231">
+              <caret line="141" column="81" selection-start-line="141" selection-start-column="81" selection-end-line="141" selection-end-column="81" />
             </state>
           </provider>
         </entry>
@@ -89,8 +119,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="406">
-              <caret line="379" column="45" lean-forward="true" selection-start-line="379" selection-start-column="45" selection-end-line="379" selection-end-column="45" />
+            <state relative-caret-position="1923">
+              <caret line="457" column="160" selection-start-line="457" selection-start-column="160" selection-end-line="457" selection-end-column="160" />
+            </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="191">
+              <caret line="199" column="51" selection-start-line="199" selection-start-column="36" selection-end-line="199" selection-end-column="51" />
             </state>
           </provider>
         </entry>
@@ -107,7 +146,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>remove</find>
       <find>yw-an-rela</find>
       <find>delete</find>
       <find>unfold</find>
@@ -135,8 +173,9 @@
       <find>QRcodeID</find>
       <find>linkName</find>
       <find>checkItemArray</find>
-      <find>deletecheckItemArray</find>
       <find>deleteRecord</find>
+      <find>deletecheckItemArray</find>
+      <find>inputItems</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -168,20 +207,20 @@
         <option value="$PROJECT_DIR$/pages/editQRcode/editQRcode.html" />
         <option value="$PROJECT_DIR$/static/js/QRcode.js" />
         <option value="$PROJECT_DIR$/pages/editQRcode/pureText.html" />
-        <option value="$PROJECT_DIR$/pages/editQRcode/imageText.html" />
         <option value="$PROJECT_DIR$/static/js/jjjs.js" />
         <option value="$PROJECT_DIR$/pages/QRcode/imageAtlas.html" />
-        <option value="$PROJECT_DIR$/pages/editQRcode/imageAtlas.html" />
-        <option value="$PROJECT_DIR$/pages/editQRcode/addDevice.html" />
-        <option value="$PROJECT_DIR$/pages/editQRcode/addFile.html" />
-        <option value="$PROJECT_DIR$/pages/editQRcode/addVideo.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/recordAdmin.html" />
-        <option value="$PROJECT_DIR$/pages/editQRcode/addLink.html" />
         <option value="$PROJECT_DIR$/static/js/editpulic.js" />
         <option value="$PROJECT_DIR$/static/js/state.js" />
         <option value="$PROJECT_DIR$/pages/admin/addrecordTemplate.html" />
-        <option value="$PROJECT_DIR$/pages/admin/updateRecordTemplate.html" />
         <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
+        <option value="$PROJECT_DIR$/pages/admin/updateRecordTemplate.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/imageText.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/imageAtlas.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/addVideo.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/addLink.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/addFile.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/addDevice.html" />
       </list>
     </option>
   </component>
@@ -218,6 +257,12 @@
             <path>
               <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="static" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -283,12 +328,12 @@
       <updated>1555581172311</updated>
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
-      <workItem from="1555841941143" duration="82509000" />
+      <workItem from="1555841941143" duration="84537000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="90883000" />
+    <option name="totallyTimeSpent" value="92911000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -443,13 +488,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="179">
-          <caret line="199" column="51" selection-start-line="199" selection-start-column="36" selection-end-line="199" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="418">
@@ -500,13 +538,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageText.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="33">
-          <caret line="124" column="10" lean-forward="true" selection-start-line="124" selection-start-column="10" selection-end-line="124" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/imageAtlas.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
@@ -514,13 +545,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageAtlas.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="171" column="159" selection-start-line="171" selection-start-column="159" selection-end-line="171" selection-end-column="159" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/addDevice.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="588">
@@ -528,13 +552,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="527">
-          <caret line="165" column="19" selection-start-line="165" selection-start-column="19" selection-end-line="165" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/addFile.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="744">
@@ -542,23 +559,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addFile.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="653">
-          <caret line="178" column="18" selection-start-line="178" selection-start-column="18" selection-end-line="178" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addText.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-27">
-          <caret line="135" column="18" selection-start-line="135" selection-start-column="16" selection-end-line="135" selection-end-column="18" />
-          <folding>
-            <element signature="n#style#0;n#div#5;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/addVideo.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="588">
@@ -590,13 +590,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addVideo.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="564">
-          <caret line="121" column="18" selection-start-line="121" selection-start-column="18" selection-end-line="121" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/editQRcode/recordAdmin.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="737">
@@ -604,13 +597,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addLink.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-340">
-          <caret line="84" column="97" selection-start-line="84" selection-start-column="97" selection-end-line="84" selection-end-column="97" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/recordAdmin.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="695">
@@ -625,24 +611,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
+    <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="406">
-          <caret line="379" column="45" lean-forward="true" selection-start-line="379" selection-start-column="45" selection-end-line="379" selection-end-column="45" />
+        <state relative-caret-position="-1118">
+          <caret line="421" column="56" selection-start-line="421" selection-start-column="56" selection-end-line="421" selection-end-column="56" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
+    <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1118">
-          <caret line="421" column="56" selection-start-line="421" selection-start-column="56" selection-end-line="421" selection-end-column="56" />
+        <state relative-caret-position="1923">
+          <caret line="457" column="160" selection-start-line="457" selection-start-column="160" selection-end-line="457" selection-end-column="160" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="560">
-          <caret line="684" column="49" selection-start-line="684" selection-start-column="49" selection-end-line="684" selection-end-column="49" />
+        <state relative-caret-position="542">
+          <caret line="392" column="63" lean-forward="true" selection-start-line="392" selection-start-column="63" selection-end-line="392" selection-end-column="63" />
           <folding>
             <element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
@@ -665,5 +651,64 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="191">
+          <caret line="199" column="51" selection-start-line="199" selection-start-column="36" selection-end-line="199" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageText.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="450">
+          <caret line="146" column="66" selection-start-line="146" selection-start-column="66" selection-end-line="146" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageAtlas.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="185">
+          <caret line="171" column="105" selection-start-line="171" selection-start-column="105" selection-end-line="171" selection-end-column="105" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addVideo.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="233">
+          <caret line="102" column="121" selection-start-line="102" selection-start-column="121" selection-end-line="102" selection-end-column="121" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addText.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="135" column="18" selection-start-line="135" selection-start-column="16" selection-end-line="135" selection-end-column="18" />
+          <folding>
+            <element signature="n#style#0;n#div#5;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addLink.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="341">
+          <caret line="148" column="80" selection-start-line="148" selection-start-column="80" selection-end-line="148" selection-end-column="80" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addFile.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="263">
+          <caret line="154" column="80" selection-start-line="154" selection-start-column="80" selection-end-line="154" selection-end-column="80" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addDevice.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="141" column="81" selection-start-line="141" selection-start-column="81" selection-end-line="141" selection-end-column="81" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

pages/admin/updateRecordTemplate.html

@@ -451,10 +451,11 @@
                 if (inputType != "photo"){
                     businessType =""
                 }
+                console.log(';;$(this).parent().parent().find(".inputJson").html()',$(this).parent().parent().find(".inputJson").html())
                 id = $(this).parent().parent().attr("record-id");
                 deleteFlag = $(this).parent().parent().attr("deleteFlag");
                 inputList.businessType = businessType;
-                inputList.inputItems = JSON.parse($(this).parent().parent().find(".inputJson").html());
+                inputList.inputItems = $(this).parent().parent().find(".inputJson").html() == "null" || $(this).parent().parent().find(".inputJson").html() == ""? [] :JSON.parse($(this).parent().parent().find(".inputJson").html());
                 inputList.inputName = value;
                 inputList.inputType = inputType;
                 inputList.isEchart = isEchart;

pages/editQRcode/addDevice.html

@@ -139,7 +139,7 @@
                 equipmenItem.each(function () {
                     equipmentobj = {};
                     equipmentobj.title = $('.textName').val();
-                    equipmentobj.pageId = sessionStorage.getItem("QRcodeID");
+                    equipmentobj.pageId = sessionStorage.getItem("QRcodeDetaileID");
                     equipmentobj.paramName = $(this).find('.equipmentName').val();
                     equipmentobj.paramContent = $(this).find('.equipmentContent').val();
                     equipmentobj.zIndex = num++ +1;

pages/editQRcode/addFile.html

@@ -148,11 +148,11 @@
         form.on('submit(fileBtn)', function(){
             if (sessionStorage.getItem('QRcodeIDs') == "false") {
                 var fileItemArray = [] , fileItem = $('.fileItem');
-                var fileItemobj = {fileName:"",filePath:'',pageId:sessionStorage.getItem("QRcodeID"),title:$('.textName').val(),fileSize:''};
+                var fileItemobj = {fileName:"",filePath:'',pageId:sessionStorage.getItem("QRcodeDetaileID"),title:$('.textName').val(),fileSize:''};
                 fileItem.each(function () {
                     fileItemobj = {};
                     fileItemobj.title = $('.textName').val();
-                    fileItemobj.pageId = sessionStorage.getItem("QRcodeID");
+                    fileItemobj.pageId = sessionStorage.getItem("QRcodeDetaileID");
                     fileItemobj.fileName = $(this).find('.fileName').val();
                     fileItemobj.filePath = $(this).attr('file-path');
                     fileItemobj.fileSize = $(this).attr('file-size');

pages/editQRcode/addLink.html

@@ -146,7 +146,7 @@
                 linkItem.each(function () {
                     linkItemobj = {};
                     linkItemobj.title = $('.textName').val();
-                    linkItemobj.pageId = sessionStorage.getItem("QRcodeID");
+                    linkItemobj.pageId = sessionStorage.getItem("QRcodeDetaileID");
                     linkItemobj.linkName = $(this).find('.linkName').val();
                     linkItemobj.linkUrl = $(this).find('.linkUrl').val();
                     linkItemobj.remark = $('#LAY_demo_editor').val();

pages/editQRcode/addVideo.html

@@ -100,7 +100,7 @@
         });
         form.on('submit(videoBtn)', function(){
             if (sessionStorage.getItem('QRcodeIDs') == "false") {
-                var videoItemobj = [{videoName:videoName,videoUrl:videoUrl,pageId:sessionStorage.getItem("QRcodeID"),title:$('.textName').val()}];
+                var videoItemobj = [{videoName:videoName,videoUrl:videoUrl,pageId:sessionStorage.getItem("QRcodeDetaileID"),title:$('.textName').val()}];
                 $.ajax({
                     url:'http://apptest.jieweizhineng.com/api/swagger/api/page/v1/addVideo',
                     type:'post',

pages/editQRcode/imageAtlas.html

@@ -169,13 +169,13 @@
         form.on('submit(imageAtlasBtn)', function(){
             if (sessionStorage.getItem('QRcodeIDs') == "false") {
                 var imageAtlasArray = [] , imageAtlas_tiem = $('.imageAtlas_tiem'),num = 0;
-                var imageAtlas = {imageName:"",imageUrl:'',pageId:sessionStorage.getItem("QRcodeID"),title:$('.textName').val(),imageTitle:'',imageLinking:''};
+                var imageAtlas = {imageName:"",imageUrl:'',pageId:sessionStorage.getItem("QRcodeDetaileID"),title:$('.textName').val(),imageTitle:'',imageLinking:''};
                 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.pageId = sessionStorage.getItem("QRcodeDetaileID");
                     imageAtlas.imageName = $(this).attr('img-name');
                     imageAtlas.imageUrl = $(this).attr('img-url');
                     imageAtlasArray.push(imageAtlas)

pages/editQRcode/imageText.html

@@ -144,7 +144,7 @@
                     data:base64Text,
                     imageName:imageName,
                     imageUrl:imageUrl,
-                    pageId:sessionStorage.getItem("QRcodeID"),
+                    pageId:sessionStorage.getItem("QRcodeDetaileID"),
                     title:$('.textName').val(),
                 };
                 $.ajax({

static/js/recordTemplate.js

@@ -408,13 +408,13 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                         recordStatusList.push(recordStatusObj)
                     };
                     // 记录项
-                    var inputList = {businessType:'',inputItems:'',inputName:'',inputType:'',isEchart:'',isOptional:'',remark:'',special:'',zIndex:'',id:'',deleteFlag:''},
+                    var inputList = {businessType:'',inputItems:[],inputName:'',inputType:'',isEchart:'',isOptional:'',remark:'',special:'',zIndex:'',id:'',deleteFlag:''},
                         value,fieldType,inputItems,mandatory,isEchart,inputType,businessType,id,deleteFlag;
                     var record_term = body.find(".record_term");
                     var recordArray =[];
                     var n;
                     // 特殊记录项
-                    var specialObj= {businessType:'',inputItems:'',inputName:"",inputType:'',isEchart:'false',isOptional:'false',remark:'',special:'true',zIndex:1,id:'',deleteFlag:'false'};
+                    var specialObj= {businessType:'',inputItems:[],inputName:"",inputType:'',isEchart:'false',isOptional:'false',remark:'',special:'true',zIndex:1,id:'',deleteFlag:'false'};
                     var specialName = body.find(".specialName").val(),specialRemarks = body.find(".specialRemarks").val(),specialSelect = body.find(".specialSelect").val(),specialID= body.find(".T_recordterm").attr("recordterm-id");
                     if (specialName != "" && specialRemarks != "" && specialSelect != "") {
                         specialObj.inputName = specialName;
@@ -447,9 +447,10 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                             inputItems = $(this).find(".inputJson").val();
 
                         }else {
-                            inputItems =""
+                            inputItems =[]
                         }
-                        inputList.businessType = businessType == undefined ? " " : businessType;
+                        console.log(inputItems == "",'inputItems');
+                        inputList.businessType = businessType == undefined ? "" : businessType;
                         inputList.inputItems = inputItems == "" ? [] : JSON.parse(inputItems);
                         inputList.inputName = value;
                         inputList.inputType = inputType;
@@ -601,13 +602,13 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     recordStatusList.push(recordStatusObj)
                 };
                 // 记录项
-                var inputList = {businessType:'',inputItems:'',inputName:'',inputType:'',isEchart:'',isOptional:'',remark:'',special:'',zIndex:''},
+                var inputList = {businessType:'',inputItems:[],inputName:'',inputType:'',isEchart:'',isOptional:'',remark:'',special:'',zIndex:''},
                 value,fieldType,inputItems,mandatory,isEchart,inputType,businessType;
                 var record_term = body.find(".record_term");
                 var recordArray =[];
                 var n;
                 // 特殊记录项
-                var specialObj= {businessType:'',inputItems:'',inputName:"",inputType:'',isEchart:'false',isOptional:'false',remark:'',special:'true',zIndex:1};
+                var specialObj= {businessType:'',inputItems:[],inputName:"",inputType:'',isEchart:'false',isOptional:'false',remark:'',special:'true',zIndex:1};
                 var specialName = body.find(".specialName").val(),specialRemarks = body.find(".specialRemarks").val(),specialSelect = body.find(".specialSelect").val();
                 if (specialName != "" && specialRemarks != "" && specialSelect != "") {
                     specialObj.inputName = specialName;
@@ -630,10 +631,11 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                         inputItems = $(this).find(".inputJson").val();
 
                     }else {
-                        inputItems = ""
+                        inputItems = []
                     }
+                    console.log(inputItems == [],'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;