Apple пре 6 година
родитељ
комит
700b1fad4e
2 измењених фајлова са 21 додато и 25 уклоњено
  1. 20 24
      .idea/workspace.xml
  2. 1 1
      pages/QRcode/addText.html

+ 20 - 24
.idea/workspace.xml

@@ -2,20 +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$/.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/" />
@@ -68,7 +55,7 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="5854">
@@ -77,6 +64,15 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="394">
+              <caret line="131" column="76" selection-start-line="131" selection-start-column="76" selection-end-line="131" selection-end-column="76" />
+            </state>
+          </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">
@@ -133,13 +129,13 @@
         <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" />
+        <option value="$PROJECT_DIR$/pages/QRcode/addText.html" />
       </list>
     </option>
   </component>
@@ -219,12 +215,12 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1555581172311</updated>
-      <workItem from="1555581173970" duration="5884000" />
+      <workItem from="1555581173970" duration="6031000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="5884000" />
+    <option name="totallyTimeSpent" value="6031000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="6" />
@@ -274,13 +270,6 @@
         </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">
@@ -371,5 +360,12 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="394">
+          <caret line="131" column="76" selection-start-line="131" selection-start-column="76" selection-end-line="131" selection-end-column="76" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 1 - 1
pages/QRcode/addText.html

@@ -129,7 +129,7 @@
         $('body').on("click",".a_stetaBtn",function () {
             var QRcodeInfo = {
                 colorType:color,
-                departmentId:sessionStorage.getItem("depID"),
+                departmentId:sessionStorage.getItem("depID") == ""?"root" : sessionStorage.getItem("depID"),
                 remark:$('#LAY_editor').val(),
                 title:$('.QRcodeName').val(),
             };