Explorar o código

主页面抛弃tooltip,有冲突

zhongzewei %!s(int64=6) %!d(string=hai) anos
pai
achega
ba3ddb9735

+ 13 - 13
web/building_saas/main/html/main.html

@@ -63,22 +63,22 @@
                     <!--<a href="javascript:void(0)" class="btn btn-sm" title="复制" ><i class="fa fa-files-o" aria-hidden="true"></i></a>
                     <a href="javascript:void(0)" class="btn btn-sm" title="剪切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
                     <a href="javascript:void(0)" class="btn btn-sm" title="粘贴"><i class="fa fa-clipboard" aria-hidden="true"></i></a>-->
-                    <a class="btn btn-sm" href="javascript:void(0);" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cog" title="项目属性" data-toggle="tooltip" data-placement="bottom"></i></a>
+                    <a class="btn btn-sm" href="javascript:void(0);" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cog" title="项目属性" data-placement="bottom"></i></a>
                     <span class="btn btn-sm">
-                        <a class="dropdown-toggle" href="#" data-toggle="dropdown"><i class="fa  fa-cloud-upload" data-toggle="tooltip" data-placement="bottom" title="导入"></i></a>
+                        <a class="dropdown-toggle" href="#" data-toggle="dropdown"><i class="fa  fa-cloud-upload" data-placement="bottom" title="导入"></i></a>
                         <div class="dropdown-menu">
                             <a id="uploadLj" class="dropdown-item" href="#import" data-toggle="modal" data-target="#import">导入09表Excel清单</a>
                             <a id="uploadGld" class="dropdown-item" href="#import" data-toggle="modal" data-target="#import">导入广联达算量Excel清单</a>
                         </div>
                     </span>
-                    <a href="javascript:void(0)" data-toggle="tooltip" class="btn btn-sm" id="insertRation" title="插入定额"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
-                    <a href="javascript:void(0)" data-toggle="tooltip" class="btn btn-sm" id="delete" title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
-                    <a href="javascript:void(0)" data-toggle="tooltip" class="btn btn-sm" id="upLevel" title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
-                    <a href="javascript:void(0)" data-toggle="tooltip" class="btn btn-sm" id="downLevel" title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
-                      <a href="javascript:void(0)" data-toggle="tooltip" class="btn btn-sm" id="upMove" title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
-                      <a href="javascript:void(0)" data-toggle="tooltip" class="btn btn-sm" id="downMove" title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
+                    <a href="javascript:void(0)" class="btn btn-sm" id="insertRation" title="插入定额"><i class="fa fa-sign-in" aria-hidden="true"></i></a>
+                    <a href="javascript:void(0)" class="btn btn-sm" id="delete" title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
+                    <a href="javascript:void(0)" class="btn btn-sm" id="upLevel" title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
+                    <a href="javascript:void(0)"  class="btn btn-sm" id="downLevel" title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
+                      <a href="javascript:void(0)" class="btn btn-sm" id="upMove" title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
+                      <a href="javascript:void(0)" class="btn btn-sm" id="downMove" title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
                     <span class="btn btn-sm">
-                      <a href="" data-toggle="dropdown"><span data-toggle="tooltip"  data-placement="bottom" title="显示至..."><i class="fa fa-list-ol"></i></span></a>
+                      <a href="" data-toggle="dropdown"><span  data-placement="bottom" title="显示至..."><i class="fa fa-list-ol"></i></span></a>
                       <div class="dropdown-menu dropdown-menu-left" style="min-width: 6.5rem">
                       <a class="dropdown-item" href="javascript:void(0);" id="displayDXFY">大项费用</a>
                       <a class="dropdown-item" href="javascript:void(0);"  id="displayFB1">一级分部</a>
@@ -90,13 +90,13 @@
                       <a class="dropdown-item" href="javascript:void(0);"  id="displayZD">最底层</a>
                     </div>
                     </span>
-                      <a href="javascript:void(0);" data-toggle="tooltip" id="ZLFB_btn" class="btn btn-sm" data-placement="bottom" title="整理分部"><i class="fa fa-retweet" aria-hidden="true"></i></a>
+                      <a href="javascript:void(0);" id="ZLFB_btn" class="btn btn-sm" data-placement="bottom" title="整理分部"><i class="fa fa-retweet" aria-hidden="true"></i></a>
                       <% if (projectData.property.lockBills == true) { %>
-                      <a href="javascript:void(0)" data-toggle="tooltip"  class="btn btn-sm" name="lockBills" title="解锁清单"> <i class="fa fa-unlock-alt" aria-hidden="true"></i></a>
+                      <a href="javascript:void(0)"  class="btn btn-sm" name="lockBills" title="解锁清单"> <i class="fa fa-unlock-alt" aria-hidden="true"></i></a>
                       <% } else { %>
-                      <a href="javascript:void(0)" data-toggle="tooltip" class="btn btn-sm" name="lockBills" title="锁定清单"> <i class="fa fa-lock" aria-hidden="true"></i></a>
+                      <a href="javascript:void(0)"  class="btn btn-sm" name="lockBills" title="锁定清单"> <i class="fa fa-lock" aria-hidden="true"></i></a>
                       <% } %>
-                      <a id="switchTznr" href="javascript:void(0);" data-toggle="tooltip" class="btn btn-sm"  data-placement="bottom" title="显示特征"><i class="fa fa-eye" aria-hidden="true"></i></a>
+                      <a id="switchTznr" href="javascript:void(0);"  class="btn btn-sm"  data-placement="bottom" title="显示特征"><i class="fa fa-eye" aria-hidden="true"></i></a>
                   </div>
                   <div class="side-tabs">
                       <ul class="nav nav-tabs" role="tablist">

+ 1 - 1
web/building_saas/main/js/views/main_tree_col.js

@@ -529,7 +529,7 @@ function switchTznrHtml(show) {
 
 $('#switchTznr').click(function () {
     let me = colSettingObj;
-    let cur = $(this).attr('title');
+    let cur = $(this).prop('title');
     //$("[data-toggle='tooltip']").tooltip('hide');
     if(cur.includes('显示特征')){
         switchTznrHtml(false);

+ 2 - 2
web/building_saas/main/js/views/project_info.js

@@ -22,7 +22,7 @@ var projectInfoObj = {
             }
              */
             let newHtml = `<span><i class="fa fa-sticky-note-o"></i></span>
-                <span class="" data-toggle="tooltip" data-placement="bottom" title="t1"> <span class="text-truncate float-right">&nbsp;t1</span></span>`
+                <span class="" data-placement="bottom" title="t1"> <span class="text-truncate float-right">&nbsp;t1</span></span>`
             fullPath.push(newHtml);
 
         }
@@ -43,7 +43,7 @@ var projectInfoObj = {
                 basicInfoView.orgDatas = data.property.basicInformation ? basicInfoView.toViewDatas(data.property.basicInformation) : [];
                 projFeatureView.orgDatas = data.property.projectFeature ? projFeatureView.toViewDatas(data.property.projectFeature) : [];
                 $('#fullpath').html(that.getFullPathHtml(that.projectInfo));
-                $("[data-toggle='tooltip']").tooltip();
+                //$("[data-toggle='tooltip']").tooltip();
             }
         });
     }