diff --git a/src/api/gis/index.ts b/src/api/gis/index.ts index f14d3e1..5413341 100644 --- a/src/api/gis/index.ts +++ b/src/api/gis/index.ts @@ -1,6 +1,16 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { QualityVO, Query, ConstructionUserVO, MachineryrVO, MaterialsVO, projectNewsVO, safetyInspectionVO, projectNewsDetailVO } from './type'; +import { + QualityVO, + Query, + ConstructionUserVO, + MachineryrVO, + MaterialsVO, + projectNewsVO, + safetyInspectionVO, + projectNewsDetailVO, + weatherVO +} from './type'; /** * 查询大屏质量信息 * @param query @@ -97,3 +107,16 @@ export const getMaterialsList = (query?: Query): AxiosPromise => params: query }); }; + +/** + * 查询项目天气 + * @param query + * @returns {*} + */ + +export const getweatherList = (id?: string): AxiosPromise => { + return request({ + url: '/project/project/weather/' + id, + method: 'get' + }); +}; diff --git a/src/api/gis/type.ts b/src/api/gis/type.ts index 8da562f..badb6ac 100644 --- a/src/api/gis/type.ts +++ b/src/api/gis/type.ts @@ -73,3 +73,16 @@ export interface safetyInspectionlist { name: string; meetingDate: string; } + +export interface weatherVO { + date: string; + week: string; + tempMax: string; + tempMin: string; + dayStatus: string; + dayIcon: string; + nightStatus: string; + nightIcon: string; + sunRise: string; + sunSet: string; +} diff --git a/src/assets/images/bigRain.png b/src/assets/images/bigRain.png new file mode 100644 index 0000000..f2a2d07 Binary files /dev/null and b/src/assets/images/bigRain.png differ diff --git a/src/assets/images/bigSnow.png b/src/assets/images/bigSnow.png new file mode 100644 index 0000000..fed9e8b Binary files /dev/null and b/src/assets/images/bigSnow.png differ diff --git a/src/assets/images/cloudy.png b/src/assets/images/cloudy.png new file mode 100644 index 0000000..bd3dc45 Binary files /dev/null and b/src/assets/images/cloudy.png differ diff --git a/src/assets/images/day.png b/src/assets/images/day.png deleted file mode 100644 index 2658572..0000000 Binary files a/src/assets/images/day.png and /dev/null differ diff --git a/src/assets/images/fog.png b/src/assets/images/fog.png new file mode 100644 index 0000000..7fd2eef Binary files /dev/null and b/src/assets/images/fog.png differ diff --git a/src/assets/images/haze.png b/src/assets/images/haze.png new file mode 100644 index 0000000..76caa46 Binary files /dev/null and b/src/assets/images/haze.png differ diff --git a/src/assets/images/headerr.png b/src/assets/images/headerr.png deleted file mode 100644 index f1a6138..0000000 Binary files a/src/assets/images/headerr.png and /dev/null differ diff --git a/src/assets/images/image.png（1）.png b/src/assets/images/image.png（1）.png deleted file mode 100644 index 01ffa3e..0000000 Binary files a/src/assets/images/image.png（1）.png and /dev/null differ diff --git a/src/assets/images/manyCloud.png b/src/assets/images/manyCloud.png new file mode 100644 index 0000000..d54b94b Binary files /dev/null and b/src/assets/images/manyCloud.png differ diff --git a/src/assets/images/nightSunny.png b/src/assets/images/nightSunny.png new file mode 100644 index 0000000..457338a Binary files /dev/null and b/src/assets/images/nightSunny.png differ diff --git a/src/assets/images/rainSnow.png b/src/assets/images/rainSnow.png new file mode 100644 index 0000000..c995451 Binary files /dev/null and b/src/assets/images/rainSnow.png differ diff --git a/src/assets/images/sandstorm.png b/src/assets/images/sandstorm.png new file mode 100644 index 0000000..e878513 Binary files /dev/null and b/src/assets/images/sandstorm.png differ diff --git a/src/assets/images/smallRain.png b/src/assets/images/smallRain.png new file mode 100644 index 0000000..cb7eb52 Binary files /dev/null and b/src/assets/images/smallRain.png differ diff --git a/src/assets/images/smallSnow.png b/src/assets/images/smallSnow.png new file mode 100644 index 0000000..5bc7dd8 Binary files /dev/null and b/src/assets/images/smallSnow.png differ diff --git a/src/assets/images/sunny.png b/src/assets/images/sunny.png new file mode 100644 index 0000000..a1c65ac Binary files /dev/null and b/src/assets/images/sunny.png differ diff --git a/src/assets/images/thunderstorm.png b/src/assets/images/thunderstorm.png new file mode 100644 index 0000000..c819388 Binary files /dev/null and b/src/assets/images/thunderstorm.png differ diff --git a/src/assets/images/分组 1.png b/src/assets/images/分组 1.png deleted file mode 100644 index c18c5d4..0000000 Binary files a/src/assets/images/分组 1.png and /dev/null differ diff --git a/src/assets/images/分组 41.png b/src/assets/images/分组 41.png deleted file mode 100644 index 638e817..0000000 Binary files a/src/assets/images/分组 41.png and /dev/null differ diff --git a/src/assets/images/分组 50.png b/src/assets/images/分组 50.png deleted file mode 100644 index d2441f2..0000000 Binary files a/src/assets/images/分组 50.png and /dev/null differ diff --git a/src/assets/images/画板 7.png b/src/assets/images/画板 7.png deleted file mode 100644 index d2441f2..0000000 Binary files a/src/assets/images/画板 7.png and /dev/null differ diff --git a/src/views/gisHome/component/leftMain.vue b/src/views/gisHome/component/leftMain.vue index 77402b9..fd2bf38 100644 --- a/src/views/gisHome/component/leftMain.vue +++ b/src/views/gisHome/component/leftMain.vue @@ -554,7 +554,7 @@ onUnmounted(() => { #orderMain { width: 100%; padding-right: vw(14); - height: vh(300); + height: vh(335); } .title { > div > img { diff --git a/src/views/gisHome/component/map.vue b/src/views/gisHome/component/map.vue index 028bc93..9951848 100644 --- a/src/views/gisHome/component/map.vue +++ b/src/views/gisHome/component/map.vue @@ -14,6 +14,10 @@ const createEarth = () => { roll: 0.0 } }); + let layer = new YJ.Obj.ArcgisWXImagery(sdk, { + show: true, + layer_index: 1 + }); YJ.Global.CesiumContainer(sdk, { compass: false // 罗盘 }); diff --git a/src/views/gisHome/component/weatherListScroll.vue b/src/views/gisHome/component/weatherListScroll.vue index 4fcefde..557a50f 100644 --- a/src/views/gisHome/component/weatherListScroll.vue +++ b/src/views/gisHome/component/weatherListScroll.vue @@ -12,7 +12,7 @@ import { ref, onMounted, onUnmounted, computed } from 'vue'; const props = defineProps<{ - items: string[]; + items: any[]; interval?: number; height?: number; }>(); @@ -92,7 +92,7 @@ onUnmounted(() => { @import '../css/gis.scss'; // 引入 vh 单位 .marquee-container { height: vh(50); /* 控制容器高度为视口高度的 10% */ - width: vw(287); + min-width: vw(287); overflow: hidden; position: relative; } diff --git a/src/views/gisHome/index.vue b/src/views/gisHome/index.vue index 51684a5..56dfb78 100644 --- a/src/views/gisHome/index.vue +++ b/src/views/gisHome/index.vue @@ -3,22 +3,29 @@
- - 1,235 - +
+ +
安全生产天数：
+
1,235
+
天
+ +
XXX智慧工地管理平台
- + @@ -98,11 +98,9 @@ import { MachineryDetailForm, MachineryDetailQuery, MachineryDetailVO } from '@/api/machinery/machineryDetail/types'; import { delMachineryDetail, getMachineryDetail, listMachineryDetail, updateMachineryDetail } from '@/api/machinery/machineryDetail'; import { ref } from 'vue'; -import { Picture } from '@element-plus/icons-vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { machinery_entry_exit_type, sys_normal_disable } = toRefs(proxy?.useDict('machinery_entry_exit_type', 'sys_normal_disable')); - interface Props { machineryId: string | number; } @@ -149,7 +147,12 @@ const data = reactive>({ const { queryParams, form, rules } = toRefs(data); const imgList = computed(() => (list) => { - const newList = list.map((item) => item.url); + let newList; + if (list) { + newList = list.map((item) => item.url); + } else { + newList = ['']; + } return newList; }); @@ -197,7 +200,7 @@ const submitForm = () => { const closeDialog = () => { dialogRef.value = false; }; -onMounted(() => { +onMounted(async () => { getList(); });