ztree

.idea/workspace.xml

@@ -2,11 +2,6 @@
 <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>
@@ -24,8 +19,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="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" />
+            <state relative-caret-position="-432">
+              <caret line="715" column="44" lean-forward="true" selection-start-line="715" selection-start-column="44" selection-end-line="715" selection-end-column="44" />
               <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" />
@@ -49,11 +44,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <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 relative-caret-position="617">
+              <caret line="273" column="45" lean-forward="true" selection-start-line="273" selection-start-column="45" selection-end-line="273" selection-end-column="45" />
             </state>
           </provider>
         </entry>
@@ -111,11 +106,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="49" selection-start-line="523" selection-start-column="49" selection-end-line="523" selection-end-column="49" />
+              <caret line="523" column="60" selection-start-line="523" selection-start-column="60" selection-end-line="523" selection-end-column="60" />
             </state>
           </provider>
         </entry>
@@ -141,7 +136,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>index_data</find>
       <find>deviceItem</find>
       <find>QRcodeDetaileID</find>
       <find>QRcodePureText</find>
@@ -171,6 +165,7 @@
       <find>deleteStateGroup</find>
       <find>qr</find>
       <find>console.log</find>
+      <find>recordArray</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -214,10 +209,10 @@
         <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$/static/js/recordTemplate.js" />
+        <option value="$PROJECT_DIR$/static/js/state.js" />
       </list>
     </option>
   </component>
@@ -307,12 +302,12 @@
       <updated>1555581172311</updated>
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
-      <workItem from="1555841941143" duration="104404000" />
+      <workItem from="1555841941143" duration="106553000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="112778000" />
+    <option name="totallyTimeSpent" value="114927000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -655,24 +650,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/state.js">
+    <entry file="file://$PROJECT_DIR$/static/js/QRcode.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 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/QRcode.js">
+    <entry file="file://$PROJECT_DIR$/static/js/admin.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 relative-caret-position="602">
+          <caret line="523" column="60" selection-start-line="523" selection-start-column="60" selection-end-line="523" selection-end-column="60" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="-432">
+          <caret line="715" column="44" lean-forward="true" selection-start-line="715" selection-start-column="44" selection-end-line="715" selection-end-column="44" />
           <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" />
@@ -695,10 +690,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/admin.js">
+    <entry file="file://$PROJECT_DIR$/static/js/state.js">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="617">
+          <caret line="273" column="45" lean-forward="true" selection-start-line="273" selection-start-column="45" selection-end-line="273" selection-end-column="45" />
         </state>
       </provider>
     </entry>

static/js/recordTemplate.js

@@ -431,7 +431,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     }else {
                         for (var i = 0; i < inputs.length; i++) {
                             recordStatusObj = {};
-                            if (valArray[i] != ""){
+                            if (reg.test(valArray[i])){
                                 recordStatusObj.isEchart = cheackboxBoolArray[i];
                                 recordStatusObj.statusContent = valArray[i];
                                 recordStatusObj.statusId = stateIDArray[i];
@@ -483,7 +483,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                         }else {
                             inputItems =[]
                         }
-                        if (value != "" && inputType !="") {
+                        if (reg.test(value) && inputType !="") {
                             inputList.businessType = businessType == undefined ? "" : businessType;
                             inputList.inputItems = inputItems == "" ? [] : JSON.parse(inputItems);
                             inputList.inputName = value;
@@ -498,6 +498,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                             recordArray.push(inputList)
                         }
                     });
+                    console.log('recordArray',recordArray)
                     // 检查项
                     var inspect_terms = body.find(".inspect_terms");
                     var term_nameTextarea,inspect_select,inspectInfo,checkItemArray=[],id,deleteFlag;
@@ -516,7 +517,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                         term_nameTextarea = $(this).parent().parent().find('.term_nameTextarea').val();
                         inspect_select = $(this).parent().parent().find('.inspect_select').val();
                         inspectInfo = $(this).find('.inspectInfo').val();
-                        if (inspectInfo != "") {
+                        if (reg.test(inspectInfo)) {
                             id =  $(this).attr("inspect-id");
                             deleteFlag = $(this).attr('deleteFlag');
                             checkItemList.checkType = inspect_select;
@@ -687,7 +688,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     }else {
                         inputItems = []
                     }
-                    if (value != "" && inputType != "") {
+                    if (reg.test(value) && inputType != "") {
                         inputList.businessType = businessType == undefined ? "" : businessType;
                         inputList.inputItems = inputItems == ""? [] : JSON.parse(inputItems);
                         inputList.inputName = value;
@@ -700,6 +701,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                         recordArray.push(inputList)
                     }
                 });
+                console.log('recordArray添加',recordArray)
                 // 检查项
                 var inspect_terms = body.find(".inspect_terms");
                 var term_nameTextarea,inspect_select,inspectInfo,checkItemArray=[];
@@ -711,7 +713,7 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     term_nameTextarea = $(this).parent().parent().find('.term_nameTextarea').val();
                     inspect_select = $(this).parent().parent().find('.inspect_select').val();
                     inspectInfo = $(this).find('.inspectInfo').val();
-                    if (inspectInfo != "") {
+                    if (reg.test(inspectInfo)) {
                         checkItemList.checkType = inspect_select;
                         checkItemList.groupName = term_nameTextarea;
                         checkItemList.itemValue = inspectInfo;

static/js/state.js

@@ -258,13 +258,14 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                     item.each(function () {
                         var value = $(this).find('input').val();
                         var ids = $(this).attr("id-data");
-                        if (value != "") {
+                        if (reg.test(value)) {
                             arr.push(value);
                             ID.push(ids)
                         }
                     });
+                    console.log(arr,'atttr')
                     for (var i = 0; i < arr.length; i++) {
-                        if (arr[i] != "") {
+                        // if (reg.test(arr[i])) {
                             obj = {};
                             obj.deleteFlag = false;
                             obj.id = ID[i];
@@ -272,7 +273,7 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                             obj.statusContent = arr[i];
                             obj.zIndex = i+1;
                             delobj.push(obj)
-                        }
+                        // }
                     }
                     var updateStetaInfo = {
                         id:objID.id,
@@ -375,18 +376,16 @@ layui.use(['jquery','eleTree','table','laypage','admin'], function(){
                 });
                 item.each(function () {
                     var value = $(this).find('input').val();
-                    if ($(this).find('input').val() != "") {
+                    if (reg.test(value)) {
                         arr.push(value);
                     }
                 });
                 for (var j = 0; j < arr.length; j++) {
-                    if (arr[j] != "") {
                         obj = {};
                         obj.statusColor = color[j];
                         obj.statusContent = arr[j];
                         obj.zIndex = j+1;
                         json.push(obj);
-                    }
                 }
                 var addStetaInfo = {
                     departmentId:belpID,