Преглед изворни кода

报表管理分离为FC,新增FC登录页,FC相关按钮颜色修改为绿色,侧栏修改为中性颜色

Chente пре 10 година
родитељ
комит
ae4270c649
12 измењених фајлова са 221 додато и 115 уклоњено
  1. 146 94
      .idea/workspace.xml
  2. 2 2
      add-form.html
  3. BIN
      css/login-bg-fc.jpg
  4. BIN
      css/login-bg.jpg
  5. 10 7
      css/style.css
  6. 3 3
      edit-formcate.html
  7. 2 2
      edit-formpoj.html
  8. 12 4
      edit-formver.html
  9. 2 2
      form-list.html
  10. 1 1
      formver-list.html
  11. 40 0
      login-fc.html
  12. 3 0
      login.html

+ 146 - 94
.idea/workspace.xml

@@ -21,11 +21,84 @@
   </component>
   </component>
   <component name="FileEditorManager">
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="edit-formpoj.html" pinned="false" current-in-tab="true">
+      <file leaf-file-name="edit-formpoj.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/edit-formpoj.html">
         <entry file="file://$PROJECT_DIR$/edit-formpoj.html">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="289">
-              <caret line="41" column="40" selection-start-line="41" selection-start-column="40" selection-end-line="41" selection-end-column="40" />
+            <state relative-caret-position="1411">
+              <caret line="95" column="57" selection-start-line="95" selection-start-column="57" selection-end-line="95" selection-end-column="57" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="login-fc.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/login-fc.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="462">
+              <caret line="30" column="74" selection-start-line="30" selection-start-column="74" selection-end-line="30" selection-end-column="74" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="form-list.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/form-list.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="4461">
+              <caret line="238" column="49" selection-start-line="238" selection-start-column="49" selection-end-line="238" selection-end-column="49" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="formver-list.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/formver-list.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="528">
+              <caret line="27" column="57" selection-start-line="27" selection-start-column="57" selection-end-line="27" selection-end-column="57" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="style.css" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/css/style.css">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="242">
+              <caret line="83" column="12" selection-start-line="83" selection-start-column="12" selection-end-line="83" selection-end-column="12" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="edit-formver.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/edit-formver.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="176">
+              <caret line="187" column="49" selection-start-line="187" selection-start-column="49" selection-end-line="187" selection-end-column="49" />
+              <folding>
+                <element signature="n#div#5;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
+                <element signature="n#div#6;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="add-form.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/add-form.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="572">
+              <caret line="94" column="70" selection-start-line="94" selection-start-column="70" selection-end-line="94" selection-end-column="70" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="edit-formcate.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/edit-formcate.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-22">
+              <caret line="188" column="57" selection-start-line="188" selection-start-column="57" selection-end-line="188" selection-end-column="57" />
               <folding />
               <folding />
             </state>
             </state>
           </provider>
           </provider>
@@ -50,13 +123,16 @@
         <option value="$PROJECT_DIR$/css/codemirror/material.css" />
         <option value="$PROJECT_DIR$/css/codemirror/material.css" />
         <option value="$PROJECT_DIR$/css/codemirror/codemirror.css" />
         <option value="$PROJECT_DIR$/css/codemirror/codemirror.css" />
         <option value="$PROJECT_DIR$/add-formver.html" />
         <option value="$PROJECT_DIR$/add-formver.html" />
-        <option value="$PROJECT_DIR$/edit-formver.html" />
-        <option value="$PROJECT_DIR$/formver-list.html" />
-        <option value="$PROJECT_DIR$/edit-formcate.html" />
         <option value="$PROJECT_DIR$/edit-form.html" />
         <option value="$PROJECT_DIR$/edit-form.html" />
+        <option value="$PROJECT_DIR$/login.html" />
+        <option value="$PROJECT_DIR$/login-fc.html" />
         <option value="$PROJECT_DIR$/add-form.html" />
         <option value="$PROJECT_DIR$/add-form.html" />
-        <option value="$PROJECT_DIR$/form-list.html" />
+        <option value="$PROJECT_DIR$/edit-formcate.html" />
         <option value="$PROJECT_DIR$/edit-formpoj.html" />
         <option value="$PROJECT_DIR$/edit-formpoj.html" />
+        <option value="$PROJECT_DIR$/form-list.html" />
+        <option value="$PROJECT_DIR$/edit-formver.html" />
+        <option value="$PROJECT_DIR$/formver-list.html" />
+        <option value="$PROJECT_DIR$/css/style.css" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -97,8 +173,6 @@
       <foldersAlwaysOnTop value="true" />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     </navigator>
     <panes>
     <panes>
-      <pane id="Scratches" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
       <pane id="ProjectPane">
         <subPane>
         <subPane>
           <PATH>
           <PATH>
@@ -131,26 +205,10 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             </PATH_ELEMENT>
           </PATH>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jszfver" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jszfver" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="css" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="codemirror" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
         </subPane>
       </pane>
       </pane>
+      <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
     </panes>
   </component>
   </component>
   <component name="PropertiesComponent">
   <component name="PropertiesComponent">
@@ -242,17 +300,18 @@
       <workItem from="1470033171148" duration="684000" />
       <workItem from="1470033171148" duration="684000" />
       <workItem from="1470037226564" duration="1099000" />
       <workItem from="1470037226564" duration="1099000" />
       <workItem from="1470362153416" duration="618000" />
       <workItem from="1470362153416" duration="618000" />
+      <workItem from="1479176842396" duration="3028000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="43970000" />
+    <option name="totallyTimeSpent" value="46998000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
-    <frame x="1912" y="71" width="1456" height="886" extended-state="6" />
-    <editor active="false" />
+    <frame x="1912" y="71" width="1456" height="886" extended-state="0" />
+    <editor active="true" />
     <layout>
     <layout>
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14587738" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14587738" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980132" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980132" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -289,27 +348,6 @@
     <watches-manager />
     <watches-manager />
   </component>
   </component>
   <component name="editorHistoryManager">
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/htmlmixed/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="59" column="24" selection-start-line="59" selection-start-column="15" selection-end-line="59" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/xml/test.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="1" column="66" selection-start-line="1" selection-start-column="66" selection-end-line="1" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/xml/xml.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/add-formver.html">
     <entry file="file://$PROJECT_DIR$/add-formver.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="22">
         <state relative-caret-position="22">
@@ -338,13 +376,7 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$USER_HOME$/Desktop/codepress/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/Desktop/codepress/index.html" />
     <entry file="file://$PROJECT_DIR$/add-formver.html">
     <entry file="file://$PROJECT_DIR$/add-formver.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
         <state relative-caret-position="0">
@@ -502,13 +534,7 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$USER_HOME$/Desktop/codepress/codepress.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="421">
-          <caret line="29" column="72" selection-start-line="29" selection-start-column="72" selection-end-line="29" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/Desktop/codepress/codepress.html" />
     <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/xml/index.html">
     <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/xml/index.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="594">
         <state relative-caret-position="594">
@@ -523,13 +549,7 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$USER_HOME$/Desktop/codepress/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/Desktop/codepress/index.html" />
     <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/css/gss.html">
     <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/css/gss.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
         <state relative-caret-position="0">
@@ -572,53 +592,85 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/edit-formver.html">
+    <entry file="file://$PROJECT_DIR$/edit-form.html" />
+    <entry file="file://$PROJECT_DIR$/add-formver.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="347">
-          <caret line="175" column="35" selection-start-line="175" selection-start-column="35" selection-end-line="175" selection-end-column="35" />
+        <state relative-caret-position="421">
+          <caret line="90" column="41" selection-start-line="90" selection-start-column="41" selection-end-line="90" selection-end-column="41" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/formver-list.html">
+    <entry file="file://$PROJECT_DIR$/login.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="267">
-          <caret line="47" column="38" selection-start-line="47" selection-start-column="38" selection-end-line="47" selection-end-column="38" />
+        <state relative-caret-position="479">
+          <caret line="32" column="59" selection-start-line="32" selection-start-column="59" selection-end-line="32" selection-end-column="59" />
+          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/add-form.html">
+    <entry file="file://$PROJECT_DIR$/login-fc.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-173">
-          <caret line="51" column="84" selection-start-line="51" selection-start-column="84" selection-end-line="51" selection-end-column="84" />
+        <state relative-caret-position="462">
+          <caret line="30" column="74" selection-start-line="30" selection-start-column="74" selection-end-line="30" selection-end-column="74" />
+          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/edit-form.html" />
-    <entry file="file://$PROJECT_DIR$/form-list.html">
+    <entry file="file://$PROJECT_DIR$/edit-formpoj.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="413">
-          <caret line="206" column="80" selection-start-line="206" selection-start-column="80" selection-end-line="206" selection-end-column="80" />
+        <state relative-caret-position="1411">
+          <caret line="95" column="57" selection-start-line="95" selection-start-column="57" selection-end-line="95" selection-end-column="57" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/add-form.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="572">
+          <caret line="94" column="70" selection-start-line="94" selection-start-column="70" selection-end-line="94" selection-end-column="70" />
+          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/edit-formcate.html">
     <entry file="file://$PROJECT_DIR$/edit-formcate.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="118" column="99" selection-start-line="118" selection-start-column="80" selection-end-line="118" selection-end-column="99" />
+        <state relative-caret-position="-22">
+          <caret line="188" column="57" selection-start-line="188" selection-start-column="57" selection-end-line="188" selection-end-column="57" />
+          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/add-formver.html">
+    <entry file="file://$PROJECT_DIR$/edit-formver.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="421">
-          <caret line="90" column="41" selection-start-line="90" selection-start-column="41" selection-end-line="90" selection-end-column="41" />
+        <state relative-caret-position="176">
+          <caret line="187" column="49" selection-start-line="187" selection-start-column="49" selection-end-line="187" selection-end-column="49" />
+          <folding>
+            <element signature="n#div#5;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
+            <element signature="n#div#6;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
+          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/edit-formpoj.html">
+    <entry file="file://$PROJECT_DIR$/form-list.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4461">
+          <caret line="238" column="49" selection-start-line="238" selection-start-column="49" selection-end-line="238" selection-end-column="49" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/formver-list.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="528">
+          <caret line="27" column="57" selection-start-line="27" selection-start-column="57" selection-end-line="27" selection-end-column="57" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="41" column="40" selection-start-line="41" selection-start-column="40" selection-end-line="41" selection-end-column="40" />
+        <state relative-caret-position="242">
+          <caret line="83" column="12" selection-start-line="83" selection-start-column="12" selection-end-line="83" selection-end-column="12" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>

+ 2 - 2
add-form.html

@@ -58,7 +58,7 @@
                 <div class="row">
                 <div class="row">
                   <div class="col-xs-5">
                   <div class="col-xs-5">
                     <a href="form-list.html" class="btn btn-default">返回</a>
                     <a href="form-list.html" class="btn btn-default">返回</a>
-                    <a href="formver-list.html" class="btn btn-info">确认添加</a>
+                    <a href="formver-list.html" class="btn btn-success">确认添加</a>
                   </div>
                   </div>
                 </div>
                 </div>
               </div>
               </div>
@@ -92,7 +92,7 @@
                 <div class="row">
                 <div class="row">
                   <div class="col-xs-5">
                   <div class="col-xs-5">
                     <a href="form-list.html" class="btn btn-default">返回</a>
                     <a href="form-list.html" class="btn btn-default">返回</a>
-                    <a href="formver-list.html" class="btn btn-info">确认添加</a>
+                    <a href="formver-list.html" class="btn btn-success">确认添加</a>
                   </div>
                   </div>
                 </div>
                 </div>
               </div>
               </div>

BIN
css/login-bg-fc.jpg



+ 10 - 7
css/style.css

@@ -35,10 +35,13 @@ a:focus {
 }
 }
 .login-top{
 .login-top{
   width:100%;
   width:100%;
-  height:220px;
+  height:320px;
   background: url(login-bg.jpg) no-repeat center center;
   background: url(login-bg.jpg) no-repeat center center;
   margin-bottom:30px;
   margin-bottom:30px;
 }
 }
+.login-top.login-fc-bg{
+  background: url(login-bg-fc.jpg) no-repeat center center
+}
 .login-top h4,.login-top h5{
 .login-top h4,.login-top h5{
   text-align: center;
   text-align: center;
   color:#fff;
   color:#fff;
@@ -46,7 +49,7 @@ a:focus {
 }
 }
 .login-top h4{
 .login-top h4{
   font-size:48px;
   font-size:48px;
-  margin:70px 0 0 0;
+  margin:120px 0 0 0;
 }
 }
 .login-item .login-form{
 .login-item .login-form{
   width: 400px;
   width: 400px;
@@ -59,7 +62,7 @@ a:focus {
   top:0;
   top:0;
 }
 }
 .side-nav h1{
 .side-nav h1{
-  background:#5bc0de;
+  background:#333;
   color:#fff;
   color:#fff;
   font-size: 24px;
   font-size: 24px;
   height:50px;
   height:50px;
@@ -70,7 +73,7 @@ a:focus {
 .side-nav ul{
 .side-nav ul{
   margin:0;
   margin:0;
   padding:0;
   padding:0;
-  border-right:1px solid #5bc0de;
+  border-right:1px solid #333;
 }
 }
 .side-nav ul li {
 .side-nav ul li {
   width:50px;
   width:50px;
@@ -78,7 +81,7 @@ a:focus {
 }
 }
 .side-nav ul li a{
 .side-nav ul li a{
   display:inline-block;
   display:inline-block;
-  color:#999;
+  color:#CCC;
   font-size: 18px;
   font-size: 18px;
   width:50px;
   width:50px;
   height:50px;
   height:50px;
@@ -86,10 +89,10 @@ a:focus {
   text-align: center
   text-align: center
 }
 }
 .side-nav ul li a:hover{
 .side-nav ul li a:hover{
-  color:#31b0d5
+  color:#333
 }
 }
 .side-nav ul li a.active{
 .side-nav ul li a.active{
-  color:#5bc0de;
+  color:#000;
 }
 }
 .warp-content {
 .warp-content {
   margin-left:50px;
   margin-left:50px;

+ 3 - 3
edit-formcate.html

@@ -45,7 +45,7 @@
                         <label>父级</label>
                         <label>父级</label>
                         <select class="form-control"><option>设为父级</option><option>父级类别1</option><option>父级类别2</option><option>父级类别3</option><option>父级类别4</option><option>父级类别5</option><option>父级类别6</option></select>
                         <select class="form-control"><option>设为父级</option><option>父级类别1</option><option>父级类别2</option><option>父级类别3</option><option>父级类别4</option><option>父级类别5</option><option>父级类别6</option></select>
                     </div>
                     </div>
-                    <button type="submit" class="btn btn-info">添加类别</button>
+                    <button type="submit" class="btn btn-success">添加类别</button>
                 </form>
                 </form>
             </div>
             </div>
             <div class="col-md-8 col-md-offset-1">
             <div class="col-md-8 col-md-offset-1">
@@ -100,7 +100,7 @@
                         <label>父级</label>
                         <label>父级</label>
                         <select class="form-control"><option>设为父级</option><option>父级类别1</option><option>父级类别2</option><option>父级类别3</option><option>父级类别4</option><option>父级类别5</option><option>父级类别6</option></select>
                         <select class="form-control"><option>设为父级</option><option>父级类别1</option><option>父级类别2</option><option>父级类别3</option><option>父级类别4</option><option>父级类别5</option><option>父级类别6</option></select>
                     </div>
                     </div>
-                    <button type="submit" class="btn btn-info">添加类别</button>
+                    <button type="submit" class="btn btn-success">添加类别</button>
                 </form>
                 </form>
             </div>
             </div>
             <div class="col-md-8 col-md-offset-1">
             <div class="col-md-8 col-md-offset-1">
@@ -186,7 +186,7 @@
                   </div>
                   </div>
               </div>
               </div>
               <div class="modal-footer">
               <div class="modal-footer">
-                  <a type="button" class="btn btn-info" href="#">保存</a>
+                  <a type="button" class="btn btn-success" href="#">保存</a>
               </div>
               </div>
           </div>
           </div>
       </div>
       </div>

+ 2 - 2
edit-formpoj.html

@@ -34,7 +34,7 @@
                         <label>项目名称</label>
                         <label>项目名称</label>
                         <input class="form-control" placeholder="不要太长就是了" type="text">
                         <input class="form-control" placeholder="不要太长就是了" type="text">
                     </div>
                     </div>
-                    <button type="submit" class="btn btn-info">添加项目</button>
+                    <button type="submit" class="btn btn-success">添加项目</button>
                 </form>
                 </form>
             </div>
             </div>
             <div class="col-md-8 col-md-offset-1">
             <div class="col-md-8 col-md-offset-1">
@@ -93,7 +93,7 @@
                   </div>
                   </div>
               </div>
               </div>
               <div class="modal-footer">
               <div class="modal-footer">
-                  <a type="button" class="btn btn-info" href="#">保存</a>
+                  <a type="button" class="btn btn-success" href="#">保存</a>
               </div>
               </div>
           </div>
           </div>
       </div>
       </div>

+ 12 - 4
edit-formver.html

@@ -166,8 +166,8 @@
                   <label></label>
                   <label></label>
                   <div class="row">
                   <div class="row">
                       <div class="col-xs-12">
                       <div class="col-xs-12">
-                          <a href="form-list.html" class="btn btn-default">返回</a>
-                          <a href="form-list.html" class="btn btn-info">确认修改</a>
+                          <a href="formver-list.html" class="btn btn-default">返回</a>
+                          <a href="form-list.html" class="btn btn-success">确认修改</a>
                       </div>
                       </div>
                   </div>
                   </div>
               </div>
               </div>
@@ -175,12 +175,20 @@
                   <label></label>
                   <label></label>
                   <div class="row">
                   <div class="row">
                       <div class="col-xs-12">
                       <div class="col-xs-12">
-                          <a href="form-list.html" class="btn btn-default">返回</a>
+                          <a href="formver-list.html" class="btn btn-default">返回</a>
                           <a href="form-list.html" class="btn btn-default">保存草稿</a>
                           <a href="form-list.html" class="btn btn-default">保存草稿</a>
-                          <a href="form-list.html" class="btn btn-info">确认发布</a>
+                          <a href="form-list.html" class="btn btn-success">确认发布</a>
                       </div>
                       </div>
                   </div>
                   </div>
               </div>
               </div>
+              <div class="form-group">
+                <ul>
+                    <li>2016-01-01 15:20:14 陈特 创建版本2016-07-21</li>
+                    <li>2016-01-01 15:30:30 陈特 保存草稿</li>
+                    <li>2016-01-01 15:35:30 陈特 发布</li>
+                    <li>2016-01-01 15:37:30 陈特 编辑</li>
+                </ul>
+              </div>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>

+ 2 - 2
form-list.html

@@ -25,7 +25,7 @@
   <div class="warp-content">
   <div class="warp-content">
     <div class="container">
     <div class="container">
       <div class="page-header">
       <div class="page-header">
-        <a href="add-form.html" class="btn btn-info pull-right">添加新报表</a>
+        <a href="add-form.html" class="btn btn-success pull-right">添加新报表</a>
         <h2><i class="glyphicon glyphicon-list"></i>&nbsp;报表库</h2>
         <h2><i class="glyphicon glyphicon-list"></i>&nbsp;报表库</h2>
       </div>
       </div>
       <div class="page-nav clearfix">
       <div class="page-nav clearfix">
@@ -236,7 +236,7 @@
           <!--定制报表信息-->
           <!--定制报表信息-->
         </div>
         </div>
         <div class="modal-footer">
         <div class="modal-footer">
-          <a type="button" class="btn btn-info" href="#">保存</a>
+          <a type="button" class="btn btn-success" href="#">保存</a>
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>

+ 1 - 1
formver-list.html

@@ -25,7 +25,7 @@
   <div class="warp-content">
   <div class="warp-content">
     <div class="container">
     <div class="container">
       <div class="page-header">
       <div class="page-header">
-        <a href="add-formver.html" class="btn btn-info pull-right">添加新版本</a>
+        <a href="add-formver.html" class="btn btn-success pull-right">添加新版本</a>
         <h2 id="basis-info">报表历史版本</h2>
         <h2 id="basis-info">报表历史版本</h2>
       </div>
       </div>
       <table class="table table-hover">
       <table class="table table-hover">

+ 40 - 0
login-fc.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+  <title>VC</title> 
+  <meta name=description content="VC">  
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="renderer" content="webkit">
+	<meta name=copyright content=smartcost.com.cn> 
+	<link rel=stylesheet href=css/bootstrap.css> 
+	<link rel=stylesheet href=css/style.css> 
+	<script src=js/jquery-1.9.1.min.js></script> 
+	<script src=js/bootstrap.js></script> 
+	<script src=js/global.js></script> 
+</head>
+<body>
+  <div class="wrap-login">
+    <div class="login-item"> 
+      <div class="login-top login-fc-bg clearfix">
+        <h4 class="title">FC</h4>
+        <h5>珠海纵横创新软件有限公司</h5>
+      </div>
+      <div class="login-form">
+        <form>
+          <div class="form-group">
+            <input  class="form-control input-lg"  placeholder="帐号">
+          </div>
+          <div class="form-group">
+            <input type="password" class="form-control input-lg"  placeholder="密码">
+          </div>
+          <a class="btn btn-success btn-block btn-lg" href="form-list.html">登录</a>
+            <div class="form-group">
+                <a class="btn btn-link" href="login.html">VC</a>
+            </div>
+        </form>
+      </div>
+    </div>
+  </div>
+  <div class="login copy-right">Copyright @XiaoHeiWu all rights reserved</div>
+</body>

+ 3 - 0
login.html

@@ -29,6 +29,9 @@
             <input type="password" class="form-control input-lg"  placeholder="密码">
             <input type="password" class="form-control input-lg"  placeholder="密码">
           </div>
           </div>
           <a class="btn btn-info btn-block btn-lg" href="server-list.html">登录</a>
           <a class="btn btn-info btn-block btn-lg" href="server-list.html">登录</a>
+            <div class="form-group">
+                <a href="login-fc.html" class="btn btn-link">FC</a>
+            </div>
         </form>
         </form>
       </div>
       </div>
     </div>
     </div>