From d2cb95fc43a67a0f9c5cad426f71a491f075163a Mon Sep 17 00:00:00 2001 From: chenwu Date: Fri, 24 Apr 2026 00:39:10 +0800 Subject: [PATCH] =?UTF-8?q?20260424-=E5=B7=AE=E5=88=86=E5=8C=BA=E6=B2=A1?= =?UTF-8?q?=E6=94=B9-=E6=9C=89dim=5Fgeo=E7=9A=84=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E6=9C=AA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/05d495a4d45dc9188f5f/page.json | 133 +- .../visuals/1a87a52ff2879a7337df/visual.json | 7 - .../visuals/61c7c3b22f821512bca9/visual.json | 32 +- .../visuals/ab76512b53fd2542bed4/visual.json | 42 - .../visuals/5f0991311ab5615ccffe/visual.json | 91 -- .../visuals/7dc141fad08c05f8bf4f/visual.json | 4 +- .../visuals/cf5f81641109ae6cda32/visual.json | 91 -- .../visuals/07d68f37d952b5b8a1e8/visual.json | 91 -- .../visuals/333fa634e45d00e8e080/visual.json | 4 +- .../pages/7901063b99ba6dd20a76/page.json | 79 +- .../visuals/325378aaa0cae869302d/visual.json | 2 +- .../page.json | 80 +- .../visuals/d2307a4a0b4bc393fd2c/visual.json | 91 -- .../visuals/df9709b3004095e69c0a/visual.json | 2 +- .../visuals/3e0784de458b212bd867/visual.json | 2 +- .../page.json | 79 +- .../visuals/00ad0b2ca638d476ad5e/visual.json | 91 -- .../visuals/bde72cd7068543004626/visual.json | 2 +- .../page.json | 76 +- .../visuals/10b4afd023a970d9d100/visual.json | 36 - .../visuals/7cb93112d73452dd0990/visual.json | 91 -- .../visuals/8eecdf971487c06d8850/visual.json | 6 +- .../visuals/970ddd7c4d5610841628/visual.json | 4 +- .../visuals/a38ec7410488c0406450/visual.json | 2 +- .../visuals/e540378da57667468e92/visual.json | 20 +- .../visuals/3e05074d80315d48c611/visual.json | 13 +- .../visuals/95263e60b50b67007b0a/visual.json | 6 +- .../visuals/b68ec0d4ae74c65d1100/visual.json | 4 +- .../pages/b76a2e405a526ad30c18/page.json | 76 +- .../visuals/10dca877e239302016a5/visual.json | 91 -- .../pages/ecb4c3d9dd5480470c2b/page.json | 79 +- .../visuals/52791a00c1a10445cd20/visual.json | 2 +- .../definition/pages/pages.json | 2 +- .../definition/cultures/zh-CN.tmdl | 30 - .../definition/expressions.tmdl | 2 +- .../definition/tables/00_KPI.tmdl | 1206 +++++++++-------- .../definition/tables/0_Measure_CalGroup.tmdl | 25 + .../definition/tables/Dim_Market.tmdl | 117 +- .../definition/tables/Dim_MarketTA.tmdl | 2 +- .../definition/tables/Measure.tmdl | 79 +- .../diagramLayout.json | 2 +- 41 files changed, 761 insertions(+), 2133 deletions(-) diff --git a/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/page.json b/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/page.json index 0fadbc2..fac1523 100644 --- a/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/page.json +++ b/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/page.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.1.0/schema.json", "name": "05d495a4d45dc9188f5f", "displayName": "Cross Channel渠道整合分析", "displayOption": "FitToWidth", @@ -139,137 +139,6 @@ }, "howCreated": "User", "isLockedInViewMode": true - }, - { - "name": "bdc930ec6cec6a206d65", - "ordinal": 2, - "field": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_RC" - } - }, - "Property": "IS_TARGET_HP" - } - }, - "type": "Categorical", - "filter": { - "Version": 2, - "From": [ - { - "Name": "d", - "Entity": "Dim_RC", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "d" - } - }, - "Property": "IS_TARGET_HP" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'Y'" - } - } - ] - ] - } - } - } - ] - }, - "howCreated": "User", - "isLockedInViewMode": true - }, - { - "name": "dbf67b8c50d7a8d373a5", - "ordinal": 3, - "field": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Fact_Sales" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - }, - "type": "Categorical", - "filter": { - "Version": 2, - "From": [ - { - "Name": "f", - "Entity": "Fact_Sales", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "Not": { - "Expression": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "f" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'3'" - } - } - ] - ] - } - } - } - } - } - ] - }, - "howCreated": "User", - "isLockedInViewMode": true, - "objects": { - "general": [ - { - "properties": { - "isInvertedSelectionMode": { - "expr": { - "Literal": { - "Value": "true" - } - } - } - } - } - ] - } } ], "filterSortOrder": "Custom" diff --git a/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/1a87a52ff2879a7337df/visual.json b/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/1a87a52ff2879a7337df/visual.json index e978283..ce36741 100644 --- a/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/1a87a52ff2879a7337df/visual.json +++ b/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/1a87a52ff2879a7337df/visual.json @@ -102,13 +102,6 @@ "Value": "'CHPA'" } } - ], - [ - { - "Literal": { - "Value": "'AIA'" - } - } ] ] } diff --git a/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/61c7c3b22f821512bca9/visual.json b/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/61c7c3b22f821512bca9/visual.json index 22c149b..92dffc5 100644 --- a/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/61c7c3b22f821512bca9/visual.json +++ b/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/61c7c3b22f821512bca9/visual.json @@ -100,36 +100,6 @@ "queryRef": "Measure.External.MS%.KPI", "nativeQueryRef": "MS%", "displayName": "MS%" - }, - { - "field": { - "Measure": { - "Expression": { - "SourceRef": { - "Entity": "Measure" - } - }, - "Property": "External.Sales.KPI" - } - }, - "queryRef": "Measure.External.Sales.KPI", - "nativeQueryRef": "Sales", - "displayName": "Sales" - }, - { - "field": { - "Measure": { - "Expression": { - "SourceRef": { - "Entity": "Measure" - } - }, - "Property": "External.Sales.LY.KPI" - } - }, - "queryRef": "Measure.External.Sales.LY.KPI", - "nativeQueryRef": "Sales LY", - "displayName": "Sales LY" } ], "fieldParameters": [ @@ -145,7 +115,7 @@ } }, "index": 0, - "length": 4 + "length": 2 } ] } diff --git a/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/ab76512b53fd2542bed4/visual.json b/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/ab76512b53fd2542bed4/visual.json index a1d8f36..1ad7ebb 100644 --- a/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/ab76512b53fd2542bed4/visual.json +++ b/External All Channel.Report/definition/pages/05d495a4d45dc9188f5f/visuals/ab76512b53fd2542bed4/visual.json @@ -84,20 +84,6 @@ "Value": "'''Measure''[External.MS%.KPI]'" } } - ], - [ - { - "Literal": { - "Value": "'''Measure''[External.Sales.KPI]'" - } - } - ], - [ - { - "Literal": { - "Value": "'''Measure''[External.Sales.LY.KPI]'" - } - } ] ] } @@ -150,28 +136,6 @@ } ] } - ], - [ - { - "0": [ - { - "Literal": { - "Value": "'''Measure''[External.Sales.KPI]'" - } - } - ] - } - ], - [ - { - "0": [ - { - "Literal": { - "Value": "'''Measure''[External.Sales.LY.KPI]'" - } - } - ] - } ] ], "columns": [ @@ -198,12 +162,6 @@ }, { "0": "MS%" - }, - { - "0": "Sales" - }, - { - "0": "Sales LY" } ] } diff --git a/External All Channel.Report/definition/pages/0c6bf6c9118eec051860/visuals/5f0991311ab5615ccffe/visual.json b/External All Channel.Report/definition/pages/0c6bf6c9118eec051860/visuals/5f0991311ab5615ccffe/visual.json index ffe5062..0f24bfe 100644 --- a/External All Channel.Report/definition/pages/0c6bf6c9118eec051860/visuals/5f0991311ab5615ccffe/visual.json +++ b/External All Channel.Report/definition/pages/0c6bf6c9118eec051860/visuals/5f0991311ab5615ccffe/visual.json @@ -171,97 +171,6 @@ "Value": "true" } } - }, - "filter": { - "filter": { - "Version": 2, - "From": [ - { - "Name": "d", - "Entity": "Dim_Geo", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "d" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - ] - } - }, - "Annotations": { - "filterExpressionMetadata": { - "expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "decomposedIdentities": { - "values": [ - [ - { - "0": [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - } - ] - ], - "columns": [ - { - "value": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - } - ] - }, - "valueMap": [ - { - "0": "浙江" - } - ] - } - } - } - ] - } } } } diff --git a/External All Channel.Report/definition/pages/1adfe56cfdfc93fcf3b0/visuals/7dc141fad08c05f8bf4f/visual.json b/External All Channel.Report/definition/pages/1adfe56cfdfc93fcf3b0/visuals/7dc141fad08c05f8bf4f/visual.json index 8edaf15..c321c38 100644 --- a/External All Channel.Report/definition/pages/1adfe56cfdfc93fcf3b0/visuals/7dc141fad08c05f8bf4f/visual.json +++ b/External All Channel.Report/definition/pages/1adfe56cfdfc93fcf3b0/visuals/7dc141fad08c05f8bf4f/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "7dc141fad08c05f8bf4f", "position": { "x": 1420.6478474226371, @@ -67,7 +67,7 @@ [ { "Literal": { - "Value": "'YTD'" + "Value": "'MTH'" } } ] diff --git a/External All Channel.Report/definition/pages/533895fc7e570101ad8f/visuals/cf5f81641109ae6cda32/visual.json b/External All Channel.Report/definition/pages/533895fc7e570101ad8f/visuals/cf5f81641109ae6cda32/visual.json index e7f5f81..ed8f00e 100644 --- a/External All Channel.Report/definition/pages/533895fc7e570101ad8f/visuals/cf5f81641109ae6cda32/visual.json +++ b/External All Channel.Report/definition/pages/533895fc7e570101ad8f/visuals/cf5f81641109ae6cda32/visual.json @@ -171,97 +171,6 @@ "Value": "true" } } - }, - "filter": { - "filter": { - "Version": 2, - "From": [ - { - "Name": "d", - "Entity": "Dim_Geo", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "d" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - ] - } - }, - "Annotations": { - "filterExpressionMetadata": { - "expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "decomposedIdentities": { - "values": [ - [ - { - "0": [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - } - ] - ], - "columns": [ - { - "value": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - } - ] - }, - "valueMap": [ - { - "0": "浙江" - } - ] - } - } - } - ] - } } } } diff --git a/External All Channel.Report/definition/pages/57cfd40c66e1339a587b/visuals/07d68f37d952b5b8a1e8/visual.json b/External All Channel.Report/definition/pages/57cfd40c66e1339a587b/visuals/07d68f37d952b5b8a1e8/visual.json index 0a9ade4..3126ac9 100644 --- a/External All Channel.Report/definition/pages/57cfd40c66e1339a587b/visuals/07d68f37d952b5b8a1e8/visual.json +++ b/External All Channel.Report/definition/pages/57cfd40c66e1339a587b/visuals/07d68f37d952b5b8a1e8/visual.json @@ -206,97 +206,6 @@ "Value": "true" } } - }, - "filter": { - "filter": { - "Version": 2, - "From": [ - { - "Name": "d", - "Entity": "Dim_Geo", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "d" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - ] - } - }, - "Annotations": { - "filterExpressionMetadata": { - "expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "decomposedIdentities": { - "values": [ - [ - { - "0": [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - } - ] - ], - "columns": [ - { - "value": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - } - ] - }, - "valueMap": [ - { - "0": "浙江" - } - ] - } - } - } - ] - } } } } diff --git a/External All Channel.Report/definition/pages/57cfd40c66e1339a587b/visuals/333fa634e45d00e8e080/visual.json b/External All Channel.Report/definition/pages/57cfd40c66e1339a587b/visuals/333fa634e45d00e8e080/visual.json index d2b41a2..cdaa4d2 100644 --- a/External All Channel.Report/definition/pages/57cfd40c66e1339a587b/visuals/333fa634e45d00e8e080/visual.json +++ b/External All Channel.Report/definition/pages/57cfd40c66e1339a587b/visuals/333fa634e45d00e8e080/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "333fa634e45d00e8e080", "position": { "x": 1207.8102283812432, @@ -67,7 +67,7 @@ [ { "Literal": { - "Value": "'YTD'" + "Value": "'MTH'" } } ] diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/page.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/page.json index 20cee08..b4ca89b 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/page.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/page.json @@ -1,87 +1,10 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.1.0/schema.json", "name": "7901063b99ba6dd20a76", "displayName": "Geography Analysis-EN", "displayOption": "FitToWidth", "height": 2000, "width": 1920, - "filterConfig": { - "filters": [ - { - "name": "9eb24f8a25aee8f11a7f", - "field": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Fact_Sales" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - }, - "type": "Categorical", - "filter": { - "Version": 2, - "From": [ - { - "Name": "f", - "Entity": "Fact_Sales", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "Not": { - "Expression": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "f" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'3'" - } - } - ] - ] - } - } - } - } - } - ] - }, - "howCreated": "User", - "objects": { - "general": [ - { - "properties": { - "isInvertedSelectionMode": { - "expr": { - "Literal": { - "Value": "true" - } - } - } - } - } - ] - } - } - ] - }, "objects": { "outspacePane": [ { diff --git a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/325378aaa0cae869302d/visual.json b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/325378aaa0cae869302d/visual.json index 490da43..1499051 100644 --- a/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/325378aaa0cae869302d/visual.json +++ b/External All Channel.Report/definition/pages/7901063b99ba6dd20a76/visuals/325378aaa0cae869302d/visual.json @@ -99,7 +99,7 @@ [ { "Literal": { - "Value": "'DTP'" + "Value": "'CHPA'" } } ] diff --git a/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/page.json b/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/page.json index 3e11347..854f2af 100644 --- a/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/page.json +++ b/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/page.json @@ -1,88 +1,10 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.1.0/schema.json", "name": "ReportSection3e9b78a99de7939003a0", "displayName": "Market Analysis 市场分析", "displayOption": "FitToWidth", "height": 2500, "width": 1920, - "filterConfig": { - "filters": [ - { - "name": "4f0140d5338e47a1e3cc", - "field": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Fact_Sales" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - }, - "type": "Categorical", - "filter": { - "Version": 2, - "From": [ - { - "Name": "f", - "Entity": "Fact_Sales", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "Not": { - "Expression": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "f" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'3'" - } - } - ] - ] - } - } - } - } - } - ] - }, - "howCreated": "User", - "isLockedInViewMode": true, - "objects": { - "general": [ - { - "properties": { - "isInvertedSelectionMode": { - "expr": { - "Literal": { - "Value": "true" - } - } - } - } - } - ] - } - } - ] - }, "objects": { "outspacePane": [ { diff --git a/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/d2307a4a0b4bc393fd2c/visual.json b/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/d2307a4a0b4bc393fd2c/visual.json index 4ad12d5..e99361c 100644 --- a/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/d2307a4a0b4bc393fd2c/visual.json +++ b/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/d2307a4a0b4bc393fd2c/visual.json @@ -171,97 +171,6 @@ "Value": "true" } } - }, - "filter": { - "filter": { - "Version": 2, - "From": [ - { - "Name": "d", - "Entity": "Dim_Geo", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "d" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - ] - } - }, - "Annotations": { - "filterExpressionMetadata": { - "expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "decomposedIdentities": { - "values": [ - [ - { - "0": [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - } - ] - ], - "columns": [ - { - "value": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - } - ] - }, - "valueMap": [ - { - "0": "浙江" - } - ] - } - } - } - ] - } } } } diff --git a/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/df9709b3004095e69c0a/visual.json b/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/df9709b3004095e69c0a/visual.json index 4c44156..4afff5b 100644 --- a/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/df9709b3004095e69c0a/visual.json +++ b/External All Channel.Report/definition/pages/ReportSection3e9b78a99de7939003a0/visuals/df9709b3004095e69c0a/visual.json @@ -99,7 +99,7 @@ [ { "Literal": { - "Value": "'DTP'" + "Value": "'CHPA'" } } ] diff --git a/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/3e0784de458b212bd867/visual.json b/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/3e0784de458b212bd867/visual.json index f291da9..4a96e4c 100644 --- a/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/3e0784de458b212bd867/visual.json +++ b/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/3e0784de458b212bd867/visual.json @@ -116,7 +116,7 @@ [ { "Literal": { - "Value": "'DTP'" + "Value": "'CHPA'" } } ] diff --git a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/page.json b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/page.json index eb8eed0..2ea1a7b 100644 --- a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/page.json +++ b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/page.json @@ -1,87 +1,10 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.1.0/schema.json", "name": "ReportSectioneb7f7ada5bac80ed00c1", "displayName": "Geography Analysis 地理维度分析", "displayOption": "FitToWidth", "height": 2000, "width": 1920, - "filterConfig": { - "filters": [ - { - "name": "35711f4f9030948abba0", - "field": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Fact_Sales" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - }, - "type": "Categorical", - "filter": { - "Version": 2, - "From": [ - { - "Name": "f", - "Entity": "Fact_Sales", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "Not": { - "Expression": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "f" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'3'" - } - } - ] - ] - } - } - } - } - } - ] - }, - "howCreated": "User", - "objects": { - "general": [ - { - "properties": { - "isInvertedSelectionMode": { - "expr": { - "Literal": { - "Value": "true" - } - } - } - } - } - ] - } - } - ] - }, "objects": { "outspacePane": [ { diff --git a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/00ad0b2ca638d476ad5e/visual.json b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/00ad0b2ca638d476ad5e/visual.json index a22df05..46a62c6 100644 --- a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/00ad0b2ca638d476ad5e/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/00ad0b2ca638d476ad5e/visual.json @@ -171,97 +171,6 @@ "Value": "true" } } - }, - "filter": { - "filter": { - "Version": 2, - "From": [ - { - "Name": "d", - "Entity": "Dim_Geo", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "d" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - ] - } - }, - "Annotations": { - "filterExpressionMetadata": { - "expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "decomposedIdentities": { - "values": [ - [ - { - "0": [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - } - ] - ], - "columns": [ - { - "value": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - } - ] - }, - "valueMap": [ - { - "0": "浙江" - } - ] - } - } - } - ] - } } } } diff --git a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/bde72cd7068543004626/visual.json b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/bde72cd7068543004626/visual.json index 57a44fd..d26d732 100644 --- a/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/bde72cd7068543004626/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioneb7f7ada5bac80ed00c1/visuals/bde72cd7068543004626/visual.json @@ -99,7 +99,7 @@ [ { "Literal": { - "Value": "'DTP'" + "Value": "'CHPA'" } } ] diff --git a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/page.json b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/page.json index d263fbf..26d21eb 100644 --- a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/page.json +++ b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/page.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.1.0/schema.json", "name": "ReportSectioned71c491b41e12906de3", "displayName": "Free report 自助报告", "displayOption": "FitToWidth", @@ -79,80 +79,6 @@ } ] } - }, - { - "name": "fcf18b3fb6533b0ee0b2", - "field": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Fact_Sales" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - }, - "type": "Categorical", - "filter": { - "Version": 2, - "From": [ - { - "Name": "f", - "Entity": "Fact_Sales", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "Not": { - "Expression": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "f" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'3'" - } - } - ] - ] - } - } - } - } - } - ] - }, - "howCreated": "User", - "isLockedInViewMode": true, - "objects": { - "general": [ - { - "properties": { - "isInvertedSelectionMode": { - "expr": { - "Literal": { - "Value": "true" - } - } - } - } - } - ] - } } ] }, diff --git a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/10b4afd023a970d9d100/visual.json b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/10b4afd023a970d9d100/visual.json index 45a2dff..bdbcc24 100644 --- a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/10b4afd023a970d9d100/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/10b4afd023a970d9d100/visual.json @@ -209,18 +209,6 @@ "Value": "'''Dim_Unit''[DW]'" } } - ], - [ - { - "Literal": { - "Value": "'Market & Product'" - } - }, - { - "Literal": { - "Value": "'''Dim_Market''[MARKET]'" - } - } ] ] } @@ -290,26 +278,6 @@ } ] } - ], - [ - { - "0": [ - { - "Literal": { - "Value": "'Market & Product'" - } - } - ] - }, - { - "1": [ - { - "Literal": { - "Value": "'''Dim_Market''[MARKET]'" - } - } - ] - } ] ], "columns": [ @@ -347,10 +315,6 @@ { "0": "KeepSelected", "1": "Value Type" - }, - { - "0": "Market & Product", - "1": "Market" } ] } diff --git a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/7cb93112d73452dd0990/visual.json b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/7cb93112d73452dd0990/visual.json index b2aaad6..6d10555 100644 --- a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/7cb93112d73452dd0990/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/7cb93112d73452dd0990/visual.json @@ -206,97 +206,6 @@ "Value": "true" } } - }, - "filter": { - "filter": { - "Version": 2, - "From": [ - { - "Name": "d", - "Entity": "Dim_Geo", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "d" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - ] - } - }, - "Annotations": { - "filterExpressionMetadata": { - "expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "decomposedIdentities": { - "values": [ - [ - { - "0": [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - } - ] - ], - "columns": [ - { - "value": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - } - ] - }, - "valueMap": [ - { - "0": "浙江" - } - ] - } - } - } - ] - } } } } diff --git a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/8eecdf971487c06d8850/visual.json b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/8eecdf971487c06d8850/visual.json index d69528f..c522d0c 100644 --- a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/8eecdf971487c06d8850/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/8eecdf971487c06d8850/visual.json @@ -105,7 +105,7 @@ [ { "Literal": { - "Value": "'202601'" + "Value": "'R'" } } ] @@ -133,7 +133,7 @@ "0": [ { "Literal": { - "Value": "'202601'" + "Value": "'R'" } } ] @@ -157,7 +157,7 @@ }, "valueMap": [ { - "0": "202601" + "0": "R" } ] } diff --git a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/970ddd7c4d5610841628/visual.json b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/970ddd7c4d5610841628/visual.json index bf72455..70f3b89 100644 --- a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/970ddd7c4d5610841628/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/970ddd7c4d5610841628/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "970ddd7c4d5610841628", "position": { "x": 1207.8102283812432, @@ -67,7 +67,7 @@ [ { "Literal": { - "Value": "'YTD'" + "Value": "'MTH'" } } ] diff --git a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/a38ec7410488c0406450/visual.json b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/a38ec7410488c0406450/visual.json index 5871815..e5735b7 100644 --- a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/a38ec7410488c0406450/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/a38ec7410488c0406450/visual.json @@ -99,7 +99,7 @@ [ { "Literal": { - "Value": "'CHPA'" + "Value": "'DTP'" } } ] diff --git a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/e540378da57667468e92/visual.json b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/e540378da57667468e92/visual.json index ae06b16..e3fd874 100644 --- a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/e540378da57667468e92/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/e540378da57667468e92/visual.json @@ -45,21 +45,6 @@ "nativeQueryRef": "Value Type", "displayName": "Value Type" }, - { - "field": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Market" - } - }, - "Property": "MARKET" - } - }, - "queryRef": "Dim_Market.MARKET", - "nativeQueryRef": "Market", - "displayName": "Market" - }, { "field": { "Measure": { @@ -103,7 +88,7 @@ } }, "index": 0, - "length": 3 + "length": 2 } ] } @@ -6054,7 +6039,8 @@ "Property": "MARKET" } }, - "type": "Categorical" + "type": "Categorical", + "howCreated": "User" }, { "name": "5e9ce2d0ab02300e9d32", diff --git a/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/3e05074d80315d48c611/visual.json b/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/3e05074d80315d48c611/visual.json index 62457d4..ca93b42 100644 --- a/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/3e05074d80315d48c611/visual.json +++ b/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/3e05074d80315d48c611/visual.json @@ -50,15 +50,15 @@ "Column": { "Expression": { "SourceRef": { - "Entity": "Dim_PackInfo" + "Entity": "Dim_Market" } }, - "Property": "PACK_COD" + "Property": "MARKET" } }, - "queryRef": "Dim_PackInfo.PACK_COD", - "nativeQueryRef": "Package Code", - "displayName": "Package Code" + "queryRef": "Dim_Market.MARKET", + "nativeQueryRef": "Market", + "displayName": "Market" }, { "field": { @@ -6211,7 +6211,8 @@ "Property": "PACK_COD" } }, - "type": "Categorical" + "type": "Categorical", + "howCreated": "User" }, { "name": "7dc9ecffc3dc14c1b1b9", diff --git a/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/95263e60b50b67007b0a/visual.json b/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/95263e60b50b67007b0a/visual.json index ba1e354..26ad34e 100644 --- a/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/95263e60b50b67007b0a/visual.json +++ b/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/95263e60b50b67007b0a/visual.json @@ -191,7 +191,7 @@ }, { "Literal": { - "Value": "'''Dim_PackInfo''[PACK_COD]'" + "Value": "'''Dim_Market''[MARKET]'" } } ] @@ -278,7 +278,7 @@ "1": [ { "Literal": { - "Value": "'''Dim_PackInfo''[PACK_COD]'" + "Value": "'''Dim_Market''[MARKET]'" } } ] @@ -323,7 +323,7 @@ }, { "0": "Market & Product", - "1": "Package Code" + "1": "Market" } ] } diff --git a/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/b68ec0d4ae74c65d1100/visual.json b/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/b68ec0d4ae74c65d1100/visual.json index fa17cb2..6692a08 100644 --- a/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/b68ec0d4ae74c65d1100/visual.json +++ b/External All Channel.Report/definition/pages/b44a3196b500090487a3/visuals/b68ec0d4ae74c65d1100/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.6.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", "name": "b68ec0d4ae74c65d1100", "position": { "x": 1209.5406155279215, @@ -67,7 +67,7 @@ [ { "Literal": { - "Value": "'YTD'" + "Value": "'MTH'" } } ] diff --git a/External All Channel.Report/definition/pages/b76a2e405a526ad30c18/page.json b/External All Channel.Report/definition/pages/b76a2e405a526ad30c18/page.json index d965ba9..a62d755 100644 --- a/External All Channel.Report/definition/pages/b76a2e405a526ad30c18/page.json +++ b/External All Channel.Report/definition/pages/b76a2e405a526ad30c18/page.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.1.0/schema.json", "name": "b76a2e405a526ad30c18", "displayName": "Price Distribution价格与铺货", "displayOption": "FitToWidth", @@ -60,80 +60,6 @@ ] }, "howCreated": "User" - }, - { - "name": "fb015b18b3ee532d5a99", - "field": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Fact_Sales" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - }, - "type": "Categorical", - "filter": { - "Version": 2, - "From": [ - { - "Name": "f", - "Entity": "Fact_Sales", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "Not": { - "Expression": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "f" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'3'" - } - } - ] - ] - } - } - } - } - } - ] - }, - "howCreated": "User", - "isLockedInViewMode": true, - "objects": { - "general": [ - { - "properties": { - "isInvertedSelectionMode": { - "expr": { - "Literal": { - "Value": "true" - } - } - } - } - } - ] - } } ] }, diff --git a/External All Channel.Report/definition/pages/b76a2e405a526ad30c18/visuals/10dca877e239302016a5/visual.json b/External All Channel.Report/definition/pages/b76a2e405a526ad30c18/visuals/10dca877e239302016a5/visual.json index ce334c7..66fca7b 100644 --- a/External All Channel.Report/definition/pages/b76a2e405a526ad30c18/visuals/10dca877e239302016a5/visual.json +++ b/External All Channel.Report/definition/pages/b76a2e405a526ad30c18/visuals/10dca877e239302016a5/visual.json @@ -171,97 +171,6 @@ "Value": "true" } } - }, - "filter": { - "filter": { - "Version": 2, - "From": [ - { - "Name": "d", - "Entity": "Dim_Geo", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "d" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - ] - } - }, - "Annotations": { - "filterExpressionMetadata": { - "expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - ], - "decomposedIdentities": { - "values": [ - [ - { - "0": [ - { - "Literal": { - "Value": "'浙江'" - } - } - ] - } - ] - ], - "columns": [ - { - "value": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_Geo" - } - }, - "Property": "PROVINCE_C" - } - } - } - ] - }, - "valueMap": [ - { - "0": "浙江" - } - ] - } - } - } - ] - } } } } diff --git a/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/page.json b/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/page.json index b087bc7..04930a9 100644 --- a/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/page.json +++ b/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/page.json @@ -1,87 +1,10 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.0.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/page/2.1.0/schema.json", "name": "ecb4c3d9dd5480470c2b", "displayName": "Market Analysis-EN", "displayOption": "FitToWidth", "height": 2500, "width": 1920, - "filterConfig": { - "filters": [ - { - "name": "f7368bdc326a9faf650a", - "field": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Fact_Sales" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - }, - "type": "Categorical", - "filter": { - "Version": 2, - "From": [ - { - "Name": "f", - "Entity": "Fact_Sales", - "Type": 0 - } - ], - "Where": [ - { - "Condition": { - "Not": { - "Expression": { - "In": { - "Expressions": [ - { - "Column": { - "Expression": { - "SourceRef": { - "Source": "f" - } - }, - "Property": "MERGED_DATA_DTP_OTHERS" - } - } - ], - "Values": [ - [ - { - "Literal": { - "Value": "'3'" - } - } - ] - ] - } - } - } - } - } - ] - }, - "howCreated": "User", - "objects": { - "general": [ - { - "properties": { - "isInvertedSelectionMode": { - "expr": { - "Literal": { - "Value": "true" - } - } - } - } - } - ] - } - } - ] - }, "objects": { "outspacePane": [ { diff --git a/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/52791a00c1a10445cd20/visual.json b/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/52791a00c1a10445cd20/visual.json index e9b86c1..7ab5abd 100644 --- a/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/52791a00c1a10445cd20/visual.json +++ b/External All Channel.Report/definition/pages/ecb4c3d9dd5480470c2b/visuals/52791a00c1a10445cd20/visual.json @@ -99,7 +99,7 @@ [ { "Literal": { - "Value": "'DTP'" + "Value": "'CHPA'" } } ] diff --git a/External All Channel.Report/definition/pages/pages.json b/External All Channel.Report/definition/pages/pages.json index 08dc3f8..227117e 100644 --- a/External All Channel.Report/definition/pages/pages.json +++ b/External All Channel.Report/definition/pages/pages.json @@ -34,5 +34,5 @@ "1045910bcda4e7ccea89", "57cfd40c66e1339a587b" ], - "activePageName": "ReportSectioned71c491b41e12906de3" + "activePageName": "ReportSection7c203e32de7071898401" } \ No newline at end of file diff --git a/External All Channel.SemanticModel/definition/cultures/zh-CN.tmdl b/External All Channel.SemanticModel/definition/cultures/zh-CN.tmdl index 52bad5d..1afe58a 100644 --- a/External All Channel.SemanticModel/definition/cultures/zh-CN.tmdl +++ b/External All Channel.SemanticModel/definition/cultures/zh-CN.tmdl @@ -9056,16 +9056,6 @@ cultureInfo zh-CN "State": "Generated", "Weight": 0.97 } - }, - { - "RC": { - "State": "Suggested", - "Source": { - "Type": "External", - "Agent": "PowerBI.VisualColumnRename" - }, - "Weight": 0.9 - } } ] }, @@ -42533,16 +42523,6 @@ cultureInfo zh-CN "State": "Generated", "Weight": 0.99 } - }, - { - "RSD Name": { - "State": "Suggested", - "Source": { - "Type": "External", - "Agent": "PowerBI.VisualColumnRename" - }, - "Weight": 0.9 - } } ] }, @@ -44490,16 +44470,6 @@ cultureInfo zh-CN "State": "Generated", "Weight": 0.99 } - }, - { - "Ins Code": { - "State": "Suggested", - "Source": { - "Type": "External", - "Agent": "PowerBI.VisualColumnRename" - }, - "Weight": 0.9 - } } ] }, diff --git a/External All Channel.SemanticModel/definition/expressions.tmdl b/External All Channel.SemanticModel/definition/expressions.tmdl index c90db47..24c82b6 100644 --- a/External All Channel.SemanticModel/definition/expressions.tmdl +++ b/External All Channel.SemanticModel/definition/expressions.tmdl @@ -75,7 +75,7 @@ expression Fact_Sales_SQL = ``` ---关联主键----------------------------- TO_DATE(CONCAT(YYYYMM, '01'), 'yyyyMMdd') AS DATE_KEY, COALESCE(MARKET, '') || DATA_SOURCE AS MARKET_KEY, - COALESCE(PACK_COD, '') || DATA_SOURCE AS PACK_SOURCE, + COALESCE(PACK_COD, '') || DATA_SOURCE || NEW_CODE AS PACK_SOURCE, COALESCE(AUDIT_COD, '') || DATA_SOURCE AS AUDIT_SOURCE, COALESCE(AUDIT_COD, '') || DATA_SOURCE AS AUDIT_KEY, COALESCE(MARKET, '') || COALESCE(CLASS, '') || DATA_SOURCE AS CLASS_KEY, diff --git a/External All Channel.SemanticModel/definition/tables/00_KPI.tmdl b/External All Channel.SemanticModel/definition/tables/00_KPI.tmdl index 6ebae4b..fbca741 100644 --- a/External All Channel.SemanticModel/definition/tables/00_KPI.tmdl +++ b/External All Channel.SemanticModel/definition/tables/00_KPI.tmdl @@ -1039,249 +1039,6 @@ table 00_KPI annotation PBI_FormatHint = {"isGeneralNumber":true} - measure 'External.Sales.LY.MTH.MID' = - VAR DS = SELECTEDVALUE ( Dim_DataSource[SOURCENAME] ) - VAR DS1 = SELECTEDVALUE ( Dim_DataSource[DATA_SOURCE] ) - VAR MGDS = SELECTEDVALUE ( Dim_MergeDataSource[DATA_SOURCE] ) - VAR FactDS = SELECTEDVALUE ( Fact_Sales[DATA_SOURCE] ) - VAR MKT_FLAG = - SWITCH ( - TRUE ( ) - , ISFILTERED ( Dim_Market ), MAX ( Dim_Market[MKT_FLAG] ) - , ISFILTERED ( Dim_BrandDefaultMKT ), - SWITCH ( - TRUE ( ) - , ISFILTERED ( Dim_MergeDataSource[DATA_SOURCE] ), - CALCULATE ( - MAX ( Dim_BrandDefaultMKT[MKT_FLAG] ), - Dim_BrandDefaultMKT[DATA_SOURCE] = FactDS - ) - , CALCULATE ( - MAX ( Dim_BrandDefaultMKT[MKT_FLAG] ), - Dim_BrandDefaultMKT[DATA_SOURCE] = DS1 - ) - ) - , 0 - ) - VAR PROD_FLAG = - SWITCH ( - TRUE ( ) - , ISFILTERED ( Dim_Market ), MAX ( Dim_Market[PRD_FLAG] ) - , ISFILTERED ( Dim_BrandDefaultMKT ), - SWITCH ( - TRUE ( ) - , ISFILTERED ( Dim_MergeDataSource[DATA_SOURCE] ), - CALCULATE ( - MAX ( Dim_BrandDefaultMKT[PRD_FLAG] ), - Dim_BrandDefaultMKT[DATA_SOURCE] = FactDS - ) - , CALCULATE ( - MAX ( Dim_BrandDefaultMKT[PRD_FLAG] ), - Dim_BrandDefaultMKT[DATA_SOURCE] = DS1 - ) - ) - , 0 - ) - VAR period_flag = SELECTEDVALUE ( MQY[Period] ) = "mth" - VAR mm_flag = MAX ( Dim_Calendar[MONTH] ) IN { 3, 6, 9, 12 } - VAR province_flag = - ISFILTERED ( Dim_Geo ) || ISFILTERED ( Dim_Org ) - RETURN - SWITCH ( - TRUE ( ) - , - //若选择Molecule,选择地理，且市场是品牌报告里面的市场 - ISFILTERED ( Dim_Org ) && NOT ISFILTERED ( Dim_Market ) - && NOT ISFILTERED ( Dim_BrandDefaultMKT ), --BLANK(), - IF ( [Fix_Is_AIA.MID.MID], [External.Sales.LY.MTH] ) - , ISFILTERED ( Dim_IsTarget_AIASpecial ) - && NOT ISFILTERED ( Dim_Market ) - && NOT ISFILTERED ( Dim_BrandDefaultMKT ), - IF ( [Fix_Is_AIA.MID.MID], [External.Sales.LY.MTH] ) - , ISFILTERED ( Dim_HP_Potential_AIA ) - && NOT ISFILTERED ( Dim_Market ) - && NOT ISFILTERED ( Dim_BrandDefaultMKT ), - BLANK ( ) - , ISFILTERED ( Dim_CoreDept ) && NOT ISFILTERED ( Dim_Market ) - && NOT ISFILTERED ( Dim_BrandDefaultMKT ), - BLANK ( ) - , - // 隐藏HTN Market 和 Respules Market - OR ( DS = "Retail", MGDS = "dtp" ) - && ( ISFILTERED ( Dim_Geo ) || ISFILTERED ( Dim_Org ) ) - && MKT_FLAG = 2, - BLANK ( ) - , DS = "Retail" && MKT_FLAG = 0 && province_flag - && OR ( period_flag, AND ( NOT period_flag, NOT mm_flag ) ), - BLANK ( ) - , OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) && MKT_FLAG = 1 - && NOT SELECTEDVALUE ( Dim_Market[MARKET] ) = "egfr tki market" - && NOT ISFILTERED ( Dim_PackInfo[PROD_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_CORP_C] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - && ISFILTERED ( Dim_Geo ) - && ( ISFILTERED ( Dim_PackInfo[MOLECULE_CODE_DESC] ) - || ISFILTERED ( Dim_PackInfo[MOLECULE_DES_C] ) - || ISFILTERED ( Dim_PackInfo[CMPS_COD] ) - || ISFILTERED ( Dim_PackInfo[CMPS_DES] ) - || ISFILTERED ( Dim_PackInfo[CMPS_DES_C] ) ), [External.Sales.LY.MTH] - , - - //除开特定市场外，其余的retail，针对于class，选择地理或org维度，值为空 - OR ( DS IN { "Retail", "DTP" }, MGDS = "dtp" ) - && ( ISFILTERED ( Dim_Geo ) || ISFILTERED ( Dim_Org ) ) - && ISFILTERED ( Dim_Class ) - && ( ISFILTERED ( Dim_Market ) || ISFILTERED ( Dim_BrandDefaultMKT ) ) - && MKT_FLAG = 0, - BLANK ( ) - , - - //选择市场，只出现品牌报告里面的有市场； - OR ( DS IN { "Retail", "DTP" }, MGDS = "dtp" ) - && ( ISFILTERED ( Dim_Geo ) || ISFILTERED ( Dim_Org ) ) - && ( ISFILTERED ( Dim_Market ) || ISFILTERED ( Dim_BrandDefaultMKT ) ) - && PROD_FLAG = 0, - BLANK ( ) - , MGDS = "dtp" && province_flag, - CALCULATE ( - [External.Sales.LY.MTH], - KEEPFILTERS ( - Dim_GeoKey[AUDIT_SOURCE] <> "ROCDTP(Quarterly)" - ) - , KEEPFILTERS ( - Dim_GeoKey[AUDIT_SOURCE] <> "ROCIQVIA-CHPA(Monthly)" - ) - ) - , - --若不选pack，用于计算class相关KPI - OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) - && ( ISFILTERED ( Dim_Geo ) || ISFILTERED ( Dim_Org ) ) - && NOT ISFILTERED ( Dim_PackInfo ), - IF ( - ISFILTERED ( Dim_Class[CLASS] ) - && SELECTEDVALUE ( Dim_Market[MARKET] ) = "egfr tki market" - , BLANK ( ) - , [External.Sales.LY.MTH] - ) - , - - //若选择Molecule,没选择地理 - DS IN { "Retail", "EC", "DTP" } && NOT ISFILTERED ( Dim_Geo ) - && NOT ISFILTERED ( Dim_Org ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_CORP_C] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - && ( ISFILTERED ( Dim_PackInfo[MOLECULE_CODE_DESC] ) - || ISFILTERED ( Dim_PackInfo[MOLECULE_DES_C] ) - || ISFILTERED ( Dim_PackInfo[CMPS_COD] ) - || ISFILTERED ( Dim_PackInfo[CMPS_DES] ) - || ISFILTERED ( Dim_PackInfo[CMPS_DES_C] ) ), [External.Sales.LY.MTH] - , - - //若选择Molecule,选择地理 - OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_CORP_C] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - && ( ISFILTERED ( Dim_PackInfo[MOLECULE_CODE_DESC] ) - || ISFILTERED ( Dim_PackInfo[MOLECULE_DES_C] ) - || ISFILTERED ( Dim_PackInfo[CMPS_COD] ) - || ISFILTERED ( Dim_PackInfo[CMPS_DES] ) - || ISFILTERED ( Dim_PackInfo[CMPS_DES_C] ) ), - CALCULATE ( [External.Sales.LY.MTH], Fact_Sales[CMPS_FLAG] = 1 ) - , - //若选择BRAND,没有选择地理 - OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) - && NOT ISFILTERED ( Dim_Geo ) - && NOT ISFILTERED ( Dim_Org ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - && ( ISFILTERED ( Dim_PackInfo[PROD_COD] ) - || ISFILTERED ( Dim_PackInfo[PROD_CORP_C] ) - || ISFILTERED ( Dim_PackInfo[PROD_DES] ) - || ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) ), - CALCULATE ( - [External.Sales.LY.MTH], - Fact_Sales[PROD_FLAG] IN { 1, 2 } - ) - , - - //若选择BRAND,选择地理 - OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - && ( ISFILTERED ( Dim_PackInfo[PROD_COD] ) - || ISFILTERED ( Dim_PackInfo[PROD_CORP_C] ) - || ISFILTERED ( Dim_PackInfo[PROD_DES] ) - || ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) ), - CALCULATE ( [External.Sales.LY.MTH], Fact_Sales[GEO_FLAG] = 1 ) - , - //若选择PACKAGE,不选择地理维度，1表示pack+省份数据；2表示pack+全国的数据 - OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) - && NOT ISFILTERED ( Dim_Org ) - && NOT ISFILTERED ( Dim_Geo ) - && ( ISFILTERED ( Dim_PackInfo[PACK_DES] ) - || ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - || ISFILTERED ( Dim_PackInfo[PACK_COD] ) - || ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) ), - CALCULATE ( - [External.Sales.LY.MTH], - Fact_Sales[PACK_FLAG] IN { 1, 2 } - ) - , - - //若选择PACKAGE,且省份维度不是全国 - OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) - && ( ISFILTERED ( Dim_PackInfo[PACK_DES] ) - || ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - || ISFILTERED ( Dim_PackInfo[PACK_COD] ) - || ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) ), - IF ( - SELECTEDVALUE ( Dim_Market[MARKET] ) <> "EGFR TKI Market" - , CALCULATE ( [External.Sales.LY.MTH], Fact_Sales[PACK_FLAG] = 1 ) - , CALCULATE ( [External.Sales.LY.MTH], Fact_Sales[GEO_FLAG] = 1 ) - ) - , - //chap选择地理，隐藏ROC - DS IN { "CHPA" } && province_flag, - CALCULATE ( - [External.Sales.LY.MTH], - KEEPFILTERS ( - Dim_GeoKey[AUDIT_SOURCE] <> "ROCIQVIA-CHPA(Monthly)" - ) - ) - , [External.Sales.LY.MTH] - ) - displayFolder: Normal\05 - lineageTag: 0726ecc2-0bf6-43de-a635-c0089856d494 - - annotation PBI_FormatHint = {"isGeneralNumber":true} - measure 'External.Sales.MTH' = VAR SalesKPI = SWITCH ( @@ -1343,265 +1100,6 @@ table 00_KPI annotation PBI_FormatHint = {"isGeneralNumber":true} - measure 'External.Sales.MTH.MID' = - VAR DS = SELECTEDVALUE ( Dim_DataSource[SOURCENAME] ) - VAR DS1 = SELECTEDVALUE ( Dim_DataSource[DATA_SOURCE] ) - VAR MGDS = SELECTEDVALUE ( Dim_MergeDataSource[DATA_SOURCE] ) - VAR FactDS = SELECTEDVALUE ( Fact_Sales[DATA_SOURCE] ) - VAR MKT_FLAG = - SWITCH ( - TRUE ( ) - , ISFILTERED ( Dim_Market ), MAX ( Dim_Market[MKT_FLAG] ) - , ISFILTERED ( Dim_BrandDefaultMKT ), - SWITCH ( - TRUE ( ) - , ISFILTERED ( Dim_MergeDataSource[DATA_SOURCE] ), - CALCULATE ( - MAX ( Dim_BrandDefaultMKT[MKT_FLAG] ), - Dim_BrandDefaultMKT[DATA_SOURCE] = FactDS - ) - , CALCULATE ( - MAX ( Dim_BrandDefaultMKT[MKT_FLAG] ), - Dim_BrandDefaultMKT[DATA_SOURCE] = DS1 - ) - ) - , 0 - ) - VAR PROD_FLAG = - SWITCH ( - TRUE ( ) - , ISFILTERED ( Dim_Market ), MAX ( Dim_Market[PRD_FLAG] ) - , ISFILTERED ( Dim_BrandDefaultMKT ), - SWITCH ( - TRUE ( ) - , ISFILTERED ( Dim_MergeDataSource[DATA_SOURCE] ), - CALCULATE ( - MAX ( Dim_BrandDefaultMKT[PRD_FLAG] ), - Dim_BrandDefaultMKT[DATA_SOURCE] = FactDS - ) - , CALCULATE ( - MAX ( Dim_BrandDefaultMKT[PRD_FLAG] ), - Dim_BrandDefaultMKT[DATA_SOURCE] = DS1 - ) - ) - , 0 - ) - VAR period_flag = SELECTEDVALUE ( MQY[Period] ) = "mth" - VAR mm_flag = MAX ( Dim_Calendar[MONTH] ) IN { 3, 6, 9, 12 } - VAR province_flag = - ISFILTERED ( Dim_Geo ) || ISFILTERED ( Dim_Org ) - RETURN - SWITCH ( - TRUE ( ) - , - //若选择Molecule,选择地理，且市场是品牌报告里面的市场 - ISFILTERED ( Dim_Org ) && NOT ISFILTERED ( Dim_Market ) - && NOT ISFILTERED ( Dim_BrandDefaultMKT ), --BLANK(), - IF ( [Fix_Is_AIA.MID.MID], [External.Sales.MTH] ) - , ISFILTERED ( Dim_IsTarget_AIASpecial ) - && NOT ISFILTERED ( Dim_Market ) - && NOT ISFILTERED ( Dim_BrandDefaultMKT ), - IF ( [Fix_Is_AIA.MID.MID], [External.Sales.MTH] ) - , ISFILTERED ( Dim_HP_Potential_AIA ) - && NOT ISFILTERED ( Dim_Market ) - && NOT ISFILTERED ( Dim_BrandDefaultMKT ), - BLANK ( ) - , ISFILTERED ( Dim_CoreDept ) && NOT ISFILTERED ( Dim_Market ) - && NOT ISFILTERED ( Dim_BrandDefaultMKT ), - BLANK ( ) - , - // 隐藏HTN Market 和 Respules Market - OR ( DS = "Retail", MGDS = "dtp" ) - && ( ISFILTERED ( Dim_Geo ) || ISFILTERED ( Dim_Org ) ) - && MKT_FLAG = 2, - BLANK ( ) - , DS = "Retail" && MKT_FLAG = 0 && province_flag - && OR ( period_flag, AND ( NOT period_flag, NOT mm_flag ) ), - BLANK ( ) - , OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) && MKT_FLAG = 1 - && NOT SELECTEDVALUE ( Dim_Market[MARKET] ) = "egfr tki market" - && NOT ISFILTERED ( Dim_PackInfo[PROD_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_CORP_C] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - && ISFILTERED ( Dim_Geo ) - && ( ISFILTERED ( Dim_PackInfo[MOLECULE_CODE_DESC] ) - || ISFILTERED ( Dim_PackInfo[MOLECULE_DES_C] ) - || ISFILTERED ( Dim_PackInfo[CMPS_COD] ) - || ISFILTERED ( Dim_PackInfo[CMPS_DES] ) - || ISFILTERED ( Dim_PackInfo[CMPS_DES_C] ) ), [External.Sales.MTH] - , - - //除开特定市场外，其余的retail，针对于class，选择地理或org维度，值为空 - OR ( DS IN { "Retail", "DTP" }, MGDS = "dtp" ) - && ( ISFILTERED ( Dim_Geo ) || ISFILTERED ( Dim_Org ) ) - && ISFILTERED ( Dim_Class ) - && ( ISFILTERED ( Dim_Market ) || ISFILTERED ( Dim_BrandDefaultMKT ) ) - && MKT_FLAG = 0, - BLANK ( ) - , - - //选择市场，只出现品牌报告里面的有市场； - OR ( DS IN { "Retail", "DTP" }, MGDS = "dtp" ) - && ( ISFILTERED ( Dim_Geo ) || ISFILTERED ( Dim_Org ) ) - && ( ISFILTERED ( Dim_Market ) || ISFILTERED ( Dim_BrandDefaultMKT ) ) - && PROD_FLAG = 0, - BLANK ( ) - , MGDS IN { "dtp", "chpa" } && province_flag, - CALCULATE ( - [External.Sales.MTH] - , KEEPFILTERS ( - Dim_GeoKey[AUDIT_SOURCE] <> "ROCDTP(Quarterly)" - ) - , KEEPFILTERS ( - Dim_GeoKey[AUDIT_SOURCE] <> "ROCIQVIA-CHPA(Monthly)" - ) - ) - , - --若不选pack，用于计算class相关KPI - OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) - && ( ISFILTERED ( Dim_Geo ) || ISFILTERED ( Dim_Org ) ) - && NOT ISFILTERED ( Dim_PackInfo ), - IF ( - ISFILTERED ( Dim_Class[CLASS] ) - && SELECTEDVALUE ( Dim_Market[MARKET] ) = "egfr tki market" - , BLANK ( ) - , [External.Sales.MTH] - ) - , - - //若选择Molecule,没选择地理 - DS IN { "Retail", "EC", "DTP" } && NOT ISFILTERED ( Dim_Geo ) - && NOT ISFILTERED ( Dim_Org ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_CORP_C] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - && ( ISFILTERED ( Dim_PackInfo[MOLECULE_CODE_DESC] ) - || ISFILTERED ( Dim_PackInfo[MOLECULE_DES_C] ) - || ISFILTERED ( Dim_PackInfo[CMPS_COD] ) - || ISFILTERED ( Dim_PackInfo[CMPS_DES] ) - || ISFILTERED ( Dim_PackInfo[CMPS_DES_C] ) ), [External.Sales.MTH] - , - - //若选择Molecule,选择地理 - OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_CORP_C] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - && ( ISFILTERED ( Dim_PackInfo[MOLECULE_CODE_DESC] ) - || ISFILTERED ( Dim_PackInfo[MOLECULE_DES_C] ) - || ISFILTERED ( Dim_PackInfo[CMPS_COD] ) - || ISFILTERED ( Dim_PackInfo[CMPS_DES] ) - || ISFILTERED ( Dim_PackInfo[CMPS_DES_C] ) ), - CALCULATE ( [External.Sales.MTH], Fact_Sales[CMPS_FLAG] = 1 ) - , - //若选择BRAND,没有选择地理 - OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) - && NOT ISFILTERED ( Dim_Geo ) - && NOT ISFILTERED ( Dim_Org ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - && ( ISFILTERED ( Dim_PackInfo[PROD_COD] ) - || ISFILTERED ( Dim_PackInfo[PROD_CORP_C] ) - || ISFILTERED ( Dim_PackInfo[PROD_DES] ) - || ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) ), - CALCULATE ( - [External.Sales.MTH], - Fact_Sales[PROD_FLAG] IN { 1, 2 } - ) - , - - //若选择BRAND,选择地理 - OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_COD] ) - && NOT ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_DES] ) - && NOT ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - && ( ISFILTERED ( Dim_PackInfo[PROD_COD] ) - || ISFILTERED ( Dim_PackInfo[PROD_CORP_C] ) - || ISFILTERED ( Dim_PackInfo[PROD_DES] ) - || ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) ), - CALCULATE ( [External.Sales.MTH], Fact_Sales[GEO_FLAG] = 1 ) - , - //若选择PACKAGE,不选择地理维度，1表示pack+省份数据；2表示pack+全国的数据 - OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) - && NOT ISFILTERED ( Dim_Org ) - && NOT ISFILTERED ( Dim_Geo ) - && ( ISFILTERED ( Dim_PackInfo[PACK_DES] ) - || ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - || ISFILTERED ( Dim_PackInfo[PACK_COD] ) - || ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) ), - CALCULATE ( - [External.Sales.MTH], - Fact_Sales[PACK_FLAG] IN { 1, 2 } - ) - , - - //若选择PACKAGE,且省份维度不是全国 - OR ( DS IN { "Retail", "EC", "DTP" }, MGDS = "dtp" ) - && ( ISFILTERED ( Dim_PackInfo[PACK_DES] ) - || ISFILTERED ( Dim_PackInfo[PACK_LCH] ) - || ISFILTERED ( Dim_PackInfo[PACK_COD] ) - || ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) ), - IF ( - SELECTEDVALUE ( Dim_Market[MARKET] ) <> "EGFR TKI Market" - , CALCULATE ( [External.Sales.MTH], Fact_Sales[PACK_FLAG] = 1 ) - , CALCULATE ( [External.Sales.MTH], Fact_Sales[GEO_FLAG] = 1 ) - ) - , - //chap选择地理，隐藏ROC - DS IN { "CHPA" } && province_flag, - CALCULATE ( - [External.Sales.MTH], - KEEPFILTERS ( - Dim_GeoKey[AUDIT_SOURCE] <> "ROCIQVIA-CHPA(Monthly)" - ) - ) - , [External.Sales.MTH] - ) - /*---------------------------------KPI描述------------------------------------ - ------创建者：zhouxin - ------邮箱：kmls393@astrazeneca.net - ------KPI名字：PDOT - ------KPI公式：1、若TA是ONCO且是Retail，需要取DTP_FLAG为1的数据； - 2、若选择PACKAGE，且外部渠道是Retail,不选择地理维度，展示PACK_FLAG是1和2的数据(1：pack+省份数据；2：pack+全国的数据); - 3、若选择PACKAGE，且外部渠道是Retail,且选择了具体的某个省份（非全国），展示PACK_FLAG是1的数据； - 4、若选择PROD，且外部渠道是Retail,展示Prod_FLAG是1的数据； - 5、若选择地理维度，且外部渠道是Retail,展示PACK_FLAG是1和2的数据； - 6、其余渠道，取原来的PDOT kpi。 - ------备注：1、DTP的数据不参与retail总计计算，其余外部渠道数据默认是0； - 2、1：pack+省份数据，意思是提供的原始数据就是Pack+省份的数据；2：pack+全国的数据，意思是提供的原始数据是pack+全国数据，只是因为倒减，在底表中显示的是pack+省份。 - ------创建时间：2024.5.15 - ------修改时间：2024.6.10 - ------修改内容：添加Retail的特殊逻辑处理 - ----------------------------------------------------------------------------*/ - displayFolder: Normal\05 - lineageTag: 3d5b4e15-ba20-4231-93ac-581e6e436e0f - - annotation PBI_FormatHint = {"isGeneralNumber":true} - measure 'External.CountingUnit.LY.MID' = ``` VAR MKT = @@ -2112,131 +1610,301 @@ table 00_KPI annotation PBI_FormatHint = {"isGeneralNumber":true} - measure '01.Retail.NIAD.CU' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), - CALCULATE ( - [00.Retail.NIAD.CU], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] + measure '01.Retail.NIAD.CU' = ``` + VAR _count = [00.base.if.countMarket] + VAR _count_TA = [00.base.if.countTA] + VAR _isfilter_org = + ISFILTERED ( Dim_RC ) + || ISFILTERED ( Dim_Org ) + || ISFILTERED ( Dim_IsTarget_AIASpecial ) + || ISFILTERED ( Dim_HP_Potential_AIA ) + RETURN + SWITCH ( + TRUE ( ) + , _isfilter_org && _count, + CALCULATE ( + [00.Retail.NIAD.CU] + , TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ) + , '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" ) - ), - [00.Retail.NIAD.CU] - ) + , _count, + CALCULATE ( + [00.Retail.NIAD.CU], + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ) + , _count_TA, + CALCULATE ( + [00.Retail.NIAD.CU], + '0_Measure_CalGroup'[for_measure] = "_allmkt_TA_niad" + ) + , CALCULATE ( + [00.Retail.NIAD.CU], + '0_Measure_CalGroup'[for_measure] = "_allmkt_niad" + ) + ) + ``` displayFolder: FreeReport_NIAD\01 lineageTag: f2fbd703-32b4-45c5-8f2f-37b9c6e68908 measure '01.Retail.NIAD.CU.LY' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + VAR _count = [00.base.if.countMarket] + VAR _count_TA = [00.base.if.countTA] + VAR _isfilter_org = + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ) + || ISFILTERED ( Dim_IsTarget_AIASpecial ) + || ISFILTERED ( Dim_HP_Potential_AIA ) + RETURN + SWITCH ( + TRUE ( ), + _isfilter_org && _count, + CALCULATE ( + [00.Retail.NIAD.CU.LY], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ), + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count, + CALCULATE ( + [00.Retail.NIAD.CU.LY], + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count_TA, + CALCULATE ( + [00.Retail.NIAD.CU.LY], + '0_Measure_CalGroup'[for_measure] = "_allmkt_TA_niad" + ), CALCULATE ( [00.Retail.NIAD.CU.LY], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.CU.LY] - ) + '0_Measure_CalGroup'[for_measure] = "_allmkt_niad_niad" + ) + ) displayFolder: FreeReport_NIAD\01 lineageTag: cd23c4ea-e5b0-4ce3-864f-c45178a9af82 measure '01.Retail.NIAD.PDOT' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + VAR _count = [00.base.if.countMarket] + VAR _count_TA = [00.base.if.countTA] + VAR _isfilter_org = + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ) + || ISFILTERED ( Dim_IsTarget_AIASpecial ) + || ISFILTERED ( Dim_HP_Potential_AIA ) + RETURN + SWITCH ( + TRUE ( ), + _isfilter_org && _count, + CALCULATE ( + [00.Retail.NIAD.PDOT], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ), + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count, + CALCULATE ( + [00.Retail.NIAD.PDOT], + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count_TA, + CALCULATE ( + [00.Retail.NIAD.PDOT], + '0_Measure_CalGroup'[for_measure] = "_allmkt_TA_niad" + ), CALCULATE ( [00.Retail.NIAD.PDOT], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.PDOT] - ) + '0_Measure_CalGroup'[for_measure] = "_allmkt_niad" + ) + ) displayFolder: FreeReport_NIAD\01 lineageTag: 4c7f667e-7d0a-4fcf-82d2-19fabf18e790 measure '01.Retail.NIAD.PDOT.LY' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + VAR _count = [00.base.if.countMarket] + VAR _count_TA = [00.base.if.countTA] + VAR _isfilter_org = + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ) + || ISFILTERED ( Dim_IsTarget_AIASpecial ) + || ISFILTERED ( Dim_HP_Potential_AIA ) + RETURN + SWITCH ( + TRUE ( ), + _isfilter_org && _count, + CALCULATE ( + [00.Retail.NIAD.PDOT.LY], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ), + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count, + CALCULATE ( + [00.Retail.NIAD.PDOT.LY], + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count_TA, + CALCULATE ( + [00.Retail.NIAD.PDOT.LY], + '0_Measure_CalGroup'[for_measure] = "_allmkt_TA_niad" + ), CALCULATE ( [00.Retail.NIAD.PDOT.LY], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.PDOT.LY] - ) + '0_Measure_CalGroup'[for_measure] = "_allmkt_niad" + ) + ) displayFolder: FreeReport_NIAD\01 lineageTag: 1dcc6d0b-3a67-45da-b593-c09d2a2f9802 measure '01.Retail.NIAD.Unit' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + VAR _count = [00.base.if.countMarket] + VAR _count_TA = [00.base.if.countTA] + VAR _isfilter_org = + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ) + || ISFILTERED ( Dim_IsTarget_AIASpecial ) + || ISFILTERED ( Dim_HP_Potential_AIA ) + RETURN + SWITCH ( + TRUE ( ), + _isfilter_org && _count, + CALCULATE ( + [00.Retail.NIAD.Unit], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ), + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count, + CALCULATE ( + [00.Retail.NIAD.Unit], + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count_TA, + CALCULATE ( + [00.Retail.NIAD.Unit], + '0_Measure_CalGroup'[for_measure] = "_allmkt_TA_niad" + ), CALCULATE ( [00.Retail.NIAD.Unit], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.Unit] - ) + '0_Measure_CalGroup'[for_measure] = "_allmkt_niad" + ) + ) displayFolder: FreeReport_NIAD\01 lineageTag: 99b4674a-cd6d-4621-897d-c3e8831c5210 measure '01.Retail.NIAD.Unit.LY' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + VAR _count = [00.base.if.countMarket] + VAR _count_TA = [00.base.if.countTA] + VAR _isfilter_org = + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ) + || ISFILTERED ( Dim_IsTarget_AIASpecial ) + || ISFILTERED ( Dim_HP_Potential_AIA ) + RETURN + SWITCH ( + TRUE ( ), + _isfilter_org && _count, + CALCULATE ( + [00.Retail.NIAD.Unit.LY], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ), + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count, + CALCULATE ( + [00.Retail.NIAD.Unit.LY], + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count_TA, + CALCULATE ( + [00.Retail.NIAD.Unit.LY], + '0_Measure_CalGroup'[for_measure] = "_allmkt_TA_niad" + ), CALCULATE ( [00.Retail.NIAD.Unit.LY], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.Unit.LY] - ) + '0_Measure_CalGroup'[for_measure] = "_allmkt_niad" + ) + ) displayFolder: FreeReport_NIAD\01 lineageTag: 0a81f7dc-01d9-4446-b7fa-1cb30dd57d44 measure '01.Retail.NIAD.Value' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + VAR _count = [00.base.if.countMarket] + VAR _count_TA = [00.base.if.countTA] + VAR _isfilter_org = + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ) + || ISFILTERED ( Dim_IsTarget_AIASpecial ) + || ISFILTERED ( Dim_HP_Potential_AIA ) + RETURN + SWITCH ( + TRUE ( ), + _isfilter_org && _count, + CALCULATE ( + [00.Retail.NIAD.Value], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ), + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count, + CALCULATE ( + [00.Retail.NIAD.Value], + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count_TA, + CALCULATE ( + [00.Retail.NIAD.Value], + '0_Measure_CalGroup'[for_measure] = "_allmkt_TA_niad" + ), CALCULATE ( [00.Retail.NIAD.Value], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.Value] - ) + '0_Measure_CalGroup'[for_measure] = "_allmkt_niad" + ) + ) displayFolder: FreeReport_NIAD\01 lineageTag: 792eaa55-a51f-4d28-8aef-f62b69a676e4 measure '01.Retail.NIAD.Value.LY' = - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ), + VAR _count = [00.base.if.countMarket] + VAR _count_TA = [00.base.if.countTA] + VAR _isfilter_org = + ISFILTERED ( Dim_RC ) || ISFILTERED ( Dim_Org ) + || ISFILTERED ( Dim_IsTarget_AIASpecial ) + || ISFILTERED ( Dim_HP_Potential_AIA ) + RETURN + SWITCH ( + TRUE ( ), + _isfilter_org && _count, + CALCULATE ( + [00.Retail.NIAD.Value.LY], + TREATAS ( + VALUES ( Dim_Market[MKT_SOURCE] ), + Dim_RC[MKT_SOURCE] + ), + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count, + CALCULATE ( + [00.Retail.NIAD.Value.LY], + '0_Measure_CalGroup'[for_measure] = "_not_allmkt_niad" + ), + _count_TA, + CALCULATE ( + [00.Retail.NIAD.Value.LY], + '0_Measure_CalGroup'[for_measure] = "_allmkt_TA_niad" + ), CALCULATE ( [00.Retail.NIAD.Value.LY], - TREATAS ( - VALUES ( Dim_Market[MKT_SOURCE] ), - Dim_RC[MKT_SOURCE] - ) - ), - [00.Retail.NIAD.Value.LY] - ) + '0_Measure_CalGroup'[for_measure] = "_allmkt_niad" + ) + ) displayFolder: FreeReport_NIAD\01 lineageTag: 00a3ee30-b5b7-4253-9db4-f0aa80e5b409 @@ -4327,6 +3995,376 @@ table 00_KPI displayFolder: Overview\04\01 lineageTag: c3852948-d323-4143-9f43-1363d8691d3b + measure 'External.Sales.MTH.MID' = + VAR DS = SELECTEDVALUE ( Dim_DataSource[SOURCENAME] ) + VAR DS1 = SELECTEDVALUE ( Dim_DataSource[DATA_SOURCE] ) + VAR MGDS = SELECTEDVALUE ( Dim_MergeDataSource[DATA_SOURCE] ) + VAR FactDS = SELECTEDVALUE ( Fact_Sales[DATA_SOURCE] ) + VAR MKT_FLAG = + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_Market ), MAX ( Dim_Market[MKT_FLAG] ), + ISFILTERED ( Dim_BrandDefaultMKT ), + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_MergeDataSource[DATA_SOURCE] ), + CALCULATE ( + MAX ( Dim_BrandDefaultMKT[MKT_FLAG] ), + Dim_BrandDefaultMKT[DATA_SOURCE] = FactDS + ), + CALCULATE ( + MAX ( Dim_BrandDefaultMKT[MKT_FLAG] ), + Dim_BrandDefaultMKT[DATA_SOURCE] = DS1 + ) + ), + 0 + ) + VAR PROD_FLAG = + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_Market ), MAX ( Dim_Market[PRD_FLAG] ), + ISFILTERED ( Dim_BrandDefaultMKT ), + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_MergeDataSource[DATA_SOURCE] ), + CALCULATE ( + MAX ( Dim_BrandDefaultMKT[PRD_FLAG] ), + Dim_BrandDefaultMKT[DATA_SOURCE] = FactDS + ), + CALCULATE ( + MAX ( Dim_BrandDefaultMKT[PRD_FLAG] ), + Dim_BrandDefaultMKT[DATA_SOURCE] = DS1 + ) + ), + 0 + ) + VAR period_flag = SELECTEDVALUE ( MQY[Period] ) = "mth" + VAR mm_flag = MAX ( Dim_Calendar[MONTH] ) IN { 3, 6, 9, 12 } + VAR _isfilter_province = + ISFILTERED ( Dim_Geo ) || ISFILTERED ( Dim_Org ) + VAR _isfilter_market = + ISFILTERED ( Dim_Market ) || ISFILTERED ( Dim_BrandDefaultMKT ) + VAR isfilter_packinfo = + ( ISFILTERED ( Dim_PackInfo[PACK_DES] ) + || ISFILTERED ( Dim_PackInfo[PACK_LCH] ) + || ISFILTERED ( Dim_PackInfo[PACK_COD] ) + || ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) ) + VAR _isfilter_brandinfo = + ( ISFILTERED ( Dim_PackInfo[PROD_COD] ) + || ISFILTERED ( Dim_PackInfo[PROD_CORP] ) + || ISFILTERED ( Dim_PackInfo[PROD_CORP_C] ) + || ISFILTERED ( Dim_PackInfo[PROD_DES] ) + || ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) ) + VAR _isfilter_not_packinfo_only_brand = + NOT isfilter_packinfo && _isfilter_brandinfo + VAR _isfilter_not_packinfo_only_mole = + NOT isfilter_packinfo && NOT _isfilter_brandinfo + && ( ISFILTERED ( Dim_PackInfo[MOLECULE_CODE_DESC] ) + || ISFILTERED ( Dim_PackInfo[MOLECULE_DES_C] ) + || ISFILTERED ( Dim_PackInfo[CMPS_COD] ) + || ISFILTERED ( Dim_PackInfo[CMPS_DES] ) + || ISFILTERED ( Dim_PackInfo[CMPS_DES_C] ) ) + RETURN + SWITCH ( + TRUE ( ), + + //全局藏数据，没有选market + NOT _isfilter_market && ISFILTERED ( Dim_Org ), + IF ( DS = "AIA", [External.Sales.MTH] ), + NOT _isfilter_market + && ( ISFILTERED ( Dim_HP_Potential_AIA ) + || ISFILTERED ( Dim_CoreDept ) ), + BLANK ( ), + DS = "Retail", + SWITCH ( + TRUE ( ), + + // 隐藏HTN Market 和 Respules Market + _isfilter_province && MKT_FLAG = 2, BLANK ( ), + + // 选择月份和地理 + _isfilter_province && MKT_FLAG = 0 + && OR ( period_flag, AND ( NOT period_flag, NOT mm_flag ) ), + BLANK ( ), + + //若选择Molecule,选择地理，且市场是品牌报告里面的市场 + MKT_FLAG = 1 && _isfilter_not_packinfo_only_mole, [External.Sales.MTH], + + //除开特定市场外，其余的retail，针对于class，选择地理或org维度，值为空 + _isfilter_province && ISFILTERED ( Dim_Class ) + && _isfilter_market + && MKT_FLAG = 0, + BLANK ( ), + + //选择市场，只出现品牌报告里面的有市场； + _isfilter_province && _isfilter_market && PROD_FLAG = 0, + BLANK ( ), + + //若不选pack，用于计算class相关KPI + _isfilter_province && NOT ISFILTERED ( Dim_PackInfo ), [External.Sales.MTH], + + //若选择Molecule,没选择地理 + NOT _isfilter_province && _isfilter_not_packinfo_only_mole, [External.Sales.MTH], + + //若选择Molecule,选择地理 + _isfilter_province && _isfilter_not_packinfo_only_mole, + CALCULATE ( [External.Sales.MTH], Fact_Sales[CMPS_FLAG] = 1 ), + + //若选择BRAND,没有选择地理 + NOT _isfilter_province && _isfilter_not_packinfo_only_brand, + CALCULATE ( + [External.Sales.MTH], + Fact_Sales[PROD_FLAG] IN { 1, 2 } + ), + + //若选择BRAND,选择地理 + _isfilter_province && _isfilter_not_packinfo_only_brand, + CALCULATE ( [External.Sales.MTH], Fact_Sales[GEO_FLAG] = 1 ), + + //若选择PACKAGE,不选择地理维度，1表示pack+省份数据；2表示pack+全国的数据 + NOT _isfilter_province && isfilter_packinfo, + CALCULATE ( + [External.Sales.MTH], + Fact_Sales[PACK_FLAG] IN { 1, 2 } + ), + + //若选择PACKAGE,且省份维度不是全国 + _isfilter_province && isfilter_packinfo, + CALCULATE ( [External.Sales.MTH], Fact_Sales[PACK_FLAG] = 1 ), + [External.Sales.MTH] + ), + MGDS = "DTP", + SWITCH ( + TRUE ( ), + _isfilter_province, + CALCULATE ( + [External.Sales.MTH], + KEEPFILTERS ( + Dim_GeoKey[AUDIT_SOURCE] <> "ROCDTP(Quarterly)" + ) + ), + [External.Sales.MTH] + ), + DS = "CHPA" || MGDS = "CHPA", + SWITCH ( + TRUE ( ), + _isfilter_province, + CALCULATE ( + [External.Sales.MTH], + KEEPFILTERS ( + Dim_GeoKey[AUDIT_SOURCE] <> "ROCIQVIA-CHPA(Monthly)" + ) + ), + [External.Sales.MTH] + ), + [External.Sales.MTH] + ) + /*---------------------------------KPI描述------------------------------------ + ------创建者：zhouxin + ------邮箱：kmls393@astrazeneca.net + ------KPI名字：PDOT + ------KPI公式：1、若TA是ONCO且是Retail，需要取DTP_FLAG为1的数据； + 2、若选择PACKAGE，且外部渠道是Retail,不选择地理维度，展示PACK_FLAG是1和2的数据(1：pack+省份数据；2：pack+全国的数据); + 3、若选择PACKAGE，且外部渠道是Retail,且选择了具体的某个省份（非全国），展示PACK_FLAG是1的数据； + 4、若选择PROD，且外部渠道是Retail,展示Prod_FLAG是1的数据； + 5、若选择地理维度，且外部渠道是Retail,展示PACK_FLAG是1和2的数据； + 6、其余渠道，取原来的PDOT kpi。 + ------备注：1、DTP的数据不参与retail总计计算，其余外部渠道数据默认是0； + 2、1：pack+省份数据，意思是提供的原始数据就是Pack+省份的数据；2：pack+全国的数据，意思是提供的原始数据是pack+全国数据，只是因为倒减，在底表中显示的是pack+省份。 + ------创建时间：2024.5.15 + ------修改时间：2024.6.10 + ------修改内容：添加Retail的特殊逻辑处理 + ----------------------------------------------------------------------------*/ + displayFolder: Normal\05 + lineageTag: bebca109-cab7-4c6c-b985-88ca56b0e9f7 + + annotation PBI_FormatHint = {"isGeneralNumber":true} + + measure 'External.Sales.LY.MTH.MID' = + VAR DS = SELECTEDVALUE ( Dim_DataSource[SOURCENAME] ) + VAR DS1 = SELECTEDVALUE ( Dim_DataSource[DATA_SOURCE] ) + VAR MGDS = SELECTEDVALUE ( Dim_MergeDataSource[DATA_SOURCE] ) + VAR FactDS = SELECTEDVALUE ( Fact_Sales[DATA_SOURCE] ) + VAR MKT_FLAG = + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_Market ), MAX ( Dim_Market[MKT_FLAG] ), + ISFILTERED ( Dim_BrandDefaultMKT ), + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_MergeDataSource[DATA_SOURCE] ), + CALCULATE ( + MAX ( Dim_BrandDefaultMKT[MKT_FLAG] ), + Dim_BrandDefaultMKT[DATA_SOURCE] = FactDS + ), + CALCULATE ( + MAX ( Dim_BrandDefaultMKT[MKT_FLAG] ), + Dim_BrandDefaultMKT[DATA_SOURCE] = DS1 + ) + ), + 0 + ) + VAR PROD_FLAG = + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_Market ), MAX ( Dim_Market[PRD_FLAG] ), + ISFILTERED ( Dim_BrandDefaultMKT ), + SWITCH ( + TRUE ( ), + ISFILTERED ( Dim_MergeDataSource[DATA_SOURCE] ), + CALCULATE ( + MAX ( Dim_BrandDefaultMKT[PRD_FLAG] ), + Dim_BrandDefaultMKT[DATA_SOURCE] = FactDS + ), + CALCULATE ( + MAX ( Dim_BrandDefaultMKT[PRD_FLAG] ), + Dim_BrandDefaultMKT[DATA_SOURCE] = DS1 + ) + ), + 0 + ) + VAR period_flag = SELECTEDVALUE ( MQY[Period] ) = "mth" + VAR mm_flag = MAX ( Dim_Calendar[MONTH] ) IN { 3, 6, 9, 12 } + VAR _isfilter_province = + ISFILTERED ( Dim_Geo ) || ISFILTERED ( Dim_Org ) + VAR _isfilter_market = + ISFILTERED ( Dim_Market ) || ISFILTERED ( Dim_BrandDefaultMKT ) + VAR isfilter_packinfo = + ( ISFILTERED ( Dim_PackInfo[PACK_DES] ) + || ISFILTERED ( Dim_PackInfo[PACK_LCH] ) + || ISFILTERED ( Dim_PackInfo[PACK_COD] ) + || ISFILTERED ( Dim_PackInfo[PROD_PACK_CORP] ) ) + VAR _isfilter_brandinfo = + ( ISFILTERED ( Dim_PackInfo[PROD_COD] ) + || ISFILTERED ( Dim_PackInfo[PROD_CORP] ) + || ISFILTERED ( Dim_PackInfo[PROD_CORP_C] ) + || ISFILTERED ( Dim_PackInfo[PROD_DES] ) + || ISFILTERED ( Dim_PackInfo[PROD_DES_C] ) ) + VAR _isfilter_not_packinfo_only_brand = + NOT isfilter_packinfo && _isfilter_brandinfo + VAR _isfilter_not_packinfo_only_mole = + NOT isfilter_packinfo && NOT _isfilter_brandinfo + && ( ISFILTERED ( Dim_PackInfo[MOLECULE_CODE_DESC] ) + || ISFILTERED ( Dim_PackInfo[MOLECULE_DES_C] ) + || ISFILTERED ( Dim_PackInfo[CMPS_COD] ) + || ISFILTERED ( Dim_PackInfo[CMPS_DES] ) + || ISFILTERED ( Dim_PackInfo[CMPS_DES_C] ) ) + RETURN + SWITCH ( + TRUE ( ), + + //全局藏数据，没有选market + NOT _isfilter_market && ISFILTERED ( Dim_Org ), + IF ( DS = "AIA", [External.Sales.LY.MTH] ), + NOT _isfilter_market + && ( ISFILTERED ( Dim_HP_Potential_AIA ) + || ISFILTERED ( Dim_CoreDept ) ), + BLANK ( ), + DS = "Retail", + SWITCH ( + TRUE ( ), + + // 隐藏HTN Market 和 Respules Market + _isfilter_province && MKT_FLAG = 2, BLANK ( ), + + // 选择月份和地理 + _isfilter_province && MKT_FLAG = 0 + && OR ( period_flag, AND ( NOT period_flag, NOT mm_flag ) ), + BLANK ( ), + + //若选择Molecule,选择地理，且市场是品牌报告里面的市场 + MKT_FLAG = 1 && _isfilter_not_packinfo_only_mole, [External.Sales.LY.MTH], + + //除开特定市场外，其余的retail，针对于class，选择地理或org维度，值为空 + _isfilter_province && ISFILTERED ( Dim_Class ) + && _isfilter_market + && MKT_FLAG = 0, + BLANK ( ), + + //选择市场，只出现品牌报告里面的有市场； + _isfilter_province && _isfilter_market && PROD_FLAG = 0, + BLANK ( ), + + //若不选pack，用于计算class相关KPI + _isfilter_province && NOT ISFILTERED ( Dim_PackInfo ), [External.Sales.LY.MTH], + + //若选择Molecule,没选择地理 + NOT _isfilter_province && _isfilter_not_packinfo_only_mole, [External.Sales.LY.MTH], + + //若选择Molecule,选择地理 + _isfilter_province && _isfilter_not_packinfo_only_mole, + CALCULATE ( [External.Sales.LY.MTH], Fact_Sales[CMPS_FLAG] = 1 ), + + //若选择BRAND,没有选择地理 + NOT _isfilter_province && _isfilter_not_packinfo_only_brand, + CALCULATE ( + [External.Sales.LY.MTH], + Fact_Sales[PROD_FLAG] IN { 1, 2 } + ), + + //若选择BRAND,选择地理 + _isfilter_province && _isfilter_not_packinfo_only_brand, + CALCULATE ( [External.Sales.LY.MTH], Fact_Sales[GEO_FLAG] = 1 ), + + //若选择PACKAGE,不选择地理维度，1表示pack+省份数据；2表示pack+全国的数据 + NOT _isfilter_province && isfilter_packinfo, + CALCULATE ( + [External.Sales.LY.MTH], + Fact_Sales[PACK_FLAG] IN { 1, 2 } + ), + + //若选择PACKAGE,且省份维度不是全国 + _isfilter_province && isfilter_packinfo, + CALCULATE ( [External.Sales.LY.MTH], Fact_Sales[PACK_FLAG] = 1 ), + [External.Sales.LY.MTH] + ), + MGDS = "DTP", + SWITCH ( + TRUE ( ), + _isfilter_province, + CALCULATE ( + [External.Sales.LY.MTH], + KEEPFILTERS ( + Dim_GeoKey[AUDIT_SOURCE] <> "ROCDTP(Quarterly)" + ) + ), + [External.Sales.LY.MTH] + ), + DS = "CHPA" || MGDS = "CHPA", + SWITCH ( + TRUE ( ), + _isfilter_province, + CALCULATE ( + [External.Sales.LY.MTH], + KEEPFILTERS ( + Dim_GeoKey[AUDIT_SOURCE] <> "ROCIQVIA-CHPA(Monthly)" + ) + ), + [External.Sales.LY.MTH] + ), + [External.Sales.LY.MTH] + ) + /*---------------------------------KPI描述------------------------------------ + ------创建者：zhouxin + ------邮箱：kmls393@astrazeneca.net + ------KPI名字：PDOT + ------KPI公式：1、若TA是ONCO且是Retail，需要取DTP_FLAG为1的数据； + 2、若选择PACKAGE，且外部渠道是Retail,不选择地理维度，展示PACK_FLAG是1和2的数据(1：pack+省份数据；2：pack+全国的数据); + 3、若选择PACKAGE，且外部渠道是Retail,且选择了具体的某个省份（非全国），展示PACK_FLAG是1的数据； + 4、若选择PROD，且外部渠道是Retail,展示Prod_FLAG是1的数据； + 5、若选择地理维度，且外部渠道是Retail,展示PACK_FLAG是1和2的数据； + 6、其余渠道，取原来的PDOT kpi。 + ------备注：1、DTP的数据不参与retail总计计算，其余外部渠道数据默认是0； + 2、1：pack+省份数据，意思是提供的原始数据就是Pack+省份的数据；2：pack+全国的数据，意思是提供的原始数据是pack+全国数据，只是因为倒减，在底表中显示的是pack+省份。 + ------创建时间：2024.5.15 + ------修改时间：2024.6.10 + ------修改内容：添加Retail的特殊逻辑处理 + ----------------------------------------------------------------------------*/ + displayFolder: Normal\05 + lineageTag: e119ab9f-2f37-46b1-abef-61d9588519fc + + annotation PBI_FormatHint = {"isGeneralNumber":true} + column KPI dataType: string isHidden diff --git a/External All Channel.SemanticModel/definition/tables/0_Measure_CalGroup.tmdl b/External All Channel.SemanticModel/definition/tables/0_Measure_CalGroup.tmdl index 7c2fe5c..91f00aa 100644 --- a/External All Channel.SemanticModel/definition/tables/0_Measure_CalGroup.tmdl +++ b/External All Channel.SemanticModel/definition/tables/0_Measure_CalGroup.tmdl @@ -29,6 +29,31 @@ table 0_Measure_CalGroup Fact_Sales[MARKET] = "all market" ) + calculationItem _allmkt_niad = + CALCULATE ( + SELECTEDMEASURE ( ), + KEEPFILTERS ( VALUES ( Fact_Sales[PACK_COD] ) ), + REMOVEFILTERS ( Dim_Market[MARKET] ), + REMOVEFILTERS ( Dim_MarketTA ), + Fact_Sales_NIAD[MARKET] = "all market" + ) + + calculationItem _not_allmkt_niad = CALCULATE( SELECTEDMEASURE( ), KEEPFILTERS( Fact_Sales_NIAD[MARKET] <> "all market" ) ) + + calculationItem _allmkt_TA_niad = + CALCULATE ( + SELECTEDMEASURE ( ), + KEEPFILTERS ( + CALCULATETABLE ( + VALUES ( Fact_Sales[PACK_COD] ), + Fact_Sales_NIAD[MARKET] <> "all market" + ) + ), + REMOVEFILTERS ( Dim_Market[MARKET] ), + REMOVEFILTERS ( Dim_MarketTA[TA] ), + Fact_Sales_NIAD[MARKET] = "all market" + ) + column for_measure dataType: string lineageTag: daa1dfa2-573f-47cb-9ad6-1985b05ce72e diff --git a/External All Channel.SemanticModel/definition/tables/Dim_Market.tmdl b/External All Channel.SemanticModel/definition/tables/Dim_Market.tmdl index f083ca8..f937f4c 100644 --- a/External All Channel.SemanticModel/definition/tables/Dim_Market.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Dim_Market.tmdl @@ -77,7 +77,7 @@ table Dim_Market partition Dim_Market = m mode: import - queryGroup: OLD\非首页 + queryGroup: Dim source = ``` let Source = @@ -92,104 +92,55 @@ table Dim_Market [Name = CatalogName, Kind = "Database"] }[Data], " - WITH COUNTY_MARKET as ( - select + WITH COUNTY_MARKET AS ( + SELECT DISTINCT MARKET, TA_MAP - from - dm.dm_td_external_market_ta - WHERE - TA_MAP in ('ONCO', 'RARE') - GROUP BY - 1, - 2 + FROM dm.dm_td_ext_unionall_market_ta + WHERE TA_MAP IN ('ONCO', 'RARE') ), + MERGED_DATA AS ( - select - t1.market - from - ( - select - MARKET - from - DM.DM_TD_EXTERNAL_MARKET - where - DATA_SOURCE = 'AIA(Monthly)' - group by - 1 - ) t1 - inner join ( - select - MARKET - from - DM.DM_TD_EXTERNAL_MARKET - where - DATA_SOURCE = 'IQVIA-CHPA(Monthly)' - group by - 1 - ) t2 - on t1.market = t2.market + SELECT MARKET FROM dm.dm_td_ext_unionall_market WHERE DATA_SOURCE = 'AIA(Monthly)' + INTERSECT + SELECT MARKET FROM DM.dm_td_ext_unionall_market WHERE DATA_SOURCE = 'IQVIA-CHPA(Monthly)' ) + SELECT A.MARKET, A.DATA_SOURCE, A.MARKET_DESC, - A.AZ_RELATED TA, - INT(A.PRD_FLAG) PRD_FLAG, + A.AZ_RELATED AS TA, + INT(A.PRD_FLAG) AS PRD_FLAG, CASE - -------------Retail - WHEN - A.DATA_SOURCE = 'Retail(Quarterly)' + -- Retail + WHEN A.DATA_SOURCE = 'Retail(Quarterly)' AND A.MARKET IN ( - 'Inhaled Extended Market', - 'NIAD (Non-Insulin Anti-Diabetic) Market', - 'Rosuvastatin Market', - 'BUDESONIDE Market', - 'EGFR TKI Market', - 'Anti-HER2 Market', - 'Anti-HER2 mBC Market', - 'Fasenra Market', - 'Severe Asthma', - 'DAPA Market' - ) - THEN - 1 - -------------DTP - WHEN - A.DATA_SOURCE = 'DTP(Quarterly)' + 'Inhaled Extended Market', 'NIAD (Non-Insulin Anti-Diabetic) Market', + 'Rosuvastatin Market', 'BUDESONIDE Market', 'EGFR TKI Market', + 'Anti-HER2 Market', 'Anti-HER2 mBC Market', + 'Fasenra Market', 'Severe Asthma', 'DAPA Market' + ) THEN 1 + -- DTP + WHEN A.DATA_SOURCE = 'DTP(Quarterly)' AND A.MARKET IN ( - 'Anti-HER2 Market', - 'Anti-HER2 mBC Market', - 'Fasenra/Tezspire Related Market', - 'Severe Asthma', - 'Tezspire CRSwNP Market', - 'CRSwNP Market', - 'PAM Market' - ) - THEN - 1 - WHEN - A.DATA_SOURCE = 'Retail(Quarterly)' - AND A.MARKET IN ('Respules Market', 'HTN Market') - THEN - 2 + 'Anti-HER2 Market', 'Anti-HER2 mBC Market', + 'Fasenra/Tezspire Related Market', 'Severe Asthma', + 'Tezspire CRSwNP Market', 'CRSwNP Market', 'PAM Market','EGFR TKI Market' + ) THEN 1 + WHEN A.DATA_SOURCE = 'Retail(Quarterly)' + AND A.MARKET IN ('Respules Market', 'HTN Market') THEN 2 ELSE 0 - END MKT_FLAG, + END AS MKT_FLAG, CASE WHEN B.TA_MAP = 'RARE' THEN 1 WHEN B.TA_MAP = 'ONCO' THEN 2 ELSE 0 - END AS IS_HIDDEN_COUNTY, - CASE - WHEN C.MARKET IS NOT NULL THEN 1 - ELSE 0 - END AS MERGED_DATA_MARKET - FROM - DM.dm_td_ext_unionall_market A - LEFT JOIN COUNTY_MARKET B - ON A.MARKET = B.MARKET - LEFT JOIN MERGED_DATA C - ON A.MARKET = C.MARKET + END AS IS_HIDDEN_COUNTY, + CASE WHEN C.MARKET IS NOT NULL THEN 1 ELSE 0 END AS MERGED_DATA_MARKET + FROM DM.dm_td_ext_unionall_market A + LEFT JOIN COUNTY_MARKET B ON A.MARKET = B.MARKET + LEFT JOIN MERGED_DATA C ON A.MARKET = C.MARKET " & UsingLimit, null, @@ -201,7 +152,7 @@ table Dim_Market Source ``` - annotation PBI_ResultType = Table + annotation PBI_ResultType = Exception annotation PBI_NavigationStepName = Navigation diff --git a/External All Channel.SemanticModel/definition/tables/Dim_MarketTA.tmdl b/External All Channel.SemanticModel/definition/tables/Dim_MarketTA.tmdl index 0b60e49..9cc734b 100644 --- a/External All Channel.SemanticModel/definition/tables/Dim_MarketTA.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Dim_MarketTA.tmdl @@ -76,7 +76,7 @@ table Dim_MarketTA partition Dim_MarketTA = m mode: import - queryGroup: OLD\非首页 + queryGroup: Dim source = ``` let Source = diff --git a/External All Channel.SemanticModel/definition/tables/Measure.tmdl b/External All Channel.SemanticModel/definition/tables/Measure.tmdl index 7f07b11..e2d437f 100644 --- a/External All Channel.SemanticModel/definition/tables/Measure.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Measure.tmdl @@ -2546,44 +2546,48 @@ table Measure lineageTag: 26a2b26c-9862-4f99-b1d7-4544433a031f measure 'External.△MS%.Leader.SelectMoleculeName' = - - VAR DS = SELECTEDVALUE(Dim_DataSource[DATA_SOURCE]) + VAR DS = SELECTEDVALUE ( Dim_DataSource[DATA_SOURCE] ) VAR A = [External.△MS%.KPI.Top1PlayerName] - RETURN CALCULATE(MAX(Dim_PackInfo[CMPS_DES]),Dim_PackInfo[PROD_CORP_C] = A,Dim_PackInfo[DATA_SOURCE] = DS,ALL()) + RETURN + CALCULATE ( + MAX ( Dim_PackInfo[CMPS_DES] ), + Dim_PackInfo[PROD_CORP_C] = A, + Dim_PackInfo[DATA_SOURCE] = DS, + ALL ( ) + ) displayFolder: OLD\Others lineageTag: 8be26376-5072-42ab-9d11-aedc08010dda annotation PBI_FormatHint = {"isGeneralNumber":true} measure 'External.MS%.Leader.SelectClassName' = - VAR DS = SELECTEDVALUE ( Dim_DataSource[DATA_SOURCE] ) - VAR A = [External.MS%.KPI.Top1PlayerName] - VAR B = + IF ( + COUNTROWS ( VALUES ( Fact_Sales[MARKET] ) ) = 1, CALCULATE ( - MAX ( Dim_PackInfo[PACK_COD] ), - Dim_PackInfo[PROD_CORP_C] = A, - Dim_PackInfo[DATA_SOURCE] = DS, - ALL ( ) - ) - VAR C = - CALCULATE ( - MAX ( Dim_Class[CLASS] ), - Dim_PackInfo[PACK_COD] = B, - Dim_PackInfo[DATA_SOURCE] = DS, - ALL ( ) - ) - RETURN - C + MAX ( Fact_Sales[MARKET] ), + TREATAS ( + { [External.MS%.KPI.Top1PlayerName] }, + Dim_PackInfo[PROD_CORP_C] + ), + ALL ( Dim_PackInfo ) + ), + "请先选择市场" + ) displayFolder: OLD\Others lineageTag: 6216c487-0225-4f91-8a04-06a5df7c42a5 annotation PBI_FormatHint = {"isGeneralNumber":true} measure 'External.MS%.Leader.SelectMoleculeName' = - - VAR DS = SELECTEDVALUE(Dim_DataSource[DATA_SOURCE]) + VAR DS = SELECTEDVALUE ( Dim_DataSource[DATA_SOURCE] ) VAR A = [External.MS%.KPI.Top1PlayerName] - RETURN CALCULATE(MAX(Dim_PackInfo[CMPS_DES]),Dim_PackInfo[PROD_CORP_C] = A,Dim_PackInfo[DATA_SOURCE] = DS,ALL()) + RETURN + CALCULATE ( + MAX ( Dim_PackInfo[CMPS_DES] ), + Dim_PackInfo[PROD_CORP_C] = A, + Dim_PackInfo[DATA_SOURCE] = DS, + ALL ( ) + ) displayFolder: OLD\Others lineageTag: 5392d9af-f38f-457e-9f83-67b7b5082b64 @@ -2600,25 +2604,18 @@ table Measure annotation PBI_FormatHint = {"isGeneralNumber":true} measure 'External.△MS%.Leader.SelectClassName' = - VAR DS = SELECTEDVALUE ( Dim_DataSource[DATA_SOURCE] ) - VAR A = [External.△MS%.KPI.Top1PlayerName] - VAR MKT = SELECTEDVALUE ( Dim_Market[MARKET] ) - VAR B = + IF ( + COUNTROWS ( VALUES ( Fact_Sales[MARKET] ) ) = 1, CALCULATE ( - MAX ( Dim_PackInfo[PACK_COD] ), - Dim_PackInfo[PROD_CORP_C] = A, - Dim_PackInfo[DATA_SOURCE] = DS, - ALL ( ) - ) - VAR C = - CALCULATE ( - MAX ( Dim_Class[CLASS] ), - //Dim_MKTPackMapping[PACK_COD] = B, - Dim_PackInfo[DATA_SOURCE] = DS, - ALL ( ) - ) - RETURN - C + MAX ( Fact_Sales[MARKET] ), + TREATAS ( + { [External.△MS%.KPI.Top1PlayerName] }, + Dim_PackInfo[PROD_CORP_C] + ), + ALL ( Dim_PackInfo ) + ), + "请先选择市场" + ) displayFolder: OLD\Others lineageTag: b0033167-23d7-44db-be6b-dd1a3a04b977 diff --git a/External All Channel.SemanticModel/diagramLayout.json b/External All Channel.SemanticModel/diagramLayout.json index fbfe4e2..1b8f0a6 100644 --- a/External All Channel.SemanticModel/diagramLayout.json +++ b/External All Channel.SemanticModel/diagramLayout.json @@ -1364,7 +1364,7 @@ "ordinal": 3, "scrollPosition": { "x": 0, - "y": 279 + "y": 279.20001220703125 }, "nodes": [ {