diff --git a/.env.development b/.env.development index 844c0d8..40d199b 100644 --- a/.env.development +++ b/.env.development @@ -13,6 +13,8 @@ VITE_APP_BASE_API_GO = 'http://xny.yj-3d.com:7464' # ws VITE_APP_BASE_WS_API = 'ws://192.168.110.149:8899/resource/websocket' +# EARTH +VITE_APP_BASE_EARTH_API="http://192.168.110.2:8895" # 无人机接口地址 VITE_APP_BASE_DRONE_API = 'http://58.17.134.85:9512' diff --git a/public/assets/demo/Sunny.png b/public/assets/demo/Sunny.png index 14c94d4..a1c65ac 100644 Binary files a/public/assets/demo/Sunny.png and b/public/assets/demo/Sunny.png differ diff --git a/public/assets/demo/sunny copy.png b/public/assets/demo/sunny copy.png deleted file mode 100644 index a1c65ac..0000000 Binary files a/public/assets/demo/sunny copy.png and /dev/null differ diff --git a/public/assets/demo/sunnyBig.png b/public/assets/demo/sunnyBig.png new file mode 100644 index 0000000..14c94d4 Binary files /dev/null and b/public/assets/demo/sunnyBig.png differ diff --git a/src/api/projectScreen/index.ts b/src/api/projectScreen/index.ts index dbb7da7..ef4e94c 100644 --- a/src/api/projectScreen/index.ts +++ b/src/api/projectScreen/index.ts @@ -87,4 +87,13 @@ export const setSelect = (data) => { method: 'post', data }); +}; + +// 获取模型列表 +export const getModelList = (params) => { + return request({ + url: '/yjearth4.0/api/v1/source/list', + method: 'get', + params + }); }; \ No newline at end of file diff --git a/src/views/demo/components/qixiang.vue b/src/views/demo/components/qixiang.vue index 58629bb..966a713 100644 --- a/src/views/demo/components/qixiang.vue +++ b/src/views/demo/components/qixiang.vue @@ -1,224 +1,218 @@ - + diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue index 6303cf4..5ef73e3 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/leftPage.vue @@ -118,21 +118,21 @@ const indicators = ref([ name: '风电项目', value: '288.88', unit: '个', - iconPath: '/src/assets/images/contract.png' + iconPath: '/assets/demo/contract.png' }, { id: '3', name: '光伏系统总容量', value: '158.88', unit: 'MW', - iconPath: '/src/assets/images/totalCapacity.png' + iconPath: '/assets/demo/totalCapacity.png' }, { id: '4', name: '风电项目总容量', value: '18', unit: 'MW', - iconPath: '/src/assets/images/todayConstruction.png' + iconPath: '/assets/demo/todayConstruction.png' } ]); diff --git a/src/views/projectLarge/ProjectScreen/components/newmap.vue b/src/views/projectLarge/ProjectScreen/components/newmap.vue index 6c15ca4..f616954 100644 --- a/src/views/projectLarge/ProjectScreen/components/newmap.vue +++ b/src/views/projectLarge/ProjectScreen/components/newmap.vue @@ -1,33 +1,35 @@