css

.idea/workspace.xml

@@ -2,14 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="92e76c55-ad95-4e21-b088-a7137f395ba7" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/pages/OnSiteInspection/list.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/static/js/OnSiteInspection.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.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" />
+      <change beforePath="$PROJECT_DIR$/pages/QRcode/addText.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/QRcode/addText.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/editQRcode/addText.html" beforeDir="false" afterPath="$PROJECT_DIR$/pages/editQRcode/addText.html" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -68,7 +62,7 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/OnSiteInspection.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="645">
@@ -77,6 +71,27 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="183">
+              <caret line="123" column="11" selection-start-line="123" selection-start-column="11" selection-end-line="123" selection-end-column="11" />
+            </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="251">
+              <caret line="47" column="97" selection-start-line="47" selection-start-column="88" selection-end-line="47" selection-end-column="97" />
+              <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$/static/js/admin.js">
           <provider selected="true" editor-type-id="text-editor">
@@ -107,7 +122,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>QRcodePureText</find>
       <find>getPageEdit</find>
       <find>QRcodeImageText</find>
       <find>edituploadImageAtlas</find>
@@ -137,6 +151,7 @@
       <find>console.log</find>
       <find>console</find>
       <find>ID</find>
+      <find>colorType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -148,7 +163,6 @@
         <option value="$PROJECT_DIR$/pages/QRcode/Jurisdiction.html" />
         <option value="$PROJECT_DIR$/pages/editQRcode/addQRcode.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/addQRcode.html" />
-        <option value="$PROJECT_DIR$/pages/editQRcode/addText.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/addDevice.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/addFile.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/addLink.html" />
@@ -157,7 +171,6 @@
         <option value="$PROJECT_DIR$/pages/QRcode/pureText.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/recordAdmin.html" />
         <option value="$PROJECT_DIR$/static/js/pulic.js" />
-        <option value="$PROJECT_DIR$/pages/QRcode/addText.html" />
         <option value="$PROJECT_DIR$/pages/admin/recordTemplate.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/depMaintain.html" />
         <option value="$PROJECT_DIR$/pages/QRcode/QRcodeList.html" />
@@ -186,6 +199,8 @@
         <option value="$PROJECT_DIR$/static/js/state.js" />
         <option value="$PROJECT_DIR$/static/js/OnSiteInspection.js" />
         <option value="$PROJECT_DIR$/static/js/QRcode.js" />
+        <option value="$PROJECT_DIR$/pages/editQRcode/addText.html" />
+        <option value="$PROJECT_DIR$/pages/QRcode/addText.html" />
       </list>
     </option>
   </component>
@@ -231,6 +246,12 @@
               <item name="admin" type="b2602c69:ProjectViewProjectNode" />
               <item name="admin" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
+              <item name="editQRcode" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="admin" type="b2602c69:ProjectViewProjectNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
               <item name="OnSiteInspection" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -297,18 +318,18 @@
       <workItem from="1555581173970" duration="6979000" />
       <workItem from="1555736815328" duration="1395000" />
       <workItem from="1555841941143" duration="115268000" />
-      <workItem from="1556432139569" duration="12008000" />
+      <workItem from="1556432139569" duration="12583000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="135650000" />
+    <option name="totallyTimeSpent" value="136225000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18322763" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.18322763" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -515,16 +536,6 @@
         </state>
       </provider>
     </entry>
-    <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>
     <entry file="file://$PROJECT_DIR$/pages/editQRcode/addLink.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="341">
@@ -635,13 +646,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="625">
-          <caret line="155" column="25" lean-forward="true" selection-start-line="155" selection-start-column="12" selection-end-line="155" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/OnSiteInspection/list.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-12">
@@ -694,5 +698,22 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pages/editQRcode/addText.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="251">
+          <caret line="47" column="97" selection-start-line="47" selection-start-column="88" selection-end-line="47" selection-end-column="97" />
+          <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>
+    <entry file="file://$PROJECT_DIR$/pages/QRcode/addText.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="183">
+          <caret line="123" column="11" selection-start-line="123" selection-start-column="11" selection-end-line="123" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

pages/QRcode/addText.html

@@ -45,11 +45,11 @@
         <div class="layui-form-item">
             <label class="layui-form-label">二维码颜色：</label>
             <div class="layui-input-block">
-                <select name="interest" lay-verify="required">
+                <select name="interest" lay-verify="required" class="colorType">
                     <option value=""></option>
-                    <option value="0">蓝色</option>
-                    <option value="1">黑色</option>
-                    <option value="2">绿色</option>
+                    <option value="蓝色">蓝色</option>
+                    <option value="黑色">黑色</option>
+                    <option value="绿色">绿色</option>
                 </select>
             </div>
         </div>
@@ -122,13 +122,9 @@
             }
 
         });
-        var color = "";
-        form.on("select(color)",function (data) {
-           color = data.elem[data.elem.selectedIndex].text;
-        });
         form.on('submit(formQRcode)', function(){
             var QRcodeInfo = {
-                colorType:color,
+                colorType:$('.colorType').val(),
                 departmentId:sessionStorage.getItem("depID") == ""?"root" : sessionStorage.getItem("depID"),
                 remark:$('#LAY_editor').val(),
                 title:$('.QRcodeName').val(),

pages/editQRcode/addText.html

@@ -113,8 +113,6 @@
             theme:{bgcolor:"#00A1CB",pnColor:"#00CCFF"},
         });
         form.on("switch(switch)",function (data) {
-            console.log("data",data)
-            console.log(data.elem.checked)
             if (data.elem.checked === true) {
                 $(".showOrhide").show();
             }else {
@@ -122,14 +120,10 @@
             }
 
         });
-        var color = "";
-        form.on("select(color)",function (data) {
-           color = data.elem[data.elem.selectedIndex].text;
-        });
         var id = '';
         form.on('submit(formQRcode)', function(){
             var QRcodeInfo = {
-                colorType:color,
+                colorType:$(".colorType").val(),
                 departmentId:sessionStorage.getItem("depID") == ""?"root" : sessionStorage.getItem("depID"),
                 remark:$('#LAY_editor').val(),
                 title:$('.QRcodeName').val(),