修改chooseContent

TEAMModelOS/ClientApp/src/components/selflearn/NewChooseContent.vue

@@ -106,7 +106,7 @@
             </TabPane>
             <!-- 选择题库 -->
             <TabPane label="题目" name="question" v-if="showQuestion" tab="chooseContent">
-                <div class="tab-wrap">
+                <div class="tab-wrap" v-if="tabName === 'question'">
                     <vuescroll>
                         <ExerciseList ref="exListRef" @chooseQuChange="chooseQuChange"></ExerciseList>
 						<!-- <BaseExerciseList></BaseExerciseList> -->
@@ -115,7 +115,7 @@
             </TabPane>
 			<!-- 选择试卷 -->
 			<TabPane label="试卷" name="paper" v-if="showPaper" tab="chooseContent">
-			    <div class="tab-wrap">
+			    <div class="tab-wrap" v-if="tabName === 'paper'">
 			        <vuescroll>
 						<BasePaperList ref="paperListRef" chooseModel @previewPaper="onPreviewPaper"></BasePaperList>
 			        </vuescroll>
@@ -415,7 +415,7 @@ export default {
                     this.getFileList()
                     break
                 case 'question':
-                    this.queryQuestionByPage()
+                    // this.queryQuestionByPage()
                     break
                 default:
                     break

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/syllabus.js

@@ -1,4 +1,5 @@
 export default{
+	noPreview:'该类型文件不支持预览！',
 	praviteSyllabus:'个人课纲',
 	fromCreate:'我创建的课纲',
 	fromShare:'他人分享的课纲',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/syllabus.js

@@ -1,4 +1,5 @@
 export default {
+	noPreview:'該類型檔案不支持預覽！',
 	praviteSyllabus: '個人課綱',
 	fromCreate: '我創建的課綱',
 	fromShare: '他人分享的課綱',

TEAMModelOS/ClientApp/src/utils/editorTools.js

@@ -409,7 +409,7 @@ export default {
 		      // 公式输入插件
 		      constructor(editors) {
 		        const $elem = $(
-		        	'<div class="w-e-menu" style="color:red"><i class="ivu-icon ivu-icon-logo-tumblr" style="font-size: 20px;"></i></div>'
+		        	'<div class="w-e-menu" style="color:red"><i class="icon iconfont icon-function" style="font-size: 20px;font-weight:bold"></i></div>'
 		        );
 		        super($elem, editors);
 		      }

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

@@ -51,9 +51,11 @@
 		    <NewChooseContent :showSyllabus="isFalse"
 		                   :showOther="isFalse"
 		                   :showQuestion="isFalse"
+						   :showPaper="isFalse"
 						   :defaultFiles="curRepair.blobUrl"
 						   ref="chooseContentRef"
-		                   @on-file-change="onSelectFile"></NewChooseContent>
+		                   @on-file-change="onSelectFile"
+						   v-if="isRelatedContent"></NewChooseContent>
 		
 		    <Button class="modal-btn" :loading="isLoading" @click="onConfirmRelate">{{$t('evaluation.confirm')}}</Button>
 		</Modal>
@@ -71,7 +73,7 @@
 			<p style="margin: 15px 2px;">{{ $t('evaluation.repairResourse.link')}}{{ isSiteLink ?  '' : $t('evaluation.repairResourse.tip1')}}</p>
 			
 			<!-- 选择内容 -->
-			<Button type="info" @click="isRelatedContent = true" v-if="isSiteLink">{{$t('evaluation.newExercise.chooseContent')}}</Button>
+			<Button type="info" @click="doSelectContent" v-if="isSiteLink">{{$t('evaluation.newExercise.chooseContent')}}</Button>
 			<!-- 手动输入 -->
 			<Input v-model="curOutLink" v-if="!isSiteLink" :placeholder="$t('evaluation.repairResourse.place2')" @on-enter="onAddOutLink"/>
 			<!-- 链接link列表 -->
@@ -135,6 +137,15 @@
 				this.defaultFiles = []
 			},
 			
+			doSelectContent(){
+				this.isRelatedContent = true
+				this.$nextTick(() => {
+					if(this.$refs.chooseContentRef){
+						this.$refs.chooseContentRef.clickTab('content')
+					}
+				})
+			},
+			
 			/* 回车添加外部资源链接 */
 			onAddOutLink(){
 				if(this.isURL(this.curOutLink)){
@@ -219,9 +230,7 @@
 		},
 
 		mounted() {
-			if(this.$refs.chooseContentRef){
-				this.$refs.chooseContentRef.clickTab('content')
-			}
+			
 
 		},
 		watch:{

TEAMModelOS/ClientApp/src/view/syllabus/Syllabus.less

@@ -215,6 +215,7 @@
 					align-items: center;
 					
 					&:hover{
+						background-color: #1d1d1d;
 						.node-resource-tools{
 							display: flex;
 						}

TEAMModelOS/ClientApp/src/view/syllabus/Syllabus.vue

@@ -220,7 +220,7 @@
 
 		<!-- 关联内容弹窗 -->
 		<Modal v-model="isRelateContentModal" width="900" class="tree-modal add-volume-modal choose-content-modal">
-			<ChooseContent v-if="isRelateContentModal" ref="chooseContentRef" :showSyllabus="false"
+			<ChooseContent  ref="chooseContentRef" :showSyllabus="false"
 				@previewPaper="onPreviewPaper"></ChooseContent>
 			<Button slot="footer" @click="onRelateContent" style="margin-bottom: 20px;" class="modal-btn"
 				:loading="isRelateLoading">{{ $t('syllabus.confirm') }}</Button>
@@ -1358,6 +1358,9 @@
 					case 'link':
 						window.open(item.link);
 						break;
+					case 'other':
+						this.$Message.warning(this.$t('syllabus.noPreview'))
+						break;	
 					case 'doc':
 						let copyLink = JSON.parse(JSON.stringify(item.link))
 						let docSas = ''