Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

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

@@ -48,12 +48,12 @@
 	}
 	
 	&-right{
-		width: 24%;
+		width: 23%;
 		background-color: #fff;
-		padding: 10px 20px;
-		min-height: 80%;
+		padding: 10px 20px 50px 20px;
+		height: calc(100% - 265px);
 		position: sticky;
-		top: 100px;
+		top: 65px;
 		.title{
 			font-size: 18px;
 			font-weight: bold;

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

@@ -98,6 +98,8 @@
 			}
 		},
 		created() {
+			let tabName = this.$route.params.tabName
+			this.tabName = tabName || 'item'
 			this.getSchoolInfo()
 		},
 		methods: {

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

@@ -111,7 +111,7 @@
 				this.$router.push({
 					name: 'shareCenter',
 					params: {
-						isFromItemBank: this.currentTab === 'exercise'
+						tabName: this.currentTab === 'exercise' ? 'item' : 'paper'
 					}
 				})
 			},

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

@@ -816,10 +816,10 @@
 			analysisEditor.create();
 			this.analysisEditor = analysisEditor;
 			
-			this.$EventBus.$off('clickResource')
-			this.$EventBus.$on('clickResource',val => {
-				console.log('xxxxxxxxxxxxxx')
-			})
+			// this.$EventBus.$off('clickResource')
+			// this.$EventBus.$on('clickResource',val => {
+			// 	console.log('xxxxxxxxxxxxxx')
+			// })
 		},
 		computed: {
 			isSchool() {