update: 怡康链接调整&&课纲多语系调整&&学生名单导出栏位调整

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

@@ -5405,6 +5405,13 @@ const LANG_EN_US = {
     },
     // 课纲管理
     syllabus: {
+        importTip1: 'Note:',
+        importTip2: '1. Currently, only table file in xls and xlsx formats are supported for batch creation.',
+        importTip3: '2. The size of the imported file cannot exceed 10M.',
+        importTip4: '3. Please strictly follow the import template format for editing.',
+        importTip5: 'Parsing template...',
+        importTip6: 'Select the Excel file to import',
+        importTip7: 'Batch import questions',
         shareContentText1: 'Syllabus Sharing',
         shareContentText2: 'Sharer',
         shareContentText3: 'Syllabus Name',

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

@@ -5408,6 +5408,13 @@ const LANG_ZH_CN = {
     },
     // 课纲管理
     syllabus: {
+        importTip1: '注意事项：',
+        importTip2: '1. 目前仅支持文件类型为xls，xlsx格式的表格文档进行批量创建。',
+        importTip3: '2. 导入的文件大小不能超过10M。',
+        importTip4: '3. 请严格遵循导入模板格式进行编辑。',
+        importTip5: '模板解析中...',
+        importTip6: '选择导入的Excel文件',
+        importTip7: '批量导题',
         shareContentText1: '课纲分享',
         shareContentText2: '分享者',
         shareContentText3: '课纲名称',

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

@@ -5409,6 +5409,13 @@ const LANG_ZH_TW = {
     },
     // 课纲管理
     syllabus: {
+        importTip1: '注意事項：',
+        importTip2: '1. 目前僅支持xls, xlsx類型檔案格式進行批次建立。',
+        importTip3: '2. 匯入的檔案大小不能超過10M。',
+        importTip4: '3. 請嚴格遵循匯入模板格式進行編輯。',
+        importTip5: '解析模板中...',
+        importTip6: '選擇要匯入的Excel文件',
+        importTip7: '批次匯入題目',
         shareContentText1: '課綱分享',
         shareContentText2: '分享者',
         shareContentText3: '課綱名稱',

TEAMModelOS/ClientApp/src/view/dashboard/Sport.vue

@@ -5,16 +5,29 @@
 </template>
 
 <script>
+import axios from 'axios'
 export default {
   data() {
     return {
-      iframeSrc: "https://ydztshow.cdwalker.com/app-health-100/smart-course"
+      iframeSrc: ""
     }
   },
   created() {
-    if (this.$store.state.userInfo.schoolCode === 'xajkbx') {
-      this.iframeSrc = 'https://xian-eightps.cdwalker.com/app-health-100/smart-course'
-    }
+    // 获取学校怡康整体看板
+    axios({
+      method: 'get',
+      url: 'https://sport.ykcdwalker.com/timodou/screen?type=2&schoolCode=' + localStorage.getItem('login_schoolCode'),
+      // url: 'https://sport.ykcdwalker.com/timodou/screen?type=2&schoolCode=ydzt',
+    }).then(async res => {
+      if (res.data.data) {
+        this.iframeSrc = res.data.data
+      } else {
+        this.$Message.error('获取体育看板链接失败！')
+      }
+    }).catch(e => {
+      console.error(e)
+      this.$Message.error('获取体育看板链接失败！')
+    })
   },
   mounted() {
     setTimeout(() => {

TEAMModelOS/ClientApp/src/view/student-account/stuMgt/StuMgt.vue

@@ -595,7 +595,9 @@ export default {
       let fileName = this.$t('stuAccount.stuNameList')
       let title = this.tableColumns.map(item => item.title)
       title.splice(0, 2)
-      title = title.filter((i, index) => index !== 6)
+      if (this.$store.state.config.srvAdr == 'China') {
+        title = title.filter((i, index) => index !== 6)
+      }
       let key = ["id", "name", "gender", "year", "classYear", "className", "no", "action"]
       let data = this._.cloneDeep(this.tableShowData)
       data.forEach(item => {

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

@@ -94,7 +94,7 @@
           <span>{{ $t('syllabus.syllabusMenu') }}</span>
           <span class="syllabus-content-header-tools" v-if="volumeList.length && curVolume.id && !inShareView">
             <Icon type="md-add" :title="$t('syllabus.tree.addChapterTitle')" @click="isAddTreeModal = true" v-if="hasSyllabusAuth || hasVolumeAuth(curVolume.auth)" />
-            <Icon type="md-cloud-upload" :title="`批量创建`" @click="importModal = true" v-if="hasSyllabusAuth || hasVolumeAuth(curVolume.auth)" />
+            <Icon type="md-cloud-upload" :title="$t('syllabus.importTip7')" @click="importModal = true" v-if="hasSyllabusAuth || hasVolumeAuth(curVolume.auth)" />
           </span>
         </div>
         <div class="syllabus-tree-box">
@@ -175,20 +175,20 @@
     <!--批量汇入-->
     <Modal v-model="importModal" width="800" footer-hide class="tree-modal add-volume-modal tree-upload-modal">
       <div class="modal-header" slot="header">
-        <span>{{ `批量导题` }}</span>
+        <span>{{ $t('syllabus.importTip7') }}</span>
       </div>
       <Upload action="" :before-upload="onBeforeImportUpload" :show-upload-list="false" :disabled="isImporting">
         <div class="import-wrap">
           <Icon type="md-cloud-upload" size="100" color="#c2c2c1" />
-          <p style="margin:10px 0">{{ isImporting ? `模板解析中...` : `选择导入的Excel文件` }}</p>
+          <p style="margin:10px 0">{{ isImporting ? $t('syllabus.importTip5') : $t('syllabus.importTip6') }}</p>
           <Progress :percent="importPercent" status="active" v-if="isImporting" />
         </div>
       </Upload>
       <div class="tip-wrap">
-        <p>注意事项：</p>
-        <p>1. 目前仅支持文件类型为xls，xlsx格式的表格文档进行批量创建。</p>
-        <p>2. 导入的文件大小不能超过10M。</p>
-        <p>3. 请严格遵循导入模板格式进行编辑。</p>
+        <p>{{ $t('syllabus.importTip1') }}</p>
+        <p>{{ $t('syllabus.importTip2') }}</p>
+        <p>{{ $t('syllabus.importTip3') }}</p>
+        <p>{{ $t('syllabus.importTip4') }}</p>
       </div>
     </Modal>
     <!--上传文件-->
@@ -534,7 +534,7 @@ export default {
               option: this.getItemOptions(item),
               repair: [{
                 blobUrl: item.Url,
-                name: '补救资源',
+                name: this.$t('evalutaion.newExercise.repair'),
                 type: 'link'
               }],
               nodeId: itemNode[itemNode.length - 1].id