by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

Browse Source
This commit is contained in:
zcxlsm
2025-09-10 20:45:09 +08:00
parent e7ab904858 60eed1ab12
commit 22878ac139
17 changed files with 409 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/web-antd/src/api/analytics/index.ts
View File

@@ -25,6 +25,36 @@ export function getworkOrder() {
export function getTodayMeetCount() {
return requestClient.get<any>('/property/screen/todayMeetCount');
}
// 水电
export function getHydropower() {
return requestClient.get<any>('/property/meterInfo/statusCount');
}
// 门禁
export function getAccessControl() {
return requestClient.get<any>('/sis/e8/door/online');
}
// 摄像头状态
export function getCamera() {
return requestClient.get<any>('/sis/deviceManage/online');
}
//车流
export async function queryTwentyfourRunningDatasByPlNos() {
let params = {
"orgId": "10012",
"plNos": [
"PFN000000012",
"PFN000000025"
]
};
const response = await fetch('https://server.cqnctc.com:6081/web/thirdParty/queryTwentyfourRunningDatasByPlNos', {
method: 'POST', // 指定请求方法为POST
headers: {
'Content-Type': 'application/json', // 设置内容类型为JSON
},
body: JSON.stringify(params), // 将参数对象转换为JSON字符串并作为请求体发送
});
return response.json();
}
// /**
// * 导出资产管理列表
// * @param params

BIN
apps/web-antd/src/assets/property/bg1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 436 KiB

24
apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue
View File

@@ -8,6 +8,7 @@ import relativeTime from 'dayjs/plugin/relativeTime';
import {renderDict} from "#/utils/render";
import {workOrdersInfo} from "#/api/property/businessManagement/workOrders";
import type {WorkOrdersVO} from "#/api/property/businessManagement/workOrders/model";
import {ossInfo} from "#/api/system/oss";
dayjs.extend(duration);
dayjs.extend(relativeTime);
@@ -35,6 +36,25 @@ async function handleOpenChange(open: boolean) {
handlerName: index === 0 ? item.initiatorPeople : item.handlerName
}))
}
try {
if (orderDetail.value.orderImgUrl) {
const res = await ossInfo([orderDetail.value.orderImgUrl]);
let imgUrls = [] as string[];
res.forEach(item => {
imgUrls.push(item.url)
})
orderDetail.value.orderImgPath = imgUrls;
}
if (orderDetail.value.imgUrl) {
const res = await ossInfo([orderDetail.value.imgUrl]);
let imgUrls = [] as string[];
res.forEach(item => {
imgUrls.push(item.url)
})
orderDetail.value.evaluateImgPath = imgUrls
}
} catch (e) {
}
modalApi.modalLoading(false);
}
</script>
@@ -61,6 +81,10 @@ async function handleOpenChange(open: boolean) {
<DescriptionsItem label="创建时间">
{{ orderDetail.createTime }}
</DescriptionsItem>
<DescriptionsItem label="工单图片" v-if="orderDetail.orderImgPath" :span="2">
<img v-for="item in orderDetail.orderImgPath" :src="item" alt="图片加载失败"
class="orders-img"/>
</DescriptionsItem>
<!-- <DescriptionsItem label="计划完成时间">-->
<!-- {{ orderDetail.planCompleTime }}-->
<!-- </DescriptionsItem>-->

28
apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue
View File

@@ -8,6 +8,7 @@ import relativeTime from 'dayjs/plugin/relativeTime';
import {renderDict} from "#/utils/render";
import {workOrdersInfo} from "#/api/property/businessManagement/workOrders";
import type {WorkOrdersVO} from "#/api/property/businessManagement/workOrders/model";
import {ossInfo} from "#/api/system/oss";
dayjs.extend(duration);
dayjs.extend(relativeTime);
@@ -35,6 +36,25 @@ async function handleOpenChange(open: boolean) {
handlerName: index === 0 ? item.initiatorPeople : item.handlerName
}))
}
try {
if (orderDetail.value.orderImgUrl) {
const res = await ossInfo([orderDetail.value.orderImgUrl]);
let imgUrls = [] as string[];
res.forEach(item => {
imgUrls.push(item.url)
})
orderDetail.value.orderImgPath = imgUrls;
}
if (orderDetail.value.imgUrl) {
const res = await ossInfo([orderDetail.value.imgUrl]);
let imgUrls = [] as string[];
res.forEach(item => {
imgUrls.push(item.url)
})
orderDetail.value.evaluateImgPath = imgUrls
}
} catch (e) {
}
modalApi.modalLoading(false);
}
</script>
@@ -81,6 +101,14 @@ async function handleOpenChange(open: boolean) {
:is="orderDetail.isTimeOut ? renderDict(orderDetail.isTimeOut,'wy_sf') : ''"
/>
</DescriptionsItem>
<DescriptionsItem label="工单图片" v-if="orderDetail.orderImgPath" :span="2">
<img v-for="item in orderDetail.orderImgPath" :src="item" alt="图片加载失败"
class="orders-img"/>
</DescriptionsItem>
<DescriptionsItem label="评价图片" v-if="orderDetail.evaluateImgPath" :span="2">
<img v-for="item in orderDetail.evaluateImgPath" :src="item" alt="图片加载失败"
class="orders-img"/>
</DescriptionsItem>
<DescriptionsItem label="备注">
{{ orderDetail.remark }}
</DescriptionsItem>

2
apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue
View File

@@ -112,7 +112,7 @@ async function handleOpenChange(open: boolean) {
<DescriptionsItem label="创建时间">
{{ orderDetail.createTime }}
</DescriptionsItem>
<DescriptionsItem label="完成时间">
<DescriptionsItem label="完成时间" v-if="orderDetail.compleTime!=null">
{{ orderDetail.compleTime }}
</DescriptionsItem>
<DescriptionsItem label="是否超时" :span="2">

5
apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts
View File

@@ -68,11 +68,6 @@ export const columns: VxeGridProps['columns'] = [
field: 'sort',
width: 180,
},
{
title: '累计工单数量',
field: 'number',
width: 180,
},
{
title: '是否支持转单',
field: 'isTransfers',

23
apps/web-antd/src/views/property/customerService/notices/notices-modal.vue
View File

@@ -11,7 +11,6 @@ import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
import { modalSchema } from './data';
import {personList} from "#/api/property/resident/person";
import {renderDictValue} from "#/utils/render";
import {userList} from "#/api/system/user";
const emit = defineEmits<{ reload: [] }>();
@@ -105,11 +104,23 @@ async function queryPersonData() {
pageSize: 1000,
pageNum: 1,
}
const res = await userList(params);
const options = res.rows.map((user) => ({
label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex')
+ '-' + user.phonenumber,
value: user.userId.toString(),
const user = await userList(params);
const resident = await personList(params);
const residentPerson = user.rows.map(item => ({
name: item.nickName,
phone: item.phonenumber,
id: item.userId
}));
const userPerson = resident.rows.map(item => ({
name: item.userName,
phone: item.phone,
id: item.id
}));
const person = residentPerson.concat(userPerson);
const options = person.map((user) => ({
label: user.name + '-' + user.phone,
value: user.id.toString(),
}));
formApi.updateSchema([{
componentProps: () => ({

8
apps/web-antd/src/views/property/inspectionManagement/inspectionDetails/data.ts
View File

@@ -34,22 +34,22 @@ export const columns: VxeGridProps['columns'] = [
{ type: 'checkbox', width: 60 },
{
title: '巡检计划',
field: 'planId',
field: 'planText',
minWidth:200
},
{
title: '巡检任务',
field: 'taskId',
field: 'taskText',
width:150
},
{
title: '巡检路线',
field: 'routeId',
field: 'routeText',
width:150
},
{
title: '巡检点',
field: 'pointId',
field: 'pointText',
width:150
},
{

4
apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
View File

@@ -42,6 +42,10 @@ export const columns: VxeGridProps['columns'] = [
title: '巡检项目',
field: 'itemName',
},
{
title: '巡检位置',
field: 'inspectionLocation',
},
{
title: 'nfc编码',
field: 'nfcCode',

3
apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/point-detail.vue
View File

@@ -47,6 +47,9 @@ async function handleOpenChange(open: boolean) {
<DescriptionsItem label="巡检项目">
{{pointDetail.itemName}}
</DescriptionsItem>
<DescriptionsItem label="巡检位置">
{{pointDetail.inspectionLocation}}
</DescriptionsItem>
<DescriptionsItem label="nfc编码">
{{ pointDetail.nfcCode}}
</DescriptionsItem>

2
apps/web-antd/src/views/property/room/data.ts
View File

@@ -73,7 +73,7 @@ export const modalSchema: FormSchemaGetter = () => [
component: 'TreeSelect',
fieldName: 'floorId',
defaultValue: undefined,
label: '社区建筑',
label: '园区建筑',
rules: 'selectRequired',
formItemClass: 'col-span-2',
},

2
apps/web-antd/src/views/property/room/room-detail.vue
View File

@@ -38,7 +38,7 @@ async function handleOpenChange(open: boolean) {
<BasicModal :footer="false" :fullscreen-button="false" title="房间详情" class="w-[70%]">
<Descriptions v-if="roomDetail" size="small" :column="2" bordered
:labelStyle="{width:'120px'}">
<DescriptionsItem label="社区">
<DescriptionsItem label="园区">
{{ roomDetail.communityText }}
</DescriptionsItem>
<DescriptionsItem label="建筑名称">

6
apps/web-antd/src/views/screen/property/analytics-trends.vue
View File

@@ -48,8 +48,8 @@ const getMeterRecordTrend = async (selectedDate: any) => {
bottom: 125,
containLabel: true,
left: '2%',
right: '8%',
top: '8%',
right: '2%',
top: '2%',
},
series: [
{
@@ -90,7 +90,6 @@ const getMeterRecordTrend = async (selectedDate: any) => {
// type: 'category',
// },
xAxis: {
name: '月',
axisTick: {
show: false,
},
@@ -108,7 +107,6 @@ const getMeterRecordTrend = async (selectedDate: any) => {
},
yAxis: [
{
name: 'KW.h',
axisTick: {
show: false,
},

448
apps/web-antd/src/views/screen/property/index.vue
View File

@@ -70,28 +70,56 @@
</div>
</div>
<div class="content-center-second">
<div class="second-item" @click="changeToPersonnelDuty">
<div>
<div class="second-item-box1">645</div>
<div class="second-item-box-label">采购部</div>
</div>
<div>
<div class="second-item-box2">729</div>
<div class="second-item-box-label">研发部</div>
</div>
<div>
<div class="second-item-box3">648</div>
<div class="second-item-box-label">安保部</div>
</div>
<div>
<div class="second-item-box4">786</div>
<div class="second-item-box-label">人事部</div>
</div>
<div>
<div class="second-item-box5">645</div>
<div class="second-item-box-label">财务部</div>
</div>
<div>
<EchartsUI
ref="water"
height="100%"
width="150px"
/>
</div>
<div>
<EchartsUI
ref="electricity"
height="100%"
width="150px"
/>
</div>
<div>
<EchartsUI
ref="accessControl"
height="100%"
width="150px"
/>
</div>
<div>
<EchartsUI
ref="camera"
height="100%"
width="150px"
/>
</div>
<!-- <div class="second-item" @click="changeToPersonnelDuty">-->
<!-- <div>-->
<!-- <div class="second-item-box1">645</div>-->
<!-- <div class="second-item-box-label">采购部</div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div class="second-item-box2">729</div>-->
<!-- <div class="second-item-box-label">研发部</div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div class="second-item-box3">648</div>-->
<!-- <div class="second-item-box-label">安保部</div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div class="second-item-box4">786</div>-->
<!-- <div class="second-item-box-label">人事部</div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div class="second-item-box5">645</div>-->
<!-- <div class="second-item-box-label">财务部</div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<div class="content-right">
@@ -135,11 +163,11 @@
<!-- <div ref="deviceChart" class="device-chart"></div>-->
<div class="third-item">
<div class="third-title">会议室总数</div>
<div class="third-num">557</div>
<div class="third-num">{{todayMeetCount?.meetCount}}</div>
</div>
<div class="third-item">
<div class="third-title">当日预约会议室总数</div>
<div class="third-num">669</div>
<div class="third-num">{{todayMeetCount?.timeQuantity}}</div>
</div>
</div>
</div>
@@ -149,38 +177,13 @@
</template>
<script setup lang="ts">
import {getStatistics,getworkOrder,getTodayMeetCount} from '#/api/analytics';
import {getStatistics,getworkOrder,getTodayMeetCount,getHydropower,getAccessControl,getCamera,queryTwentyfourRunningDatasByPlNos} from '#/api/analytics';
import AnalyticsTrends from './analytics-trends.vue';
import { Radio } from 'ant-design-vue';
import {EchartsUI, useEcharts} from "@vben/plugins/echarts";
//预警类型
const warning = ref([
// {
// "typeCode": 1025,
// "typeName": "车辆违停占用报警",
// "total": 121
// },
// {
// "typeCode": 1008,
// "typeName": "周界闯入",
// "total": 64306
// },
// {
// "typeCode": 1026,
// "typeName": "黑名单人员",
// "total": 25
// },
// {
// "typeCode": 1007,
// "typeName": "人员聚集",
// "total": 250
// },
// {
// "typeCode": 1028,
// "typeName": "非法停车",
// "total": 628
// }
])
const warning = ref([])
async function getWarning() {
warning.value = await getStatistics();
}
@@ -207,10 +210,211 @@ const handleDateChange = (date: any) => {
const todayMeetCount = ref();
const handleTodayMeetCount = async () => {
todayMeetCount.value = await getTodayMeetCount();
console.log(todayMeetCount)
};
// 水
const water = ref();
const { renderEcharts: renderWater } = useEcharts(water);
async function fetchWater() {
const data = await getHydropower()
const waterData = [
{ name: '离线', value: data.water.off },
{ name: '在线', value: data.water.on }
];
renderWater({
title: {
text: '水',
left: 'center',
top: 'bottom',
padding: [0, 0, 15, 0],
textStyle: {
color: '#fff',
fontSize: 16,
}
},
tooltip: {
trigger: 'item'
},
series: [
{
type: 'pie',
radius: ['40%', '70%'],
avoidLabelOverlap: false,
itemStyle: {
borderRadius: 5,
borderColor: '#fff',
borderWidth: 1
},
label: {
show: false,
position: 'center'
},
emphasis: {
label: {
show: true,
fontSize: 10,
}
},
labelLine: {
show: false
},
data:waterData
}
]
})
}
// 电
const electricity = ref();
const { renderEcharts: renderElectricity } = useEcharts(electricity);
async function fetchElectricity() {
const data = await getHydropower()
const electricityData = [
{ name: '离线', value: data.power.off },
{ name: '在线', value: data.power.on }
];
renderElectricity({
title: {
text: '电',
left: 'center',
top: 'bottom',
padding: [0, 0, 15, 0],
textStyle: {
color: '#fff',
fontSize: 16,
}
},
tooltip: {
trigger: 'item'
},
series: [
{
type: 'pie',
radius: ['40%', '70%'],
avoidLabelOverlap: false,
itemStyle: {
borderRadius: 5,
borderColor: '#fff',
borderWidth: 1
},
label: {
show: false,
position: 'center'
},
emphasis: {
label: {
show: true,
fontSize: 10,
}
},
labelLine: {
show: false
},
data:electricityData
}
]
})
}
// 门禁
const accessControl = ref();
const { renderEcharts: renderAccessControl } = useEcharts(accessControl);
async function fetchAccessControl() {
const data = await getAccessControl()
const accessControlData = [
{ name: '离线', value: data.off },
{ name: '在线', value: data.on }
];
renderAccessControl({
title: {
text: '门禁',
left: 'center',
top: 'bottom',
padding: [0, 0, 15, 0],
textStyle: {
color: '#fff',
fontSize: 16,
}
},
tooltip: {
trigger: 'item'
},
series: [
{
type: 'pie',
radius: ['40%', '70%'],
avoidLabelOverlap: false,
itemStyle: {
borderRadius: 5,
borderColor: '#fff',
borderWidth: 1
},
label: {
show: false,
position: 'center'
},
emphasis: {
label: {
show: true,
fontSize: 10,
}
},
labelLine: {
show: false
},
data:accessControlData
}
]
})
}
// 摄像头
const camera = ref();
const { renderEcharts: renderCamera } = useEcharts(camera);
async function fetchCamera() {
const data = await getCamera()
const cameraData = [
{ name: '离线', value: data.off },
{ name: '在线', value: data.on }
];
renderCamera({
title: {
text: '摄像头',
left: 'center',
top: 'bottom',
padding: [0, 0, 15, 0],
textStyle: {
color: '#fff',
fontSize: 16,
}
},
tooltip: {
trigger: 'item'
},
series: [
{
type: 'pie',
radius: ['40%', '70%'],
avoidLabelOverlap: false,
itemStyle: {
borderRadius: 5,
borderColor: '#fff',
borderWidth: 1
},
label: {
show: false,
position: 'center'
},
emphasis: {
label: {
show: true,
fontSize: 10,
}
},
labelLine: {
show: false
},
data:cameraData
}
]
})
}
@@ -227,7 +431,7 @@ import {
} from '#/utils/echartsResize';
import { useFlexibleRem } from '#/utils/useFlexibleRem';
import {DatePicker} from "ant-design-vue";
import {getTodayMeetCount} from "#/api/analytics";
import {getCamera} from "#/api/analytics";
useFlexibleRem();
// 路由
const router = useRouter();
@@ -372,17 +576,20 @@ const initPowerChart = () => {
addChartToResizeManager(chart);
};
// 初始化环境图表
const initEnvChart = () => {
// 人流车流
const initEnvChart = async () => {
if (!envChart.value) return;
const data = await queryTwentyfourRunningDatasByPlNos()
const inCounts = data.data.inCounts
const staticTimeStrs = data.data.staticTimeStrs
console.log(data)
const chart = echarts.init(envChart.value);
const option = {
tooltip: { trigger: 'axis' },
grid: { left: 40, right: 20, top: 40, bottom: 30 },
xAxis: {
type: 'category',
data: Array.from({ length: 8 }, (_, i) => (i + 1) * 3),
data: staticTimeStrs,
axisLine: { lineStyle: { color: '#3ec6ff' } },
axisLabel: { color: '#fff' },
},
@@ -394,8 +601,8 @@ const initEnvChart = () => {
},
series: [
{
name: '今年',
data: [100, 200, 150, 300, 250, 200, 100, 80],
name: '车流',
data: inCounts,
type: 'line',
smooth: true,
itemStyle: { color: '#b388ff' },
@@ -404,17 +611,17 @@ const initEnvChart = () => {
symbol: 'circle',
symbolSize: 0,
},
{
name: '去年',
data: [80, 120, 100, 180, 150, 120, 60, 40],
type: 'line',
smooth: true,
itemStyle: { color: '#ffb300' },
lineStyle: { width: 3 },
areaStyle: { color: 'rgba(255,179,0,0.15)' },
symbol: 'circle',
symbolSize: 0,
},
// {
// name: '去年',
// data: [80, 120, 100, 180, 150, 120, 60, 40],
// type: 'line',
// smooth: true,
// itemStyle: { color: '#ffb300' },
// lineStyle: { width: 3 },
// areaStyle: { color: 'rgba(255,179,0,0.15)' },
// symbol: 'circle',
// symbolSize: 0,
// },
],
};
chart.setOption(option);
@@ -586,14 +793,18 @@ const initPie3DChart = () => {
}
};
const changeToPersonnelDuty=()=>{
router.push('/property/attendanceManagement/workforceManagement')
}
// const changeToPersonnelDuty=()=>{
// router.push('/property/attendanceManagement/workforceManagement')
// }
// 组件挂载时初始化
onMounted(() => {
getWarning()
handleTodayMeetCount()
fetchWater()
fetchElectricity()
fetchAccessControl()
fetchCamera()
updateTime();
timer = setInterval(updateTime, 1000);
@@ -657,7 +868,7 @@ onBeforeUnmount(() => {
}
.mian {
height: 100vh;
background: url('../../../assets/property/bg.png');
background: url('../../../assets/property/bg1.png');
background-size: 100% 100%;
background-color: #081b3a;
display: flex;
@@ -841,90 +1052,9 @@ onBeforeUnmount(() => {
}
}
.content-center-second {
display: flex;
justify-content: center;
align-items: center;
height: 12.5rem;
.second-item {
width: 100%;
display: flex;
justify-content: space-around;
align-items: center;
cursor: pointer;
.second-item-box1 {
width: 7rem;
height: 7rem;
display: flex;
justify-content: center;
align-items: center;
font-family: ShiShangZhongHeiJianTi;
font-weight: 400;
font-size: 1.37rem;
color: #ffffff;
background: url('../../../assets/property/personnel-duty-circle1.png');
background-size: 100% 100%;
}
.second-item-box-label{
display: flex;
justify-content: center;
align-items: center;
font-weight: 400;
font-size: 1rem;
color: #ffffff;
}
.second-item-box2 {
width: 7rem;
height: 7rem;
display: flex;
justify-content: center;
align-items: center;
font-family: ShiShangZhongHeiJianTi;
font-weight: 400;
font-size: 1.37rem;
color: #ffffff;
background: url('../../../assets/property/personnel-duty-circle2.png');
background-size: 100% 100%;
}
.second-item-box3 {
width: 7rem;
height: 7rem;
display: flex;
justify-content: center;
align-items: center;
font-family: ShiShangZhongHeiJianTi;
font-weight: 400;
font-size: 1.37rem;
color: #ffffff;
background: url('../../../assets/property/personnel-duty-circle3.png');
background-size: 100% 100%;
}
.second-item-box4 {
width: 7rem;
height: 7rem;
display: flex;
justify-content: center;
align-items: center;
font-family: ShiShangZhongHeiJianTi;
font-weight: 400;
font-size: 1.37rem;
color: #ffffff;
background: url('../../../assets/property/personnel-duty-circle1.png');
background-size: 100% 100%;
}
.second-item-box5 {
width: 7rem;
height: 7rem;
display: flex;
justify-content: center;
align-items: center;
font-family: ShiShangZhongHeiJianTi;
font-weight: 400;
font-size: 1.37rem;
color: #ffffff;
background: url('../../../assets/property/personnel-duty-circle4.png');
background-size: 100% 100%;
}
}
display: flex;
justify-content: space-around;
}
}
.content-right {

2
apps/web-antd/src/views/sis/video/realtime/index.vue
View File

@@ -291,6 +291,8 @@ function onNodeChecked(
}
}
});
// 处理树节点状态
treeSelectHandle();
}
}

4
apps/web-antd/src/views/system/user/data.tsx
View File

@@ -43,12 +43,12 @@ export const columns: VxeGridProps['columns'] = [
{ type: 'checkbox', width: 60 },
{
field: 'userName',
title: '名称',
title: '账号',
minWidth: 80,
},
{
field: 'nickName',
title: '昵称',
title: '名称',
minWidth: 130,
},
{

2
apps/web-antd/vite.config.mts
View File

@@ -27,7 +27,7 @@ export default defineConfig(async () => {
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, ''),
// mock代理目标地址
target: 'http://localhost:8080',
target: 'http://192.168.1.113:8080',
ws: true,
},
},