附件相关功能优化

.idea/workspace.xml

@@ -24,8 +24,8 @@
       <file leaf-file-name="style.css" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/css/style.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="21054">
-              <caret line="957" column="12" selection-start-line="957" selection-start-column="12" selection-end-line="957" selection-end-column="12" />
+            <state relative-caret-position="501">
+              <caret line="953" column="21" selection-start-line="953" selection-start-column="21" selection-end-line="954" selection-end-column="19" />
               <folding />
             </state>
           </provider>
@@ -54,23 +54,23 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="w-project-section-files.html" pinned="false" current-in-tab="true">
+      <file leaf-file-name="w-project-section-files.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/w-project-section-files.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="91">
-              <caret line="230" column="22" selection-start-line="230" selection-start-column="22" selection-end-line="230" selection-end-column="22" />
+            <state relative-caret-position="286">
+              <caret line="119" column="185" selection-start-line="119" selection-start-column="185" selection-end-line="119" selection-end-column="185" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="w-project-section-files-recover.html" pinned="false" current-in-tab="false">
+      <file leaf-file-name="w-project-section-files-recover.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/w-project-section-files-recover.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="237">
-              <caret line="113" column="49" selection-start-line="113" selection-start-column="49" selection-end-line="113" selection-end-column="49" />
+            <state relative-caret-position="329">
+              <caret line="113" column="185" selection-start-line="113" selection-start-column="185" selection-end-line="113" selection-end-column="185" />
               <folding>
-                <element signature="n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
+                <element signature="n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -140,8 +140,8 @@
         <option value="$PROJECT_DIR$/sign-view-page.html" />
         <option value="$PROJECT_DIR$/js/jl.js" />
         <option value="$PROJECT_DIR$/css/style.css" />
-        <option value="$PROJECT_DIR$/w-project-section-files-recover.html" />
         <option value="$PROJECT_DIR$/w-project-section-files.html" />
+        <option value="$PROJECT_DIR$/w-project-section-files-recover.html" />
       </list>
     </option>
   </component>
@@ -310,12 +310,12 @@
       <workItem from="1476150323463" duration="10217000" />
       <workItem from="1476236493960" duration="1194000" />
       <workItem from="1476254310309" duration="1452000" />
-      <workItem from="1476328814950" duration="2009000" />
+      <workItem from="1476328814950" duration="5921000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="58510000" />
+    <option name="totallyTimeSpent" value="62422000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="71" width="1456" height="886" extended-state="0" />
@@ -749,27 +749,27 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21054">
-          <caret line="957" column="12" selection-start-line="957" selection-start-column="12" selection-end-line="957" selection-end-column="12" />
+        <state relative-caret-position="501">
+          <caret line="953" column="21" selection-start-line="953" selection-start-column="21" selection-end-line="954" selection-end-column="19" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/w-project-section-files-recover.html">
+    <entry file="file://$PROJECT_DIR$/w-project-section-files.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="237">
-          <caret line="113" column="49" selection-start-line="113" selection-start-column="49" selection-end-line="113" selection-end-column="49" />
-          <folding>
-            <element signature="n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
-          </folding>
+        <state relative-caret-position="286">
+          <caret line="119" column="185" selection-start-line="119" selection-start-column="185" selection-end-line="119" selection-end-column="185" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/w-project-section-files.html">
+    <entry file="file://$PROJECT_DIR$/w-project-section-files-recover.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="91">
-          <caret line="230" column="22" selection-start-line="230" selection-start-column="22" selection-end-line="230" selection-end-column="22" />
-          <folding />
+        <state relative-caret-position="329">
+          <caret line="113" column="185" selection-start-line="113" selection-start-column="185" selection-end-line="113" selection-end-column="185" />
+          <folding>
+            <element signature="n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>

w-project-section-files-recover.html

@@ -87,6 +87,16 @@
             </li>
           </ul>
         </div>
+          <!--导航-->
+          <ul class="nav nav-tabs">
+            <li>
+              <a href="w-project-section-detail.html">标段概况</a>
+            </li>
+            <li class="active"><a href="w-project-section-files.html">附件</a></li>
+            <li><a href="w-project-section-measure.html">计量台帐</a></li>
+          </ul>
+          <!--导航-->
+
         <div class="title">
           <h1>附件回收站</h1>
         </div>
@@ -101,7 +111,7 @@
               </thead>
               <tbody>
                 <tr>
-                  <td width=""><span class="fileico ico-jpg"></span><a href="#">K0+800-K1+000图纸</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td width="">陈工</td><td width="">2014-11-20</td>
+                  <td width=""><span class="fileico ico-jpg"></span><a href="#">K0+800-K1+000图纸</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20 10:10</td><td class="text-error">陈工</td><td class="text-error">2014-11-20 10:10</td>
                   <td>
                     <div class="btn-group">
                       <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
@@ -111,44 +121,42 @@
                         <li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>
                         <li><a><i class="icon-download-alt"></i>&nbsp;下载</a></li>
                         <li><a href="#file-replace" data-toggle="modal"><i class="icon-repeat"></i>&nbsp;恢复</a></li>
-                        <li class="divider"></li>
-                        <li><a href="#file-del" data-toggle="modal"><i class="icon-remove"></i>&nbsp;彻底删除</a></li>
                       </ul>
                     </div>
                   </td>
                 </tr>
                 <tr>
-                  <td width=""><span class="fileico ico-pdf"></span><a href="#">K0+800-K1+000图纸</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td width="">陈工</td><td width="">2014-11-20</td><td></td>
+                  <td width=""><span class="fileico ico-pdf"></span><a href="#">K0+800-K1+000图纸</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td class="text-error">陈工</td><td class="text-error">2014-11-20</td><td></td>
                 </tr>
                 <tr>
-                  <td width=""><span class="fileico ico-xls"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td width="">陈工</td><td width="">2014-11-20</td><td></td>
+                  <td width=""><span class="fileico ico-xls"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td class="text-error">陈工</td><td class="text-error">2014-11-20</td><td></td>
                 </tr>
                 <tr>
-                  <td width=""><span class="fileico ico-doc"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td width="">陈工</td><td width="">2014-11-20</td><td></td>
+                  <td width=""><span class="fileico ico-doc"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td class="text-error">陈工</td><td class="text-error">2014-11-20</td><td></td>
                 </tr>
                 <tr>
-                  <td width=""><span class="fileico ico-txt"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td width="">陈工</td><td width="">2014-11-20</td><td></td>
+                  <td width=""><span class="fileico ico-txt"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td class="text-error">陈工</td><td class="text-error">2014-11-20</td><td></td>
                 </tr>
                 <tr>
-                  <td width=""><span class="fileico ico-zip"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td width="">陈工</td><td width="">2014-11-20</td><td></td>
+                  <td width=""><span class="fileico ico-zip"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td class="text-error">陈工</td><td class="text-error">2014-11-20</td><td></td>
                 </tr>
                 <tr>
-                  <td width=""><span class="fileico ico-jpg"></span><a href="#">K0+800-K1+000图纸</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td width="">陈工</td><td width="">2014-11-20</td><td></td>
+                  <td width=""><span class="fileico ico-jpg"></span><a href="#">K0+800-K1+000图纸</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td class="text-error">陈工</td><td class="text-error">2014-11-20</td><td></td>
                 </tr>
                 <tr>
-                  <td width=""><span class="fileico ico-pdf"></span><a href="#">K0+800-K1+000图纸</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td width="">陈工</td><td width="">2014-11-20</td><td></td>
+                  <td width=""><span class="fileico ico-pdf"></span><a href="#">K0+800-K1+000图纸</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td class="text-error">陈工</td><td class="text-error">2014-11-20</td><td></td>
                 </tr>
                 <tr>
-                  <td width=""><span class="fileico ico-xls"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td width="">陈工</td><td width="">2014-11-20</td><td></td>
+                  <td width=""><span class="fileico ico-xls"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td class="text-error">陈工</td><td class="text-error">2014-11-20</td><td></td>
                 </tr>
                 <tr>
-                  <td width=""><span class="fileico ico-doc"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td width="">陈工</td><td width="">2014-11-20</td><td></td>
+                  <td width=""><span class="fileico ico-doc"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td class="text-error">陈工</td><td class="text-error">2014-11-20</td><td></td>
                 </tr>
                 <tr>
-                  <td width=""><span class="fileico ico-txt"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td width="">陈工</td><td width="">2014-11-20</td><td></td>
+                  <td width=""><span class="fileico ico-txt"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td class="text-error">陈工</td><td class="text-error">2014-11-20</td><td></td>
                 </tr>
                 <tr>
-                  <td width=""><span class="fileico ico-zip"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td width="">陈工</td><td width="">2014-11-20</td><td></td>
+                  <td width=""><span class="fileico ico-zip"></span><a href="#">文件名</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td><td class="text-error">陈工</td><td class="text-error">2014-11-20</td><td></td>
                 </tr>
               </tbody>
             </table>
@@ -170,12 +178,8 @@
               <tr><th width="60">格式</th><td><span class="fileico ico-jpg"></span>.jpg</td><th width="60">所在期</th><td>第二期</td></tr>
               <tr><th width="60">上传者</th><td>陈工</td><th width="60">上传时间</th><td>2014-11-20 14:20</td></tr>
               <tr><th width="60">备注/描述</th><td colspan="3">内容内容内容内容</td></tr>
-              <tr><th width="60">操作</th>
+              <tr><th width="60">更多操作</th>
                   <td colspan="3">
-                    <button class="btn btn-mini" type="button"><i class="icon-eye-open"></i>预览</button>
-                    <button class="btn btn-mini btn-primary" type="button"><i class="icon-download-alt icon-white"></i>下载</button>
-                    <button class="btn btn-mini btn-info" type="button" href="#file-replace" data-toggle="modal"><i class="icon-repeat icon-white"></i>恢复</button>
-                    &nbsp;&nbsp;&nbsp;&nbsp;
                     <button class="btn btn-mini btn-danger" type="button" href="#file-del" data-toggle="modal"><i class="icon-remove icon-white"></i>彻底删除</button>
                     <button class="btn btn-mini btn-danger" type="button" href="#file-del2" data-toggle="modal"><i class="icon-remove icon-white"></i>彻底删除</button>
               </td></tr>

w-project-section-files.html

@@ -117,7 +117,7 @@
               </thead>
               <tbody>
                 <tr>
-                  <td width=""><span class="fileico ico-jpg"></span><a href="#">K0+800-K1+000图纸</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20</td>
+                  <td width=""><span class="fileico ico-jpg"></span><a href="#">K0+800-K1+000图纸</a></td><td>第二期</td><td>203-1-a 挖土方</td><td width="">陈工</td><td width="">2014-11-20 10:10</td>
                   <td>
                     <div class="btn-group">
                     <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
@@ -179,29 +179,21 @@
           </div>
           <div class="filesDetail">
             <table class="table table-striped" >
-            <thead><tr><th colspan="4">文件详情</th></tr></thead>
+            <thead>
+              <tr>
+                <th colspan="4">文件详情</th>
+              </tr></thead>
               <tr><th width="60">文件名</th><td colspan="3"> K0+800-K1+000图纸</td></tr>
               <tr><th width="60">格式</th><td><span class="fileico ico-jpg"></span>.jpg</td><th width="60">所在期</th><td>第二期</td></tr>
               <tr><th width="60">上传者</th><td>陈工</td><th width="60">上传时间</th><td>2014-11-20 14:20</td></tr>
               <tr><th width="60">备注/描述</th><td colspan="3">内容内容内容内容</td></tr>
-              <tr><th width="60">操作</th>
-                  <td colspan="3">
-                    <button class="btn btn-mini" type="button"><i class="icon-eye-open"></i>预览</button>
-                    <button class="btn btn-mini btn-primary" type="button" href="#file-edit" data-toggle="modal"><i class="icon-pencil icon-white"></i>编辑</button>
-                    <button class="btn btn-mini btn-primary" type="button"><i class="icon-download-alt icon-white"></i>下载</button>
-                    <button class="btn btn-mini btn-info" type="button" href="#file-replace" data-toggle="modal"><i class="icon-retweet icon-white"></i>替换</button>
-                    <div class="btn-group">
-                      <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
-                        更多
-                        <span class="caret"></span>
-                      </a>
-                      <ul class="dropdown-menu">
-                        <li><a><i class="icon-time"></i>&nbsp;历史版本</a></li>
-                        <li class="divider"></li>
-                        <li><a href="#file-del" data-toggle="modal"><i class="icon-remove"></i>&nbsp;删除</a></li>
-                      </ul>
-                    </div>
-              </td></tr>
+              <tr><th width="60">更多操作</th>
+                <td colspan="3">
+                  <button class="btn btn-mini btn-primary" type="button"  href="#file-replace" data-toggle="modal"><i class="icon-retweet icon-white"></i>替换</button>
+                  <button class="btn btn-mini btn-info" type="button" href="#file-history" data-toggle="modal"><i class="icon-time icon-white"></i>历史版本</button>
+                  &nbsp;&nbsp;&nbsp;&nbsp;
+                  <button class="btn btn-mini btn-danger" type="button" href="#file-del" data-toggle="modal"><i class="icon-remove icon-white"></i>删除</button>
+                </td></tr>
             </table>
           </div>
         </div>
@@ -273,12 +265,44 @@
   </div>
   <div class="modal-body">
     <h5 class="text-success">文件删除成功，您可以在附件回收站恢复它。</h5>
-    </div>
+  </div>
   <div class="modal-footer">
     <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
   </div>
+</div>
+</div>
+<!-- 删除弹出 -->
+<!-- 历史版本弹出 -->
+<div id="file-history" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="myModalLabel">历史版本</h3>
   </div>
+  <div class="modal-body">
+    <div class="media">
+      <div class="pull-left">
+        <h4>#1</h4>
+      </div>
+      <div class="media-body">
+        <h5>陈特&nbsp;上传于 2016-10-10 10:10</h5>
+        <a href="#" target="_blank">QQ截图20160629164352.png</a>
+      </div>
+    </div>
+    <div class="media">
+      <div class="pull-left">
+        <h4>#2</h4>
+      </div>
+      <div class="media-body">
+        <h5>陈特&nbsp;上传于 2016-9-24 17:30</h5>
+        <a href="#" target="_blank">dfsdf.png</a>
+      </div>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+  </div>
+</div>
 </div>
-<!-- 产出弹出 -->
+<!-- 历史版本1弹出 -->
 <script type="text/javascript">autoFlashHeight();</script>
 </body>