test冲突

web/building_saas/main/html/main.html

@@ -96,7 +96,7 @@
                       <% } 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 id="switchTznr" href="javascript:void(0);" 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);" data-toggle="tooltip" 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">
@@ -1493,6 +1493,8 @@
         </script>
 
         <SCRIPT type="text/javascript">
+            bootstrapButton   = $.fn.button.noConflict();
+            $.fn.bootstrapBtn = bootstrapButton;
             let clearFlag = false;
             function onCheck(e, treeId, treeNode) {
                 count();