Commit 8d8e66208cef7abdce9ba57a2daa9e85f85058db
Merge branch 'perf/organization-query' into 'main_dev'
perf: 优化组态数据源查询根据组态所属组织进行查询 See merge request yunteng/thingskit-scada!128
Showing
2 changed files
with
17 additions
and
2 deletions
| @@ -12,7 +12,7 @@ class ConfigurationNodeApi { | @@ -12,7 +12,7 @@ class ConfigurationNodeApi { | ||
| 12 | * @param {'CONFIGURE' | 'CONTENT' | 'NODE'} levelType - 组态资源类型 | 12 | * @param {'CONFIGURE' | 'CONTENT' | 'NODE'} levelType - 组态资源类型 | 
| 13 | * @param {string} levelId - 组态资源ID | 13 | * @param {string} levelId - 组态资源ID | 
| 14 | */ | 14 | */ | 
| 15 | - static getConfigurationInfo( levelType, levelId) { | 15 | + static getConfigurationInfo(levelType, levelId) { | 
| 16 | var configurationId = urlParams['configurationId'] | 16 | var configurationId = urlParams['configurationId'] | 
| 17 | return defHttp.get(`/yt/configuration/node/${configurationId}/${levelType}/${levelId}`) | 17 | return defHttp.get(`/yt/configuration/node/${configurationId}/${levelType}/${levelId}`) | 
| 18 | } | 18 | } | 
| @@ -22,7 +22,7 @@ class ConfigurationNodeApi { | @@ -22,7 +22,7 @@ class ConfigurationNodeApi { | ||
| 22 | * @returns | 22 | * @returns | 
| 23 | */ | 23 | */ | 
| 24 | static getOrgTree() { | 24 | static getOrgTree() { | 
| 25 | - return defHttp.get('/yt/organization/me/list') | 25 | + return defHttp.get(`/yt/organization/me/list${ORGANIZATION_ID ? `?organizationId=${ORGANIZATION_ID}` : ''}`) | 
| 26 | } | 26 | } | 
| 27 | 27 | ||
| 28 | /** | 28 | /** | 
| @@ -3,6 +3,21 @@ const isShareMode = (() => { | @@ -3,6 +3,21 @@ const isShareMode = (() => { | ||
| 3 | return urlParams.share && urlParams.share === 'SCADA' | 3 | return urlParams.share && urlParams.share === 'SCADA' | 
| 4 | })() | 4 | })() | 
| 5 | 5 | ||
| 6 | +const ORGANIZATION_ID = (() => { | ||
| 7 | + var result = new Object(); | ||
| 8 | + var params = window.location.search.slice(1).split('&'); | ||
| 9 | + | ||
| 10 | + for (var i = 0; i < params.length; i++) { | ||
| 11 | + var idx = params[i].indexOf('='); | ||
| 12 | + | ||
| 13 | + if (idx > 0) { | ||
| 14 | + result[params[i].substring(0, idx)] = params[i].substring(idx + 1); | ||
| 15 | + } | ||
| 16 | + } | ||
| 17 | + | ||
| 18 | + return result.organizationId | ||
| 19 | +})() | ||
| 20 | + | ||
| 6 | const GLOBAL_STORAGE_KEY = (() => { | 21 | const GLOBAL_STORAGE_KEY = (() => { | 
| 7 | const isDEV = location.href.includes('dev=1') | 22 | const isDEV = location.href.includes('dev=1') | 
| 8 | const DEVELOPMENT = 'DEVELOPMENT' | 23 | const DEVELOPMENT = 'DEVELOPMENT' |