Merge branch 'termLink0615' into test

# Conflicts:
#	src/components/knowledgeExtra/AddDevKnow.vue

src/components/knowledgeExtra/AddDevKnow.vue

@@ -675,11 +675,11 @@ export default {
       let positionArr = positiontemp.reduce(function(a, b) {
         return a.concat(b);
       }); // 所有被选中的值集合
-      // console.log(positionArr, "positionArr");
-      // console.log(this.showType, "当前页的显示类型");
-      let isVisFlag = positionArr.some(item => item === 2);
-      let isDiagFlag = positionArr.some(item => item === 3);
-      // console.log(isVisFlag, "isVisFlag是否显示");
+      // console.log(positionArr, 'positionArr');
+      // console.log(this.showType, '当前页的显示类型');
+      let isVisFlag = positionArr.some(item => item === '2');
+      let isDiagFlag = positionArr.some(item => item === '3');
+      // console.log(isVisFlag, 'isVisFlag是否显示');
       if (
         (this.showType == 3 ||
           this.showType == 4 ||