소스 검색

產品分析Excel資料匯出 追加「T課堂」欄位

jeff 6 달 전
부모
커밋
5ded119a6a
2개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      TEAMModelBI/ClientApp/src/view/ddlogin.vue
  2. 3 2
      TEAMModelBI/ClientApp/src/view/product/index.vue

+ 2 - 2
TEAMModelBI/ClientApp/src/view/ddlogin.vue

@@ -10,8 +10,8 @@ const hosts = window.location.host === 'localhost:5001' ? 'localhost:5001' :
         window.location.host === 'bi.teammodel.net' ? 'bi.teammodel.net' :
         window.location.host === 'bi.teammodel.net' ? 'bi.teammodel.net' :
             window.location.host === 'bi-rc.teammodel.net' ? 'bi-rc.teammodel.net' :
             window.location.host === 'bi-rc.teammodel.net' ? 'bi-rc.teammodel.net' :
                 'bitest.teammodel.cn'
                 'bitest.teammodel.cn'
-    const appsKey = window.location.host === 'localhost:5001' || window.location.host === 'bi.teammodel.cn' || window.location.host === 'bitest.teammodel.cn' ? 'dingrucgsnt8p13rfbgd' : 'dingupjxyj1guhh5p8dt'
-    //const appsKey =  window.location.host === 'bi.teammodel.cn' || window.location.host === 'bitest.teammodel.cn' ? 'dingrucgsnt8p13rfbgd' : 'dingupjxyj1guhh5p8dt'
+    //const appsKey = window.location.host === 'localhost:5001' || window.location.host === 'bi.teammodel.cn' || window.location.host === 'bitest.teammodel.cn' ? 'dingrucgsnt8p13rfbgd' : 'dingupjxyj1guhh5p8dt'
+    const appsKey =  window.location.host === 'bi.teammodel.cn' || window.location.host === 'bitest.teammodel.cn' ? 'dingrucgsnt8p13rfbgd' : 'dingupjxyj1guhh5p8dt'
 console.log(appsKey, 'key的内容')
 console.log(appsKey, 'key的内容')
 import axios from 'axios'
 import axios from 'axios'
 export default {
 export default {

+ 3 - 2
TEAMModelBI/ClientApp/src/view/product/index.vue

@@ -460,7 +460,7 @@ let columns = ref([
   },
   },
 ])
 ])
 const popoverRef = ref()
 const popoverRef = ref()
-const siteValue = window.location.host === 'localhost:5001' ? 'cn' : window.location.host === 'bi.teammodel.cn' ? 'cn' : window.location.host === 'bitest.teammodel.cn' ? 'cn' : 'international'
+const siteValue = window.location.host === 'localhost:5001' ? 'international' : window.location.host === 'bi.teammodel.cn' ? 'cn' : window.location.host === 'bitest.teammodel.cn' ? 'cn' : 'international'
 const optionsData = siteValue === 'cn' ? option_cn : option_gl
 const optionsData = siteValue === 'cn' ? option_cn : option_gl
 //const optionsData = option_gl
 //const optionsData = option_gl
 columns.value[0].headerCellRenderer = (props = HeaderCellSlotProps) => {
 columns.value[0].headerCellRenderer = (props = HeaderCellSlotProps) => {
@@ -716,11 +716,12 @@ let exportList = ref([
   { label: proxy.$t(`product.studentNumberUnique`), key: 'stuShow' },
   { label: proxy.$t(`product.studentNumberUnique`), key: 'stuShow' },
   { label: proxy.$t(`product.studentJoinHours`), key: 'stuLessonLengMin' },
   { label: proxy.$t(`product.studentJoinHours`), key: 'stuLessonLengMin' },
   { label: proxy.$t(`product.tGreen`), key: 'tGreen' },
   { label: proxy.$t(`product.tGreen`), key: 'tGreen' },
+  { label: proxy.$t(`product.tLesson`), key: 'tLesson' },
   { label: proxy.$t(`product.lessonNumber`), key: 'lessonRecord' },
   { label: proxy.$t(`product.lessonNumber`), key: 'lessonRecord' },
   { label: proxy.$t(`product.lessonHours`), key: 'lessonLengMin' },
   { label: proxy.$t(`product.lessonHours`), key: 'lessonLengMin' },
   { label: proxy.$t(`product.time`), key: 'date' },
   { label: proxy.$t(`product.time`), key: 'date' },
 ])
 ])
-let fieldList = ref([proxy.$t(`product.school`) + proxy.$t(`product.name`), proxy.$t(`product.school`) + proxy.$t(`product.simpleCode`), proxy.$t(`product.classroomNumber`), proxy.$t(`product.teacherNumber`), proxy.$t(`product.studentNumberUnique`), proxy.$t(`product.studentJoinHours`), proxy.$t(`product.tGreen`), proxy.$t(`product.lessonNumber`), proxy.$t(`product.lessonHours`), proxy.$t(`product.time`)])
+let fieldList = ref([proxy.$t(`product.school`) + proxy.$t(`product.name`), proxy.$t(`product.school`) + proxy.$t(`product.simpleCode`), proxy.$t(`product.classroomNumber`), proxy.$t(`product.teacherNumber`), proxy.$t(`product.studentNumberUnique`), proxy.$t(`product.studentJoinHours`), proxy.$t(`product.tGreen`), proxy.$t(`product.tLesson`), proxy.$t(`product.lessonNumber`), proxy.$t(`product.lessonHours`), proxy.$t(`product.time`)])
 let exportStandard = ref([
 let exportStandard = ref([
   { title: proxy.$t(`product.joinNumberUnique`), value: 0, key: 'personnum', option: [{ name: proxy.$t(`product.smaller`) + '50', value: '50' }, { name: proxy.$t(`product.bigger`) + '50,' + proxy.$t(`product.smaller`) + '100', value: '50-100' }, { name: proxy.$t(`product.bigger`) + '100', value: '101' }, { name: proxy.$t(`product.bigger`) + '300', value: '301' }] },
   { title: proxy.$t(`product.joinNumberUnique`), value: 0, key: 'personnum', option: [{ name: proxy.$t(`product.smaller`) + '50', value: '50' }, { name: proxy.$t(`product.bigger`) + '50,' + proxy.$t(`product.smaller`) + '100', value: '50-100' }, { name: proxy.$t(`product.bigger`) + '100', value: '101' }, { name: proxy.$t(`product.bigger`) + '300', value: '301' }] },
   { title: proxy.$t(`product.lessonTime`), value: 0, key: 'classtime', option: [{ name: proxy.$t(`product.smaller`) + proxy.$t(`product.equal`) + '45' + proxy.$t(`product.minute`), value: '45' }, { name: proxy.$t(`product.bigger`) + '45' + proxy.$t(`product.minute`) + ',' + proxy.$t(`product.smaller`) + '90' + proxy.$t(`product.minute`), value: '45-90' }, { name: proxy.$t(`product.smaller`) + '90' + proxy.$t(`product.minute`), value: '91' }] },
   { title: proxy.$t(`product.lessonTime`), value: 0, key: 'classtime', option: [{ name: proxy.$t(`product.smaller`) + proxy.$t(`product.equal`) + '45' + proxy.$t(`product.minute`), value: '45' }, { name: proxy.$t(`product.bigger`) + '45' + proxy.$t(`product.minute`) + ',' + proxy.$t(`product.smaller`) + '90' + proxy.$t(`product.minute`), value: '45-90' }, { name: proxy.$t(`product.smaller`) + '90' + proxy.$t(`product.minute`), value: '91' }] },