Merge branch 'develop3.0' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0

TEAMModelOS/ClientApp/src/view/evaluation/bank/ExerciseList.less

@@ -1,638 +0,0 @@
-.ev-list-container {
-    user-select: none !important;
-    position: relative;
-    font-family: '微軟正黑體', 'Heiti TC' !important;
-}
-
-.ev-list-container .ev-header {
-    background: #fff;
-    padding: 10px;
-    display: flex;
-    align-items: center;
-}
-
-.ev-list-container .ev-title {
-    font-size: 20px;
-    font-weight: bold;
-    margin-left: 5px;
-    vertical-align: middle;
-}
-
-.ev-list-container .ev-length {
-    font-size: 12px;
-    font-weight: bold;
-    margin-left: 30px;
-    display: inline-block;
-    margin-top: 5px;
-    vertical-align: text-top;
-}
-
-.ev-list-container .ivu-divider-horizontal {
-    margin: 15px 0;
-}
-
-.ev-list-container .no-data-text {
-    width: 100%;
-    padding: 30px;
-    background: #fff;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    margin-top: 10px;
-    font-size: 16px;
-}
-
-.ev-list-operation {
-    width: 100%;
-    height: 60px;
-    background: #fff;
-    padding: 10px;
-    /*border-top:1px dashed rgba(128, 128, 128,0.4);*/
-    margin-top: 10px;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.ev-list-operation .ivu-checkbox-wrapper {
-    font-size: 14px;
-}
-
-.ev-list-operation .ivu-checkbox {
-    margin: 10px;
-}
-
-.ev-list-operation .import-exercise {
-    font-weight: bold;
-    color: rgb(16, 171, 231);
-    font-size: 16px;
-    display: flex;
-}
-
-.ev-list-operation .import-exercise .ivu-btn {
-    margin-right: 10px;
-}
-
-.ev-list-operation .ivu-icon {
-    font-size: 16px;
-    margin-right: 6px;
-    cursor: pointer;
-    vertical-align: initial;
-}
-
-.ev-list-operation .ivu-checkbox-checked .ivu-checkbox-inner {
-    background: #01b4ef;
-    border-color: #01b4ef;
-}
-
-.ev-list-operation .operation-cart {
-    position: fixed;
-    right: 70px;
-    bottom: -10px;
-    height: 100px;
-    width: 100px;
-    padding: 0 10px;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    z-index: 999;
-}
-
-.ev-list-operation .operation-cart img {
-    width: 60px;
-    height: 50px;
-    cursor: pointer;
-}
-
-.ev-list-operation .operation-cart span {
-    cursor: pointer;
-    font-size: 16px;
-    font-weight: bold;
-    margin-right: 10px;
-}
-
-.ev-list-operation .ivu-poptip-title {
-    display: none;
-}
-
-.ev-list-operation .ivu-poptip-body {
-    padding: 0;
-}
-
-.ev-list-operation .ivu-poptip-popper[x-placement^=top] .ivu-poptip-arrow::after {
-    border-top-color: rgb(16, 171, 231);
-}
-
-.basket-content {
-    width: 300px;
-}
-
-.basket-content .basket-title {
-    height: 40px;
-    font-size: 16px;
-    text-align: center;
-    line-height: 40px;
-    color: #fff;
-    background: rgb(16, 171, 231);
-}
-
-.basket-content .basket-body {
-    width: 100%;
-    padding: 20px;
-}
-
-.basket-content .basket-body .ivu-progress {
-    width: 45%;
-}
-
-.basket-content .basket-body .ivu-progress-inner {
-    vertical-align: unset;
-}
-
-.basket-content .basket-body .basket-item {
-    margin-top: 15px;
-}
-
-.basket-content .basket-body .basket-delete {
-    font-size: 14px;
-    margin-left: 5px;
-    color: #01b4ef;
-}
-
-.basket-content .basket-footer {
-    height: 40px;
-    font-size: 16px;
-    text-align: center;
-    line-height: 40px;
-    margin-top: 20px;
-    color: #fff;
-    background: rgb(16, 171, 231);
-    cursor: pointer;
-}
-
-.basket-content .basket-footer-no {
-    height: 40px;
-    font-size: 16px;
-    text-align: center;
-    line-height: 40px;
-    margin-top: 20px;
-    color: #fff;
-    background: #ccc;
-    cursor: pointer;
-}
-
-
-
-.ev-content {
-    background: none;
-}
-
-.content-wrap {
-    position: relative;
-    width: 100%;
-    height: auto;
-    display: flex;
-    flex-direction: column;
-}
-
-.content-wrap .exercise-item {
-    width: 100%;
-    height: auto;
-    padding: 10px 20px 10px 20px;
-    margin-top: 10px;
-    font-size: 16px;
-    font-weight: 600;
-    background: #fff;
-    cursor: pointer;
-    /*box-shadow: 6px 5px 5px 2px rgb(214, 214, 214);*/
-}
-
-.content-wrap .exercise-item table, .content-wrap .exercise-item td {
-    border: 1px solid rgb(128, 128, 128);
-    border-collapse: collapse;
-    text-align: center;
-    padding: 5px 10px;
-}
-
-.content-wrap .exercise-item:hover {
-    box-shadow: 0px 0px 20px 2px rgb(228, 224, 224);
-}
-
-.content-wrap .exercise-item:hover .item-tools-bind {
-    display: unset;
-}
-
-.content-wrap .exercise-item p {
-    /*margin: 10px 0;*/
-    display: inline-block;
-    word-break: break-all;
-}
-
-.complete-line {
-    margin: 0 5px;
-    padding: 0 45px;
-    border-bottom: 2px solid rgb(128, 128, 128);
-}
-
-.exercise-item .item-question {
-    /*display: inline-block;*/
-    /*margin-top:20px;*/
-    position: relative;
-    cursor: pointer;
-}
-
-.exercise-item .item-question .item-btn-toggle {
-    position: absolute;
-    right: 0;
-    top: 0;
-}
-
-.exercise-item .item-question .item-btn-toggle .ivu-icon {
-    font-size: 22px;
-    cursor: pointer;
-}
-
-.exercise-item .item-difficulty {
-    display: inline-block;
-    padding: 2px 10px;
-    background: rgb(16, 171, 231);
-    border-radius: 5px;
-    color: #fff;
-    font-size: 12px;
-}
-
-.exercise-item .item-type {
-    display: inline-block;
-    padding: 1px 9px;
-    border-radius: 5px;
-    color: #fff;
-    font-size: 12px;
-    margin-left: 5px;
-    background: rgb(16, 171, 231);
-}
-
-.exercise-item .item-relevant-points {
-    display: inline-block;
-    padding: 1px 9px;
-    font-size: 13px;
-}
-
-.exercise-item .item-options {
-    margin-top: 10px;
-}
-
-.exercise-item .item-options .item-option-content {
-    margin: 7px 0;
-}
-
-.exercise-item .toggle-area {
-    border-top: 1px #c3c3c34d dashed;
-    padding-top: 10px;
-    margin-top: 10px;
-}
-
-.exercise-item .item-answer {
-    display: inline-block;
-    cursor: pointer;
-    margin-top: 12px;
-    font-size: 14px;
-}
-
-.exercise-item .item-answer-item {
-    margin-left: 25px;
-    padding: 0 25px;
-    border-bottom: 2px solid rgb(128, 128, 128);
-}
-
-.exercise-item .item-answer-details {
-    margin: 10px 20px;
-}
-
-.exercise-item .item-answer .answer-title-line {
-    background: rgb(0, 173, 37);
-    padding: 0 3px;
-    border-radius: 5px;
-}
-
-.exercise-item .item-answer .answer-title {
-    margin-left: 10px;
-    color: rgb(0, 173, 37);
-}
-
-.exercise-item .item-explain {
-    display: table;
-    margin-top: 10px;
-    margin-left: -10px;
-    cursor: pointer;
-    font-size: 14px;
-}
-
-.exercise-item .item-explain-item {
-    margin-left: 25px;
-    padding: 0 25px;
-    border-bottom: 2px solid rgb(128, 128, 128);
-}
-
-.exercise-item .item-explain-details {
-    margin: 10px;
-    display: inline-block;
-}
-
-.exercise-item .item-explain .explain-title-line {
-    background: rgb(16, 171, 231);
-    padding: 0 3px;
-    border-radius: 5px;
-}
-
-.exercise-item .item-explain .explain-title {
-    margin-left: 10px;
-    color: rgb(16, 171, 231);
-}
-
-.exercise-item .item-tools {
-    width: 100%;
-    padding: 10px 0;
-    margin-top: 20px;
-    font-size: 14px;
-    border-top: 1px #c3c3c34d dashed;
-}
-
-.exercise-item .item-tools .item-tools-action {
-    float: right;
-    color: #01b4ef;
-    margin: 0 20px;
-    margin-top: 8px;
-    font-size: 14px;
-    display: flex;
-    align-items: center;
-    cursor: pointer;
-}
-
-.exercise-item .item-tools .item-tools-action .ivu-icon {
-    font-size: 18px;
-}
-
-.exercise-item .item-tools .ivu-icon {
-    font-size: 16px;
-    margin-right: 5px;
-    font-weight: bold;
-}
-
-.exercise-item .item-tools .ivu-btn {
-    float: right;
-    border-color: transparent;
-    box-shadow: none;
-}
-
-.exercise-item .item-tools-tool {
-    margin-left: 10px;
-    font-weight: bold;
-    cursor: pointer;
-    color: rgb(16, 171, 231);
-    font-size: 14px;
-}
-
-.exercise-item .item-tools-tool .ivu-icon {
-    margin-left: 15px;
-    vertical-align: top;
-}
-
-.exercise-item .item-tools-tool .item-bind-point {
-    color: rgb(128, 128, 128);
-    margin-left: 5px;
-}
-
-.exercise-item .item-tools-tool .ivu-tag {
-    margin-top: -2px;
-}
-
-.exercise-item .item-tools-tool .ivu-tag-border {
-    line-height: 22px;
-}
-
-
-.exercise-item .item-tools .item-tools-info {
-    vertical-align: sub;
-    color: #868686;
-    border-right: 2px solid #d2d2d2;
-    font-size: 12px;
-    padding: 0 10px;
-}
-
-.exercise-item .item-tools .item-tools-info:first-child {
-    padding-left: 0;
-}
-
-.exercise-item .item-tools .item-tools-info:last-child {
-    border:none;
-}
-
-
-.ev-list-container h1, h2, h3, h4, h5, h6 {
-    display: inline-block;
-}
-
-.filter-wrap {
-    width: 100%;
-    padding: 20px;
-    background: #fff;
-}
-
-.filter-wrap .filter-item:first-child {
-    margin-top: 0px;
-}
-
-.filter-wrap .filter-item {
-    margin-top: 10px;
-}
-
-.filter-wrap .filter-title {
-    font-size: 16px;
-    font-weight: bold;
-    margin-right: 10px;
-}
-
-.filter-wrap .ivu-radio-group {
-    padding-bottom: 4px;
-}
-
-.filter-wrap .ivu-radio-wrapper {
-    padding: 0 10px;
-    margin-left: 15px;
-    height: 28px;
-    line-height: 28px;
-    box-shadow: none !important;
-    border: none !important;
-    font-size: 14px;
-    border-radius: 0 !important;
-}
-
-.filter-wrap .ivu-radio-wrapper .ivu-icon {
-    margin-bottom: 2px;
-}
-
-.filter-wrap .ivu-radio-wrapper:after, .ivu-radio-group-button .ivu-radio-wrapper:before {
-    content: none;
-}
-
-.filter-wrap .ivu-radio-group-item {
-    border-radius: 5px !important;
-}
-
-.filter-wrap .ivu-radio-wrapper-checked {
-    background: rgb(16, 171, 231);
-    box-shadow: none !important;
-    color: white;
-}
-
-.filter-wrap .ivu-radio-group-button .ivu-radio-wrapper-checked:hover {
-    color: #fff !important;
-}
-
-
-
-.filter-wrap .ivu-checkbox-group {
-    padding-bottom: 4px;
-    display: inline-block;
-}
-
-.filter-wrap .ivu-checkbox-inner,
-.filter-wrap .ivu-checkbox-checked,
-.filter-wrap .ivu-checkbox {
-    display: none;
-}
-
-.filter-wrap .ivu-checkbox-wrapper {
-    padding: 0 10px;
-    margin-left: 15px;
-    height: 28px;
-    line-height: 28px;
-    box-shadow: none !important;
-    border: none !important;
-    font-size: 14px;
-    border-radius: 0 !important;
-}
-
-.filter-wrap .ivu-checkbox-wrapper .ivu-icon {
-    margin-bottom: 2px;
-}
-
-.filter-wrap .ivu-checkbox-wrapper:after, .ivu-checkbox-group-button .ivu-checkbox-wrapper:before {
-    content: none;
-}
-
-.filter-wrap .ivu-checkbox-group-item {
-    border-radius: 5px !important;
-}
-
-.filter-wrap .ivu-checkbox-wrapper-checked {
-    background: rgb(16, 171, 231);
-    box-shadow: none !important;
-    color: white;
-}
-
-.filter-wrap .ivu-checkbox-group-button .ivu-checkbox-wrapper-checked:hover {
-    color: #fff !important;
-}
-
-
-.ev-list-container .ivu-page {
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    margin: 20px 0;
-}
-
-/*绑定知识点部分树形结构样式*/
-
-.singleClass {
-    cursor: pointer;
-    font-size: 14px;
-    margin: 10px;
-}
-
-.transferModal {
-    overflow: hidden;
-}
-
-.transferModal .point-list {
-    max-height: 400px;
-    overflow: auto;
-}
-
-.transferModal .point-list .ivu-input-wrapper {
-    width: 90%;
-    margin-bottom: 10px;
-}
-
-.transferModal .selected-point-list {
-    padding: 10px;
-    width: 100%;
-    border-top: 1px solid rgba(128, 128, 128,.3);
-    margin-top: 15px;
-}
-
-.transferModal .bind-title {
-    margin: 10px 0;
-    font-weight: bold;
-    font-size: 14px;
-}
-
-.transferModal .checked-point {
-    margin: 5px 10px;
-    background: rgb(16, 171, 231);
-    padding: 5px 10px;
-    color: #fff;
-    border-radius: 5px;
-    display: inline-block;
-}
-
-.transferModal .ivu-checkbox-checked .ivu-checkbox-inner {
-    background: rgb(16, 171, 231);
-    border-color: rgb(16, 171, 231);
-}
-
-.transferModal .ivu-icon {
-    color: rgb(16, 171, 231);
-}
-
-.transferModal .btn-clear {
-    float: right;
-    font-weight: 500;
-    font-size: 12px;
-    color: rgb(16, 171, 231);
-    cursor: pointer;
-    letter-spacing: 1px;
-}
-
-.transferModal .point-checkbox {
-    margin-left: 10px;
-    border-radius: 2px;
-    width: 15px;
-    height: 15px;
-    padding: 2px;
-    vertical-align: middle;
-    box-sizing: border-box;
-    border: 1px solid #dcdee2;
-}
-
-.transferModal .point-checked {
-    background: rgb(16, 171, 231);
-    background-clip: content-box;
-}
-
-.transferModal .ivu-tabs-nav-scroll {
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-}
-
-.transferModal .ivu-tree-empty {
-    text-align: center;
-    margin: 15px;
-    color: rgb(128, 128, 128);
-}
-

TEAMModelOS/ClientApp/src/view/evaluation/bank/ExerciseList.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="ev-list-container">
+    <div class="ev-list-container" style="width:98%;margin:0 auto">
         <!-- 筛选部分 -->
         <Loading :top="100" v-show="importLoading" type="1"></Loading>
         <div class="filter-wrap">

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseEditExercise.vue

@@ -39,7 +39,7 @@
                     <div v-else style="margin-top:10px">
                         <span v-for="(item,index) in exercisePoints" :key="index" class="exercise-item-point">
                             {{item.name}}
-                            <span class="exercise-item-point-close"><Icon type="md-close" @click="onDeletePoint(index)" style="display:none" /></span>
+                            <span class="exercise-item-point-close"><Icon type="md-close" @click="onDeletePoint(index)" /></span>
                         </span>
                         <span class="exercise-item-point-modify" @click="selectPointsModal = true">修改</span>
                     </div>
@@ -98,6 +98,7 @@
 
         <Modal v-model="selectPointsModal"
                title="选择知识点"
+               ref="editPointRef"
                width="600px"
                style="z-index:99999">
             <BasePoints period="6f705b1b-8221-5307-18da-13da05adf91e" subject="Subject_Chinese" @onCheckChange="onCheckChange"></BasePoints>
@@ -258,6 +259,7 @@
              */
             onDeletePoint(index) {
                 this.exercisePoints.splice(index, 1)
+                this.$refs.editPointRef.$children[1].onDeletePoint(index)
             },
 
             // 题目类型转换

TEAMModelOS/ClientApp/src/view/evaluation/components/BasePoints.vue

@@ -1,12 +1,16 @@
 <template>
     <div class="points-container">
-        <Tabs name="pointTab">
+        <Tabs name="pointTab" @on-click="getPoints">
             <TabPane label="私有知识点" tab="pointTab">
                 <CheckboxGroup v-model="checkedList" @on-change="onCheckChange">
-                    <Checkbox v-for="(item,index) in pointList" :label="item.id" :key="index">{{ item.name }}</Checkbox>
+                    <Checkbox v-for="(item,index) in pointList" :label="item.id" :key="item.id">{{ item.name }}</Checkbox>
+                </CheckboxGroup>
+            </TabPane>
+            <TabPane label="校本知识点" tab="pointTab">
+                <CheckboxGroup v-model="checkedList" @on-change="onCheckChange">
+                    <Checkbox v-for="(item,index) in schoolPointList" :label="item.id" :key="item.id">{{ item.name }}</Checkbox>
                 </CheckboxGroup>
             </TabPane>
-            <TabPane label="校本知识点" tab="pointTab">标签二的内容</TabPane>
         </Tabs>
 
         <div class="points-checked-wrap">
@@ -23,10 +27,11 @@
         data() {
             return {
                 pointList: [],
+                schoolPointList:[],
                 checkedList: [],
                 originPointList: [],
                 defaultParams: {
-                    scopeCode: 'HBCN',
+                    scopeCode: '',
                     period: null,
                     subjectCode: null,
                     type: 1
@@ -34,19 +39,30 @@
             }
         },
         created() {
-            this.getPoints()
+            this.getPoints(0)
         },
         methods: {
+
+            onTabChange(val) {
+                    this.getPoints(val)
+            },
+
             /**
              * 获取知识点仓库数据
              */
-            getPoints() {
+            getPoints(type) {
+                if (this.pointList.length && this.schoolPointList.length) return
+                this.defaultParams.scopeCode = type === 0 ? 'habook#0001' : 'HBCN'
                 this.defaultParams.period = this.period
                 this.defaultParams.subjectCode = this.subject
                 this.$api.knowledge.GetSchoolPoints(this.defaultParams).then(res => {
                     if (!res.error && res.result.data) {
-                        this.pointList = res.result.data
-                        this.originPointList = res.result.data
+                        if (type) {
+                            this.schoolPointList = res.result.data
+                        } else {
+                            this.pointList = res.result.data
+                        }
+                        this.originPointList = this.originPointList.concat(res.result.data)
                     } else {
                         this.$Message.warning('获取数据失败')
                     }
@@ -54,7 +70,7 @@
             },
 
             showName(id) {
-                return this.pointList.filter(item => item.id === id)[0].name
+                return this.originPointList.filter(item => item.id === id)[0].name
             },
 
             onCheckChange(val) {
@@ -62,7 +78,7 @@
                     this.$Message.warning('最多绑定5个知识点')
                     this.checkedList.splice(this.checkedList.length - 1, 1)
                 } else {
-                    this.$emit('onCheckChange', val, this.pointList)
+                    this.$emit('onCheckChange', val, this.originPointList)
                 }
             },
 
@@ -79,6 +95,11 @@
 </script>
 
 <style scoped>
+    .points-container {
+        font-family: '微軟正黑體', 'Heiti TC' !important;
+    }
+
+
     .points-container .ivu-checkbox-group-item {
         display:block;
         margin:10px;

TEAMModelOS/ClientApp/src/view/evaluation/index/PickExercise.vue

@@ -83,6 +83,7 @@
                 <span class="exercise-backet-item">综合题:<span class="exercise-backet-num">{{ basketList.filter(item => item.type === 'Compose').length }}</span> 道</span>
             </div>
             <span class="import-exercise">
+                <Button type="info" @click="goToBank">试题/试卷库</Button>
                 <Badge :count="basketList.length" show-zero>
                     <Button type="info" @click="onSetPaperInfo" class="exercise-backet" :style="{background: basketList.length ? '#0AAEE7' : '#acaaaa'}">进入组卷中心</Button>
                 </Badge>
@@ -169,7 +170,7 @@
                     <!--<Button type="info" :style="{backgroundColor:basketList.all.indexOf(item) > -1 ? '#bbbbbb' : ''}" @click="handleChoose(item)">{{basketList.all.indexOf(item) > -1 ? '已选入' : '选题'}} </Button>-->
 
                 <Button type="info" :style="{background: basketList.map(item => item.id).indexOf(item.id) > -1 ? '#acaaaa' : '#14B6EF'}" @click.stop="selectExercise(item)" style="margin-right:10px">{{ basketList.map(item => item.id).indexOf(item.id) > -1 ? '移除' : '选题' }}</Button>
-                    <Button type="info" @click.stop="handleEdit(item)" style="margin-right:10px">编辑</Button>
+                   <!-- <Button type="info" @click.stop="handleEdit(item)" style="margin-right:10px">编辑</Button>-->
                 </div>
             </div>
         </div>
@@ -456,6 +457,12 @@
                 })
             },
 
+            goToBank() {
+                this.$router.push({
+                    name: 'testPaperList'
+                })
+            },
+
             /**
              * 切换页码操作
              * @param page

TEAMModelOS/ClientApp/src/view/evaluation/index/index.vue

@@ -11,7 +11,7 @@
                 </div>
             </div>
         </vuescroll>
-        <div class="slide-menu animated">
+        <div class="slide-menu animated" style="display:none">
             <ul>
                 <li @click="goRouter('createExercises')">创建习题</li>
                 <li @click="goRouter('exercisesList')">组卷中心</li>
@@ -77,6 +77,7 @@
     overflow:hidden;
     font-family: '微軟正黑體', 'Heiti TC' !important;
   }
+
   .ev-body {
     width:98%;
     min-width:1200px;
@@ -143,13 +144,13 @@
           padding-right:10px;
           font-size:14px;
       }
-      .ev-slide .ev-slide-select-volumes /deep/ .ivu-select-arrow {
-          color:#fff;
-      }
+    .ev-slide .ev-slide-select-volumes /deep/ .ivu-select-arrow {
+        color: #fff;
+    }
 
-      .ev-slide .ev-slide-select-volumes /deep/ .ivu-select-dropdown {
-          left:unset !important;
-      }
+    .ev-slide .ev-slide-select-volumes /deep/ .ivu-select-dropdown {
+        left: unset !important;
+    }
       .ev-slide .ev-slide-select-volumes /deep/ .ivu-select-placeholder {
           color:#fff;
           font-size:14px;

TEAMModelOS/ClientApp/src/view/knowledge-point/index/operation/AddBlock.vue

@@ -55,14 +55,12 @@
                         name: this.formTop.name,
                         alias: this.formTop.name,
                         subjectCode: this.formTop.subject,
-                        partitionKey: this.addPointType === 'school' ? this.originDatas.schoolCode : 'personal',
+                        scopeCode: this.addPointType === 'school' ? this.originDatas.schoolCode : 'habook#0001',
                         order: 706,
                         status: 1,
                         knowledgeId: this.uuid,
                         period: this.currentPeriod.periodCode,
                         points: [],
-                        scope: 'school',
-                        TEAMModelId: 'habook#001',
                         source: 1
                     }
                     if (this.editItem) {

TEAMModelOS/ClientApp/src/view/knowledge-point/index/operation/AddPoint.vue

@@ -54,14 +54,12 @@
                         name: newName,
                         alias: newName,
                         subjectCode: editPointItem ? editPointItem.subjectCode : this.schoolInfos.subjectCode,
-                        partitionKey: this.addPointType === 'school' ? this.schoolInfos.schoolCode : 'personal', // //判断当前添加为校本或者私有知识点
+                        scopeCode: this.addPointType === 'school' ? this.schoolInfos.schoolCode : 'habook#0001', // //判断当前添加为校本或者私有知识点
                         order: 706,
                         status: 1,
                         knowledgeId: editPointItem ? editPointItem.knowledgeId : this.uuid,
                         period: editPointItem ? editPointItem.period : this.schoolInfos.period,
                         source: 1,
-                        scope: this.addPointType,
-                        TEAMModelId: 'habook#001',
                         points: this.blockDatas ? [this.blockDatas.id] : [],
                         id: null
                     }