Merge branch 'knowledgePlat' into test

src/components/basicKnow/SearchList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="conceptSearch" ref="conceptSearch">
+  <div class="conceptSearch" :style="{'top':top?top:'200px'}" ref="conceptSearch">
     <h4  class="conceptTitle">术语（概念ID）搜索</h4>
     <img class="closeSearch" src="../../images/close-icon.png" @click="closeSearch" alt="">
     <p class="searchWrap">
@@ -22,7 +22,7 @@
 import api from '@api/knowledgeTree.js';
 
 export default {
-  props:['conceptList','addLevel'],
+  props:['conceptList','addLevel','top'],
   data(){
     return {
       conceptText: '',
@@ -46,8 +46,8 @@ export default {
       this.$emit('closeSearch')
     },
     selectConcept(item) {
-      this.$emit('selectConcept',item)
-      this.$emit('closeSearch')
+      this.$emit('selectConcept',{item,txt:this.conceptText})
+      // this.$emit('closeSearch')
     },
     searchConcept() {
       this.$emit('searchConcept',this.conceptText)

src/components/knowledgeExtra/DiseaseTree.vue

@@ -55,10 +55,12 @@
         </div>
       </div>
     </div>
+    <div class="btmFix"></div>
     <SearchList 
       v-if="showSearch" 
       :conceptList="conceptList||[]" 
       :addLevel="addLevel"
+      top="120px"
       @closeSearch="closeSearch" 
       @selectConcept="selectConcept" 
       @searchConcept="searchConcept" />
@@ -292,7 +294,8 @@ export default {
           }
         })
       },
-      selectConcept(item) {
+      selectConcept(data) {
+        const {item,txt} = data
         if(this.addLevel == 0) {
           let temp = JSON.parse(JSON.stringify(this.template))
           temp.conceptId = item.conceptId
@@ -308,7 +311,8 @@ export default {
           data.nodeList.push(newChild);
         }
         this.conceptList = [];
-        this.closeSearch();
+        this.searchConcept(txt)
+        // this.closeSearch();
       },
       openSearch(e) {
         this.showSearch = true

src/components/knowledgeExtra/KnowledgeAll.vue

@@ -56,6 +56,7 @@
         </div>
       </div>
     </div>
+    <div class="btmFix"></div>
     <SearchList 
       v-if="showSearch" 
       :conceptList="conceptList" 
@@ -236,7 +237,8 @@ export default {
           }
         })
       },
-      selectConcept(item) {
+      selectConcept(data) {
+        const {item,txt} = data
         if(this.addLevel == 0) {
           this.list.push(Object.assign({}, item,  {nodeList: [], level: 0, conceptId: item.conceptId, sonRelationId: 17}))
           this.list = JSON.parse(JSON.stringify(this.list))
@@ -250,7 +252,8 @@ export default {
           data.nodeList.push(newChild);
         }
         this.conceptList = [];
-        this.closeSearch();
+        this.searchConcept(txt)
+        // this.closeSearch();
       },
       openSearch(e) {
         this.showSearch = true

src/components/knowledgeExtra/StaticInfo.vue

@@ -38,7 +38,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="typeName"
-                        label="标准术语归属"
+                        label="标准术语归类"
                         width="120">
                 </el-table-column>
                 <el-table-column
@@ -280,7 +280,7 @@
         }).catch(() => {});
       },
       showDelDialog(row){
-        this.showConfirmDialog('是否删除该静态知识？',()=>{
+        this.showConfirmDialog('是否禁用该静态知识？',()=>{
           api.changeBaseStatus({id:row.id,status:0}).then((res)=>{
             if(res.data.code=='0'){
               if(!this.searched){

src/less/common.less

@@ -201,3 +201,11 @@
 }
 
 
+.btmFix {
+  position: fixed;
+  width: 100%;
+  height:10px;
+  left: 280px;
+  bottom: 0;
+  background-color: #dee2ea;
+}