Browse Source

feat: 工具栏“数据接口”,移至“更多”下,放在“锁定清单”上面

vian 4 years ago
parent
commit
f5cca93465
2 changed files with 39 additions and 17 deletions
  1. 16 14
      web/building_saas/main/html/main.html
  2. 23 3
      web/building_saas/main/js/views/project_view.js

+ 16 - 14
web/building_saas/main/html/main.html

@@ -104,20 +104,6 @@
                     data-target="#import">导入广联达算量Excel清单</a>
                 </div>
               </span>
-              <% if (region === '重庆市' || region === '广东省') { %>
-              <span id="exportSpan" class="btn btn-light btn-sm" data-toggle="tooltip" data-original-title="数据接口"
-                data-placement="bottom">
-                <a class="dropdown-toggle" href="#" data-toggle="dropdown"><i class="fa  fa-code-fork"></i></a>
-                <div class="dropdown-menu" id="exportMenu">
-                  <a class="dropdown-item" href="#export" data-toggle="modal"
-                    data-target="#export">导出<%= region %>电子招投标数据文件</a>
-                  <% if (region !== '广东省') { %>
-                  <a class="dropdown-item" href="#exportIndex" data-toggle="modal"
-                    data-target="#exportIndex">导出<%= region %>指标成果文件</a>
-                  <% } %>
-                </div>
-              </span>
-              <% } %>
               <!--<a href="javascript:void(0)" class="btn btn-light btn-sm" id="insertRation" data-toggle="tooltip" data-placement="bottom" data-original-title="插入定额"><i class="fa fa-sign-in" aria-hidden="true"></i></a>-->
               <a href="javascript:void(0)" class="btn btn-light btn-sm" id="delete" data-toggle="tooltip"
                 data-placement="bottom" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
@@ -150,6 +136,22 @@
                   </div>
                   <a href="javascript:void(0);" id="ZLFB_btn" class="dropdown-item" data-placement="bottom"
                     style="display: none;"><i class="fa fa-retweet" aria-hidden="true"></i> 整理分部</a>
+                  <% if (region === '重庆市' || region === '广东省') { %>
+                  <a id="interface-dropdown" href="javascript:void(0);" data-toggle="dropdown"
+                    class="dropdown-item dropdown-toggle"><i class="fa fa-list-ol"></i> 数据接口...</a>
+                    <div style="position: relative;">
+                      <div id="interface-dropdown-sub" class="dropdown-menu dropdown-menu-left"
+                      style="min-width: 6.5rem; position: absolute; transform: translate3d(158px, 3px, 0px); top: -40px; left: 0px; will-change: transform;"
+                      x-placement="right-start">
+                      <a class="dropdown-item btn-sm" href="#export" data-toggle="modal"
+                      data-target="#export">导出<%= region %>电子招投标数据文件</a>
+                      <% if (region !== '广东省') { %>
+                      <a class="dropdown-item btn-sm" href="#exportIndex" data-toggle="modal"
+                      data-target="#exportIndex">导出<%= region %>指标成果文件</a>
+                       <% } %>
+                    </div>
+                    </div>
+                  <% } %>
                   <% if (projectData.property.lockBills == true) { %>
                   <a href="javascript:void(0)" class="dropdown-item" name="lockBills"> <i class="fa fa-unlock-alt"
                       aria-hidden="true"></i> 解锁清单</a>

+ 23 - 3
web/building_saas/main/js/views/project_view.js

@@ -2469,6 +2469,9 @@ $('body').click(function () {
 });
 let enterDisplayA = false;
 //鼠标移到显示至,自动弹出子菜单
+$('#displayA').click(function () {
+    return false;
+});
 $('#displayA').mouseenter(function (e) {
     enterDisplayA = true;
     $('#subDisplay').addClass('show');
@@ -2476,12 +2479,29 @@ $('#displayA').mouseenter(function (e) {
 $('#displayA').mouseleave(function () {
     enterDisplayA = false;
 });
+
+let enterInterfaceDropdown = false;
+$('#interface-dropdown').mouseenter(function () {
+    enterInterfaceDropdown = true;
+    $('#interface-dropdown-sub').addClass('show');
+});
+$('#interface-dropdown').mouseleave(function () {
+    enterInterfaceDropdown = false;
+});
+$('#interface-dropdown').click(function() {
+    return false;
+});
+
 $('#moreMenu > a').mouseenter(function () {
-   if (!enterDisplayA) {
-       $('#subDisplay').removeClass('show');
-   }
+    if (!enterDisplayA) {
+        $('#subDisplay').removeClass('show');
+    }
+    if (!enterInterfaceDropdown) {
+        $('#interface-dropdown-sub').removeClass('show');
+    }
 });
 
+
 $('#displayDXFY').click(function () {
    displayLevel(projectObj.project.mainTree.items, 0, 'DXFY')
 });