css冲突

web/building_saas/main/html/main.html

@@ -63,7 +63,7 @@
                     <!--<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" data-original-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-toggle="tooltip" 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>
                         <div class="dropdown-menu">
@@ -92,9 +92,9 @@
                     </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>
                       <% if (projectData.property.lockBills == true) { %>
-                      <a href="javascript:void(0)" data-toggle="tooltip"  class="btn btn-sm" name="lockBills" data-original-title="解锁清单"> <i class="fa fa-unlock-alt" aria-hidden="true"></i></a>
+                      <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>
                       <% } else { %>
-                      <a href="javascript:void(0)" data-toggle="tooltip" class="btn btn-sm" name="lockBills" data-original-title="锁定清单"> <i class="fa fa-lock" aria-hidden="true"></i></a>
+                      <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 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>
                   </div>
@@ -1493,8 +1493,6 @@
         </script>
 
         <SCRIPT type="text/javascript">
-            bootstrapButton   = $.fn.button.noConflict();
-            $.fn.bootstrapBtn = bootstrapButton;
             let clearFlag = false;
             function onCheck(e, treeId, treeNode) {
                 count();

web/building_saas/main/js/views/main_tree_col.js

@@ -516,12 +516,12 @@ function switchTznrHtml(show) {
         return;
     }
     if(show){
-        $('#switchTznr').attr('data-original-title', '显示特征');
+        $('#switchTznr').attr('title', '显示特征');
         $('#switchTznr').find('i').removeClass('fa-eye-slash');
         $('#switchTznr').find('i').addClass('fa-eye');
     }
     else {
-        $('#switchTznr').attr('data-original-title', '隐藏特征');
+        $('#switchTznr').attr('title', '隐藏特征');
         $('#switchTznr').find('i').removeClass('fa-eye');
         $('#switchTznr').find('i').addClass('fa-eye-slash');
     }
@@ -529,7 +529,7 @@ function switchTznrHtml(show) {
 
 $('#switchTznr').click(function () {
     let me = colSettingObj;
-    let cur = $(this).attr('data-original-title');
+    let cur = $(this).attr('title');
     //$("[data-toggle='tooltip']").tooltip('hide');
     if(cur.includes('显示特征')){
         switchTznrHtml(false);

web/building_saas/main/js/views/project_view.js

@@ -1590,10 +1590,10 @@ var projectObj = {
     },
     loadLockBillsButton:function () {
         if(projectInfoObj.projectInfo.property.lockBills == true){
-            $("a[name='lockBills']").attr("data-original-title","解锁清单");
+            $("a[name='lockBills']").attr("title","解锁清单");
             $("a[name='lockBills']").html('<i class="fa fa-unlock-alt" aria-hidden="true"></i>');
         }else {
-            $("a[name='lockBills']").attr("data-original-title","锁定清单");
+            $("a[name='lockBills']").attr("title","锁定清单");
             $("a[name='lockBills']").html('<i class="fa fa-lock" aria-hidden="true"></i>');
         }
     },