Merge remote-tracking branch 'origin/test' into test

src/components/basicKnow/BasicTermsMaintenance.vue

@@ -127,6 +127,8 @@ export default {
     const param = this.$route.params;
     if(param.currentPage){
       this.inCurrentPage = param.currentPage
+    }
+    if(param.filter){
       this.filter = param.filter
     }
     

src/components/knowledgeExtra/AddDevKnow.vue

@@ -19,7 +19,7 @@
               loading-text="加载中..."
               @change="changeWord"
               @visible-change="handleVisible"
-              value-key="conceptId"
+              value-key="id"
               @clear="handleClear"
               ref="termName"
               placeholder="搜索"
@@ -359,9 +359,8 @@ export default {
       const name = newVal.name;
       const typeName = newVal.typeName;
       const type = newVal.type;
-      this.form.selectedTermName =
-        name + (typeName ? '(' + typeName + ')' : '');
-      this.form.selectedTerm = name + (typeName ? '(' + typeName + ')' : '');
+      this.form.selectedTermName = name + (typeName ? '(' + typeName + ')' : '');
+      // this.form.selectedTerm = name + (typeName ? '(' + typeName + ')' : '');
       this.form.name = name;
       this.form.fileList = [];
       this.showFileList = false;