Merge branch 'ft' into 'main_dev'

fix(src/api): 修改url传组织id，过滤其他组织

See merge request yunteng/thingskit-view!125

@@ -16,7 +16,7 @@ import { PaginationResult } from '/#/external/axios';
     DEVICE_ATTR_LIST = '/device/attributes',
     GET_PUBLIC_INTERFACE_ALL = '/data_view_interface/find/can_use_interfaces',
     //ft
-  GET_PUBLIC_INTERFACE_DETAIL = '/data_view_interface/get_interface_details'
+    GET_PUBLIC_INTERFACE_DETAIL = '/data_view_interface/get_interface_details'
 }
 
 export const getPublicInterface = async (params: Record<'page' | 'pageSize', number>) => {
@@ -26,9 +26,10 @@ export const getPublicInterface = async (params: Record<'page' | 'pageSize', num
   })
 }
 
-export const getOrgList = async () => {
+export const getOrgList = async (params:object) => {
   return defHttp.get({
-    url: Api.ORG_LISt
+    url: Api.ORG_LISt,
+    params
   })
 }
 

@@ -74,10 +74,15 @@ props.chartConfig.option = {
 //地图点击返回
 const watchAdcode = async () => {
   if (props.chartConfig.option.drillingIn) {
-    let saveAdcode: any = saveLevelStr.parentInfo.adcode
-    saveLevelStr.level = saveLevelStr.parentInfo.level
+    //如果是从右边配置里设置的，比如点击四川省，然后点击返回
+    const savePopParent = saveHistoryParent.value.pop()
+    let saveAdcode: any = savePopParent?.adcode
+    saveLevelStr.level = savePopParent?.level as string
+    if (!savePopParent) {
+      saveAdcode = getParentAdcode(props.chartConfig.option.mapRegion.adcode)
+      saveLevelStr.level = (regionMapParentArea as any)[props.chartConfig.option.mapRegion.saveSelect.levelStr]
+    }
     if (saveAdcode === 0) {
-      //
       saveAdcode = 'china'
       saveLevelStr.level = 'COUNTRY'
     }
@@ -110,9 +115,11 @@ const handleMap3DClick = async (params: any) => {
         const adcode = item.properties.adcode
         props.chartConfig.option.mapRegion.adcode = adcode
         saveLevelStr.level = level
-        saveLevelStr.parentInfo.adcode = item.properties.parent.adcode //保存上一级的地区编码
-        saveLevelStr.parentInfo.level = (regionMapParentArea as any)[level] //保存上一级的行政级别
         handleDataPoint(adcode)
+        saveHistoryParent.value.push({
+          adcode: item.properties.parent.adcode,
+          level: (regionMapParentArea as any)[level]
+        })
       }
     })
   }
@@ -123,14 +130,18 @@ const saveGeojson: any = ref({}) // 保存geojson
 const chinaDefaultRegionId = ref(100000) //如果是china则adcode为100000
 
 const saveLevelStr = reactive({
-  // 保存行政级别和上一级的adcode和level
-  level: '',
-  parentInfo: {
-    adcode: 0,
-    level: ''
-  }
+   // 地区级别
+   level: ''
 })
 
+//父级地区编码和级别接口
+interface HistoryParentType {
+  adcode: number
+  level: string
+}
+
+const saveHistoryParent = ref<HistoryParentType[]>([])
+
 //动态注册地图
 const getGeojson = (regionId: any) => {
   try {
@@ -158,6 +169,18 @@ const getGeojson = (regionId: any) => {
   }
 }
 
+
+//传adcode 获取上级
+const getParentAdcode = (adcode: number) => {
+  let adcodeNum = 100000
+  saveGeojson.value?.features.forEach((item: any) => {
+    if (item.properties.adcode === adcode) {
+      adcodeNum = item.properties.parent.adcode
+    }
+  })
+  return adcodeNum
+}
+
 watch(
   () => w.value,
   (value: number) => {

@@ -107,10 +107,15 @@ props.chartConfig.option = {
 //地图点击返回 adcode=100000,名字必须是china
 const watchAdcode = async () => {
   if (props.chartConfig.option.drillingIn) {
-    let saveAdcode: any = saveLevelStr.parentInfo.adcode
-    saveLevelStr.level = saveLevelStr.parentInfo.level
+    //如果是从右边配置里设置的，比如点击四川省，然后点击返回
+    const savePopParent = saveHistoryParent.value.pop()
+    let saveAdcode: any = savePopParent?.adcode
+    saveLevelStr.level = savePopParent?.level as string
+    if (!savePopParent) {
+      saveAdcode = getParentAdcode(props.chartConfig.option.mapRegion.adcode)
+      saveLevelStr.level = (regionMapParentArea as any)[props.chartConfig.option.mapRegion.saveSelect.levelStr]
+    }
     if (saveAdcode === 0) {
-      //
       saveAdcode = 'china'
       saveLevelStr.level = 'COUNTRY'
     }
@@ -132,14 +137,18 @@ const saveGeojson: any = ref({}) // 保存geojson
 const chinaDefaultRegionId = ref(100000) //如果是china则adcode为100000
 
 const saveLevelStr = reactive({
-  // 保存行政级别和上一级的adcode和level
-  level: '',
-  parentInfo: {
-    adcode: 0,
-    level: ''
-  }
+  // 地区级别
+  level: ''
 })
 
+//父级地区编码和级别接口
+interface HistoryParentType {
+  adcode: number
+  level: string
+}
+
+const saveHistoryParent = ref<HistoryParentType[]>([])
+
 //动态注册地图
 const getGeojson = async (regionId: any) => {
   try {
@@ -281,6 +290,17 @@ const regionMapParentArea = {
   [areaEnum.TOWN]: areaEnum.COUNTY //镇的上一级 县或者区
 }
 
+//传adcode 获取上级
+const getParentAdcode = (adcode: number) => {
+  let adcodeNum = 100000
+  saveGeojson.value?.features.forEach((item: any) => {
+    if (item.properties.adcode === adcode) {
+      adcodeNum = item.properties.parent.adcode
+    }
+  })
+  return adcodeNum
+}
+
 //地图点击下钻
 const handleVChartClick = async (params: any) => {
   if (props.chartConfig.option.drillingIn) {
@@ -291,9 +311,11 @@ const handleVChartClick = async (params: any) => {
         const adcode = item.properties.adcode
         props.chartConfig.option.mapRegion.adcode = adcode
         saveLevelStr.level = level
-        saveLevelStr.parentInfo.adcode = item.properties.parent.adcode //保存上一级的地区编码
-        saveLevelStr.parentInfo.level = (regionMapParentArea as any)[level] //保存上一级的行政级别
         handleDataPoint(adcode)
+        saveHistoryParent.value.push({
+          adcode: item.properties.parent.adcode,
+          level: (regionMapParentArea as any)[level]
+        })
       }
     })
   }

-import { excludeParseEventKeyList, excludeParseEventValueList } from "@/enums/eventEnum"
+import { excludeParseEventKeyList, excludeParseEventValueList } from '@/enums/eventEnum'
 
 const tryRunFunction = (v: string) => {
   try {
@@ -30,3 +30,11 @@ export const JSONParse = (data: string) => {
     return v
   })
 }
+
+//解析web url 参数
+export const parseWebUrl = (str = window.location.search) => {
+  const reg = /([^?&=]+)=([^&]+)/g
+  const params = {} as any
+  str.replace(reg, (_, k, v) => (params[k] = v))
+  return params
+}

@@ -8,6 +8,7 @@ import { computed, onMounted, reactive, Ref, ref, unref } from "vue"
 import { DictEnum } from '@/enums/external/dictEnum'
 import { SelectTimeAggregationFieldEnum, SelectTimeAggregationValueTypw } from "../SelectTImeAggregation"
 import { isArray } from "@/utils"
+import { parseWebUrl } from "@/utils/external/utils"
 
 const GROUP_SEPARATOR = ','
 
@@ -102,9 +103,15 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
     }, {} as BuiltInVariableRecord)
   }
 
+
+
   const getOrgOption = async () => {
+    if( !window.location.href ) return
+    const { organizationId } = parseWebUrl(window.location.href)
+    if( !organizationId) return
     if (!validIsExist(BuiltInVariable.ORGANIZATION_ID)) return
-    optionsSet[BuiltInVariable.ORGANIZATION_ID] = await getOrgList()
+    optionsSet[BuiltInVariable.ORGANIZATION_ID] = await getOrgList({organizationId})
+    console.log(optionsSet[BuiltInVariable.ORGANIZATION_ID])
   }
 
   const getDeviceProfileOption = async () => {