Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/view/knowledge-point/index/page.vue

@@ -844,7 +844,9 @@ export default {
                 if(sameIndex === -1) {
                     let idLast4 = arrOld.length ? arrOld[arrOld.length - 1].id : '-0'
                     let id4 = idLast4.split(`-`)
-                    item.id = item.level === 1 ? (Number(id4[0]) + 1).toString() : `${pid}-${Number(id4[id4.length - 1]) + 1}`
+                    // item.id = item.level === 1 ? (Number(id4[0]) + 1).toString() : `${pid}-${Number(id4[id4.length - 1]) + 1}`
+                    // 导入时已处理(level = 1)：id为“已有id + 1”，因此这里取原值不会重复
+                    item.id = item.level === 1 ? item.id : `${pid}-${Number(id4[id4.length - 1]) + 1}`
                     item.level = index
                     item.pid = pid
                     if(item.children.length) {