Browse Source

bug(4944)

zhangxc 5 years ago
parent
commit
51b5078335
4 changed files with 44 additions and 55 deletions
  1. 22 22
      src/js/graphMap.js
  2. 2 7
      src/js/index.js
  3. 2 9
      src/js/knowledgeTree.js
  4. 18 17
      src/js/schemaMap.js

+ 22 - 22
src/js/graphMap.js

@@ -161,11 +161,7 @@ function dataClick(param){
             }else {
                 let renderTabInfo = getTab(data.type) 
                 renderTab(renderTabInfo) 
-                if(data.type == "药品通用名"){
-                    $('.selectedName').html("药品")
-                }else{
-                    $('.selectedName').html(select_type)
-                }
+               
                 if(data.type == "疾病"){
                     $(".radioList").show()
                     $('.iconRadio').attr('src','/images/radioUnSelect.png')
@@ -177,6 +173,7 @@ function dataClick(param){
                 }
                 select_type_noSearch = data.type
                 select_type = data.type
+                setSelectName(select_type)
                 $('#searchInp').val(data.label)
                 if(data.type == "疾病"){
                     getTree(1,1,data.label);
@@ -275,11 +272,8 @@ function drawTree(data, showNodeName){
                     const name = treeNodeName.substring(index+1)
                     if(select_type != select_type_noSearch){
                         select_type_noSearch = select_type
-                        if(select_type == "药品通用名"){
-                            $(".selectedName").html("药品")
-                        }else{
-                            $(".selectedName").html(select_type)
-                        }
+                        setSelectName(select_type)
+                       
                     }
                    
                     getGraph(name,select_type)
@@ -516,17 +510,7 @@ function bindTabClick(){
             }
             select_type_noSearch = id
             select_type = id
-            if(id=="药品通用名"){
-                $('.selectedName').html("药品")
-            }else{
-                $('.selectedName').attr('title', select_type)
-                if(select_type.length > 3){
-                    $('.selectedName').html(select_type.slice(0,2)+'...')
-                }else{
-                    $('.selectedName').html(select_type)
-                }
-               
-            }
+            setSelectName(select_type)
            
             if(id == "疾病"){
                
@@ -584,6 +568,21 @@ function setTabBottomHei(type){
     }
  }
 
+ function setSelectName(name){
+    if(name=="药品通用名"){
+        $('.selectedName').html("药品")
+        $('.selectedName').attr("title","药品")
+    }else{
+        $('.selectedName').attr('title', name)
+        if(name.length > 3){
+            $('.selectedName').html(name.slice(0,2)+'...')
+        }else{
+            $('.selectedName').html(name)
+        }
+       
+    }
+ }
+
 module.exports ={
     drawGraph,
     updateTree,
@@ -592,5 +591,6 @@ module.exports ={
     getNode,
     getTab,
     renderTab,
-    setTabBottomHei
+    setTabBottomHei,
+    setSelectName
 }

+ 2 - 7
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} = require('./graphMap.js');
+const { drawGraph,updateTree,getGraph,getTree,getNode,getTab,renderTab,setTabBottomHei,setSelectName} = require('./graphMap.js');
 
 window.select_type="疾病";
 window.select_type_noSearch="疾病";
@@ -68,13 +68,8 @@ $('.selectList .selectItem').click(function(){
     select_type_noSearch = $(this).attr('data-id')
     const txt =  $(this).text()
     const oldTxt = $(".selectedName").html()
-    if(txt.length > 3){
-        $(".selectedName").html(txt.slice(0,2)+"...")
-    }else{
-        $(".selectedName").html(txt)
-    }
+    setSelectName(txt)
    
-    $(".selectedName").attr('title',txt)
     $("#searchInp").attr("placeholder",`请输入${txt}名称`)
     if(txt != oldTxt){
         $('#searchInp').val("")

+ 2 - 9
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} = require('./schemaMap.js');
+const {getSchema,updateTree,getTree,getNode,getTab,renderTab,setTabBottomHei,setSelectName} = require('./schemaMap.js');
 
 window.select_type="疾病";
 window.select_type_noSearch="疾病";
@@ -71,14 +71,7 @@ $('.selectList .selectItem').click(function(){
     select_type_noSearch = $(this).attr('data-id')
     const txt =  $(this).text()
     const oldTxt = $(".selectedName").html()
-    $(".selectedName").html(txt)
-    if(txt.length > 3){
-        $(".selectedName").html(txt.slice(0,2)+"...")
-    }else{
-        $(".selectedName").html(txt)
-    }
-   
-    $(".selectedName").attr('title',txt)
+    setSelectName(txt)
     $("#searchInp").attr("placeholder",`请输入${txt}名称`)
     if(txt != oldTxt){
         $('#searchInp').val("")

+ 18 - 17
src/js/schemaMap.js

@@ -75,11 +75,7 @@ function drawTree(data, showNodeName){
                     const name = treeNodeName.substring(index+1)
                     if(select_type != select_type_noSearch){
                         select_type_noSearch = select_type
-                        if(select_type == "疾病"){
-                            $(".selectedName").html("疾病")
-                        } else if(select_type == "药品通用名"){
-                            $(".selectedName").html("药品")
-                        }
+                        setSelectName(select_type)
                     }
                     getSchema(name,select_type)
                     const selectPId = $('.curSelectedNode').attr('id')
@@ -405,17 +401,7 @@ function bindTabClick(){
             }
             select_type_noSearch = id
             select_type = id
-            if(id=="药品通用名"){
-                $('.selectedName').html("药品")
-            }else{
-                $('.selectedName').attr('title', select_type)
-                if(select_type.length > 3){
-                    $('.selectedName').html(select_type.slice(0,2)+'...')
-                }else{
-                    $('.selectedName').html(select_type)
-                }
-               
-            }
+            setSelectName(select_type)
            
             if(id == "疾病"){
                
@@ -472,6 +458,20 @@ function setTabBottomHei(type){
         $(".ztree").css("height",contentHei-80-43-20-20-20+'px')
     }
  }
+ function setSelectName(name){
+    if(name=="药品通用名"){
+        $('.selectedName').html("药品")
+        $('.selectedName').attr("title","药品")
+    }else{
+        $('.selectedName').attr('title', name)
+        if(name.length > 3){
+            $('.selectedName').html(name.slice(0,2)+'...')
+        }else{
+            $('.selectedName').html(name)
+        }
+       
+    }
+ }
  module.exports ={
     getSchema,
     getTree,
@@ -479,5 +479,6 @@ function setTabBottomHei(type){
     getNode,
     getTab,
     renderTab,
-    setTabBottomHei
+    setTabBottomHei,
+    setSelectName
  }