Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -1640,7 +1640,8 @@ const LANG_EN_US = {
             tip11: 'The number of answers for single answer questions does not match the number of questions, please check and retry!',
             tip12: 'The number of answers for multiple answers questions does not match the number of questions, please check and retry!',
             tip13: 'Switching  will clear the current answers setting, do you confirm to switch? ',
-            onlyUpper: 'Only capital letters can be entered for objective questions.'
+            onlyUpper: 'Only capital letters can be entered for objective questions.',
+            modifyPaper: 'Modify',
         },
         secretTip1: 'Not public yet',
         secretTip2: 'Checking the box means that only the school administrators and I can see this exam file',

TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -1639,7 +1639,8 @@ const LANG_ZH_CN = {
             tip10:'试题数量不可为空！',
             tip11: '单选题答案数与题目数不一致，请检查后重试！',
             tip12: '多选题答案数与题目数不一致，请检查后重试！',
-            onlyUpper:'客观题仅能输入大写字母'
+            onlyUpper:'客观题仅能输入大写字母',
+            modifyPaper: '修改试卷',
         },
         secretTip1:'暂不公开',
         secretTip2:'勾选后保存的试卷仅有管理员及本人能看到',

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -1642,7 +1642,8 @@ const LANG_ZH_TW = {
             tip11: '單選題答案數與題目數不一致，請檢查後重試！',
             tip12: '複選題答案數與題目數不一致，請檢查後重試！',
             tip13: '切換模式將會清空目前已設定的答案，是否確認切換？',
-            onlyUpper: '客觀題答案僅能輸入大寫英文字母'
+            onlyUpper: '客觀題答案僅能輸入大寫英文字母',
+            modifyPaper: '修改試卷',
         },
         secretTip1: '暫不公開',
         secretTip2: '勾選後儲存的試卷僅有管理員及本人能看到',

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

@@ -83,12 +83,10 @@
 									<span>{{ $t("evaluation.share.shareResource") }}</span>
 								</span>
 							</DropdownItem>
-							<DropdownItem name="go_xkw">
-								<span @click="doXkwAuth" class="bank-tools-btn" v-show="hasXkwAuth && !inGlobalSite">
-									 
+							<DropdownItem name="go_xkw" v-if="hasXkwAuth && !inGlobalSite">
+								<span @click="doXkwAuth" class="bank-tools-btn">
 									<Icon type="ios-send" size="16" />
 									<span>{{ $t("evaluation.xkw") }}</span>
-									 
 								</span>
 							</DropdownItem>
 							<DropdownItem name="go_df" v-if="isTestSite">

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

@@ -21,7 +21,7 @@
 						<!-- <div class="item-tools-t flex-row-center" v-show="isShowTools" @click.stop="handleSetScore(item,exerciseList.indexOf(item),typeItem.list,index)">
 							<Icon type="ios-list-box-outline" />配分</div> -->
 						<div class="item-tools-t flex-row-center" v-show="isShowTools && !isExamPaper" @click.stop="handleToolEdit(typeItem.list, item, index)"><Icon type="md-create" />{{ $t("evaluation.editItem") }}</div>
-						<div class="item-tools-t flex-row-center" v-show="isChangePaper && item.type !== 'compose'" @click.stop="handleToolEdit(typeItem.list, item, index)"><Icon type="md-create" />{{ '调整' }}</div>
+						<div class="item-tools-t flex-row-center" v-show="isChangePaper && item.type !== 'compose'" @click.stop="handleToolEdit(typeItem.list, item, index)"><Icon type="md-create" />{{ $t('activity.adjust') }}</div>
 						<div class="item-tools-t flex-row-center" v-show="isAutoMode" @click.stop="handleToolChange(typeItem.list, item, index)"><Icon type="md-repeat" />{{ $t("evaluation.exchange") }}</div>
 						<div class="item-tools-t flex-row-center" v-show="isShowTools && !isExamPaper && noAnswerList.indexOf(item) > -1" @click.stop="onSetAnswer(item, exerciseList.indexOf(item), typeItem.list, index)"><Icon type="ios-brush-outline" />{{ $t("evaluation.exerciseList.setAnswer") }}</div>
 						<div class="item-tools-t flex-row-center" v-show="isShowTools && !isExamPaper" @click.stop="handleDelete(typeItem.list, item, index)"><Icon type="ios-archive-outline" />{{ $t("evaluation.deleteItem") }}</div>

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

@@ -34,15 +34,15 @@
             </div>
             <div v-if="isExamPaper && !isPreviewItems && paperInfo.item.length">
               <Button class="base-info-btn" type="info" @click="showPaperAttachments" v-show="!isChangePaper" v-if="isHiteachPaper">{{ $t('evaluation.quickPaper.attachments') }}</Button>
-              <Button class="base-info-btn" type="info" @click="showChangePaper" v-show="isExamInfoPaper && !isChangePaper">{{ '修改试卷' }}</Button>
+              <Button class="base-info-btn" type="info" @click="showChangePaper" v-show="isExamInfoPaper && !isChangePaper">{{ $t('evaluation.quickPaper.modifyPaper') }}</Button>
               <Button class="base-info-btn" type="info" @click="onHandleToggle" v-show="!isShowAnalysis && !isChangePaper">{{ isAllOpen ? $t('evaluation.index.collapseAll') : $t('evaluation.index.openAll')}}</Button>
               <Button class="base-info-btn" type="info" @click="onViewModelChange" v-show="!isShowAnalysis && !isChangePaper">{{ `${ viewModel === 'type' ? this.$t('evaluation.paperList.sortByOrder') : this.$t('evaluation.paperList.sortByType') }` }}</Button>
               <Button class="base-info-btn" type="info" @click="isShowAnalysis = !isShowAnalysis" v-show="!isHideAnalysis && !isChangePaper">{{ isShowAnalysis ? this.$t('evaluation.paperList.paperDetails') : this.$t('evaluation.paperList.paperAnalysis')}}</Button>
               <Button class="base-info-btn" type="info" @click="downloadSheet" :loading="downLoading" v-show="paperInfo.id && paper.sheetNo && !hideSheet && !isSharePreview && !isChangePaper">{{ $t('evaluation.paperList.goAnswerSheet') }}<span v-if="paperInfo.mode">-{{ paperInfo.mode }}</span></Button>
               <Button class="base-info-btn" type="info" @click="goAnswerSheet" v-show="paperInfo.id && !hideSheet && !isSharePreview && !isChangePaper">{{ paper.sheetNo ?  $t('evaluation.paperList.reCreateSheet') : $t('evaluation.paperList.createSheet') }}</Button>
               <Button class="base-info-btn" type="info" @click="exitPreview" v-show="paperInfo.id && isSharePreview && !isChangePaper">{{ $t('evaluation.index.backList') }}</Button>
-              <Button class="base-info-btn" type="success" @click="showChangePaper(1)" v-show="isChangePaper">{{ '保存' }}</Button>
-              <Button class="base-info-btn" @click="showChangePaper" v-show="isChangePaper">{{ '取消' }}</Button>
+              <Button class="base-info-btn" type="success" @click="showChangePaper(1)" v-show="isChangePaper">{{ $t('cusMgt.save') }}</Button>
+              <Button class="base-info-btn" @click="showChangePaper" v-show="isChangePaper">{{ $t('evaluation.cancel') }}</Button>
             </div>
           </div>
           <!-- 试卷头部信息 -->