Compare commits

..

No commits in common. "685d956d6c71f61c11472231f5c598bce9e42347" and "5a86c02286ac7f0193110a0525aff13a908c642f" have entirely different histories.

15 changed files with 70 additions and 168 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 MiB

View File

@ -11,15 +11,13 @@
</div>
</div>
<div class="right-div">
<img :src="licang" alt="" width="400" v-if="infoList.imgUrl == 'licang'">
<img :src="guolvcao" alt="" width="400" v-if="infoList.imgUrl == 'guolvcao'">
<img src="@/assets/images/device.png" alt="" width="400">
<span>设备图片</span>
</div>
</div>
</template>
<script setup>
import licang from '@/assets/images/licang.jpg';
import guolvcao from '@/assets/images/cao.jpg';
const props = defineProps({
infoList: {
default: {},

View File

@ -19,7 +19,7 @@ import { ElMessage } from 'element-plus';
const deviceData = {
'EQ0001': {
name: '立仓',
imgUrl: 'licang',
imgUlr: '',
detail: [
{
name: '资产名称',
@ -77,7 +77,7 @@ const deviceData = {
},
'EQ0002': {
name: '过滤槽',
imgUrl: 'guolvcao',
imgUlr: '',
detail: [
{
name: '资产名称',

View File

@ -1,6 +1,6 @@
<template>
<div class="deviceDiv">
<TopDiv title="资产事件" showMore="true"></TopDiv>
<TopDiv title="资产事件"></TopDiv>
<dv-border-box-10 backgroundColor="#00174b" :color="['#3cbfdf', '#3cbfdf']">
<el-timeline>
<el-timeline-item v-for="(activity, index) in activities" :key="index" placement="top" :icon="activity.icon"
@ -19,8 +19,8 @@
</el-timeline-item>
</el-timeline>
</dv-border-box-10>
<!-- <div class="box-button" @click="openDialog">
</div> -->
<div class="box-button" @click="openDialog">
</div>
</div>
</template>
<script setup>
@ -33,7 +33,7 @@ const data = reactive({
content: '设备完成巡检计划',
time: '下午',
timestamp: '20:46',
color: '#08326f',
color: '#87efd0e9',
icon: MoreFilled,
type: 'primary',
size: 'large'
@ -51,7 +51,7 @@ const data = reactive({
content: '设备保养周期剩余3天',
time: '上午',
timestamp: '11:46',
color: '#02a7f0',
color: '#6eebe3',
icon: MoreFilled,
type: 'primary',
size: 'large'

View File

@ -3,29 +3,17 @@
<TopDiv title="资产信息"></TopDiv>
<dv-border-box-10 backgroundColor="#00174b" :color="['#3cbfdf', '#3cbfdf']">
<div>
<span class="name">资产名称</span>
<span class="name">名称</span>
<span class="text">{{ deviceInfo && deviceInfo.name }}</span>
</div>
<div>
<span class="name">资产类型</span>
<span class="name">类型</span>
<span class="text">{{ deviceInfo && deviceInfo.type }}</span>
</div>
<div>
<span class="name">资产状态</span>
<span class="name">状态</span>
<span class="text">{{ deviceInfo && deviceInfo.status }}</span>
</div>
<div>
<span class="name">资产位置</span>
<span class="text">{{ deviceInfo && deviceInfo.location }}</span>
</div>
<div>
<span class="name">所属厂区</span>
<span class="text">{{ deviceInfo && deviceInfo.belong }}</span>
</div>
<div>
<span class="name">过保截至日期</span>
<span class="text">{{ deviceInfo && deviceInfo.date }}</span>
</div>
</dv-border-box-10>
</div>
</template>
@ -62,11 +50,11 @@ watch(() => bimStore().activateDevice.info, value => deviceInfo.value = value);
}
.name {
width: 40%;
width: 25%;
}
.text {
width: 59%;
width: 75%;
color: #fff;
}
}

View File

@ -1,6 +1,6 @@
<template>
<div class="deviceDiv">
<TopDiv title="资产信息" showMore="true"></TopDiv>
<TopDiv title="资产信息"></TopDiv>
<dv-border-box-10 backgroundColor="#00174b" :color="['#3cbfdf', '#3cbfdf']">
<!-- <div class="container1">
@ -10,8 +10,8 @@
</div>
</dv-border-box-10>
<!-- <div class="box-button" @click="openDialog">
</div> -->
<div class="box-button" @click="openDialog">
</div>
</div>
</template>
<script setup>

View File

@ -36,10 +36,7 @@ const data = reactive({
info: {
name: '生产设备',
type: '生产设备',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2025-12-15'
status: '启用'
},
children: [
{
@ -49,11 +46,7 @@ const data = reactive({
info: {
name: '立仓',
type: '生产设备',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2028-10-15'
status: '启用'
},
children: []
@ -65,10 +58,7 @@ const data = reactive({
info: {
name: '过滤槽',
type: '生产设备',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2067-12-30'
status: '启用'
},
children: []
@ -80,10 +70,7 @@ const data = reactive({
info: {
name: '设备二',
type: '生产设备',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2025-12-15'
status: '启用'
},
children: []
},
@ -94,10 +81,7 @@ const data = reactive({
info: {
name: '设备三',
type: '空调设备',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2025-12-15'
status: '启用'
},
children: []
},
@ -108,10 +92,7 @@ const data = reactive({
info: {
name: '设备四',
type: '安防设备',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2025-12-15'
status: '启用'
},
children: []
},

View File

@ -1,6 +1,6 @@
<template>
<div class="buildDiv">
<TopDiv title="设备信息"></TopDiv>
<dv-border-box-10 backgroundColor="#00174b" :color="['#3cbfdf', '#3cbfdf']">
<div>
@ -15,18 +15,6 @@
<span class="name">设备状态</span>
<span class="text">{{ equipmentInfo.status }}</span>
</div>
<div>
<span class="name">设备位置</span>
<span class="text">{{ equipmentInfo.location }}</span>
</div>
<div>
<span class="name">所属厂区:</span>
<span class="text">{{ equipmentInfo.belong }}</span>
</div>
<div>
<span class="name">过保截至日期:</span>
<span class="text">{{ equipmentInfo.date }}</span>
</div>
</dv-border-box-10>
</div>
</template>
@ -34,14 +22,11 @@
import bimStore from '@/store/modules/bim';
import TopDiv from "./TopDiv.vue";
const data = reactive({
equipmentInfo: {
name: '空调机组',
number: 'AHU-F01-02',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2025-12-15'
}
equipmentInfo: {
name: '空调机组',
number: 'AHU-F01-02',
status:'启用',
}
});
const { equipmentInfo } = toRefs(data);
@ -59,23 +44,20 @@ const { equipmentInfo } = toRefs(data);
flex-direction: column;
align-items: center;
color: #3cbfdf;
:deep(.border-box-content) {
padding: 10px;
>div {
line-height: 48px;
display: flex;
justify-content: space-between;
}
.name {
width: 40%;
width: 35%;
}
.text {
width: 59%;
width: 56%;
color: #fff;
}
}
}</style>
}
</style>

View File

@ -2,29 +2,17 @@
<div class="realInfoDialog">
<div class="top-div">
<div>
<span class="name">资产名称:</span>
<span class="name">名称:</span>
<span class="text">{{ deviceInfo && deviceInfo.name }}</span>
</div>
<div>
<span class="name">资产类型:</span>
<span class="name">类型:</span>
<span class="text">{{ deviceInfo && deviceInfo.type }}</span>
</div>
<div>
<span class="name">资产状态:</span>
<span class="name">状态:</span>
<span class="text">{{ deviceInfo && deviceInfo.status }}</span>
</div>
<div>
<span class="name">资产位置:</span>
<span class="text">{{ deviceInfo && deviceInfo.location }}</span>
</div>
<div>
<span class="name">所属厂区:</span>
<span class="text">{{ deviceInfo && deviceInfo.belong }}</span>
</div>
<div>
<span class="name">过保截至日期:</span>
<span class="text">{{ deviceInfo && deviceInfo.date }}</span>
</div>
</div>
<div class="bottom-div">
@ -76,7 +64,7 @@ const data = reactive({
content: '设备完成巡检计划',
time: '2023年',
timestamp: '12月3日',
color: '#08326f',
color: '#87efd0e9',
icon: MoreFilled,
type: 'primary',
size: 'large'
@ -94,7 +82,7 @@ const data = reactive({
content: '设备保养周期剩余3天',
time: '2023年',
timestamp: '12月6日',
color: '#02a7f0',
color: '#6eebe3',
icon: MoreFilled,
type: 'primary',
size: 'large'
@ -103,7 +91,7 @@ const data = reactive({
content: '设备完成巡检计划',
time: '2023年',
timestamp: '12月20日',
color: '#08326f',
color: '#87efd0e9',
icon: MoreFilled,
type: 'primary',
size: 'large'
@ -203,14 +191,13 @@ const getEchart = () => {
height: 25%;
border: 1px solid #2E6099;
display: flex;
// flex-direction: column;
flex-direction: column;
align-items: center;
flex-wrap: wrap;
>div {
display: flex;
line-height: 48px;
width: 33%;
width: 240px;
justify-content: space-between;
}

View File

@ -406,8 +406,8 @@ const setBottom = () => {
.btnGroup {
width: 180px;
position: absolute;
left: 260px;
top: 10px;
left: 0px;
bottom: 40px;
z-index: 999;
display: flex;
flex-direction: column;
@ -416,11 +416,10 @@ const setBottom = () => {
>div {
cursor: pointer;
// background: #0549a7;
border: 1px solid #3cbfdf;
width: 110px;
background: #477efa;
width: 120px;
height: 40px;
border-radius: 5px;
border-radius: 0 50px 50px 0;
line-height: 40px;
text-align: center;
margin-top: 10px;

View File

@ -1,28 +1,14 @@
<template>
<div class="top-div">
<span>{{ title }}</span>
<el-icon v-if="showMore" @click="viewMore">
<MoreFilled />
</el-icon>
</div>
<div class="top-div">{{ title }}</div>
</template>
<script setup>
import Bus from '@/utils/bus.js';
const props = defineProps({
title: { //
default: '建筑信息',
type: String
},
showMore: {
default: false,
type: Boolean
}
})
const emit = defineEmits(['viewMore'])
const viewMore = () => {
Bus.emit('viewMore', props.title);
}
</script>
<style lang="scss" scoped>
.top-div {
@ -35,11 +21,6 @@ const viewMore = () => {
margin-bottom: 5px;
padding-left: 24px;
color: #fff;
font-weight: 800;
justify-content: space-between;
.el-icon {
cursor: pointer;
}
font-weight: 800
}
</style>

View File

@ -10,13 +10,13 @@
<!-- 建筑信息 -->
<BuildInfo v-if="buildInfo && activateIndex == 0"></BuildInfo>
<!-- 资产信息 -->
<DevicePie v-if="deviceInfo && activateIndex == 0"></DevicePie>
<DevicePie v-if="deviceInfo && activateIndex == 0" @openDialog="openDialog"></DevicePie>
<!-- 左侧资产菜单 -->
<DeviceTree v-if="activateIndex == 1" @handleNodeClick="handleDeviceClick"></DeviceTree>
<!-- 资产信息 -->
<DeviceInfo v-if="equimentInfo && activateIndex == 1"></DeviceInfo>
<!-- 资产事件 -->
<DeviceEvent v-if="activateIndex == 1"></DeviceEvent>
<DeviceEvent v-if="activateIndex == 1" @openDialog="openDialog1"></DeviceEvent>
<!-- 左侧应用菜单 -->
<ApplicationTree v-if="activateIndex == 2" @handleNodeClick="handleApplicationClick"></ApplicationTree>
<!-- 设备信息 -->
@ -56,7 +56,6 @@ import RealInfoDialog from './components/RealInfoDialog.vue';
import DeviceDetial from './components/DeviceDetial.vue';
import bimStore from '@/store/modules/bim';
import { computed } from 'vue';
import Bus from '@/utils/bus.js';
const data = reactive({
sceneUrl: '/jz/glb/scene.gltf',
equimentInfo: {},
@ -79,11 +78,6 @@ const deviceInfo = computed(() =>
bimStore().activateTree.deviceInfo
);
Bus.on('viewMore', (title) => {
// Todo
title === '资产信息' ? dialogVisible.value = true : dialogVisible1.value = true;;
})
const onReady = () => {
@ -116,6 +110,9 @@ const handleApplicationClick = (value) => {
const changeMenu = (index) => {
}
const openDialog = () => {
dialogVisible.value = true;
}
const openDialog1 = () => {
dialogVisible1.value = true;

View File

@ -23,12 +23,6 @@ const getCharts = () => {
dom.removeAttribute('_echarts_instance_')
var myChart = echarts.init(dom);
var option = {
title: {
text: '资产维修情况',
textStyle: {
color: "#fff",
},
},
tooltip: {
trigger: "item",
confine: true, //
@ -67,12 +61,11 @@ const getCharts = () => {
elements: [
{
type: "text",
left: "16%",
left: "27%",
top: "middle",
style: {
text: " " + total + "\n" + "总报修数",
text: total + "\n" + "总数",
fill: "#fff",
fontSize: 24
},
},
],
@ -85,10 +78,10 @@ const getCharts = () => {
itemHeight: 5,
orient: "vertical",
itemGap: 30,
data: ["未维修"],
data: ["数据一"],
formatter: () => {
const arr = [
"{b|" + "未维修" + "}\xa0\xa0\xa0",
"{b|" + "数据一" + "}\xa0\xa0\xa0",
"{a|" + wei + "}\xa0\xa0\xa0\xa0",
];
return arr.join("");
@ -113,10 +106,10 @@ const getCharts = () => {
itemHeight: 5,
orient: "vertical",
itemGap: 30,
data: ["已维修"],
data: ["数据二"],
formatter: () => {
const arr = [
"{b|" + "已维修" + "}\xa0\xa0\xa0",
"{b|" + "数据二" + "}\xa0\xa0\xa0",
"{a|" + yi + "}\xa0\xa0\xa0\xa0",
];
return arr.join("");
@ -141,10 +134,10 @@ const getCharts = () => {
itemHeight: 5,
orient: "vertical",
itemGap: 30,
data: ["维修中"],
data: ["数据三"],
formatter: () => {
const arr = [
"{b|" + "维修中" + "}\xa0\xa0\xa0",
"{b|" + "数据三" + "}\xa0\xa0\xa0",
"{a|" + doing + "}\xa0\xa0\xa0\xa0",
];
return arr.join("");
@ -185,7 +178,7 @@ const getCharts = () => {
data: [
{
value: wei,
name: "未维修",
name: "数据一",
itemStyle: {
borderRadius: 10,
color: "#FD2525",
@ -194,7 +187,7 @@ const getCharts = () => {
},
{
value: yi,
name: "已维修",
name: "数据二",
itemStyle: {
color: "#1f5189",
opacity: 0.6,
@ -202,7 +195,7 @@ const getCharts = () => {
},
{
value: doing,
name: "维修中",
name: "数据三",
itemStyle: {
color: "#e7bf69",
opacity: 0.8,
@ -228,7 +221,7 @@ const getCharts = () => {
data: [
{
value: wei,
name: "未维修",
name: "数据一",
itemStyle: {
color: "#aa2b3d",
},
@ -236,7 +229,7 @@ const getCharts = () => {
{
value: yi,
name: "已维修",
name: "数据二",
itemStyle: {
color: "#1f5189",
},
@ -244,7 +237,7 @@ const getCharts = () => {
{
value: doing,
name: "维修中",
name: "数据三",
itemStyle: {
color: "#655e64",
},

View File

@ -21,10 +21,7 @@ const getCharts = () => {
var myChart = echarts.init(dom);
let option = {
title: {
text: '资产巡检间隔时长',
textStyle: {
color: "#fff",
},
text: ''
},
tooltip: {
trigger: 'axis',
@ -33,7 +30,6 @@ const getCharts = () => {
}
},
legend: {
bottom: 0,
textStyle: {
color: "#ffff",
fontFamily: "Alibaba PuHuiTi",
@ -44,7 +40,7 @@ const getCharts = () => {
grid: {
left: '15%',
right: '4%',
bottom: '12%'
bottom: '5%'
},
xAxis: [
{