qdintc/intc-iot-screen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 图片修改，增加组件等功能。

Browse Source
This commit is contained in:
tianyongbao
2025-04-30 17:04:13 +08:00
parent 5e0d04bfd3
commit 1beb28eae2
30 changed files with 191 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
index.html
View File

@@ -2,10 +2,11 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" /> <link rel="icon" href="/static/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title></title> <title></title>
<script type="text/javascript" src="/EasyWasmPlayer.js"></script> <script type="text/javascript" src="/EasyWasmPlayer.js"></script>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

BIN
public/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

4
src/api/largeScreen.js
View File

@@ -90,7 +90,7 @@ export function sunRiseSet(query) {
}); });
} }
// 灯杆统计 // 场所统计
export function lightPoleCount(query) { export function lightPoleCount(query) {
return request({ return request({
url: "/smartlight/screen/lightPoleCount", url: "/smartlight/screen/lightPoleCount",
@@ -150,7 +150,7 @@ export function getSwitchBox(id) {
}); });
} }
// 获取灯杆详情 // 获取场所详情
export function getPoleDevice(id) { export function getPoleDevice(id) {
return request({ return request({
url: `/smartlight/light/lightPole/getLightDeviceList/${id}`, url: `/smartlight/light/lightPole/getLightDeviceList/${id}`,

BIN
src/assets/img/blue/configuration/GasMonitor-active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
src/assets/img/blue/configuration/GasMonitor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
src/assets/img/blue/configuration/WaterQuality-active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
src/assets/img/blue/configuration/WaterQuality.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
src/assets/img/blue/mapDevice/pole_left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
src/assets/img/blue/mapDevice/pole_right_error.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
src/assets/img/blue/mapDevice/pole_right_online.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
src/assets/img/blue/mapDevice/pole_selected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
src/assets/img/orange/configuration/GasMonitor-active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
src/assets/img/orange/configuration/GasMonitor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
src/assets/img/orange/configuration/WaterQuality-active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
src/assets/img/orange/configuration/WaterQuality.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB

2
src/styles/_comp.scss
View File

@@ -299,7 +299,7 @@
} }
} }
// 灯杆详情 // 场所详情
.pole-dialog-wrapper { .pole-dialog-wrapper {
width: 9.14rem; width: 9.14rem;
height: 5.63rem; height: 5.63rem;

2
src/styles/_module.scss
View File

@@ -289,7 +289,7 @@
} }
} }
// 灯杆统计 // 场所统计
.pole-wrapper { .pole-wrapper {
margin-left: 0.12rem; margin-left: 0.12rem;

4
src/styles/_theme.scss
View File

@@ -125,7 +125,7 @@ $themes: (blue: (title_color: #D9E7FF, // 银海立交智慧照明平台（标
information_jiaotong_color: #CEEBFF, information_jiaotong_color: #CEEBFF,
putin_desc: #CEEBFF, putin_desc: #CEEBFF,
// 灯杆弹窗 // 场所弹窗
dialog_title: #D9E7FF, dialog_title: #D9E7FF,
pole_function_normal: #C8D3E9, pole_function_normal: #C8D3E9,
pole_function_active: #fff, pole_function_active: #fff,
@@ -273,7 +273,7 @@ $themes: (blue: (title_color: #D9E7FF, // 银海立交智慧照明平台（标
information_jiaotong_color: #D9F7FF, information_jiaotong_color: #D9F7FF,
putin_desc : #D9D9D9, putin_desc : #D9D9D9,
// 灯杆弹窗 // 场所弹窗
dialog_title: #FFF2DF, dialog_title: #FFF2DF,
pole_function_normal:#E8DECF, pole_function_normal:#E8DECF,
pole_function_active:#FFF2DF, pole_function_active:#FFF2DF,

4
src/utils/map.js
View File

@@ -119,8 +119,8 @@ export function createPopupEle(item, flag) {
<div class="popup-wrapper"> <div class="popup-wrapper">
<div class="popup-title">${item.feature.name}</div> <div class="popup-title">${item.feature.name}</div>
<div class="popup-content"> <div class="popup-content">
<div class="item">设备编号：<span class="num">${item.feature.code}</span></div> <div class="item">场所编号：<span class="num">${item.feature.code}</span></div>
${item.feature.type === '1' ? `<div class="item">关联灯杆数：<span class="num">${item.feature.deviceCount}</span>个</div>` : ''} ${item.feature.type === '1' ? `<div class="item">关联场所数：<span class="num">${item.feature.deviceCount}</span>个</div>` : ''}
${item.feature.type === '2' ? `<div class="item">挂载设备数：<span class="num">${item.feature.deviceCount}</span>个</div>` : ''} ${item.feature.type === '2' ? `<div class="item">挂载设备数：<span class="num">${item.feature.deviceCount}</span>个</div>` : ''}
${item.feature.type === '3' ? `<div class="item">控制灯具数：<span class="num">${item.feature.deviceCount}</span>个</div>` : ''} ${item.feature.type === '3' ? `<div class="item">控制灯具数：<span class="num">${item.feature.deviceCount}</span>个</div>` : ''}
<div class="item">现存故障：<span class="${item.feature.alarmTypeLabel ? 'error' :'' }">${item.feature.alarmTypeLabel || '无' }</span></div> <div class="item">现存故障：<span class="${item.feature.alarmTypeLabel ? 'error' :'' }">${item.feature.alarmTypeLabel || '无' }</span></div>

4
src/views/components/dialog/cabinet.vue
View File

@@ -9,9 +9,9 @@
</div> </div>
<div class="cabinet-info"> <div class="cabinet-info">
<span class="square"></span> <span class="square"></span>
<span class="info-text">设备编号：{{ cabinet.code }}</span> <span class="info-text">场所编号：{{ cabinet.code }}</span>
<span class="square"></span> <span class="square"></span>
<span class="info-text">关联灯杆数：{{ cabinet.deviceCount }}个</span> <span class="info-text">关联场所数：{{ cabinet.deviceCount }}个</span>
<span class="square"></span> <span class="square"></span>
<span class="info-text"> <span class="info-text">
现存故障： <span v-if="!cabinet.alarmTypeLabel">无</span> 现存故障： <span v-if="!cabinet.alarmTypeLabel">无</span>

4
src/views/components/dialog/pole-detail/index.vue
View File

@@ -110,7 +110,7 @@ const changeFunction = (item) => {
getInfo(item); getInfo(item);
}; };
// 获取灯杆挂载设备 // 获取场所挂载设备
const deviceList = ref([]); const deviceList = ref([]);
getPoleDevice(props.pole.id).then((res) => { getPoleDevice(props.pole.id).then((res) => {
if (res.data?.length > 0) { if (res.data?.length > 0) {
@@ -129,7 +129,7 @@ getPoleDevice(props.pole.id).then((res) => {
getInfo(deviceList.value[0]); getInfo(deviceList.value[0]);
} else { } else {
deviceList.value = []; deviceList.value = [];
ElMessage.warning("该灯杆未挂载设备"); ElMessage.warning("该场所未挂载设备");
} }
}); });

74
src/views/components/module/GasMonitor.vue Normal file
View File

@@ -0,0 +1,74 @@
<template>
<div class="environment-wrapper">
<div class="search" @click.stop="handleSearch">
<el-select
v-model="searchData.itemId"
placeholder="请选择..."
@change="deviceChange"
:teleported="false"
>
<el-option
v-for="item in deviceList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</div>
<div class="content">
<div class="item" v-for="item in list" :key="item.id">
<div class="name">{{ item.name }}</div>
<div class="num-con">
<div class="num">{{ item.num }}</div>
<div class="unit">{{ item.unit }}</div>
</div>
</div>
</div>
</div>
</template>
<script setup>
import { environmentData, environmentItem } from "@/api/largeScreen";
import { onMounted } from "vue";
const props = defineProps(["buildingId"]);
const searchContent = ref("请选择...");
const searchData = ref({});
const deviceList = ref([]); //传感器list
const list = ref([
{ id: 0, name: "氧气", num: "--", unit: "%" },
{ id: 1, name: "硫化氢", num: "--", unit: "ppm" },
{ id: 2, name: "甲烷", num: "--", unit: "%lel" },
{ id: 0, name: "一氧化碳", num: "--", unit: "ppm" },
{ id: 0, name: "氨气", num: "--", unit: "ppm" },
{ id: 0, name: "二氧化碳", num: "--", unit: "ppm" },
]);
// el-select切换获取新数据
const deviceChange = (val) => {
getItem(val);
};
// 获取传感器下监测项
const getItem = (val) => {
environmentItem({ id: val }).then((res) => {
list.value[0].num = res.data.noise;
list.value[1].num = res.data.windSpeed;
list.value[2].num = res.data.pm25;
list.value[3].num = res.data.temperature;
list.value[4].num = res.data.humidity;
list.value[5].num = res.data.pressure;
});
};
onMounted(() => {
// 获取传感器list
environmentData({ buildingIdList: props.buildingId }).then((res) => {
deviceList.value = res.rows;
if (res.rows.length !== 0) {
searchData.value.itemId = deviceList.value[0].id;
getItem(deviceList.value[0].id);
}
});
});
</script>
<style lang="scss" scoped></style>

6
src/views/components/module/LampPoleStatistics.vue
View File

@@ -18,9 +18,9 @@ import { onMounted } from "vue";
const props = defineProps(["buildingId"]); const props = defineProps(["buildingId"]);
const list = ref([ const list = ref([
{ id: 0, name: "灯杆总数", num: 0, unit: "根" }, { id: 0, name: "监控场所", num: 0, unit: "个" },
{ id: 1, name: "灯控总数", num: 0, unit: "个" }, { id: 1, name: "设备总数", num: 0, unit: "个" },
{ id: 2, name: "灯具总数", num: 0, unit: "个" }, { id: 2, name: "在线设备", num: 0, unit: "个" },
]); ]);
onMounted(() => { onMounted(() => {

74
src/views/components/module/WaterQualityMonitor.vue Normal file
View File

@@ -0,0 +1,74 @@
<template>
<div class="environment-wrapper">
<div class="search" @click.stop="handleSearch">
<el-select
v-model="searchData.itemId"
placeholder="请选择..."
@change="deviceChange"
:teleported="false"
>
<el-option
v-for="item in deviceList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</div>
<div class="content">
<div class="item" v-for="item in list" :key="item.id">
<div class="name">{{ item.name }}</div>
<div class="num-con">
<div class="num">{{ item.num }}</div>
<div class="unit">{{ item.unit }}</div>
</div>
</div>
</div>
</div>
</template>
<script setup>
import { environmentData, environmentItem } from "@/api/largeScreen";
import { onMounted } from "vue";
const props = defineProps(["buildingId"]);
const searchContent = ref("请选择...");
const searchData = ref({});
const deviceList = ref([]); //传感器list
const list = ref([
{ id: 0, name: "Ph值", num: "--", unit: "" },
{ id: 1, name: "色度", num: "--", unit: "度" },
{ id: 2, name: "浑浊度", num: "--", unit: "NTU" },
{ id: 0, name: "溶解氧", num: "--", unit: "%" },
{ id: 0, name: "细菌", num: "--", unit: "%" },
{ id: 0, name: "病毒", num: "--", unit: "%" },
]);
// el-select切换获取新数据
const deviceChange = (val) => {
getItem(val);
};
// 获取传感器下监测项
const getItem = (val) => {
environmentItem({ id: val }).then((res) => {
list.value[0].num = res.data.noise;
list.value[1].num = res.data.windSpeed;
list.value[2].num = res.data.pm25;
list.value[3].num = res.data.temperature;
list.value[4].num = res.data.humidity;
list.value[5].num = res.data.pressure;
});
};
onMounted(() => {
// 获取传感器list
environmentData({ buildingIdList: props.buildingId }).then((res) => {
deviceList.value = res.rows;
if (res.rows.length !== 0) {
searchData.value.itemId = deviceList.value[0].id;
getItem(deviceList.value[0].id);
}
});
});
</script>
<style lang="scss" scoped></style>

2
src/views/index.vue
View File

@@ -184,7 +184,7 @@ const vcConfirm = (currentId, currentModuleId) => {
currentModule.value.active = false; currentModule.value.active = false;
}; };
// 灯杆逻辑 // 场所逻辑
const showPoleDialog = ref(false); const showPoleDialog = ref(false);
const pole = ref({}); const pole = ref({});
const poleClick = (data) => { const poleClick = (data) => {

24
src/views/layout/body.vue
View File

@@ -86,6 +86,8 @@ import ComTitle from "../components/comp/title.vue";
import WorkOrderOverview from "../components/module/WorkOrderOverview.vue"; import WorkOrderOverview from "../components/module/WorkOrderOverview.vue";
import LightingRate from "../components/module/LightingRate.vue"; import LightingRate from "../components/module/LightingRate.vue";
import EnvironmentMonitor from "../components/module/EnvironmentMonitor.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 LampPoleStatistics from "../components/module/LampPoleStatistics.vue";
import DueToday from "../components/module/DueToday.vue"; import DueToday from "../components/module/DueToday.vue";
import MonthlyEnergyConsumption from "../components/module/MonthlyEnergyConsumption.vue"; import MonthlyEnergyConsumption from "../components/module/MonthlyEnergyConsumption.vue";
@@ -132,8 +134,8 @@ const moduleObj = {
}, },
LightPole: { LightPole: {
moduleId: "7", moduleId: "7",
title: "灯杆统计", title: "场所统计",
titleEn: "LAMP POLE STATISTICS", titleEn: "SITE STATISTICS",
comp: LampPoleStatistics, comp: LampPoleStatistics,
}, },
TodayPlan: { TodayPlan: {
@@ -178,6 +180,18 @@ const moduleObj = {
titleEn: "Environment", titleEn: "Environment",
comp: EnvironmentMonitor, comp: EnvironmentMonitor,
}, },
GasMonitor: {
moduleId: "13",
title: "气体监测",
titleEn: "GasMonitor",
comp: GasMonitor,
},
WaterQuality: {
moduleId: "14",
title: "水质监测",
titleEn: "WaterQualityMonitor",
comp: WaterQualityMonitor,
},
InfoScreen: { InfoScreen: {
moduleId: '11', moduleId: '11',
title: '屏幕总览', title: '屏幕总览',
@@ -195,7 +209,7 @@ const moduleObj = {
const deviceInfoList = ref([ const deviceInfoList = ref([
{ {
id: 0, id: 0,
name: "配电柜", name: "传感器",
num: 0, num: 0,
img: "DistributionCabinet", img: "DistributionCabinet",
isActive: false, isActive: false,
@@ -204,13 +218,13 @@ const deviceInfoList = ref([
{ id: 1, name: "摄像头", num: 0, img: "Camera", isActive: false, type: "4" }, { id: 1, name: "摄像头", num: 0, img: "Camera", isActive: false, type: "4" },
{ {
id: 2, id: 2,
name: "灯控", name: "屏幕",
num: 0, num: 0,
img: "LightControl", img: "LightControl",
isActive: false, isActive: false,
type: "3", 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) => { const getTitle = (id) => {

2
src/views/layout/header.vue
View File

@@ -197,7 +197,7 @@ const handleThemeConfirm = (val) => {
const title = ref(""); const title = ref("");
function getDefaultTitle() { function getDefaultTitle() {
getConfigKey("defaultTitle").then((res) => { getConfigKey("iotTitle").then((res) => {
title.value = res.msg; title.value = res.msg;
document.title = res.msg; document.title = res.msg;
}); });

4
src/views/login.vue
View File

@@ -170,13 +170,13 @@ function getCode() {
} }
function getDefaultBg() { function getDefaultBg() {
getConfigKey("defaultBg").then((res) => { getConfigKey("iotBg").then((res) => {
defaultBg.value = res.msg; defaultBg.value = res.msg;
}); });
} }
function getDefaultTitle() { function getDefaultTitle() {
getConfigKey("defaultTitle").then((res) => { getConfigKey("iotTitle").then((res) => {
title.value = res.msg; title.value = res.msg;
document.title = res.msg; document.title = res.msg;
}); });

BIN
static/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

6
vite.config.js
View File

@@ -14,8 +14,8 @@ export default defineConfig({
server: { server: {
proxy: { proxy: {
'/api': { // 匹配请求路径， '/api': { // 匹配请求路径，
// target: 'http://140.249.205.82:8288', // 代理的目标地址 target: 'http://117.72.197.29:8080', // 代理的目标地址
target: 'http://127.0.0.1:8080', // 代理的目标地址 // target: 'http://127.0.0.1:8080', // 代理的目标地址
changeOrigin: true, changeOrigin: true,
// secure: true, // 是否https接口 // secure: true, // 是否https接口
// ws: true, // 是否代理websockets // ws: true, // 是否代理websockets
@@ -23,7 +23,7 @@ export default defineConfig({
rewrite: (path) => path.replace(/^\/api/, '') rewrite: (path) => path.replace(/^\/api/, '')
}, },
'/fileUrl': { '/fileUrl': {
target: 'http://140.249.24.92:9000', // 本地 target: 'http://117.72.197.29:9000', // 本地
changeOrigin: true, changeOrigin: true,
rewrite: (p) => p.replace(/^\/fileUrl/, '') rewrite: (p) => p.replace(/^\/fileUrl/, '')
}, },