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

src/components/knowledgeExtra/DiagCheckRule.vue

@@ -24,6 +24,11 @@
 			<ux-grid ref="plxTable" :merge-cells="tdSpanArr" show-overflow style="width: 100%;" height="600px">
 				<ux-table-column field="id" :title="'组(共'+total+'组)'" width="120"></ux-table-column>
 				<ux-table-column field="description" title="规则名称"></ux-table-column>
+			  	<ux-table-column field="hasSubCond" title="子条件">
+				  <template slot-scope="scope">
+				  {{scope.row.hasSubCond?"有":"无"}}
+				</template>
+				</ux-table-column>
 				<ux-table-column field="msg" title="附加信息" show-overflow-tooltip></ux-table-column>
 				<ux-table-column field="baseType" title="基础规则类型">
 					<template slot-scope="scope">
@@ -42,7 +47,7 @@
 				<ux-table-column field="baseMaxOperator" title="最大域比较符" width="80"></ux-table-column>
 				<ux-table-column field="baseMaxValue" title="最大域值" width="80"></ux-table-column>
 				<ux-table-column field="baseMaxUnit" title="最大域单位" width="80"></ux-table-column>
-				<ux-table-column field="baseEqOperator" title="等于阈值" width="80"></ux-table-column>
+				<ux-table-column field="baseEqValue" title="等于阈值" width="80"></ux-table-column>
 				<ux-table-column field="baseEqUnit" title="等于域单位" width="80"></ux-table-column>
 			</ux-grid>
 		</el-main>

src/components/knowledgeExtra/RuleCheck.vue

@@ -275,6 +275,7 @@
 									  	rowspan:isFirst?dtoList.length:0,
 									  	colspan:isFirst?1:0,
 									  	ruleGroup:datai.ruleGroup,
+									  	hasSubCond:datai.hasSubCond,
 										msg:datai.msg,
 										description:datai.description,
 										...dtoList[j]