Apple 6 tahun lalu
induk
melakukan
be875ec094

+ 134 - 10
.idea/workspace.xml

@@ -2,11 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="32fae3c7-fb1b-491e-9314-563fbc017809" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcoddetails/static/recordDetaile.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcoddetails/static/recordDetaile.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/chooseRecord.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/chooseRecord.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/editQRcode/chooseRecord.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/chooseRecord.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/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/" />
@@ -22,20 +22,83 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="233">
-              <caret line="223" column="84" selection-start-line="223" selection-start-column="84" selection-end-line="223" selection-end-column="84" />
+            <state relative-caret-position="336">
+              <caret line="385" column="45" selection-start-line="385" selection-start-column="45" selection-end-line="385" selection-end-column="45" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/index.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="648">
+              <caret line="182" column="28" selection-start-line="182" selection-start-column="28" selection-end-line="182" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/QRcoddetails/index001.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1172" />
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/QRcoddetails/js/index01.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="386">
+              <caret line="25" column="26" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/QRcoddetails/static/recordDetaile.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="313">
+              <caret line="428" column="47" lean-forward="true" selection-start-line="428" selection-start-column="47" selection-end-line="428" selection-end-column="47" />
+              <folding>
+                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
+                <element signature="n#!!block;n#photoFun#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/static/js/admin.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-7420" />
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/QRcoddetails/static/note-detail.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-162">
+              <caret line="335" column="60" selection-start-line="335" selection-start-column="51" selection-end-line="335" selection-end-column="60" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>submitBtn</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$/index.html" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/chooseRecord.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/chooseRecord.html" />
+        <option value="$PROJECT_DIR$/pages/QRcoddetails/static/recordDetaile.js" />
         <option value="$PROJECT_DIR$/static/js/QRcode.js" />
       </list>
     </option>
@@ -62,6 +125,11 @@
             <path>
               <item name="ZHadmin" type="b2602c69:ProjectViewProjectNode" />
               <item name="ZHadmin" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ZHadmin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ZHadmin" type="462c0819:PsiDirectoryNode" />
               <item name="static" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -104,12 +172,12 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1557743373249</updated>
-      <workItem from="1557743375112" duration="124000" />
+      <workItem from="1557743375112" duration="3457000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="124000" />
+    <option name="totallyTimeSpent" value="3457000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="6" />
@@ -138,10 +206,66 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/pages/QRcoddetails/index001.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1172" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/chooseRecord.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="476">
+          <caret line="46" column="109" selection-start-line="46" selection-start-column="109" selection-end-line="46" selection-end-column="109" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/chooseRecord.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="584">
+          <caret line="46" column="109" selection-start-line="46" selection-start-column="109" selection-end-line="46" selection-end-column="109" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="648">
+          <caret line="182" column="28" selection-start-line="182" selection-start-column="28" selection-end-line="182" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcoddetails/static/note-detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-162">
+          <caret line="335" column="60" selection-start-line="335" selection-start-column="51" selection-end-line="335" selection-end-column="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/admin.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-7420" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcoddetails/static/recordDetaile.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="313">
+          <caret line="428" column="47" lean-forward="true" selection-start-line="428" selection-start-column="47" selection-end-line="428" selection-end-column="47" />
+          <folding>
+            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
+            <element signature="n#!!block;n#photoFun#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/QRcoddetails/js/index01.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="386">
+          <caret line="25" column="26" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="233">
-          <caret line="223" column="84" selection-start-line="223" selection-start-column="84" selection-end-line="223" selection-end-column="84" />
+        <state relative-caret-position="336">
+          <caret line="385" column="45" selection-start-line="385" selection-start-column="45" selection-end-line="385" selection-end-column="45" />
         </state>
       </provider>
     </entry>

+ 3 - 0
pages/QRcoddetails/static/recordDetaile.js

@@ -432,6 +432,9 @@ $('body').on('click','.file-list>.file-item',function () {
         window.open('https://view.officeapps.live.com/op/view.aspx?src='+url)
     }
 });
+$('.submitBtn').on("click",function () {
+     location.href = 'addRecord.html'
+});
 // $('body').on('click','.seeDoc',function () {
 //     var url = $(this).attr('file-Url');
 //     window.open('https://view.officeapps.live.com/op/view.aspx?src='+url)

+ 1 - 1
pages/QRcode/chooseRecord.html

@@ -44,7 +44,7 @@
         function delpFun(){
             var parentNodeMax,parentNode,sonNodes,sonNode,sonNodeArray=[],sonNodeStr,sonNodeID,sonNodeIDStr,sonNodeIDAarray = [],parentID;
             $.ajax({
-                url:'http://apptest.jieweizhineng.com/api/section/getlist?userStaffNum='+parent.getUserStaffNum(),
+                url:'http://apptest.jieweizhineng.com/api/section/getlist?userStaffNum='+parent.parent.parent.getUserStaffNum(),
                 method:'get',
                 dataType: 'json',
                 success:function (res) {

+ 1 - 1
pages/editQRcode/chooseRecord.html

@@ -44,7 +44,7 @@
         function delpFun(){
             var parentNodeMax,parentNode,sonNodes,sonNode,sonNodeArray=[],sonNodeStr,sonNodeID,sonNodeIDStr,sonNodeIDAarray = [],parentID;
             $.ajax({
-                url:'http://apptest.jieweizhineng.com/api/section/getlist?userStaffNum='+parent.getUserStaffNum(),
+                url:'http://apptest.jieweizhineng.com/api/section/getlist?userStaffNum='+parent.parent.parent.getUserStaffNum(),
                 method:'get',
                 dataType: 'json',
                 success:function (res) {

+ 1 - 2
static/js/QRcode.js

@@ -384,7 +384,6 @@ layui.use(['jquery', 'eleTree', 'table', 'laypage', 'admin'], function () {
                 });
             });
         } else if (obj.event === 'dataile') {
-            sessionStorage.setItem('QrcodeIds', obj.data.id);
             layer.open({
                 type: 2,
                 id: 'QRcodeDetaile',
@@ -395,7 +394,7 @@ layui.use(['jquery', 'eleTree', 'table', 'laypage', 'admin'], function () {
                 maxmin: true,
                 skin: 'oaBtn',
                 area: ['375px', '667px'],
-                content: QRcodeDetaile,
+                content: "http://apptest.jieweizhineng.com/assets/html/QRcoddetails/index.html?name="+"&uuid="+"&pageId="+obj.data.id+"&departmentID=",
                 success: function (layero, index) {
 
                 }