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

TEAMModelOS/ClientApp/src/store/module/answerSheet.js

@@ -69,7 +69,7 @@ export default {
 		},
 		config: {
 			"id": null,
-			"columns": null, //列数
+			"columns": 1, //列数
 			"pageCount": 1,
 
 			"pageWidth": SVG_BORDER_PROP.width, //页面大小(回字组成的)

TEAMModelOS/ClientApp/src/utils/editorLangTw.js

@@ -4,7 +4,7 @@ let editor_tw_config = {
         默认: '默認',
         创建: '創建',
         修改: '修改',
-        如: '如',
+        如: '連結URL,如',
         请输入正文: '請輸入正文',
         menus: {
           title: {
@@ -79,7 +79,7 @@ let editor_tw_config = {
                 },
                 link: {
                     链接: '連結',
-                    链接文字: '連結文字',
+                    链接文字: '連結描述',
                     删除链接: '删除連結',
                     查看链接: '查看連結',
 					取消链接: '取消鏈接',

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

@@ -812,7 +812,7 @@
 				this.analysisContent = html;
 			},
 			this.$editorTools.initMyEditor(analysisEditor,this)
-			
+			// this.$editorTools.addResource(this,analysisEditor)
 			analysisEditor.create();
 			this.analysisEditor = analysisEditor;
 		},

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

@@ -894,14 +894,13 @@
 
 	.sheet-right {
 		width: 16%;
-		margin-top: 20px;
 		background-color: #fff;
-		box-shadow: 0 0 5px #000000;
+		box-shadow: 0 0 5px #c4c4c4;
 		position: fixed;
-		top: 70px;
-		right: 10px;
-		height: 88vh;
-		padding: 20px;
+		top: 0;
+		right: 0;
+		height: 100%;
+		padding: 70px 20px 20px 20px;
 
 		.ivu-btn {
 			width: 100%;