Merge branch 'develop5.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -18,7 +18,7 @@
             <Menu width="auto" :class="menuitemClasses" accordion :active-name="activeName" :open-names="openNames">
                 <vuescroll :ops="ops">
                     <div v-for="(item,index) in menuTree" :key="index">
-                        <Submenu :name="index" v-if="$access.ability(item.role,item.permission).validateAll && item.child.length" v-show="(index == 0 && $store.state.userInfo.hasSchool) || index > 0">
+                        <Submenu :name="item.subName" v-if="$access.ability(item.role,item.permission).validateAll && item.child.length" v-show="(index == 0 && $store.state.userInfo.hasSchool) || index > 0">
                             <template slot="title">
                                 <Tooltip :content="item.name" placement="right" transfer v-show="isCollapsed">
                                     <Icon :custom="item.icon" style="width:55px;text-align:left;" :class="isCollapsed ? 'collapse-icon-size':''" size="20" />
@@ -26,7 +26,7 @@
                                 <Icon v-show="!isCollapsed" :custom="item.icon" :class="isCollapsed ? 'collapse-icon-size':''" size="20" />
                                 <span>{{item.name}}</span>
                             </template>
-                            <MenuItem class="sub-item-wrap sub-item-wrap-active" :name="menuItem.router" :to="menuItem.router" v-for="(menuItem,i) in item.child" :key="i" v-if="$access.ability(menuItem.role,menuItem.permission).validateAll">
+                            <MenuItem class="sub-item-wrap sub-item-wrap-active" :name="menuItem.menuName" :to="menuItem.router" v-for="(menuItem,i) in item.child" :key="i" v-if="$access.ability(menuItem.role,menuItem.permission).validateAll">
                             <Tooltip :content="menuItem.name" placement="right" transfer v-show="isCollapsed">
                                 <Icon class="sub-menu-icon" :custom="menuItem.icon" size="18" />
                             </Tooltip>
@@ -39,7 +39,7 @@
                             </span>
                             </MenuItem>
                         </Submenu>
-                        <MenuItem :name="item.router" v-else-if="$access.ability(item.role,item.permission).validateAll" :to="item.router">
+                        <MenuItem :name="item.menuName" v-else-if="$access.ability(item.role,item.permission).validateAll" :to="item.router">
                         <Tooltip :content="item.name" placement="right" transfer v-show="isCollapsed">
                             <Icon :custom="item.icon" style="width:55px;text-align:left;" :class="isCollapsed ? 'collapse-icon-size':''" size="22" />
                         </Tooltip>
@@ -73,12 +73,13 @@ export default {
         }
     },
     methods: {
-        initMenu(){
+        initMenu() {
             this.menuTree = [
                 {
                     icon: 'iconfont icon-school',
                     name: this.$t('system.menu.smartSc'),
                     router: '',
+                    subName: 'smartSchool',
                     role: 'teacher|admin',
                     permission: '',
                     child: [
@@ -88,7 +89,8 @@ export default {
                             router: '/home/system',
                             tag: '',
                             role: 'admin',
-                            permission: 'schoolSetting-read|schoolSetting-upd'
+                            permission: 'schoolSetting-read|schoolSetting-upd',
+                            menuName: 'system'
                         },
                         {
                             icon: 'iconfont icon-teacher-mgt',
@@ -96,7 +98,8 @@ export default {
                             router: '/home/teachermgmt',
                             tag: '',
                             role: 'admin',
-                            permission: 'teacher-read|teacher-upd'
+                            permission: 'teacher-read|teacher-upd',
+                            menuName: 'teachermgmt'
                         },
                         {
                             icon: 'iconfont icon-student-mgt',
@@ -104,7 +107,8 @@ export default {
                             router: '/home/studentAccount',
                             tag: '',
                             role: 'admin',
-                            permission: 'student-upd|student-read'
+                            permission: 'student-upd|student-read',
+                            menuName: 'studentAccount'
                         },
                         {
                             icon: 'iconfont icon-class-mgt',
@@ -112,17 +116,9 @@ export default {
                             router: '/home/classroom',
                             tag: '',
                             role: 'admin',
-                            permission: 'classroom-upd|classroom-read'
+                            permission: 'classroom-upd|classroom-read',
+                            menuName: 'classroom'
                         },
-                        //课程设置
-                        // {
-                        //     icon: 'iconfont icon-kecheng',
-                        //     name: this.$t('system.menu.cusSetting'),
-                        //     router: '/home/ManageCourse',
-                        //     tag: 'x',
-                        //     role: 'admin',
-                        //     permission: 'course-read|course-upd',
-                        // },
                         {
                             icon: 'iconfont icon-kecheng',
                             name: this.$t('system.menu.cusMgt'),
@@ -130,6 +126,7 @@ export default {
                             tag: '',
                             role: 'admin',
                             permission: '',
+                            menuName: 'NewCusMgt'
                         },
                         //{
                         //   icon: 'iconfont icon-time',
@@ -154,7 +151,8 @@ export default {
                             router: '/home/serviceDriveAuth',
                             tag: this.$t('system.menu.preview'),
                             role: 'admin',
-                            permission: 'auth-read|auth-upd'
+                            permission: 'auth-read|auth-upd',
+                            menuName: 'serviceDriveAuth'
                         },
                         {
                             icon: 'iconfont icon-syllabus',
@@ -163,6 +161,7 @@ export default {
                             tag: this.$t('system.menu.preview'),
                             role: 'teacher|admin',
                             permission: '',
+                            menuName: 'syllabus'
                         },
                         {
                             icon: 'iconfont icon-file',
@@ -171,6 +170,7 @@ export default {
                             tag: '',
                             role: 'teacher|admin',
                             permission: '',
+                            menuName: 'schoolcontent'
                         },
                         {
                             icon: 'iconfont icon-question-bank',
@@ -179,6 +179,7 @@ export default {
                             tag: '',
                             role: 'teacher|admin',
                             permission: '',
+                            menuName: 'schoolBank'
                         },
                         {
                             icon: 'iconfont icon-k-point',
@@ -187,6 +188,7 @@ export default {
                             tag: '',
                             role: 'teacher|admin',
                             permission: '',
+                            menuName: 'knowledge'
                         }
                     ]
                 },
@@ -195,6 +197,7 @@ export default {
                     name: this.$t('system.menu.staAna'),
                     router: '',
                     role: 'admin',
+                    subName: 'analysis',
                     permission: 'analysis-read|scboard-read',
                     child: [
                         {
@@ -203,7 +206,8 @@ export default {
                             router: '/totalIndex',
                             tag: '',
                             role: 'admin',
-                            permission: 'analysis-read'
+                            permission: 'analysis-read',
+                            menuName: 'totalIndex'
                         },
                         {
                             icon: 'iconfont icon-school-analysis',
@@ -211,7 +215,8 @@ export default {
                             router: '/home/scboard',
                             tag: this.$t('system.menu.preview'),
                             role: 'admin',
-                            permission: 'scboard-read'
+                            permission: 'scboard-read',
+                            menuName: 'scboard'
                         }
                     ]
                 },
@@ -223,6 +228,7 @@ export default {
                     // permission: 'schoolAc-read|schoolAc-upd',
                     role: 'admin',
                     permission: '',
+                    subName:'scAc',
                     child: [
                         {
                             icon: 'iconfont icon-test',
@@ -230,7 +236,8 @@ export default {
                             router: '/home/schoolEvaluation',
                             tag: '',
                             role: 'admin',
-                            permission: ''
+                            permission: '',
+                            menuName: 'schoolEvaluation'
                         },
                         {
                             icon: 'iconfont icon-vote',
@@ -238,7 +245,8 @@ export default {
                             router: '/home/manageVote',
                             tag: '',
                             role: 'admin',
-                            permission: ''
+                            permission: '',
+                            menuName: 'manageVote'
                         },
                         {
                             icon: 'iconfont icon-questionnaire',
@@ -246,7 +254,8 @@ export default {
                             router: '/home/manageQuestionnaire',
                             tag: '',
                             role: 'admin',
-                            permission: ''
+                            permission: '',
+                            menuName: 'manageQuestionnaire'
                         },
                     ]
                 },
@@ -256,6 +265,7 @@ export default {
                     router: '',
                     role: 'teacher',
                     permission: '',
+                    subName:'cusContent',
                     child: [
                         {
                             icon: 'iconfont icon-syllabus',
@@ -264,6 +274,7 @@ export default {
                             tag: this.$t('system.menu.preview'),
                             role: 'teacher|admin',
                             permission: '',
+                            menuName: 'personalSyllabus'
                         },
                         {
                             icon: 'iconfont icon-file',
@@ -272,6 +283,7 @@ export default {
                             tag: '',
                             role: 'teacher|admin',
                             permission: '',
+                            menuName: 'personalcontent'
                         },
                         {
                             icon: 'iconfont icon-question-bank',
@@ -280,6 +292,7 @@ export default {
                             tag: '',
                             role: 'teacher|admin',
                             permission: '',
+                            menuName: 'personalBank'
                         }
                     ]
                 },
@@ -289,6 +302,7 @@ export default {
                     router: '',
                     role: 'teacher|admin',
                     permission: '',
+                    subName:'stuAc',
                     child: [
                         {
                             icon: 'iconfont icon-test',
@@ -297,6 +311,7 @@ export default {
                             tag: '',
                             role: 'teacher|admin',
                             permission: '',
+                            menuName: 'privateEvaluation'
                         },
                         {
                             icon: 'iconfont icon-vote',
@@ -305,6 +320,7 @@ export default {
                             tag: '',
                             role: 'teacher|admin',
                             permission: '',
+                            menuName: 'personalVote'
                         },
                         {
                             icon: 'iconfont icon-questionnaire',
@@ -313,6 +329,7 @@ export default {
                             tag: '',
                             role: 'teacher|admin',
                             permission: '',
+                            menuName: 'personalSurvey'
                         },
                         {
                             icon: 'iconfont icon-learning-self',
@@ -321,6 +338,7 @@ export default {
                             tag: this.$t('system.menu.preview'),
                             role: 'teacher|admin',
                             permission: '',
+                            menuName: 'selfLearn'
                         },
                         {
                             icon: 'iconfont icon-hw',
@@ -329,15 +347,8 @@ export default {
                             tag: this.$t('system.menu.preview'),
                             role: 'teacher|admin',
                             permission: '',
-                        },
-                        // {
-                        //     icon: 'iconfont icon-syllabus',
-                        //     name: this.$t('system.menu.acRecord'),
-                        //     router: '/home/manageRecord',
-                        //     tag: this.$t('system.menu.preview'),
-                        //     role: 'teacher|admin',
-                        //     permission: '',
-                        // }
+                            menuName: 'manageHomeWork'
+                        }
                     ]
                 },
                 {
@@ -347,7 +358,8 @@ export default {
                     tag: '',
                     role: 'teacher',
                     permission: '',
-                    child: []
+                    child: [],
+                    menuName: 'manageClass'
                 },
                 {
                     icon: 'iconfont icon-course-self',
@@ -356,7 +368,8 @@ export default {
                     tag: '',
                     role: 'teacher',
                     permission: '',
-                    child: []
+                    child: [],
+                    menuName: 'myCourse'
                 }
             ]
         },
@@ -386,34 +399,23 @@ export default {
     watch: {
         $route: {
             handler(val, oldval) {
-                if(this.menuTree.length == 0){
+                if (this.menuTree.length == 0) {
                     this.initMenu()
                 }
+                console.log(val)
+                let metaName = val.meta.activeName
+                this.activeName = metaName
                 this.openNames = []
-                let flag = false
                 for (let i in this.menuTree) {
-                    if (this.menuTree[i].router == val.path) {
-                        this.activeName = val.path
-                        this.openNames.push(parseInt(i))
-                        flag = true
-                        break
-                    } else {
+                    if (this.menuTree[i].child.length) {
                         for (let j in this.menuTree[i].child) {
-                            if (this.menuTree[i].child[j].router == val.path) {
-                                this.activeName = val.path
-                                this.openNames.push(parseInt(i))
-                                flag = true
+                            if (this.menuTree[i].child[j].menuName == metaName) {
+                                this.activeName = metaName
+                                this.openNames.push(this.menuTree[i].subName)
                                 break
                             }
                         }
                     }
-                    if (flag) {
-                        break
-                    }
-                }
-                if (!flag) {
-                    this.activeName = ''
-                    this.openNames = []
                 }
             },
             // 深度观察监听
@@ -421,7 +423,7 @@ export default {
             //立即执行
             immediate: true
         },
-        '$i18n.locale'(n,o) {
+        '$i18n.locale'(n, o) {
             this.initMenu()
         }
     }

TEAMModelOS/ClientApp/src/router/routes.js

@@ -89,368 +89,528 @@ export const routes = [
 			middleware: ['login', 'role:admin|teacher'], // 强制登录（会自动跳转到登录页），角色为管理员或教师
 		},
 		children: [{
-				name: 'totalIndex',
-				path: '/totalIndex',
-				component: resolve => require(['@/view/student-analysis/total-analysis/EvaluationList/TotalIndex.vue'], resolve),
-			},
-			{
-				name: 'total',
-				path: 'total',
-				component: resolve => require(['@/view/student-analysis/total-analysis/index.vue'], resolve),
-				children: [{
-						path: '/total',
-						component: resolve => require([
-							'@/view/student-analysis/total-analysis/AchievementAnalysis/AchievementAnalysis.vue'
-						], resolve)
-					},
-					{
-						path: '/total/evaluationList',
-						component: resolve => require(['@/view/student-analysis/total-analysis/EvaluationList/EvaluationList.vue'],
-							resolve),
-					},
-					{
-						path: '/total/achievement',
-						component: resolve => require([
-							'@/view/student-analysis/total-analysis/AchievementAnalysis/AchievementAnalysis.vue'
-						], resolve),
-					},
-					{
-						path: '/total/achievement/entryTables',
-						component: resolve => require(['@/view/student-analysis/total-analysis/AchievementAnalysis/EntryTables.vue'],
-							resolve),
-					},
-					{
-						path: '/total/achievement/earlyWarning',
-						component: resolve => require(['@/view/student-analysis/total-analysis/AchievementAnalysis/EarlyWarning.vue'],
-							resolve)
-					},
-					{
-						path: '/total/scatter',
-						component: resolve => require(['@/view/student-analysis/total-analysis/ScatterAnalysis/ScatterAnalysis.vue'],
-							resolve),
-					},
-					{
-						path: '/total/knowledge',
-						component: resolve => require([
-							'@/view/student-analysis/total-analysis/KnowledgeAnalysis/KnowledgeAnalysis.vue'
-						], resolve)
-					},
-					{
-						path: '/total/knowledge/details',
-						component: resolve => require(['@/view/student-analysis/total-analysis/KnowledgeAnalysis/ScoreDetails.vue'],
-							resolve)
-					},
-					{
-						path: '/total/cognitionLevel',
-						component: resolve => require(['@/view/student-analysis/total-analysis/LevelAnalysis/LevelAnalysis.vue'],
-							resolve)
-					},
-					{
-						path: '/total/cognitionLevel/details',
-						component: resolve => require(['@/view/student-analysis/total-analysis/LevelAnalysis/ScoreDetails.vue'],
-							resolve)
-					},
-					{
-						path: '/total/test',
-						component: resolve => require(['@/view/student-analysis/total-analysis/TestAnalysis/TestAnalysis.vue'],
-							resolve)
-					},
-					{
-						path: '/total/questionList',
-						component: resolve => require(['@/view/student-analysis/total-analysis/TestAnalysis/QuestionList.vue'],
-							resolve)
-					}
-				]
-			},
-			//校园基础数据管理
-			{
-				name: 'system',
-				path: 'system',
+			name: 'totalIndex',
+			path: '/totalIndex',
+			component: resolve => require(['@/view/student-analysis/total-analysis/EvaluationList/TotalIndex.vue'], resolve),
+			meta: {
+				activeName: 'totalIndex'
+			}
+		},
+		{
+			name: 'total',
+			path: 'total',
+			component: resolve => require(['@/view/student-analysis/total-analysis/index.vue'], resolve),
+			children: [{
+				path: '/total',
+				component: resolve => require([
+					'@/view/student-analysis/total-analysis/AchievementAnalysis/AchievementAnalysis.vue'
+				], resolve),
 				meta: {
-					middleware: ['login', 'ability:admin,schoolSetting-read|schoolSetting-upd']
-				},
-				component: resolve => require(['@/view/schoolmgmt/SystemSetting/SystemSetting.vue'], resolve)
+					activeName: 'totalIndex'
+				}
 			},
-			//班级教室管理
 			{
-				name: 'classroom',
-				path: 'classroom',
+				path: '/total/evaluationList',
+				component: resolve => require(['@/view/student-analysis/total-analysis/EvaluationList/EvaluationList.vue'],
+					resolve),
 				meta: {
-					middleware: ['login', 'ability:admin,classroom-read|classroom-upd']
-				},
-				component: resolve => require(['@/view/schoolmgmt/ClassroomSetting/ClassroomSetting.vue'], resolve)
+					activeName: 'totalIndex'
+				}
 			},
-			//学生账号管理
 			{
-				name: 'studentAccount',
-				path: 'studentAccount',
-				component: resolve => require(['@/view/student-account/Index.vue'], resolve),
+				path: '/total/achievement',
+				component: resolve => require([
+					'@/view/student-analysis/total-analysis/AchievementAnalysis/AchievementAnalysis.vue'
+				], resolve),
 				meta: {
-					middleware: ['login', 'ability:admin,student-read|student-upd']
-				},
-
+					activeName: 'totalIndex'
+				}
 			},
-			//教师账号
 			{
-				path: 'teachermgmt',
-				name: 'teachermgmt',
+				path: '/total/achievement/entryTables',
+				component: resolve => require(['@/view/student-analysis/total-analysis/AchievementAnalysis/EntryTables.vue'],
+					resolve),
 				meta: {
-					middleware: ['login', 'ability:admin,teacher-read|teacher-upd']
-				},
-				component: () => import('@/view/teachermgmt/Index.vue')
-			},
-			{
-				path: 'evaluation',
-				name: 'evaluation',
-				redirect: '/home/evaluation/testPaperList',
-				component: resolve => require(['@/view/evaluation/index/index.vue'], resolve),
-				children: [{
-						path: 'newSchoolExercise',
-						name: 'newSchoolExercise',
-						component: resolve => require(['@/view/evaluation/index/CreateExercises.vue'], resolve)
-					},
-					{
-						path: 'newPrivateExercise',
-						name: 'newPrivateExercise',
-						component: resolve => require(['@/view/evaluation/index/CreateExercises.vue'], resolve)
-					},
-					{
-						path: 'testPaper',
-						name: 'testPaper',
-						component: resolve => require(['@/view/evaluation/index/TestPaper.vue'], resolve)
-					},
-					{
-						path: 'testPaperList',
-						name: 'testPaperList',
-						component: resolve => require(['@/view/evaluation/bank/index.vue'], resolve)
-					},
-					{
-						path: 'schoolBank',
-						name: 'schoolBank',
-						component: resolve => require(['@/view/evaluation/bank/index.vue'], resolve)
-					},
-					{
-						path: 'personalBank',
-						name: 'personalBank',
-						component: resolve => require(['@/view/evaluation/bank/index.vue'], resolve)
-					}
-				]
+					activeName: 'totalIndex'
+				}
 			},
 			{
-				path: 'newSchoolPaper',
-				name: 'newSchoolPaper',
-				component: resolve => require(['@/view/evaluation/index/CreatePaper.vue'], resolve)
-			},
-			{
-				path: 'newPrivatePaper',
-				name: 'newPrivatePaper',
-				component: resolve => require(['@/view/evaluation/index/CreatePaper.vue'], resolve)
+				path: '/total/achievement/earlyWarning',
+				component: resolve => require(['@/view/student-analysis/total-analysis/AchievementAnalysis/EarlyWarning.vue'],
+					resolve),
+				meta: {
+					activeName: 'totalIndex'
+				}
 			},
 			{
-				path: 'myCourse',
-				name: 'myCourse',
-				component: resolve => require(['@/view/newcourse/MyCourse.vue'], resolve)
+				path: '/total/scatter',
+				component: resolve => require(['@/view/student-analysis/total-analysis/ScatterAnalysis/ScatterAnalysis.vue'],
+					resolve),
+				meta: {
+					activeName: 'totalIndex'
+				}
 			},
-			//自定义名单管理页面
 			{
-				path: 'MgtStuList',
-				name: 'MgtStuList',
-				component: resolve => require(['@/view/newcourse/MgtStuList.vue'], resolve)
+				path: '/total/knowledge',
+				component: resolve => require([
+					'@/view/student-analysis/total-analysis/KnowledgeAnalysis/KnowledgeAnalysis.vue'
+				], resolve),
+				meta: {
+					activeName: 'totalIndex'
+				}
 			},
-			
-			//我的课程查看评测详细数据
 			{
-				path: 'EvDetail',
-				name: 'EvDetail',
-				component: resolve => require(['@/view/newcourse/EvDetail.vue'], resolve)
+				path: '/total/knowledge/details',
+				component: resolve => require(['@/view/student-analysis/total-analysis/KnowledgeAnalysis/ScoreDetails.vue'],
+					resolve),
+				meta: {
+					activeName: 'totalIndex'
+				}
 			},
-
-			//课程管理
 			{
-				path: 'ManageCourse',
-				name: 'ManageCourse',
-				component: resolve => require(['@/view/newcourse/ManageCourse.vue'], resolve)
+				path: '/total/cognitionLevel',
+				component: resolve => require(['@/view/student-analysis/total-analysis/LevelAnalysis/LevelAnalysis.vue'],
+					resolve),
+				meta: {
+					activeName: 'totalIndex'
+				}
 			},
-			//新版课程管理
 			{
-				path: 'NewCusMgt',
-				name: 'NewCusMgt',
-				component: resolve => require(['@/view/newcourse/NewCusMgt.vue'], resolve)
+				path: '/total/cognitionLevel/details',
+				component: resolve => require(['@/view/student-analysis/total-analysis/LevelAnalysis/ScoreDetails.vue'],
+					resolve),
+				meta: {
+					activeName: 'totalIndex'
+				}
 			},
-			//课程时间管理
 			{
-				path: 'CourseTime',
-				name: 'CourseTime',
-				component: resolve => require(['@/view/newcourse/CourseTime.vue'], resolve)
-			},
+				path: '/total/test',
+				component: resolve => require(['@/view/student-analysis/total-analysis/TestAnalysis/TestAnalysis.vue'],
+					resolve),
+				meta: {
+					activeName: 'totalIndex'
+				}
 
-			//排课管理新版
-			{
-				path: 'NewCoursePlan',
-				name: 'NewCoursePlan',
-				component: resolve => require(['@/view/newcourse/NewCoursePlan.vue'], resolve)
 			},
-			//课程表版本排课
 			{
-				path: 'CoursePlan',
-				name: 'CoursePlan',
-				component: resolve => require(['@/view/newcourse/CoursePlan.vue'], resolve)
-			},
-			// 新课纲管理
-			{
-				path: 'syllabus',
-				name: 'syllabus',
-				component: resolve => require(['@/view/syllabus/newSyllabus/Index.vue'], resolve)
-			},
-			// 新课纲管理
-			{
-				path: 'personalSyllabus',
-				name: 'personalSyllabus',
-				component: resolve => require(['@/view/syllabus/newSyllabus/Index.vue'], resolve)
-			},
-			//校本资源管理
-			{
-				path: 'schoolcontent',
-				name: 'schoolcontent',
-				component: resolve => require(['@/view/teachcontent/index.vue'], resolve)
-			},
-			//个人内容管理
-			{
-				path: 'personalcontent',
-				name: 'personalcontent',
-				component: resolve => require(['@/view/teachcontent/index.vue'], resolve)
-			},
-			// 知识点管理
-			{
-				path: 'knowledge',
-				name: 'knowledge',
-				component: resolve => require(['@/view/knowledge-point/index/Index.vue'], resolve)
-			},
-			// 创建校本评测
-			{
-				path: 'createSchoolEva',
-				name: 'createSchoolEva',
-				component: resolve => require(['@/view/learnactivity/CreateSchoolEva.vue'], resolve)
-			},
-			// 创建个人评测
-			{
-				path: 'createPrivEva',
-				name: 'createPrivEva',
-				component: resolve => require(['@/view/learnactivity/CreatePrivEva.vue'], resolve)
-			},
-			//创建学习单元
-			{
-				path: 'createLearnUnit',
-				name: 'createLearnUnit',
-				component: resolve => require(['@/view/selflearn/CreateLearnUnit.vue'], resolve)
-			},
-			//创建作业活动
-			//{
-			//    path: 'createHomeWork',
-			//    name: 'createHomeWork',
-			//    component: resolve => require(['@/view/selflearning/CreateHomeWork.vue'], resolve)
-			//},
-			//创建编序式学习
-			{
-				path: 'createOrderLearn',
-				name: 'createOrderLearn',
-				component: resolve => require(['@/view/selflearn/CreateOrderLearn.vue'], resolve)
-			},
-			//管理评测页面(学校)
-			{
-				path: 'schoolEvaluation',
-				name: 'schoolEvaluation',
-				component: resolve => require(['@/view/learnactivity/MgtSchoolEva.vue'], resolve)
-			},
-			//管理评测页面（个人）
-			{
-				path: 'privateEvaluation',
-				name: 'privateEvaluation',
-				component: resolve => require(['@/view/learnactivity/MgtPrivEva.vue'], resolve)
-			},
-			//管理活动记录页面
-			{
-				path: 'manageRecord',
-				name: 'manageRecord',
-				component: resolve => require(['@/view/learnactivity/ManageRecord.vue'], resolve)
+				path: '/total/questionList',
+				component: resolve => require(['@/view/student-analysis/total-analysis/TestAnalysis/QuestionList.vue'],
+					resolve),
+				meta: {
+					activeName: 'totalIndex'
+				}
+			}
+			]
+		},
+		//校园基础数据管理
+		{
+			name: 'system',
+			path: 'system',
+			meta: {
+				middleware: ['login', 'ability:admin,schoolSetting-read|schoolSetting-upd'],
+				activeName: 'system'
 			},
-			//管理问卷调查
-			{
-				path: 'manageQuestionnaire',
-				name: 'manageQuestionnaire',
-				component: resolve => require(['@/view/questionnaire/ManageQuestionnaire.vue'], resolve)
+			component: resolve => require(['@/view/schoolmgmt/SystemSetting/SystemSetting.vue'], resolve)
+		},
+		//班级教室管理
+		{
+			name: 'classroom',
+			path: 'classroom',
+			meta: {
+				middleware: ['login', 'ability:admin,classroom-read|classroom-upd'],
+				activeName: 'classroom'
 			},
-			//管理问卷调查
-			{
-				path: 'personalSurvey',
-				name: 'personalSurvey',
-				component: resolve => require(['@/view/questionnaire/ManageQuestionnaire.vue'], resolve)
+			component: resolve => require(['@/view/schoolmgmt/ClassroomSetting/ClassroomSetting.vue'], resolve)
+		},
+		//学生账号管理
+		{
+			name: 'studentAccount',
+			path: 'studentAccount',
+			component: resolve => require(['@/view/student-account/Index.vue'], resolve),
+			meta: {
+				middleware: ['login', 'ability:admin,student-read|student-upd'],
+				activeName: 'studentAccount'
 			},
-			//新版自主学习
-			{
-				path: 'SelfLearn',
-				name: 'selfLearn',
-				component: resolve => require(['@/view/selflearn/SelfLearn.vue'], resolve)
+
+		},
+		//教师账号
+		{
+			path: 'teachermgmt',
+			name: 'teachermgmt',
+			meta: {
+				middleware: ['login', 'ability:admin,teacher-read|teacher-upd']
 			},
-			{
-				path: 'manageHomeWork',
-				name: 'manageHomeWork',
-				component: resolve => require(['@/view/homework/ManageHomeWork.vue'], resolve)
+			component: () => import('@/view/teachermgmt/Index.vue'),
+			meta: {
+				activeName: 'teachermgmt'
 			},
-			{
-				path: 'manageVote',
-				name: 'manageVote',
-				component: resolve => require(['@/view/vote/ManageVote.vue'], resolve)
+		},
+		{
+			path: 'evaluation',
+			name: 'evaluation',
+			redirect: '/home/evaluation/testPaperList',
+			meta: {
+				activeName: 'schoolBank'
 			},
-			{
-				path: 'personalVote',
-				name: 'personalVote',
-				component: resolve => require(['@/view/vote/ManageVote.vue'], resolve)
+			component: resolve => require(['@/view/evaluation/index/index.vue'], resolve),
+			children: [{
+				path: 'newSchoolExercise',
+				name: 'newSchoolExercise',
+				component: resolve => require(['@/view/evaluation/index/CreateExercises.vue'], resolve),
+				meta: {
+					activeName: 'schoolBank'
+				},
 			},
-			//主页
 			{
-				path: 'homePage',
-				name: 'homePage',
-				component: resolve => require(['@/view/homepage/HomePage.vue'], resolve)
+				path: 'newPrivateExercise',
+				name: 'newPrivateExercise',
+				component: resolve => require(['@/view/evaluation/index/CreateExercises.vue'], resolve),
+				meta: {
+					activeName: 'personalBank'
+				},
 			},
-			//班级管理
 			{
-				path: 'manageClass',
-				name: 'manageClass',
-				component: resolve => require(['@/view/classmgt/ManageClass.vue'], resolve)
+				path: 'testPaper',
+				name: 'testPaper',
+				component: resolve => require(['@/view/evaluation/index/TestPaper.vue'], resolve),
+				meta: {
+					activeName: 'schoolBank'
+				},
 			},
-			//用户反馈
 			{
-				path: 'feedback',
-				name: 'feedback',
-				component: resolve => require(['@/view/feedback/Feedback.vue'], resolve)
+				path: 'testPaperList',
+				name: 'testPaperList',
+				component: resolve => require(['@/view/evaluation/bank/index.vue'], resolve),
+				meta: {
+					activeName: 'schoolBank'
+				},
 			},
-			//设置
 			{
-				path: 'settings',
-				name: 'settings',
-				component: resolve => require(['@/view/settings/Index.vue'], resolve)
+				path: 'schoolBank',
+				name: 'schoolBank',
+				component: resolve => require(['@/view/evaluation/bank/index.vue'], resolve),
+				meta: {
+					activeName: 'schoolBank'
+				},
 			},
-			//课堂记录
 			{
-				path: 'classRecord',
-				name: 'classRecord',
-				component: resolve => require(['@/view/classrecord/ClassRecord.vue'], resolve)
-			},
+				path: 'personalBank',
+				name: 'personalBank',
+				component: resolve => require(['@/view/evaluation/bank/index.vue'], resolve),
+				meta: {
+					activeName: 'personalBank'
+				}
+			}
+			]
+		},
+		{
+			path: 'newSchoolPaper',
+			name: 'newSchoolPaper',
+			component: resolve => require(['@/view/evaluation/index/CreatePaper.vue'], resolve),
+			meta: {
+				activeName: 'schoolBank'
+			}
+		},
+		{
+			path: 'newPrivatePaper',
+			name: 'newPrivatePaper',
+			component: resolve => require(['@/view/evaluation/index/CreatePaper.vue'], resolve),
+			meta: {
+				activeName: 'personalBank'
+			}
+		},
+		{
+			path: 'myCourse',
+			name: 'myCourse',
+			component: resolve => require(['@/view/newcourse/MyCourse.vue'], resolve),
+			meta: {
+				activeName: 'NewCusMgt'
+			}
+		},
+		//自定义名单管理页面
+		{
+			path: 'MgtStuList',
+			name: 'MgtStuList',
+			component: resolve => require(['@/view/newcourse/MgtStuList.vue'], resolve),
+			meta: {
+				activeName: 'myCourse'
+			}
+		},
 
-			//Louise的智能教室使用分析儀表板
-			{
-				path: 'scboard',
-				name: 'scboard',
-				component: resolve => require(['@/view/scboard/Index.vue'], resolve)
-			},
+		//我的课程查看评测详细数据
+		{
+			path: 'EvDetail',
+			name: 'EvDetail',
+			component: resolve => require(['@/view/newcourse/EvDetail.vue'], resolve),
+			meta: {
+				activeName: 'myCourse'
+			}
+		},
 
-			//Louise的教師儲存空間授權管理分頁
-			{
-				path: 'serviceDriveAuth',
-				name: 'serviceDriveAuth',
-				component: resolve => require(['@/view/serviceDriveAuth/Index.vue'], resolve)
+		//课程管理(废弃)
+		{
+			path: 'ManageCourse',
+			name: 'ManageCourse',
+			component: resolve => require(['@/view/newcourse/ManageCourse.vue'], resolve)
+		},
+		//新版课程管理
+		{
+			path: 'NewCusMgt',
+			name: 'NewCusMgt',
+			component: resolve => require(['@/view/newcourse/NewCusMgt.vue'], resolve),
+			meta: {
+				activeName: 'NewCusMgt'
+			}
+		},
+		//课程时间管理（废弃）
+		{
+			path: 'CourseTime',
+			name: 'CourseTime',
+			component: resolve => require(['@/view/newcourse/CourseTime.vue'], resolve)
+		},
+
+		//排课管理新版（废弃）
+		{
+			path: 'NewCoursePlan',
+			name: 'NewCoursePlan',
+			component: resolve => require(['@/view/newcourse/NewCoursePlan.vue'], resolve)
+		},
+		//课程表版本排课
+		{
+			path: 'CoursePlan',
+			name: 'CoursePlan',
+			component: resolve => require(['@/view/newcourse/CoursePlan.vue'], resolve),
+			meta: {
+				activeName: 'NewCusMgt'
+			}
+		},
+		// 新课纲管理
+		{
+			path: 'syllabus',
+			name: 'syllabus',
+			component: resolve => require(['@/view/syllabus/newSyllabus/Index.vue'], resolve),
+			meta: {
+				activeName: 'syllabus'
+			}
+		},
+		// 新课纲管理
+		{
+			path: 'personalSyllabus',
+			name: 'personalSyllabus',
+			component: resolve => require(['@/view/syllabus/newSyllabus/Index.vue'], resolve),
+			meta: {
+				activeName: 'personalSyllabus'
+			}
+		},
+		//校本资源管理
+		{
+			path: 'schoolcontent',
+			name: 'schoolcontent',
+			component: resolve => require(['@/view/teachcontent/index.vue'], resolve),
+			meta: {
+				activeName: 'schoolcontent'
 			}
+		},
+		//个人内容管理
+		{
+			path: 'personalcontent',
+			name: 'personalcontent',
+			component: resolve => require(['@/view/teachcontent/index.vue'], resolve),
+			meta: {
+				activeName: 'personalcontent'
+			}
+		},
+		// 知识点管理
+		{
+			path: 'knowledge',
+			name: 'knowledge',
+			component: resolve => require(['@/view/knowledge-point/index/Index.vue'], resolve),
+			meta: {
+				activeName: 'knowledge'
+			}
+		},
+		// 创建校本评测
+		{
+			path: 'createSchoolEva',
+			name: 'createSchoolEva',
+			component: resolve => require(['@/view/learnactivity/CreateSchoolEva.vue'], resolve),
+			meta: {
+				activeName: 'schoolEvaluation'
+			}
+		},
+		// 创建个人评测
+		{
+			path: 'createPrivEva',
+			name: 'createPrivEva',
+			component: resolve => require(['@/view/learnactivity/CreatePrivEva.vue'], resolve),
+			meta: {
+				activeName: 'privateEvaluation'
+			}
+		},
+		//创建学习单元
+		{
+			path: 'createLearnUnit',
+			name: 'createLearnUnit',
+			component: resolve => require(['@/view/selflearn/CreateLearnUnit.vue'], resolve),
+			meta: {
+				activeName: 'selfLearn'
+			}
+		},
+		//创建作业活动
+		//{
+		//    path: 'createHomeWork',
+		//    name: 'createHomeWork',
+		//    component: resolve => require(['@/view/selflearning/CreateHomeWork.vue'], resolve)
+		//},
+		//创建编序式学习
+		{
+			path: 'createOrderLearn',
+			name: 'createOrderLearn',
+			component: resolve => require(['@/view/selflearn/CreateOrderLearn.vue'], resolve),
+			meta: {
+				activeName: 'selfLearn'
+			}
+		},
+		//管理评测页面(学校)
+		{
+			path: 'schoolEvaluation',
+			name: 'schoolEvaluation',
+			component: resolve => require(['@/view/learnactivity/MgtSchoolEva.vue'], resolve),
+			meta: {
+				activeName: 'schoolEvaluation'
+			}
+		},
+		//管理评测页面（个人）
+		{
+			path: 'privateEvaluation',
+			name: 'privateEvaluation',
+			component: resolve => require(['@/view/learnactivity/MgtPrivEva.vue'], resolve),
+			meta: {
+				activeName: 'privateEvaluation'
+			}
+		},
+		//管理活动记录页面(暂未使用)
+		{
+			path: 'manageRecord',
+			name: 'manageRecord',
+			component: resolve => require(['@/view/learnactivity/ManageRecord.vue'], resolve)
+		},
+		//管理问卷调查
+		{
+			path: 'manageQuestionnaire',
+			name: 'manageQuestionnaire',
+			component: resolve => require(['@/view/questionnaire/ManageQuestionnaire.vue'], resolve),
+			meta: {
+				activeName: 'manageQuestionnaire'
+			}
+		},
+		//管理问卷调查
+		{
+			path: 'personalSurvey',
+			name: 'personalSurvey',
+			component: resolve => require(['@/view/questionnaire/ManageQuestionnaire.vue'], resolve),
+			meta: {
+				activeName: 'personalSurvey'
+			}
+		},
+		//新版自主学习
+		{
+			path: 'SelfLearn',
+			name: 'selfLearn',
+			component: resolve => require(['@/view/selflearn/SelfLearn.vue'], resolve),
+			meta: {
+				activeName: 'selfLearn'
+			}
+		},
+		{
+			path: 'manageHomeWork',
+			name: 'manageHomeWork',
+			component: resolve => require(['@/view/homework/ManageHomeWork.vue'], resolve),
+			meta: {
+				activeName: 'manageHomeWork'
+			}
+		},
+		{
+			path: 'manageVote',
+			name: 'manageVote',
+			component: resolve => require(['@/view/vote/ManageVote.vue'], resolve),
+			meta: {
+				activeName: 'manageVote'
+			}
+		},
+		{
+			path: 'personalVote',
+			name: 'personalVote',
+			component: resolve => require(['@/view/vote/ManageVote.vue'], resolve),
+			meta: {
+				activeName: 'personalVote'
+			}
+		},
+		//主页
+		{
+			path: 'homePage',
+			name: 'homePage',
+			component: resolve => require(['@/view/homepage/HomePage.vue'], resolve),
+			meta: {
+				activeName: 'homePage'
+			}
+		},
+		//班级管理
+		{
+			path: 'manageClass',
+			name: 'manageClass',
+			component: resolve => require(['@/view/classmgt/ManageClass.vue'], resolve),
+			meta: {
+				activeName: 'manageClass'
+			}
+		},
+		//用户反馈
+		{
+			path: 'feedback',
+			name: 'feedback',
+			component: resolve => require(['@/view/feedback/Feedback.vue'], resolve),
+			meta: {
+				activeName: 'feedback'
+			}
+		},
+		//设置
+		{
+			path: 'settings',
+			name: 'settings',
+			component: resolve => require(['@/view/settings/Index.vue'], resolve),
+			meta: {
+				activeName: 'settings'
+			}
+		},
+		//课堂记录
+		{
+			path: 'classRecord',
+			name: 'classRecord',
+			component: resolve => require(['@/view/classrecord/ClassRecord.vue'], resolve),
+			meta: {
+				activeName: 'myCourse'
+			}
+		},
+
+		//Louise的智能教室使用分析儀表板
+		{
+			path: 'scboard',
+			name: 'scboard',
+			component: resolve => require(['@/view/scboard/Index.vue'], resolve),
+			meta: {
+				activeName: 'scboard'
+			}
+		},
+
+		//Louise的教師儲存空間授權管理分頁
+		{
+			path: 'serviceDriveAuth',
+			name: 'serviceDriveAuth',
+			component: resolve => require(['@/view/serviceDriveAuth/Index.vue'], resolve),
+			meta: {
+				activeName: 'serviceDriveAuth'
+			}
+		}
 		]
 	},
 	//学生端
@@ -466,48 +626,48 @@ export const routes = [
 		children: [{
 			name: "homeView",
 			path: "homeView",
-				component: resolve => require(['@/components/student-web/HomeView/HomeView'], resolve),
-			},
-			{
-				name: "courseList",
-				path: "courseList",
-				component: resolve => require(['@/components/student-web/HomeView/CourseListView'], resolve), //是元件不用''
-			},
-			{
-				name: "setting",
-				path: "setting",
-				component: resolve => require(['@/components/student-web/SettingView/SettingView'], resolve), //是元件不用'
-			},
-			{
-				name: "eventView",
-				path: "eventView",
-				component: resolve => require(['@/components/student-web/EventView/EventView'], resolve),
-			},
-			{
-				name: "eventView/:name",
-				path: "eventView/:name",
-				component: resolve => require(['@/components/student-web/EventView/EventView'], resolve),
-			},
-			{
-				name: "eventLatest",
-				path: "eventLatest",
-				component: resolve => require(['@/components/student-web/EventView/EventOverView/EventLatest'], resolve),
-			},
-			{
-				name: "studyView",
-				path: "studyView",
-				component: resolve => require(['@/components/student-web/StudyView/StudyView'], resolve),
-			},
-			{
-				name: "hiteachView",
-				path: "hiteachView",
-				component: resolve => require(['@/components/student-web/HiteachView/HiteachView'], resolve),
-			},
-			{
-				name: "informView",
-				path: "informView",
-				component: resolve => require(['@/components/student-web/InformView/InformView'], resolve),
-			}
+			component: resolve => require(['@/components/student-web/HomeView/HomeView'], resolve),
+		},
+		{
+			name: "courseList",
+			path: "courseList",
+			component: resolve => require(['@/components/student-web/HomeView/CourseListView'], resolve), //是元件不用''
+		},
+		{
+			name: "setting",
+			path: "setting",
+			component: resolve => require(['@/components/student-web/SettingView/SettingView'], resolve), //是元件不用'
+		},
+		{
+			name: "eventView",
+			path: "eventView",
+			component: resolve => require(['@/components/student-web/EventView/EventView'], resolve),
+		},
+		{
+			name: "eventView/:name",
+			path: "eventView/:name",
+			component: resolve => require(['@/components/student-web/EventView/EventView'], resolve),
+		},
+		{
+			name: "eventLatest",
+			path: "eventLatest",
+			component: resolve => require(['@/components/student-web/EventView/EventOverView/EventLatest'], resolve),
+		},
+		{
+			name: "studyView",
+			path: "studyView",
+			component: resolve => require(['@/components/student-web/StudyView/StudyView'], resolve),
+		},
+		{
+			name: "hiteachView",
+			path: "hiteachView",
+			component: resolve => require(['@/components/student-web/HiteachView/HiteachView'], resolve),
+		},
+		{
+			name: "informView",
+			path: "informView",
+			component: resolve => require(['@/components/student-web/InformView/InformView'], resolve),
+		}
 		]
 	}
 ]

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

@@ -193,11 +193,9 @@ import { json } from 'd3'
 					code: ''
 				},
 				currentParams: {
-					//code: '',
 					subjectId: '',
 					school_code: '',
 					periodId: '',
-					//type: 0
 				},
 				drag: false,
 				isDragging: false,
@@ -252,7 +250,8 @@ import { json } from 'd3'
 				curDragPoint: null,
 				pointIndex: null,
 				pointDatas: {},
-                updated:false
+				updated: false,
+				setCount: false
 			}
 		},
 		components: {
@@ -264,13 +263,11 @@ import { json } from 'd3'
 		},
 		created() {
 			this.initSchoolData()
-			this.initBlockCount()
 		},
 		methods: {
 
 			/* 知识点拖动开始 */
 			onDragStart(item) {
-				console.log(item)
 				this.curDragPoint = item
 				this.isDragging = true
 			},
@@ -339,28 +336,6 @@ import { json } from 'd3'
 				this.isComposeBlock = true
 			},
 
-			/* 保存最新知识块内容 */
-			savePointAndBlock(pointItem) {
-				return new Promise((r, j) => {
-					pointItem.code = pointItem.code.replace('Knowledge-', '')
-					this.$api.knowledge.SaveOrUpdateKnowledge([pointItem]).then(res => {
-						if (!res.error && res.knowledges) {
-							this.curDragPoint = null
-							this.isLoading = false
-							this.checkedPointList = []
-							this.initBlockCount()
-                            this.$Message.success(this.$t('knowledge.success'))
-							r(200)
-						} else {
-                            this.isLoading = false
-						}
-					}).catch(err => {
-						j(err)
-                        this.$Message.warning(this.$t('knowledge.fail'))
-					})
-				})
-			},
-
 			// 获取当前学校学段学科等基本信息
 			initSchoolData() {
 				this.$store.dispatch('user/getSchoolProfile').then(res => {
@@ -371,7 +346,6 @@ import { json } from 'd3'
 						this.originData = schoolBaseInfo // 默认选择第一个
 						if (schoolBaseInfo.period.length) {
 							this.periodList = schoolBaseInfo.period
-							//this.currentParams.code = schoolBaseInfo.id
 							this.currentParams.school_code = schoolBaseInfo.id
 							this.currentParams.periodId = schoolBaseInfo.period[0].id
 							this.currentPeriodIndex = 0 // 默认选择第一个学段
@@ -383,6 +357,7 @@ import { json } from 'd3'
 
 			// 获取当前册别数量(每次都获取最新的数据)
 			initBlockCount() {
+				this.setCount = false
 				let params = {}
 					for (let data of this.subjectList) {
                         params[this.$store.state.userInfo.schoolCode + "-" + data.id] = this.periodList[this.currentPeriodIndex].id
@@ -390,6 +365,7 @@ import { json } from 'd3'
 					this.$api.syllabus.FindBlockCount(params).then(res => {
 						if (res.datas.length) {
 							this.$nextTick(() => {
+								this.setCount = true  //开始监听数据
 								this.blockCounts = res.datas
                                 this.schoolBlockCount = res.datas.map(i => i.countBlock)
 								this.privateBlockCount = res.datas.map(i => i.countBlock)
@@ -405,13 +381,11 @@ import { json } from 'd3'
                 let params = JSON.parse(JSON.stringify(this.currentParams))
                 params.type = 0
 				this.$api.knowledge.GetSchoolPoints(params).then(res => {
-					console.log(res.length)
                     if (res.length > 0) {
                         that.pointDatas = res
                         let list = res[0].blocks
                         this.blockList = list
                         this.originBlockList = JSON.parse(JSON.stringify(list))
-                        // this.handleBlockTap(0, list.length ? list[0] : null)
                         setTimeout(function () {
                             that.isLoadBlocks = false
                         }, 400)
@@ -442,15 +416,14 @@ import { json } from 'd3'
 			// 根据学科获取学科下所有知识点数据
 			getPointsData() {
 				let that = this
-				//this.currentParams.type = 1
 				this.$api.knowledge.GetSchoolPoints(this.currentParams).then(res => {
 					if (res.length) {
-						console.log(res)
 						this.pointList = res[0].points
 						this.originPointList = JSON.parse(JSON.stringify(res[0].points))
 						setTimeout(function () {
 							that.isLoadPoints = false
 						}, 800)
+                        this.updated = false
 					}
 				})
 			},
@@ -573,7 +546,6 @@ import { json } from 'd3'
 				this.editBlock = {}
 				this.isAddBlock = false // 关闭窗口
 				this.blockCounts = []
-				//this.initBlockCount()
 			},
 
 			// 添加知识点完成
@@ -593,7 +565,6 @@ import { json } from 'd3'
 				this.isEditPoint = false
 				setTimeout(function () {
 					that.isLoadPoints = false
-					//that.initBlockCount()
 				}, 400)
 			},
 			//查询当前关联的知识块数据
@@ -642,7 +613,6 @@ import { json } from 'd3'
 							this.handleBlockTap(0, this.blockList.length ? this.blockList[0] : null)
 							setTimeout(() => {
 								that.blockCounts = []
-								//that.initBlockCount()
 								that.isLoading = false
                                 that.$Message.success(this.$t('knowledge.delSuccess'))
 							}, 1000)
@@ -756,7 +726,6 @@ import { json } from 'd3'
 					this.activeBlockIndex = null
 					this.curBlockPoints = []
                     this.$Message.success(this.$t('knowledge.success'))
-					//this.initBlockCount()
 				}
 			},
 
@@ -811,21 +780,21 @@ import { json } from 'd3'
 				}
 			},
 			//保存修改后的数据
-			saveData() {
-                if (this.updated) {
+             saveData() {
+				 if (this.updated) {
+					this.setCount = false
                     let params = {}
                     params = this.pointDatas[0]
                     params.points = [...this.originPointList]
 					params.blocks = [...this.originBlockList]
-                    console.log(params)
                     this.$api.knowledge.SaveOrUpdateKnowledge(params).then(res => {
-                        if (res) {
+						if (res) {
                             this.$Message.success(this.$t('knowledge.saveSuccess'))
 							this.getPointsData()
-							this.initBlockCount()
+							//this.initBlockCount()
                         } else {
                             this.$Message.warning(this.$t('knowledge.saveFail'))
-                        }
+						}
                     }).catch(err => {
                         this.$Message.error(this.$t('knowledge.saveFail'))
                         this.isLoadBlocks = false
@@ -845,14 +814,16 @@ import { json } from 'd3'
 		watch: {
             originBlockList: {
 				handler(newValue, oldValue) {
-					//console.log(newValue)
-					this.updated = true
+					if (this.setCount) {
+						this.updated = true
+                    }
                 }
 			},
             originPointList: {
 				handler(newValue, oldValue) {
-					//console.log(newValue)
-					this.updated = true
+					if (this.setCount) {
+						this.updated = true
+                    }
                 }
             },
 		},