Forráskód Böngészése

[BI]取得IOT資料時追加IP分析地理位置:修正前端顯示頁面

jeff 3 hónapja
szülő
commit
f02e2f60e2

+ 1 - 2
TEAMModelBI/ClientApp/src/language/lang/zh-cn.js

@@ -690,7 +690,6 @@ const zh_cn = {
         parameterError: '参数错误',
         parameterError: '参数错误',
     },
     },
     product: {
     product: {
-        tmid: '醍魔豆帐号',
         geo: '地理位置',
         geo: '地理位置',
         dataTarget: '取得对象',
         dataTarget: '取得对象',
         dataFilter: '数据筛选',
         dataFilter: '数据筛选',
@@ -824,7 +823,7 @@ const zh_cn = {
         message1_1: '当前查询人数仅支持小于或等于',
         message1_1: '当前查询人数仅支持小于或等于',
         message1_2: '名用户',
         message1_2: '名用户',
         teacherData: '教师数据',
         teacherData: '教师数据',
-        tmid: '醍摩豆Id',
+        tmid: '醍摩豆ID',
         schoolName: '学校',
         schoolName: '学校',
         stuLessonLengMin: '学生参与总时数',
         stuLessonLengMin: '学生参与总时数',
         item: '题目数',
         item: '题目数',

+ 1 - 2
TEAMModelBI/ClientApp/src/language/lang/zh-tw.js

@@ -683,7 +683,6 @@ const zh_tw = {
         parameterError: '參數錯誤',
         parameterError: '參數錯誤',
     },
     },
     product: {
     product: {
-        tmid: '醍魔豆帳號',
         geo: '地理位置',
         geo: '地理位置',
         dataTarget: '取得對象',
         dataTarget: '取得對象',
         dataFilter: '數據篩選',
         dataFilter: '數據篩選',
@@ -817,7 +816,7 @@ const zh_tw = {
         message1_1: '當前查詢人數僅支持小於或等於',
         message1_1: '當前查詢人數僅支持小於或等於',
         message1_2: '名用戶',
         message1_2: '名用戶',
         teacherData: '教師數據',
         teacherData: '教師數據',
-        tmid: '醍摩豆Id',
+        tmid: '醍摩豆ID',
         schoolName: '學校',
         schoolName: '學校',
         stuLessonLengMin: '學生參與總時數',
         stuLessonLengMin: '學生參與總時數',
         item: '題目數',
         item: '題目數',

+ 1 - 2
TEAMModelBI/ClientApp/src/view/product/details.vue

@@ -1366,8 +1366,7 @@ function init (againvalue) {
   }else{
   }else{
     isShowAuth = false;
     isShowAuth = false;
   }
   }
- 
- if(props.postData.target === "school"){
+ if (props.postData.target === "school" || props.postData.target === "geo"){
   serachToresult()
   serachToresult()
  } 
  } 
  
  

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

@@ -1067,7 +1067,6 @@ async function searchData () {
   console.log(productData.value.timevalue)
   console.log(productData.value.timevalue)
   console.log(clickNum.value.filter, 'NUM')
   console.log(clickNum.value.filter, 'NUM')
   console.log(clickNum.value.target, 'target')
   console.log(clickNum.value.target, 'target')
-
   // if (!productData.value.timevalue) { return }
   // if (!productData.value.timevalue) { return }
   let searchValue = optionsValue.value
   let searchValue = optionsValue.value
   let schoolArr = []
   let schoolArr = []
@@ -1119,10 +1118,10 @@ async function searchData () {
         else if (state === 'city') {
         else if (state === 'city') {
             if (siteValue === 'cn') {
             if (siteValue === 'cn') {
                 geo.countryId = 'CN'
                 geo.countryId = 'CN'
-                let provinceId = optionsData.find((obj) => obj.name === optionsValue.value[0]).code;
+                let provinceId = optionsData.find((obj) => obj.name === (optionsValue?.value?.[0] || ''))?.code;
                 geo.provinceId = provinceId
                 geo.provinceId = provinceId
                 let cityDic = optionsData.find((obj) => obj.code === provinceId).children;
                 let cityDic = optionsData.find((obj) => obj.code === provinceId).children;
-                let cityId = cityDic.find((obj) => obj.name === optionsValue.value[1]).code;
+                let cityId = cityDic.find((obj) => obj.name === (optionsValue?.value?.[1] || ''))?.code;
                 geo.cityId = cityId
                 geo.cityId = cityId
             }
             }
             else {
             else {
@@ -1130,7 +1129,7 @@ async function searchData () {
                 geo.countryId = countryId;
                 geo.countryId = countryId;
                 geo.provinceId = null;
                 geo.provinceId = null;
                 let cityDic = optionsData.find((obj) => obj.code === countryId).children;
                 let cityDic = optionsData.find((obj) => obj.code === countryId).children;
-                let cityId = cityDic.find((obj) => obj.name === optionsValue.value[1]).code;
+                let cityId = cityDic.find((obj) => obj.name === (optionsValue?.value?.[1] || ''))?.code;
                 geo.cityId = cityId
                 geo.cityId = cityId
             }
             }
         }
         }

+ 1 - 1
TEAMModelOS.SDK/Models/Service/BI/BIProdAnalysis.cs

@@ -1226,7 +1226,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 }
                 }
                 //1.記入CSV2 Redis TmidAnalysis:Day
                 //1.記入CSV2 Redis TmidAnalysis:Day
                 //2.記入CSV2 CosmosDB Day
                 //2.記入CSV2 CosmosDB Day
-                if (GeoAnalysisList.Count > 0) //[待做]
+                if (GeoAnalysisList.Count > 0)
                 {
                 {
                     //資料整形
                     //資料整形
                     Dictionary<string, Dictionary<string, string>> redisGeoFieldDic = new Dictionary<string, Dictionary<string, string>>(); //架構: key => geoId => JsonContent     key = $"GeoAnalysis:Day:{toolType}:{y}{m}{d}"
                     Dictionary<string, Dictionary<string, string>> redisGeoFieldDic = new Dictionary<string, Dictionary<string, string>>(); //架構: key => geoId => JsonContent     key = $"GeoAnalysis:Day:{toolType}:{y}{m}{d}"