Merge remote-tracking branch 'origin/master' into referMaster

src/components/knowledgeExtra/RuleManager.vue

@@ -44,7 +44,7 @@
         <el-table-column type="index" :index="indexMethod" label="编号" width="60"></el-table-column>
         <el-table-column prop="parDescription" label="规则名称" width="160">
           <template slot-scope="scope">
-            <el-tooltip
+            <!--<el-tooltip
               v-if="scope.row.parDescription.length>8"
               class="item"
               effect="dark"
@@ -52,8 +52,8 @@
               placement="top"
             >
               <span>{{scope.row.parDescription.slice(0,8)+'...'}}</span>
-            </el-tooltip>
-            <span v-if="scope.row.parDescription.length<9">{{scope.row.parDescription}}</span>
+            </el-tooltip>-->
+            <span>{{scope.row.parDescription}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="parRuleType" label="规则类型" width="150">
@@ -61,7 +61,7 @@
         </el-table-column>
         <el-table-column prop="parConceptName" label="医学标准术语" width="160">
           <template slot-scope="scope">
-            <el-tooltip
+            <!--<el-tooltip
               v-if="scope.row.parConceptName.length>8"
               class="item"
               effect="dark"
@@ -69,8 +69,8 @@
               placement="top"
             >
               <span>{{scope.row.parConceptName.slice(0,8)+'...'}}</span>
-            </el-tooltip>
-            <span v-if="scope.row.parConceptName.length<9">{{scope.row.parConceptName}}</span>
+            </el-tooltip>-->
+            <span>{{scope.row.parConceptName}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="parLibTypeName" label="术语类型" width="150"></el-table-column>