ss

.idea/workspace.xml

@@ -3,12 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="92e76c55-ad95-4e21-b088-a7137f395ba7" name="Default Changelist" comment="">
       <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/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/addVideo.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/addVideo.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$/static/js/recordTemplate.js" beforeDir="false" afterPath="$PROJECT_DIR$/static/js/recordTemplate.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -22,11 +16,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="542">
-              <caret line="392" column="63" lean-forward="true" selection-start-line="392" selection-start-column="63" selection-end-line="392" selection-end-column="63" />
+            <state relative-caret-position="383">
+              <caret line="682" column="31" selection-start-line="682" selection-start-column="31" selection-end-line="682" selection-end-column="31" />
               <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" />
@@ -51,76 +45,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageText.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="450">
-              <caret line="146" column="66" selection-start-line="146" selection-start-column="66" selection-end-line="146" selection-end-column="66" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageAtlas.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="185">
-              <caret line="171" column="105" selection-start-line="171" selection-start-column="105" selection-end-line="171" selection-end-column="105" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/editQRcode/addVideo.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="233">
-              <caret line="102" column="121" selection-start-line="102" selection-start-column="121" selection-end-line="102" selection-end-column="121" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/editQRcode/addText.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="135" column="18" selection-start-line="135" selection-start-column="16" selection-end-line="135" selection-end-column="18" />
-              <folding>
-                <element signature="n#style#0;n#div#5;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="341">
-              <caret line="148" column="80" selection-start-line="148" selection-start-column="80" selection-end-line="148" selection-end-column="80" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/editQRcode/addFile.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="263">
-              <caret line="154" column="80" selection-start-line="154" selection-start-column="80" selection-end-line="154" selection-end-column="80" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pages/editQRcode/addDevice.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="231">
-              <caret line="141" column="81" selection-start-line="141" selection-start-column="81" selection-end-line="141" selection-end-column="81" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1923">
-              <caret line="457" column="160" selection-start-line="457" selection-start-column="160" selection-end-line="457" selection-end-column="160" />
+            <state relative-caret-position="471">
+              <caret line="254" column="56" selection-start-line="254" selection-start-column="52" selection-end-line="254" selection-end-column="56" />
             </state>
           </provider>
         </entry>
@@ -128,7 +56,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="191">
+            <state relative-caret-position="207">
               <caret line="199" column="51" selection-start-line="199" selection-start-column="36" selection-end-line="199" selection-end-column="51" />
             </state>
           </provider>
@@ -146,7 +74,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>yw-an-rela</find>
       <find>delete</find>
       <find>unfold</find>
       <find>index_data</find>
@@ -176,6 +103,7 @@
       <find>deleteRecord</find>
       <find>deletecheckItemArray</find>
       <find>inputItems</find>
+      <find>deleteStateGroup</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -213,14 +141,14 @@
         <option value="$PROJECT_DIR$/static/js/editpulic.js" />
         <option value="$PROJECT_DIR$/static/js/state.js" />
         <option value="$PROJECT_DIR$/pages/admin/addrecordTemplate.html" />
-        <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
-        <option value="$PROJECT_DIR$/pages/admin/updateRecordTemplate.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/imageText.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/imageAtlas.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/addVideo.html" />
         <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$/pages/admin/updateRecordTemplate.html" />
+        <option value="$PROJECT_DIR$/static/js/recordTemplate.js" />
       </list>
     </option>
   </component>
@@ -328,12 +256,12 @@
       <updated>1555581172311</updated>
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
-      <workItem from="1555841941143" duration="84537000" />
+      <workItem from="1555841941143" duration="86639000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="92911000" />
+    <option name="totallyTimeSpent" value="95013000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -618,46 +546,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1923">
-          <caret line="457" column="160" selection-start-line="457" selection-start-column="160" selection-end-line="457" selection-end-column="160" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="542">
-          <caret line="392" column="63" lean-forward="true" selection-start-line="392" selection-start-column="63" selection-end-line="392" selection-end-column="63" />
-          <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" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#2;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#3;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#4;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#5;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#6;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#textarea#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="191">
-          <caret line="199" column="51" selection-start-line="199" selection-start-column="36" selection-end-line="199" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/editQRcode/imageText.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="450">
@@ -710,5 +598,45 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/QRcode.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="207">
+          <caret line="199" column="51" selection-start-line="199" selection-start-column="36" selection-end-line="199" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/admin/updateRecordTemplate.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="471">
+          <caret line="254" column="56" selection-start-line="254" selection-start-column="52" selection-end-line="254" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/recordTemplate.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="383">
+          <caret line="682" column="31" selection-start-line="682" selection-start-column="31" selection-end-line="682" selection-end-column="31" />
+          <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" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#2;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#3;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#4;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#5;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#6;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#textarea#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

pages/admin/updateRecordTemplate.html

@@ -217,67 +217,13 @@
                 记录项:
             </label>
             <div class="layui-input-block record_terms">
-                <!--<div class="record_term">-->
-                    <!--<div class="a_T a_checkbox1" style="width: 11%">-->
-                        <!--<input type="checkbox" title="必选" class="mandatory" lay-filter="mandatory" checkbox-mandatory="false">-->
-                    <!--</div>-->
-                    <!--<div class="a_T record_term_name" style="width: 20%">-->
-                        <!--<input type="text" placeholder="请输入字段名称" class="layui-input fieldName">-->
-                    <!--</div>-->
-                    <!--<div class="a_T record_term_remarks" style="width: 20%">-->
-                        <!--<input type="text" placeholder="请输入字段备注" class="layui-input fieldType">-->
-                    <!--</div>-->
-                    <!--<div class="a_T record_term_select" style="width: 15%">-->
-                        <!--<select name="inputType" class="select-box" lay-filter="inputType">-->
-                            <!--<option value="">&#45;&#45;请选择&#45;&#45;</option>-->
-                        <!--</select>-->
-                    <!--</div>-->
-                    <!--<div class="a_T record_term_select1 a_hide" style="width: 10%">-->
-                        <!--<select name="interest" lay-filter="record_term_photo" class="businessType">-->
-                            <!--<option value="">&#45;&#45;请选择&#45;&#45;</option>-->
-                            <!--<option value="local">本地</option>-->
-                            <!--<option value="remote">拍照</option>-->
-                        <!--</select>-->
-                    <!--</div>-->
-                    <!--<div class="a_T a_checkbox" style="width: 15%">-->
-                        <!--<input type="checkbox" title="统计标识" class="isEchart" lay-filter="isEchart" checkbox-isEchart="false">-->
-                    <!--</div>-->
-                    <!--<div class="a_T a_operation" style="width: 15%">-->
-                        <!--<span class="moveUp">上移</span>-->
-                        <!--<span class="moveDown">下移</span>-->
-                        <!--<span class="edit_record a_hide">编辑</span>-->
-                        <!--<span class="delete_record_term">删除</span>-->
-                    <!--</div>-->
-                    <!--<input type="text" class="inputJson" style="display: none;">-->
-                <!--</div>-->
+
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">检查项</label>
             <div class="layui-input-block inspect_termList">
-                <!--<div class="inspect_terms">-->
-                    <!--<div class="inspect_term">-->
-                        <!--<div class="a_T inspect_term_name" style="width: 70%;">-->
-                            <!--<textarea name="desc" placeholder="请输入分组名称" class="layui-textarea term_nameTextarea" style="resize:none"></textarea>-->
-                        <!--</div>-->
-                        <!--<div class="a_T inspect_term_select" style="width: 30%">-->
-                            <!--<select name="interest" class="inspect_select" lay-filter="inspect_select">-->
-                                <!--<option value="checkbox">多选</option>-->
-                                <!--<option value="radio">单选</option>-->
-                            <!--</select>-->
-                        <!--</div>-->
-                    <!--</div>-->
-                    <!--<div class="inspect_term_infos">-->
-                        <!--<div class="inspect_term_info">-->
-                            <!--<div class="inspect_term_input border_t_n" style="width: 70%;">-->
-                                <!--<input type="text" class="layui-input inspectInfo" placeholder="请输入检查项信息">-->
-                            <!--</div>-->
-                            <!--<div class="inspect_term_operation border_t_n" style="width: 30%">-->
-                                <!--<span class="add_inspectInfo">添加</span>-->
-                            <!--</div>-->
-                        <!--</div>-->
-                    <!--</div>-->
-                <!--</div>-->
+
             </div>
         </div>
     </form>
@@ -300,10 +246,13 @@
                 $('.a_inputs').show();
                 $(".a_text").addClass("a_hide");
                 $(".layui-input-block1").removeClass("a_hide");
+                sessionStorage.setItem('groudBool','false');
+
             }else {
                 $('.a_inputs').hide();
                 $(".a_text").removeClass("a_hide");
                 $(".layui-input-block1").addClass("a_hide");
+                sessionStorage.setItem('groudBool','true')
             }
         });
         $('body').on("click",'.a_stateName',function () {

static/js/recordTemplate.js

@@ -398,15 +398,28 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                         inputStateID.push(id);
                         deleteFlagBool.push(deleteFlag);
                     });
-                    for (var i = 0; i < inputs.length; i++) {
-                        recordStatusObj = {};
-                        recordStatusObj.isEchart = cheackboxBoolArray[i];
-                        recordStatusObj.statusContent = valArray[i];
-                        recordStatusObj.statusId = stateIDArray[i];
-                        recordStatusObj.id = inputStateID[i];
-                        recordStatusObj.deleteFlag = deleteFlagBool[i];
-                        recordStatusList.push(recordStatusObj)
-                    };
+                    if (sessionStorage.getItem("groudBool") == 'true') {
+                        for (var i = 0; i < inputs.length; i++) {
+                            recordStatusObj = {};
+                            recordStatusObj.isEchart = cheackboxBoolArray[i];
+                            recordStatusObj.statusContent = valArray[i];
+                            recordStatusObj.statusId = stateIDArray[i];
+                            recordStatusObj.id = inputStateID[i];
+                            recordStatusObj.deleteFlag = true;
+                            recordStatusList.push(recordStatusObj)
+                        }
+                    }else {
+                        for (var i = 0; i < inputs.length; i++) {
+                            recordStatusObj = {};
+                            recordStatusObj.isEchart = cheackboxBoolArray[i];
+                            recordStatusObj.statusContent = valArray[i];
+                            recordStatusObj.statusId = stateIDArray[i];
+                            recordStatusObj.id = inputStateID[i];
+                            recordStatusObj.deleteFlag = deleteFlagBool[i];
+                            recordStatusList.push(recordStatusObj)
+                        }
+                    }
+                    console.log(recordStatusList,'recordStatusList222')
                     // 记录项
                     var inputList = {businessType:'',inputItems:[],inputName:'',inputType:'',isEchart:'',isOptional:'',remark:'',special:'',zIndex:'',id:'',deleteFlag:''},
                         value,fieldType,inputItems,mandatory,isEchart,inputType,businessType,id,deleteFlag;
@@ -494,8 +507,8 @@ layui.use(['jquery','eleTree','table','laypage','form','admin'], function(){
                     var updateStetaInfo = {
                         templateName:body.find(".TemplateName").val(),
                         remark:body.find(".Templatereamk").val() == ""? " ":body.find(".Templatereamk").val(),
-                        statusContent:body.find(".textContent").val() ==" "? "" : body.find(".textContent").val(),
-                        statusName:body.find(".textName").val() == ""? " " : body.find(".textName").val(),
+                        statusContent:sessionStorage.getItem("groudBool") == 'true'?body.find(".textContent").val():"",
+                        statusName:sessionStorage.getItem("groudBool") == 'true'?body.find(".textName").val():"",
                         departmentId:belpID,
                         checkItemList:checkItemArray,
                         inputList:recordArray,