ztree

.idea/workspace.xml

@@ -2,7 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="92e76c55-ad95-4e21-b088-a7137f395ba7" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/css/zTreeStyle.css" beforeDir="false" afterPath="$PROJECT_DIR$/static/css/zTreeStyle.css" 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/" />
@@ -18,8 +24,8 @@
       <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="635">
-              <caret line="783" column="10" selection-start-line="759" selection-start-column="7" selection-end-line="783" selection-end-column="10" />
+            <state relative-caret-position="355">
+              <caret line="172" column="57" lean-forward="true" selection-start-line="172" selection-start-column="28" selection-end-line="172" selection-end-column="57" />
               <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" />
@@ -46,8 +52,8 @@
       <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="-103">
-              <caret lean-forward="true" />
+            <state relative-caret-position="421">
+              <caret line="38" column="83" lean-forward="true" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="83" />
             </state>
           </provider>
         </entry>
@@ -55,8 +61,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/ztree/ztree.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="292">
-              <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
+            <state relative-caret-position="573">
+              <caret line="78" column="9" selection-start-line="78" selection-start-column="9" selection-end-line="78" selection-end-column="9" />
               <folding>
                 <element signature="n#style#0;n#input#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
               </folding>
@@ -65,15 +71,24 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/static/css/zTreeStyle.css">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-582">
+              <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
+            </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="483">
-              <caret line="186" column="12" lean-forward="true" selection-start-line="186" selection-start-column="12" selection-end-line="186" selection-end-column="12" />
+            <state relative-caret-position="543">
+              <caret line="169" column="28" selection-start-line="169" selection-start-column="28" selection-end-line="169" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/login.html">
           <provider selected="true" editor-type-id="text-editor" />
         </entry>
@@ -88,28 +103,19 @@
         </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="602">
-              <caret line="523" column="47" selection-start-line="523" selection-start-column="47" selection-end-line="523" selection-end-column="47" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/admin/addstate.html">
+        <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="236">
-              <caret line="202" column="40" selection-start-line="202" selection-start-column="40" selection-end-line="202" selection-end-column="40" />
+            <state relative-caret-position="-68">
+              <caret line="170" column="75" selection-start-line="170" selection-start-column="75" selection-end-line="170" selection-end-column="75" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/static/js/admin.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="236">
-              <caret line="552" column="57" selection-start-line="552" selection-start-column="57" selection-end-line="552" selection-end-column="57" />
+            <state relative-caret-position="602">
+              <caret line="523" column="49" selection-start-line="523" selection-start-column="49" selection-end-line="523" selection-end-column="49" />
             </state>
           </provider>
         </entry>
@@ -189,7 +195,6 @@
         <option value="$PROJECT_DIR$/pages/admin/recordTemplate.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/depMaintain.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/QRcodeList.html" />
-        <option value="$PROJECT_DIR$/static/css/zTreeStyle.css" />
         <option value="$PROJECT_DIR$/pages/editQRcode/editQRcode.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/pureText.html" />
         <option value="$PROJECT_DIR$/static/js/jjjs.js" />
@@ -202,15 +207,17 @@
         <option value="$PROJECT_DIR$/pages/editQRcode/addLink.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/addFile.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/addDevice.html" />
-        <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
         <option value="$PROJECT_DIR$/pages/admin/addstate.html" />
         <option value="$PROJECT_DIR$/pages/admin/updateRecordTemplate.html" />
         <option value="$PROJECT_DIR$/pages/admin/addrecordTemplate.html" />
-        <option value="$PROJECT_DIR$/static/js/QRcode.js" />
         <option value="$PROJECT_DIR$/pages/admin/list.html" />
+        <option value="$PROJECT_DIR$/index.html" />
+        <option value="$PROJECT_DIR$/static/css/zTreeStyle.css" />
+        <option value="$PROJECT_DIR$/pages/ztree/ztree.html" />
         <option value="$PROJECT_DIR$/static/js/state.js" />
+        <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
+        <option value="$PROJECT_DIR$/static/js/QRcode.js" />
         <option value="$PROJECT_DIR$/static/js/admin.js" />
-        <option value="$PROJECT_DIR$/pages/ztree/ztree.html" />
       </list>
     </option>
   </component>
@@ -253,7 +260,7 @@
               <item name="admin" type="b2602c69:ProjectViewProjectNode" />
               <item name="admin" type="462c0819:PsiDirectoryNode" />
               <item name="static" type="462c0819:PsiDirectoryNode" />
-              <item name="fonts" type="462c0819:PsiDirectoryNode" />
+              <item name="js" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -300,12 +307,12 @@
       <updated>1555581172311</updated>
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
-      <workItem from="1555841941143" duration="101804000" />
+      <workItem from="1555841941143" duration="104404000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="110178000" />
+    <option name="totallyTimeSpent" value="112778000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -422,13 +429,6 @@
     <entry file="file://$PROJECT_DIR$/static/js/ztree/jquery.ztree.excheck.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/css/zTreeStyle.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1305">
-          <caret line="84" column="123" selection-start-line="84" selection-start-column="123" selection-end-line="84" selection-end-column="123" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/QRcode/pureText.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="634">
@@ -611,24 +611,68 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
+    <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="236">
-          <caret line="196" column="26" selection-start-line="196" selection-start-column="26" selection-end-line="196" selection-end-column="26" />
+        <state relative-caret-position="410">
+          <caret line="549" column="24" selection-start-line="549" selection-start-column="24" selection-end-line="549" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/addrecordTemplate.html">
+    <entry file="file://$PROJECT_DIR$/pages/admin/list.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="410">
-          <caret line="549" column="24" selection-start-line="549" selection-start-column="24" selection-end-line="549" selection-end-column="24" />
+        <state relative-caret-position="441">
+          <caret line="80" column="95" selection-start-line="80" selection-start-column="95" selection-end-line="80" selection-end-column="95" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/fonts/iconfont.svg">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/login.html">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="543">
+          <caret line="169" column="28" selection-start-line="169" selection-start-column="28" selection-end-line="169" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/css/zTreeStyle.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-582">
+          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/ztree/ztree.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="573">
+          <caret line="78" column="9" selection-start-line="78" selection-start-column="9" selection-end-line="78" selection-end-column="9" />
+          <folding>
+            <element signature="n#style#0;n#input#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/state.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="421">
+          <caret line="38" column="83" lean-forward="true" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="83" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-68">
+          <caret line="170" column="75" selection-start-line="170" selection-start-column="75" selection-end-line="170" selection-end-column="75" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="635">
-          <caret line="783" column="10" selection-start-line="759" selection-start-column="7" selection-end-line="783" selection-end-column="10" />
+        <state relative-caret-position="355">
+          <caret line="172" column="57" lean-forward="true" selection-start-line="172" selection-start-column="28" selection-end-line="172" selection-end-column="57" />
           <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" />
@@ -651,49 +695,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/list.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="80" column="95" selection-start-line="80" selection-start-column="95" selection-end-line="80" selection-end-column="95" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/js/admin.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="602">
-          <caret line="523" column="47" selection-start-line="523" selection-start-column="47" selection-end-line="523" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/state.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-103">
-          <caret lean-forward="true" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/fonts/iconfont.svg">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/ztree/ztree.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
-          <folding>
-            <element signature="n#style#0;n#input#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="186" column="12" lean-forward="true" selection-start-line="186" selection-start-column="12" selection-end-line="186" selection-end-column="12" />
+          <caret line="523" column="49" selection-start-line="523" selection-start-column="49" selection-end-line="523" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/login.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
   </component>
 </project>

pages/ztree/ztree.html

@@ -62,35 +62,21 @@
                 onCheck: onCheck
             }
         };
+        var treeObj;
         doLoadSysMenus();
         function doLoadSysMenus(){
             var url="http://apptest.jieweizhineng.com/api/section/getlistdirect"
             $.getJSON(url,function(result){
                 if(result.code==0){
-                    var treeObj = $.fn.zTree.init($("#treeDemo"),setting,result.data);
-
+                    treeObj = $.fn.zTree.init($("#treeDemo"),setting,result.data);
                     treeObj.expandAll(true);
+                    var node = treeObj.getNodeByParam("id",sessionStorage.getItem('ztreeDepid'), null);
+                    treeObj.checkNode(node, true, true);
                 }else{
                     layer.msg(result.message, {icon: 2});
                 }
             });
         }
-        function expandNodes(nodes) {
-            if (!nodes) return;
-            curStatus = "expand";
-            var zTree = $.fn.zTree.getZTreeObj("treeDemo");
-            for (var i=0, l=nodes.length; i<l; i++) {
-                zTree.expandNode(nodes[i], true, false, false);//展开节点就会调用后台查询子节点
-                if (nodes[i].isParent && nodes[i].zAsync) {
-                    expandNodes(nodes[i].children);//递归
-                } else {
-                    goAsync = true;
-                }
-            }
-        }
-
-
-
         function onCheck(e, treeId, treeNode) {
             $('.departmentId').val(treeNode.id)
         }

static/css/zTreeStyle.css

@@ -12,7 +12,7 @@ website:	http://code.google.com/p/jquerytree/
 .ztree {margin:0; padding:5px; color:#333}
 .ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap; outline:0}
 .ztree li ul{ margin:0; padding:0 0 0 18px}
-.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}
+/*.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}*/
 
 .ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:17px; color:#333; background-color: transparent;
 	text-decoration:none; vertical-align:top; display: inline-block}

static/js/QRcode.js

@@ -15,6 +15,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
     var updateHtml = '../../pages/editQRcode/editQRcode.html';
     // 部门
     var belpID = 'root';
+    sessionStorage.setItem("ztreeDepid",'root');
     delpFun();
     function delpFun(){
         sessionStorage.setItem("depID",'root');
@@ -37,6 +38,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                     eleTree.on("nodeClick(data)",function(d) {
                         belpID =  d.data.currentData.id;
                         sessionStorage.setItem("depID",belpID);
+                        sessionStorage.setItem("ztreeDepid",d.data.currentData.id);
                         $('.stetaName').val("");
                         var info={
                             statusContent: '',
@@ -165,7 +167,8 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
     // 监听状态table
     table.on('tool(stateItme)', function(obj) {
         if( obj.event === "move"){
-
+            sessionStorage.setItem("statusId",obj.data.id);
+            moveDep('选择部门信息','http://apptest.jieweizhineng.com/api/swagger/api/page/v1/movePage/','400','500',table,'idQRcode');
         } else if (obj.event === "copy"){
             var content ={
                 _method:'put'

static/js/admin.js

@@ -492,7 +492,7 @@ layui.define(['jquery', 'form', 'layer', 'element'], function(exports) {
 	 */
 
 	exports('admin', {});
-	window.moveDep = function (title, url, w, h,table) {
+	window.moveDep = function (title, url, w, h,table,Tableid) {
 		layer.open({
 			type: 2,
 			area: [w + 'px', h + 'px'],
@@ -508,9 +508,7 @@ layui.define(['jquery', 'form', 'layer', 'element'], function(exports) {
 			yes:function(index,layero){
 				var body = layer.getChildFrame('body', index);
 				var obj = {
-					// departmentId:body.find('.departmentId').val(),
 					_method:'put',
-					// statusId:sessionStorage.getItem("statusId"),
 				};
 				$.ajax({
 					method:'post',
@@ -519,9 +517,11 @@ layui.define(['jquery', 'form', 'layer', 'element'], function(exports) {
 					dataType:'json',
 					success:function (res) {
 						if (res.code === '200') {
-							console.log(res,"resresresresres")
-							table.reload('idstetaTable');
+							layer.msg('移动成功', {icon: 1});
+							table.reload(Tableid);
 							layer.close(index);
+						}else {
+							layer.msg('移动失败，请检查网络', {icon: 2});
 						}
 					},
 					error:function (err) {

static/js/recordTemplate.js

@@ -29,6 +29,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
         FrameWH();
     });
     var belpID = 'root';
+    sessionStorage.setItem("ztreeDepid",'root');
     delpFun();
     function delpFun(){
         sessionStorage.setItem("departmentId",'root');
@@ -48,6 +49,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     eleTree.on("nodeClick(data)",function(d) {
                         belpID =  d.data.currentData.id;
                         sessionStorage.setItem("departmentId",d.data.currentData.id);
+                        sessionStorage.setItem("ztreeDepid",d.data.currentData.id);
                         $('.stetaName').val("");
                         var info={
                             statusContent: '',
@@ -154,7 +156,8 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
     // 监听状态table
     table.on('tool(recordTemplateID)', function(obj) {
         if( obj.event === "move"){
-
+            sessionStorage.setItem("statusId",obj.data.id);
+            moveDep('选择部门信息','http://apptest.jieweizhineng.com/api/swagger/api/template/v1/moveRecordTemplate/','400','500',table,'recordTemplateID');
         } else if (obj.event === "copy"){
             var content ={
                 _method:'put'

static/js/state.js

@@ -16,6 +16,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
     // 部门
     var belpID = 'root';
     delpFun();
+    sessionStorage.setItem("ztreeDepid",'root');
     function delpFun(){
         $.ajax({
             url:'http://apptest.jieweizhineng.com/api/section/getlist',
@@ -35,7 +36,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                     });
                     eleTree.on("nodeClick(data)",function(d) {
                         belpID =  d.data.currentData.id;
-                        sessionStorage.setItem("ztreeDepid",d.data.currentData.id)
+                        sessionStorage.setItem("ztreeDepid",d.data.currentData.id);
                         $('.stetaName').val("");
                         var info={
                             statusContent: '',
@@ -145,7 +146,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
     table.on('tool(stateItme)', function(obj) {
         if( obj.event === "move"){
             sessionStorage.setItem("statusId",obj.data.id);
-            moveDep('选择部门信息','http://apptest.jieweizhineng.com/api/swagger/api/status/v1/moveStatus/','400','500',table);
+            moveDep('选择部门信息','http://apptest.jieweizhineng.com/api/swagger/api/status/v1/moveStatus/','400','500',table,'idstetaTable');
         } else if (obj.event === "copy"){
             var content ={
                 _method:'put'