Merge branch 'dragTerm1025' into test

src/components/knowledgeExtra/RuleManager.vue

@@ -74,10 +74,10 @@
           </template>
         </el-table-column>
         <el-table-column prop="parLibTypeName" label="术语类型" width="190"></el-table-column>
-        <el-table-column prop="parHasSub" label="有无子条件" width="100">
+        <el-table-column prop="parHasSub" label="有无子条件" width="105">
           <template slot-scope="scope">{{scope.row.parHasSub == '0'?'无':'有'}}</template>
         </el-table-column>
-        <el-table-column label="状态" width="150">
+        <el-table-column label="状态" width="155">
           <template slot-scope="scope">
             <span>{{scope.row.parStatus === 0?'禁用':'启用'}}</span>
           </template>