diff --git a/index.html b/index.html index e48e0da..50342b1 100644 --- a/index.html +++ b/index.html @@ -2,10 +2,11 @@ - + +
diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000..3de7a73 Binary files /dev/null and b/public/favicon.ico differ diff --git a/src/api/largeScreen.js b/src/api/largeScreen.js index 8a01597..7c88e3f 100644 --- a/src/api/largeScreen.js +++ b/src/api/largeScreen.js @@ -90,7 +90,7 @@ export function sunRiseSet(query) { }); } -// 灯杆统计 +// 场所统计 export function lightPoleCount(query) { return request({ url: "/smartlight/screen/lightPoleCount", @@ -150,7 +150,7 @@ export function getSwitchBox(id) { }); } -// 获取灯杆详情 +// 获取场所详情 export function getPoleDevice(id) { return request({ url: `/smartlight/light/lightPole/getLightDeviceList/${id}`, diff --git a/src/assets/img/blue/configuration/GasMonitor-active.png b/src/assets/img/blue/configuration/GasMonitor-active.png new file mode 100644 index 0000000..990e178 Binary files /dev/null and b/src/assets/img/blue/configuration/GasMonitor-active.png differ diff --git a/src/assets/img/blue/configuration/GasMonitor.png b/src/assets/img/blue/configuration/GasMonitor.png new file mode 100644 index 0000000..53a6dfe Binary files /dev/null and b/src/assets/img/blue/configuration/GasMonitor.png differ diff --git a/src/assets/img/blue/configuration/WaterQuality-active.png b/src/assets/img/blue/configuration/WaterQuality-active.png new file mode 100644 index 0000000..089e7c2 Binary files /dev/null and b/src/assets/img/blue/configuration/WaterQuality-active.png differ diff --git a/src/assets/img/blue/configuration/WaterQuality.png b/src/assets/img/blue/configuration/WaterQuality.png new file mode 100644 index 0000000..11a126f Binary files /dev/null and b/src/assets/img/blue/configuration/WaterQuality.png differ diff --git a/src/assets/img/blue/mapDevice/pole_left.png b/src/assets/img/blue/mapDevice/pole_left.png index 1549a62..3918670 100644 Binary files a/src/assets/img/blue/mapDevice/pole_left.png and b/src/assets/img/blue/mapDevice/pole_left.png differ diff --git a/src/assets/img/blue/mapDevice/pole_right_error.png b/src/assets/img/blue/mapDevice/pole_right_error.png index 5e71442..3918670 100644 Binary files a/src/assets/img/blue/mapDevice/pole_right_error.png and b/src/assets/img/blue/mapDevice/pole_right_error.png differ diff --git a/src/assets/img/blue/mapDevice/pole_right_online.png b/src/assets/img/blue/mapDevice/pole_right_online.png index 475b4c9..3918670 100644 Binary files a/src/assets/img/blue/mapDevice/pole_right_online.png and b/src/assets/img/blue/mapDevice/pole_right_online.png differ diff --git a/src/assets/img/blue/mapDevice/pole_selected.png b/src/assets/img/blue/mapDevice/pole_selected.png new file mode 100644 index 0000000..3918670 Binary files /dev/null and b/src/assets/img/blue/mapDevice/pole_selected.png differ diff --git a/src/assets/img/orange/configuration/GasMonitor-active.png b/src/assets/img/orange/configuration/GasMonitor-active.png new file mode 100644 index 0000000..71c4147 Binary files /dev/null and b/src/assets/img/orange/configuration/GasMonitor-active.png differ diff --git a/src/assets/img/orange/configuration/GasMonitor.png b/src/assets/img/orange/configuration/GasMonitor.png new file mode 100644 index 0000000..53a6dfe Binary files /dev/null and b/src/assets/img/orange/configuration/GasMonitor.png differ diff --git a/src/assets/img/orange/configuration/WaterQuality-active.png b/src/assets/img/orange/configuration/WaterQuality-active.png new file mode 100644 index 0000000..e7047ce Binary files /dev/null and b/src/assets/img/orange/configuration/WaterQuality-active.png differ diff --git a/src/assets/img/orange/configuration/WaterQuality.png b/src/assets/img/orange/configuration/WaterQuality.png new file mode 100644 index 0000000..11a126f Binary files /dev/null and b/src/assets/img/orange/configuration/WaterQuality.png differ diff --git a/src/styles/_comp.scss b/src/styles/_comp.scss index dbe9bef..082b4da 100644 --- a/src/styles/_comp.scss +++ b/src/styles/_comp.scss @@ -299,7 +299,7 @@ } } -// 灯杆详情 +// 场所详情 .pole-dialog-wrapper { width: 9.14rem; height: 5.63rem; diff --git a/src/styles/_module.scss b/src/styles/_module.scss index ea8e077..6fe320d 100644 --- a/src/styles/_module.scss +++ b/src/styles/_module.scss @@ -289,7 +289,7 @@ } } -// 灯杆统计 +// 场所统计 .pole-wrapper { margin-left: 0.12rem; diff --git a/src/styles/_theme.scss b/src/styles/_theme.scss index 630a8ba..20753f0 100644 --- a/src/styles/_theme.scss +++ b/src/styles/_theme.scss @@ -125,7 +125,7 @@ $themes: (blue: (title_color: #D9E7FF, // 银海立交智慧照明平台（标 information_jiaotong_color: #CEEBFF, putin_desc: #CEEBFF, - // 灯杆弹窗 + // 场所弹窗 dialog_title: #D9E7FF, pole_function_normal: #C8D3E9, pole_function_active: #fff, @@ -273,7 +273,7 @@ $themes: (blue: (title_color: #D9E7FF, // 银海立交智慧照明平台（标 information_jiaotong_color: #D9F7FF, putin_desc : #D9D9D9, - // 灯杆弹窗 + // 场所弹窗 dialog_title: #FFF2DF, pole_function_normal:#E8DECF, pole_function_active:#FFF2DF, diff --git a/src/utils/map.js b/src/utils/map.js index a918c94..f801bb3 100644 --- a/src/utils/map.js +++ b/src/utils/map.js @@ -119,8 +119,8 @@ export function createPopupEle(item, flag) {
${item.feature.name}
-
设备编号：${item.feature.code}
- ${item.feature.type === '1' ? `
关联灯杆数：${item.feature.deviceCount}个
` : ''} +
场所编号：${item.feature.code}
+ ${item.feature.type === '1' ? `
关联场所数：${item.feature.deviceCount}个
` : ''} ${item.feature.type === '2' ? `
挂载设备数：${item.feature.deviceCount}个
` : ''} ${item.feature.type === '3' ? `
控制灯具数：${item.feature.deviceCount}个
` : ''}
现存故障：${item.feature.alarmTypeLabel || '无' }
diff --git a/src/views/components/dialog/cabinet.vue b/src/views/components/dialog/cabinet.vue index 1ac479e..2b9e153 100644 --- a/src/views/components/dialog/cabinet.vue +++ b/src/views/components/dialog/cabinet.vue @@ -9,9 +9,9 @@
- 设备编号：{{ cabinet.code }} + 场所编号：{{ cabinet.code }} - 关联灯杆数：{{ cabinet.deviceCount }}个 + 关联场所数：{{ cabinet.deviceCount }}个 现存故障： 无 diff --git a/src/views/components/dialog/pole-detail/index.vue b/src/views/components/dialog/pole-detail/index.vue index d376597..403fe8d 100644 --- a/src/views/components/dialog/pole-detail/index.vue +++ b/src/views/components/dialog/pole-detail/index.vue @@ -110,7 +110,7 @@ const changeFunction = (item) => { getInfo(item); }; -// 获取灯杆挂载设备 +// 获取场所挂载设备 const deviceList = ref([]); getPoleDevice(props.pole.id).then((res) => { if (res.data?.length > 0) { @@ -129,7 +129,7 @@ getPoleDevice(props.pole.id).then((res) => { getInfo(deviceList.value[0]); } else { deviceList.value = []; - ElMessage.warning("该灯杆未挂载设备"); + ElMessage.warning("该场所未挂载设备"); } }); diff --git a/src/views/components/module/GasMonitor.vue b/src/views/components/module/GasMonitor.vue new file mode 100644 index 0000000..70e34f4 --- /dev/null +++ b/src/views/components/module/GasMonitor.vue @@ -0,0 +1,74 @@ + + + + + \ No newline at end of file diff --git a/src/views/components/module/LampPoleStatistics.vue b/src/views/components/module/LampPoleStatistics.vue index 8503a17..7c2309f 100644 --- a/src/views/components/module/LampPoleStatistics.vue +++ b/src/views/components/module/LampPoleStatistics.vue @@ -18,9 +18,9 @@ import { onMounted } from "vue"; const props = defineProps(["buildingId"]); const list = ref([ - { id: 0, name: "灯杆总数", num: 0, unit: "根" }, - { id: 1, name: "灯控总数", num: 0, unit: "个" }, - { id: 2, name: "灯具总数", num: 0, unit: "个" }, + { id: 0, name: "监控场所", num: 0, unit: "个" }, + { id: 1, name: "设备总数", num: 0, unit: "个" }, + { id: 2, name: "在线设备", num: 0, unit: "个" }, ]); onMounted(() => { diff --git a/src/views/components/module/WaterQualityMonitor.vue b/src/views/components/module/WaterQualityMonitor.vue new file mode 100644 index 0000000..e0da307 --- /dev/null +++ b/src/views/components/module/WaterQualityMonitor.vue @@ -0,0 +1,74 @@ + + + + + \ No newline at end of file diff --git a/src/views/index.vue b/src/views/index.vue index d54cd9a..c7b9fe1 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -184,7 +184,7 @@ const vcConfirm = (currentId, currentModuleId) => { currentModule.value.active = false; }; -// 灯杆逻辑 +// 场所逻辑 const showPoleDialog = ref(false); const pole = ref({}); const poleClick = (data) => { diff --git a/src/views/layout/body.vue b/src/views/layout/body.vue index 1d65f3c..4fe0bef 100644 --- a/src/views/layout/body.vue +++ b/src/views/layout/body.vue @@ -86,6 +86,8 @@ import ComTitle from "../components/comp/title.vue"; import WorkOrderOverview from "../components/module/WorkOrderOverview.vue"; import LightingRate from "../components/module/LightingRate.vue"; import EnvironmentMonitor from "../components/module/EnvironmentMonitor.vue"; +import WaterQualityMonitor from "../components/module/WaterQualityMonitor.vue"; +import GasMonitor from "../components/module/GasMonitor.vue"; import LampPoleStatistics from "../components/module/LampPoleStatistics.vue"; import DueToday from "../components/module/DueToday.vue"; import MonthlyEnergyConsumption from "../components/module/MonthlyEnergyConsumption.vue"; @@ -132,8 +134,8 @@ const moduleObj = { }, LightPole: { moduleId: "7", - title: "灯杆统计", - titleEn: "LAMP POLE STATISTICS", + title: "场所统计", + titleEn: "SITE STATISTICS", comp: LampPoleStatistics, }, TodayPlan: { @@ -178,6 +180,18 @@ const moduleObj = { titleEn: "Environment", comp: EnvironmentMonitor, }, + GasMonitor: { + moduleId: "13", + title: "气体监测", + titleEn: "GasMonitor", + comp: GasMonitor, + }, + WaterQuality: { + moduleId: "14", + title: "水质监测", + titleEn: "WaterQualityMonitor", + comp: WaterQualityMonitor, + }, InfoScreen: { moduleId: '11', title: '屏幕总览', @@ -195,7 +209,7 @@ const moduleObj = { const deviceInfoList = ref([ { id: 0, - name: "配电柜", + name: "传感器", num: 0, img: "DistributionCabinet", isActive: false, @@ -204,13 +218,13 @@ const deviceInfoList = ref([ { id: 1, name: "摄像头", num: 0, img: "Camera", isActive: false, type: "4" }, { id: 2, - name: "灯控", + name: "屏幕", num: 0, img: "LightControl", isActive: false, type: "3", }, - { id: 3, name: "灯杆", num: 0, img: "Pole", isActive: true, type: "2" }, + { id: 3, name: "场所", num: 0, img: "Pole", isActive: true, type: "2" }, ]); const getTitle = (id) => { diff --git a/src/views/layout/header.vue b/src/views/layout/header.vue index 249f6b7..b28de45 100644 --- a/src/views/layout/header.vue +++ b/src/views/layout/header.vue @@ -197,7 +197,7 @@ const handleThemeConfirm = (val) => { const title = ref(""); function getDefaultTitle() { - getConfigKey("defaultTitle").then((res) => { + getConfigKey("iotTitle").then((res) => { title.value = res.msg; document.title = res.msg; }); diff --git a/src/views/login.vue b/src/views/login.vue index 42ba2b5..755f0cb 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -170,13 +170,13 @@ function getCode() { } function getDefaultBg() { - getConfigKey("defaultBg").then((res) => { + getConfigKey("iotBg").then((res) => { defaultBg.value = res.msg; }); } function getDefaultTitle() { - getConfigKey("defaultTitle").then((res) => { + getConfigKey("iotTitle").then((res) => { title.value = res.msg; document.title = res.msg; }); diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000..3de7a73 Binary files /dev/null and b/static/favicon.ico differ diff --git a/vite.config.js b/vite.config.js index 8bc332b..3eb4448 100644 --- a/vite.config.js +++ b/vite.config.js @@ -14,8 +14,8 @@ export default defineConfig({ server: { proxy: { '/api': { // 匹配请求路径， - // target: 'http://140.249.205.82:8288', // 代理的目标地址 - target: 'http://127.0.0.1:8080', // 代理的目标地址 + target: 'http://117.72.197.29:8080', // 代理的目标地址 + // target: 'http://127.0.0.1:8080', // 代理的目标地址 changeOrigin: true, // secure: true, // 是否https接口 // ws: true, // 是否代理websockets @@ -23,7 +23,7 @@ export default defineConfig({ rewrite: (path) => path.replace(/^\/api/, '') }, '/fileUrl': { - target: 'http://140.249.24.92:9000', // 本地 + target: 'http://117.72.197.29:9000', // 本地 changeOrigin: true, rewrite: (p) => p.replace(/^\/fileUrl/, '') },