Merge branch 'dev5.4.1' of http://192.168.2.236:10080/zhouna/newICSS into dev5.4.1

src/config/index.js

@@ -45,7 +45,7 @@ export default {
     recoverTagNum:3,    //可回退标签的个数
     regPreAndAft:/[^\u4e00-\u9fa5|0-9|a-z|A-Z|Ⅰ|Ⅱ|Ⅲ|Ⅳ|Ⅴ|Ⅵ|Ⅶ|Ⅷ|Ⅸ|Ⅹ]+$|^[^\u4e00-\u9fa5|0-9|a-z|A-Z|Ⅰ|Ⅱ|Ⅲ|Ⅳ|Ⅴ|Ⅵ|Ⅶ|Ⅷ|Ⅸ|Ⅹ]+/g,  //搜索去掉前后的标点
     ruleTypeMap:{     //大数据推送参数featureType对应
-      '22':'1,2',
+      '22':'1,2,6',
       '11':'3',
       '8':'4,5'
     }