zhangxc преди 5 години
родител
ревизия
c27a288596
променени са 4 файла, в които са добавени 86 реда и са изтрити 46 реда
  1. 26 4
      src/js/graphMap.js
  2. 28 19
      src/js/index.js
  3. 9 20
      src/js/knowledgeTree.js
  4. 23 3
      src/js/schemaMap.js

+ 26 - 4
src/js/graphMap.js

@@ -478,11 +478,13 @@ function renderTab(data){
     $('.showTabList').html(showtabStr)
     $('.hideTabList').html(hidetabStr)
     bindTabClick()
+    ToggleTab()
 }
 ToggleTab()
 function ToggleTab(){
-    $(".toggleTab").click(function(e){
+    $(".toggleTab").off("click").click(function(e){
         e.stopPropagation()
+        hideSlide("hideTabList")
         const hideTabDis = $(".hideTabList").css("display")
         if(hideTabDis == "none"){
             showHideTab()
@@ -490,6 +492,8 @@ function ToggleTab(){
             hideHideTab()
         }
     })
+    
+  
 }
 function showHideTab(){
     $(".hideTabList").slideDown()
@@ -504,9 +508,9 @@ function hideHideTab(e){
     // $(".toggleTabTxt").html("展开")
     // $(".toggleArrow").attr("src",iconDown)
     setTimeout(function(){
-        $(".tabList").removeClass("tabListShow")
         $(".toggleTab").css("display","block")
-    },500)
+        $(".tabList").removeClass("tabListShow")
+    },400)
     
     
 }
@@ -602,6 +606,23 @@ function setTabBottomHei(type){
        
     }
  }
+ function hideSlide(expectClass){
+    let hideSlideList = ['selectList', 'tabNameList','tabNameListNoSearch','hideTabList']
+    let index = hideSlideList.findIndex(item => item == expectClass)
+    for(let i = 0; i < hideSlideList.length; i++){
+        if(i != index){
+            if(hideSlideList[i] == "selectList"){
+                $('.'+hideSlideList[i]).hide()
+                $('.iconSlide').attr('src','./images/iconSlideDown.png')
+            }else if(hideSlideList[i] == "hideTabList"){
+                hideHideTab()
+            }else{
+                $('.'+hideSlideList[i]).hide()
+            }
+        }
+    }
+ }
+
 
 module.exports ={
     drawGraph,
@@ -613,5 +634,6 @@ module.exports ={
     renderTab,
     setTabBottomHei,
     setSelectName,
-    hideHideTab
+    hideHideTab,
+    hideSlide
 }

+ 28 - 19
src/js/index.js

@@ -23,7 +23,7 @@ const iconUp = require('./../resources/images/iconUp.png');
 const iconDown = require('./../resources/images/iconDown.png');
 const { post, api } = require('./api.js');
 const { mapData, zTreeData,mapData3,zTreeData3 } = require('./data.js');
-const { drawGraph,updateTree,getGraph,getTree,getNode,getTab,renderTab,setTabBottomHei,setSelectName,hideHideTab} = require('./graphMap.js');
+const { drawGraph,updateTree,getGraph,getTree,getNode,getTab,renderTab,setTabBottomHei,setSelectName,hideHideTab,hideSlide} = require('./graphMap.js');
 
 window.select_type="疾病";
 window.select_type_noSearch="疾病";
@@ -55,6 +55,7 @@ $('#searchInp').val("高血压3级")
 //选择类型
 $('.select').click(function(e){
     e.stopPropagation();
+    hideSlide('selectList')
     const selectListShow = $('.selectList').css('display')
     if(selectListShow == 'none'){
         $('.iconSlide').attr('src','./images/iconSlideUp.png')
@@ -103,6 +104,7 @@ $('.radioItem').click(function(e){
 //搜索
 $('#searchBtn').click(function(e){
     e.stopPropagation()
+    hideSlide()
     const val = $('#searchInp').val().trim()
     if(val){
         const clientHei = $(window).height()
@@ -157,28 +159,35 @@ $('#searchBtn').click(function(e){
 let renderTabInfo = getTab("疾病") 
 renderTab(renderTabInfo)
 
-
+$(".tabList").click(function(e){
+    e.stopPropagation()
+})
+$(".hideTabList").click(function(e){
+    e.stopPropagation()
+})
 //点击页面其他地方关闭下拉
 $('html').click(function(){
-    const selectListShow = $('.selectList').css('display')
-    const tabNameListShow = $('.tabNameList').css('display')
-    const tabNameListNoSearchShow = $('.tabNameListNoSearch').css('display')
-    const hideTabListShow = $('.hideTabList').css('display')
-    if(selectListShow == 'block'){
-        $('.selectList').hide()
-        $('.iconSlide').attr('src','./images/iconSlideDown.png')
-    }
-    if(tabNameListShow == 'block'){
-        $('.tabNameList').hide()
-    }
-    if(tabNameListNoSearchShow == 'block'){
-        $('.tabNameListNoSearch').hide()
-    }
-    if(hideTabListShow == 'block'){
-        hideHideTab()
-    }
+    hideSlide()
+    // const selectListShow = $('.selectList').css('display')
+    // const tabNameListShow = $('.tabNameList').css('display')
+    // const tabNameListNoSearchShow = $('.tabNameListNoSearch').css('display')
+    // const hideTabListShow = $('.hideTabList').css('display')
+    // if(selectListShow == 'block'){
+    //     $('.selectList').hide()
+    //     $('.iconSlide').attr('src','./images/iconSlideDown.png')
+    // }
+    // if(tabNameListShow == 'block'){
+    //     $('.tabNameList').hide()
+    // }
+    // if(tabNameListNoSearchShow == 'block'){
+    //     $('.tabNameListNoSearch').hide()
+    // }
+    // if(hideTabListShow == 'block'){
+    //     hideHideTab()
+    // }
 })
 
+
 module.exports ={
     getTab,
     renderTab

+ 9 - 20
src/js/knowledgeTree.js

@@ -21,7 +21,7 @@ require('./../resources/zTree/css/zTreeStyle/zTreeStyle.css');
 const iconUp = require('./../resources/images/iconUp.png');
 const iconDown = require('./../resources/images/iconDown.png');
 // document.write("aaaa");
-const {getSchema,updateTree,getTree,getNode,getTab,renderTab,setTabBottomHei,setSelectName,hideHideTab} = require('./schemaMap.js');
+const {getSchema,updateTree,getTree,getNode,getTab,renderTab,setTabBottomHei,setSelectName,hideHideTab,hideSlide} = require('./schemaMap.js');
 
 window.select_type="疾病";
 window.select_type_noSearch="疾病";
@@ -58,6 +58,7 @@ $('#searchInp').val("胆囊炎")
 //选择类型
 $('.select').click(function(e){
     e.stopPropagation();
+    hideSlide('selectList')
     const selectListShow = $('.selectList').css('display')
     if(selectListShow == 'none'){
         $('.iconSlide').attr('src','./images/iconSlideUp.png')
@@ -152,29 +153,17 @@ $('#searchBtn').click(function(e){
 let renderTabInfo = getTab("疾病") 
 renderTab(renderTabInfo)
 
-//切换tab
 
+$(".tabList").click(function(e){
+    e.stopPropagation()
+})
+$(".hideTabList").click(function(e){
+    e.stopPropagation()
+})
 
 //点击页面其他地方关闭下拉
 $('html').click(function(){
-    const selectListShow = $('.selectList').css('display')
-    const tabNameListShow = $('.tabNameList').css('display')
-    const tabNameListNoSearchShow = $('.tabNameListNoSearch').css('display')
-    const hideTabListShow = $('.hideTabList').css('display')
-
-    if(selectListShow == 'block'){
-        $('.selectList').hide()
-        $('.iconSlide').attr('src','./images/iconSlideDown.png')
-    }
-    if(tabNameListShow == 'block'){
-        $('.tabNameList').hide()
-    }
-    if(tabNameListNoSearchShow == 'block'){
-        $('.tabNameListNoSearch').hide()
-    }
-    if(hideTabListShow == 'block'){
-        hideHideTab()
-    }
+    hideSlide()
 })
 		
 		

+ 23 - 3
src/js/schemaMap.js

@@ -383,11 +383,13 @@ function renderTab(data){
     $('.showTabList').html(showtabStr)
     $('.hideTabList').html(hidetabStr)
     bindTabClick()
+    ToggleTab()
 }
 ToggleTab()
 function ToggleTab(){
-    $(".toggleTab").click(function(e){
+    $(".toggleTab").off("click").click(function(e){
         e.stopPropagation()
+        hideSlide("hideTabList")
         const hideTabDis = $(".hideTabList").css("display")
         if(hideTabDis == "none"){
             showHideTab()
@@ -409,8 +411,8 @@ function hideHideTab(e){
     // $(".toggleTabTxt").html("展开")
     // $(".toggleArrow").attr("src",iconDown)
     setTimeout(function(){
-        $(".tabList").removeClass("tabListShow")
         $(".toggleTab").css("display","block")
+        $(".tabList").removeClass("tabListShow")
     },500)
     
     
@@ -506,6 +508,23 @@ function setTabBottomHei(type){
        
     }
  }
+
+ function hideSlide(expectClass){
+    let hideSlideList = ['selectList', 'tabNameList','tabNameListNoSearch','hideTabList']
+    let index = hideSlideList.findIndex(item => item == expectClass)
+    for(let i = 0; i < hideSlideList.length; i++){
+        if(i != index){
+            if(hideSlideList[i] == "selectList"){
+                $('.'+hideSlideList[i]).hide()
+                $('.iconSlide').attr('src','./images/iconSlideDown.png')
+            }else if(hideSlideList[i] == "hideTabList"){
+                hideHideTab()
+            }else{
+                $('.'+hideSlideList[i]).hide()
+            }
+        }
+    }
+ }
  module.exports ={
     getSchema,
     getTree,
@@ -515,5 +534,6 @@ function setTabBottomHei(type){
     renderTab,
     setTabBottomHei,
     setSelectName,
-    hideHideTab
+    hideHideTab,
+    hideSlide
  }