Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

src/components/knowledgeExtra/AddNewRule.vue

@@ -361,7 +361,7 @@
                             message:"操作成功",
                             type:'success'
                         });
-                        this.$router.push({name: 'ZskRuleManager'});
+                        this.$router.push({name: 'ZskRuleManager',params: Object.assign({}, this.$route.params, { currentPage: 1 })});
                     }else{
                         this.$message({
                             message:res.data.msg,
@@ -373,7 +373,7 @@
             formatGroups(){
                 let obj = [];
                 this.subGroups.map((item,i)=>{
-                   item.map((it)=>{
+                    item&&item.map((it)=>{
                        obj.push({...it,groupType:i});
                    })
                 });

src/components/knowledgeExtra/RuleManager.vue

@@ -104,10 +104,10 @@
                         prop="modifierName"
                         label="操作人">
                     <template slot-scope="scope">
-                        <el-tooltip v-if="scope.row.modifierName.length>8" class="item" effect="dark" :content="scope.row.modifierName" placement="top">
-                            <span>{{scope.row.modifierName.slice(0,8)+'...'}}</span>
+                        <el-tooltip v-if="scope.row.modifierName&&scope.row.modifierName.length>8" class="item" effect="dark" :content="scope.row.modifierName" placement="top">
+                            <span>{{(scope.row.modifierName||'').slice(0,8)+'...'}}</span>
                         </el-tooltip>
-                        <span v-if="scope.row.modifierName.length<9">{{scope.row.modifierName}}</span>
+                        <span v-if="scope.row.modifierName&&scope.row.modifierName.length<9">{{scope.row.modifierName}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column