Zhang Li, BBF-411-2(Neusoft) 2 yıl önce
ebeveyn
işleme
c61874f6df

+ 15 - 12
src/views/modules/knowledge/map/addUpdateMap.vue

@@ -592,19 +592,22 @@ export default {
     handleSaveLearnOk() {
       this.$refs.learnRef.validate(valid => {
           if(valid) {
-            setTimeout(() => {
-              if(this.learnForm.type == 1) {
-                this.tabRouteList[parseInt(this.tabsKeys)-1].contents.unshift({
-                  ...this.learnForm
-                })
-              } else {
-                this.tabRouteList[parseInt(this.tabsKeys)-1].contents.unshift({
-                  ...this.learnForm,
-                  ...this.knowledgeInfo
-                })
+            let tabs = this.tabRouteList[parseInt(this.tabsKeys)-1].contents
+            if(this.learnForm.type == 1) {
+              if(tabs.some(item => item.outerSystemName == this.learnForm.outerSystemName) || tabs.some(item => item.outerContentName == this.learnForm.outerContentName)) {
+                this.$message.error('已添加相同的学习内容')
+                return
               }
-              this.showLearnFlag = false
-            },1000)
+              tabs.unshift({
+                ...this.learnForm
+              })
+            } else {
+              tabs.unshift({
+                ...this.learnForm,
+                ...this.knowledgeInfo
+              })
+            }
+            this.showLearnFlag = false
           }
         } 
       )

+ 3 - 5
src/views/modules/knowledge/map/components/pageList.vue

@@ -3,19 +3,17 @@
     <div v-for="(item, index) in contents" :key="index">
       <div class="inside">
         <template v-if="item.type == 1">
-          <div>{{ item.outerSystemName }}</div>
+          <div>{{ item.outerContentName }}</div>
         </template>
         <template v-else>
           <div>{{ item.titles }}</div>
           <div class="classify">{{ typeof(item.category) == 'string' ? item.category : item.category.join(" ")}}</div>
-          <div>
-            {{ item.summary }}
-          </div>
+          <div v-html="item.summary ? (item.summary.replaceAll('\n\r','</br>').replaceAll('\r\n','</br>').replaceAll('\n','</br>').replaceAll('\r','</br>').replaceAll('\\n','</br>')) : ''"></div>
         </template>
         <div class="flex-ac" :class="item.type == 2 && 'userinfo'">
           <div class="flex-ac" style="width: 50%;">
             <template v-if="item.type == 1">
-              位于: {{ item.outerContentName }}
+              位于: {{ item.outerSystemName }}
             </template>
             <template v-else>
               <div><img style="width:24px;height:24px;" :src="item.authorHead ? ('/api/api-system/system/core/sysFile/previewFile?fileId='+item.authorHead) : header0"/></div>