Apple vor 6 Jahren
Ursprung
Commit
4a8d086aa6
3 geänderte Dateien mit 47 neuen und 115 gelöschten Zeilen
  1. 46 98
      .idea/workspace.xml
  2. 0 16
      pages/QRcoddetails/js/index01.js
  3. 1 1
      static/js/QRcode.js

+ 46 - 98
.idea/workspace.xml

@@ -2,47 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="32fae3c7-fb1b-491e-9314-563fbc017809" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/static/js/config.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/OnSiteInspection/list.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/OnSiteInspection/list.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/QRcoddetails/js/index01.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcoddetails/js/index01.js" 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/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/chooseRecord.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/chooseRecord.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/QRcode/depMaintain.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/depMaintain.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$/pages/admin/addrecordTemplate.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/admin/addrecordTemplate.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/admin/changeStategroup.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/admin/changeStategroup.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/recordTemplate.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/admin/recordTemplate.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/Jurisdiction.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/Jurisdiction.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" />
-      <change beforePath="$PROJECT_DIR$/pages/editQRcode/addLink.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/addLink.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/editQRcode/addText.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/addText.html" afterDir="false" />
-      <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/chooseRecord.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/chooseRecord.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/editQRcode/depMaintain.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/depMaintain.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/editQRcode/editQRcode.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/editQRcode.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$/pages/ztree/ztree.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/ztree/ztree.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/OnSiteInspection.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/OnSiteInspection.js" 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" />
-      <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/" />
@@ -56,15 +17,6 @@
   <component name="FileEditorManager">
     <leaf>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/QRcode/chooseRecord.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-117">
-              <caret line="47" column="26" selection-start-line="47" selection-start-column="26" selection-end-line="47" selection-end-column="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/editQRcode/editQRcode.html">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="478">
@@ -100,7 +52,7 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="1020">
@@ -110,19 +62,28 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/editQRcode/Jurisdiction.html">
+        <entry file="file://$PROJECT_DIR$/static/js/config.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="251">
-              <caret line="71" column="49" selection-start-line="71" selection-end-line="71" selection-end-column="49" />
+            <state relative-caret-position="30">
+              <caret line="2" column="51" selection-start-line="2" selection-start-column="51" selection-end-line="2" selection-end-column="51" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="400">
+              <caret line="396" column="31" selection-start-line="396" selection-start-column="31" selection-end-line="396" selection-end-column="31" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/editQRcode/pureText.html">
+        <entry file="file://$PROJECT_DIR$/pages/QRcoddetails/js/index01.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="369">
-              <caret line="64" column="49" selection-start-line="64" selection-start-column="49" selection-end-line="64" selection-end-column="49" />
+            <state relative-caret-position="305">
+              <caret line="227" column="89" selection-start-line="227" selection-start-column="89" selection-end-line="227" selection-end-column="89" />
             </state>
           </provider>
         </entry>
@@ -171,7 +132,6 @@
       <list>
         <option value="$PROJECT_DIR$/index.html" />
         <option value="$PROJECT_DIR$/pages/QRcoddetails/static/recordDetaile.js" />
-        <option value="$PROJECT_DIR$/pages/QRcoddetails/js/index01.js" />
         <option value="$PROJECT_DIR$/pages/admin/list.html" />
         <option value="$PROJECT_DIR$/pages/admin/addrecordTemplate.html" />
         <option value="$PROJECT_DIR$/pages/admin/changeStategroup.html" />
@@ -205,20 +165,19 @@
         <option value="$PROJECT_DIR$/static/js/state.js" />
         <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
         <option value="$PROJECT_DIR$/static/js/OnSiteInspection.js" />
-        <option value="$PROJECT_DIR$/static/js/QRcode.js" />
         <option value="$PROJECT_DIR$/pages/ztree/ztree.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/chooseRecord.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/chooseRecord.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/addText.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/addLink.html" />
+        <option value="$PROJECT_DIR$/pages/QRcoddetails/js/index01.js" />
+        <option value="$PROJECT_DIR$/static/js/QRcode.js" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
-    <option name="x" value="64" />
-    <option name="y" value="23" />
-    <option name="width" value="1376" />
-    <option name="height" value="877" />
+    <option name="width" value="1440" />
+    <option name="height" value="900" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -242,25 +201,14 @@
               <item name="ZHadmin" type="b2602c69:ProjectViewProjectNode" />
               <item name="ZHadmin" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="QRcoddetails" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="ZHadmin" type="b2602c69:ProjectViewProjectNode" />
               <item name="ZHadmin" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="editQRcode" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ZHadmin" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ZHadmin" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="OnSiteInspection" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ZHadmin" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ZHadmin" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="QRcode" type="462c0819:PsiDirectoryNode" />
+              <item name="QRcoddetails" type="462c0819:PsiDirectoryNode" />
+              <item name="js" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="ZHadmin" type="b2602c69:ProjectViewProjectNode" />
@@ -313,12 +261,12 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1557743373249</updated>
-      <workItem from="1557743375112" duration="10288000" />
+      <workItem from="1557743375112" duration="11602000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10288000" />
+    <option name="totallyTimeSpent" value="11602000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="6" />
@@ -352,13 +300,6 @@
         <state relative-caret-position="-1172" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcoddetails/js/index01.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3536">
-          <caret line="244" column="50" lean-forward="true" selection-start-line="244" selection-start-column="50" selection-end-line="244" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="251">
@@ -558,13 +499,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/config.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="10" selection-start-line="1" selection-start-column="4" selection-end-line="1" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="570">
@@ -586,13 +520,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="282">
-          <caret line="152" column="36" selection-start-line="152" selection-start-column="36" selection-end-line="152" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/js/admin.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-7932" />
@@ -689,5 +616,26 @@
         </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="305">
+          <caret line="227" column="89" selection-start-line="227" selection-start-column="89" selection-end-line="227" selection-end-column="89" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="51" selection-start-line="2" selection-start-column="51" selection-end-line="2" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="400">
+          <caret line="396" column="31" selection-start-line="396" selection-start-column="31" selection-end-line="396" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 0 - 16
pages/QRcoddetails/js/index01.js

@@ -226,22 +226,6 @@ UrlSearch();
                      </div>`;
                     $('.content').append(str);
                     for (var j = 0; j < res.data.pageItemList[i].linksList.length; j++) {
-                        var name,value,pageIds= [];
-                        var str0= res.data.pageItemList[i].linksList[j].linkUrl;
-                        var num=str.indexOf("?");
-                        str0=str0.substr(num+1);
-                        var arr=str0.split("&");
-                        console.log(arr,'arr');
-                        for(var i=0;i < arr.length;i++){
-                            num=arr[i].indexOf("=");
-                            if(num>0){
-                                name=arr[i].substring(0,num);
-                                value=arr[i].substr(num+1);
-                                this[name]=value;
-                                pageIds.push(value)
-                            }
-                        }
-                    console.log(pageIds,'pageIds')
                         var html=`<a class="weui-cell" hrefs="${res.data.pageItemList[i].linksList[j].linkUrl}" href="${res.data.pageItemList[i].linksList[j].linkUrl}">
                                 <div class="weui-cell__hd">
                                 <img src="image/link.png">

+ 1 - 1
static/js/QRcode.js

@@ -394,7 +394,7 @@ layui.use(['jquery', 'eleTree', 'table', 'laypage', 'admin'], function () {
                 maxmin: true,
                 skin: 'oaBtn',
                 area: ['375px', '667px'],
-                content: urlF+"assets/html/QRcoddetails/index.html?name="+"&uuid="+"&pageId="+obj.data.id+"&departmentID=",
+                content: urlphp+"assets/html/QRcoddetails/index.html?name="+"&uuid="+"&pageId="+obj.data.id+"&departmentID=",
                 success: function (layero, index) {
 
                 }