Merge branch 'develop' into TPE/develop

TEAMModelBI/ClientApp/src/view/issueCoupons/crteadCoupon.vue

@@ -21,7 +21,9 @@
                     <el-radio class="event3" label="giftSmart1Y"  border>贈送智慧評分一年</el-radio>
                     <el-radio class="event4" label="gifCollaboration3M"  border>贈送協作三個月</el-radio>
                     <el-radio class="event4" label="gifCollaboration1Y"  border>贈送協作一年</el-radio>
-                    <el-radio label="gifAIGPT1Y"  border>贈送AIGPT一年</el-radio>
+                    <el-radio class="event5" label="gifAIGPT1Y"  border>贈送AI/GPT一年</el-radio>
+                    <el-radio class="event5" label="gifAIGPT3M"  border>贈送AI/GPT三個月</el-radio>
+                    <el-radio class="event5" label="gifAIGPT6M"  border>贈送AI/GPT六個月</el-radio>
                     <el-radio label="gifVoiceToText1Y"  border>贈送語音轉錄文字一年</el-radio>
                     <el-radio label="gifAITXTAnalysis3M"  border>贈送AI文句分析三個月</el-radio>
                     <el-radio label="hiteachBookSPLicense"  border>HiTeach專書贈送授權</el-radio>
@@ -465,6 +467,28 @@ const setEventType = (type)=>{
             crtCouponForm.info[2].l = 'en-us'
             crtCouponForm.info[2].u = 'https://www.habook.com/en/'
         break
+        case 'gifAIGPT3M':
+            crtCouponForm.couponType =  'Event'
+            crtCouponForm.eventName = 'gifAIGPT3M'
+            crtCouponForm.rule[0].b = '901014'
+            crtCouponForm.info[0].l = 'zh-tw' 
+            crtCouponForm.info[0].u = 'https://www.habook.com/zh-tw'
+            crtCouponForm.info[1].l = 'zh-cn'
+            crtCouponForm.info[1].u = 'https://www.habook.com.cn/'
+            crtCouponForm.info[2].l = 'en-us'
+            crtCouponForm.info[2].u = 'https://www.habook.com/en/'
+        break
+        case 'gifAIGPT6M':
+            crtCouponForm.couponType =  'Event'
+            crtCouponForm.eventName = 'gifAIGPT6M'
+            crtCouponForm.rule[0].b = '901015'
+            crtCouponForm.info[0].l = 'zh-tw' 
+            crtCouponForm.info[0].u = 'https://www.habook.com/zh-tw'
+            crtCouponForm.info[1].l = 'zh-cn'
+            crtCouponForm.info[1].u = 'https://www.habook.com.cn/'
+            crtCouponForm.info[2].l = 'en-us'
+            crtCouponForm.info[2].u = 'https://www.habook.com/en/'
+        break
         case 'gifVoiceToText1Y':
             crtCouponForm.couponType =  'Event'
             crtCouponForm.eventName = 'gifVoiceToText1Y'
@@ -533,6 +557,8 @@ const ruleBList = [
     { label: "小組協作(三個月)", val: "901011"},
     { label: "AI文句分析(三個月)", val: "901012"},
     { label: "Web IRS 50人 (一年)", val: "901013"},
+    { label: "AI GPT(三個月)", val: "901014"},
+    { label: "AI GPT(六個月)", val: "901015"},
 ]
 
 const crtCouponForm = reactive({
@@ -1043,7 +1069,10 @@ const copyDocument = (data) => {
     background-color: #66bb6a;
     color: #fff;
 }
-
+.event5{
+    background-color: #607d8b;
+    color: #fff;
+}
 .ruleBox{
     display: flex;
     flex-direction: row;

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

@@ -129,7 +129,7 @@
                             <span>
                                 <Icon type="md-cube" color="#40A8F0" size="16" />
                                 <span style="margin-left: 5px;">{{ $t("knowledge.point") }}</span>
-                                <span v-show="uploadNum">
+                                <span v-show="uploadShow">
                                     ({{ $t('knowledge.imported1') }}{{ filePointNum }}{{ $t('knowledge.imported2') }}，{{ $t('knowledge.imported3') }}{{ uploadNum }}{{ $t('knowledge.pointsNum') }})</span>
                                 <!-- <Input v-special-char icon="ios-close" v-model="searchPoint" v-show="subTree.length && !updated" :placeholder="$t('knowledge.searchPoint')" autofocus style="width: 300px;margin-left: 20px;" @on-click="onSearchClear" @on-blur="isSearchPoint = false" @on-change="onSearchPointChange" @on-enter="onSearchPointChange" @on-clear="onSearchClear" /> -->
                             </span>
@@ -289,6 +289,7 @@ export default {
             activeBlockIndex: null,
             uploadNum: 0,
             filePointNum: 0,
+            uploadShow: false,
             guid: '',
         }
     },
@@ -418,6 +419,7 @@ export default {
                         this.addMode = 0
                         this.uploadNum = 0
                         this.filePointNum = 0
+                        this.uploadShow = false
                         this.schoolParams = {
                             schoolCode: this.originData.id,
                             subjectId: this.subjectList[index].subjectId,
@@ -573,6 +575,7 @@ export default {
             }
             this.uploadNum = 0
             this.filePointNum = 0
+            this.uploadShow = false
         },
         doBatchDelete() {},
         // 新增知识点事件
@@ -784,6 +787,7 @@ export default {
                         this.$Message.success(this.$t("knowledge.import.sucTip"))
                         this.batchUploadModal = false
                         this.updated = true
+                        this.uploadShow = true
                     } else {
                         this.filePointNum = 0
                     }
@@ -844,7 +848,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) {