From 7bf7b2878e1395d5a7f5822df6881f136df3e108 Mon Sep 17 00:00:00 2001
From: wangqiujuan0808 <578331299@qq.com>
Date: Fri, 5 Jan 2024 22:21:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/images/{device.png => device.jpg} | Bin
.../bim/bimHome/components/BasicInfo.vue | 10 +--
.../bim/bimHome/components/DeviceDetial.vue | 67 ++++++++++++++++--
.../bimHome/components/DeviceInfoDialog.vue | 18 ++---
.../bim/bimHome/components/DeviceTree.vue | 16 ++---
.../bim/bimHome/components/ThreeView.vue | 2 +-
.../bim/bimHome/components/ThreeView2.vue | 12 +---
src/views/bim/bimHome/index.vue | 6 +-
8 files changed, 91 insertions(+), 40 deletions(-)
rename src/assets/images/{device.png => device.jpg} (100%)
diff --git a/src/assets/images/device.png b/src/assets/images/device.jpg
similarity index 100%
rename from src/assets/images/device.png
rename to src/assets/images/device.jpg
diff --git a/src/views/bim/bimHome/components/BasicInfo.vue b/src/views/bim/bimHome/components/BasicInfo.vue
index e47195e..d0edd84 100644
--- a/src/views/bim/bimHome/components/BasicInfo.vue
+++ b/src/views/bim/bimHome/components/BasicInfo.vue
@@ -11,15 +11,12 @@
\ No newline at end of file
diff --git a/src/views/bim/bimHome/components/DeviceInfoDialog.vue b/src/views/bim/bimHome/components/DeviceInfoDialog.vue
index 962cb6d..0a2ff8b 100644
--- a/src/views/bim/bimHome/components/DeviceInfoDialog.vue
+++ b/src/views/bim/bimHome/components/DeviceInfoDialog.vue
@@ -59,7 +59,7 @@ const data = reactive({
{
type: '生产设备',
name: '立仓',
- num: 'set1',
+ num: 'guan2',
value: 45,
id: "echartDiv0"
},
@@ -73,14 +73,14 @@ const data = reactive({
{
type: '安防设备',
name: '摄像头',
- num: 'set1',
+ num: 'guan2',
value: 180,
id: "echartDiv2"
},
{
type: '消防设备',
name: '烟感',
- num: 'set1',
+ num: 'guan2',
value: 100,
id: "echartDiv3"
}
@@ -101,7 +101,7 @@ const data = reactive({
{
type: '生产设备',
name: '立仓',
- num: 'set1',
+ num: 'guan2',
value: 15,
id: "echartDiv0"
},
@@ -115,14 +115,14 @@ const data = reactive({
{
type: '安防设备',
name: '摄像头',
- num: 'set1',
+ num: 'guan2',
value: 80,
id: "echartDiv2"
},
{
type: '消防设备',
name: '烟感',
- num: 'set1',
+ num: 'guan2',
value: 50,
id: "echartDiv3"
}
@@ -144,7 +144,7 @@ const data = reactive({
{
type: '生产设备',
name: '立仓',
- num: 'set1',
+ num: 'guan2',
value: 30,
id: "echartDiv0"
},
@@ -158,14 +158,14 @@ const data = reactive({
{
type: '安防设备',
name: '摄像头',
- num: 'set1',
+ num: 'guan2',
value: 100,
id: "echartDiv2"
},
{
type: '消防设备',
name: '烟感',
- num: 'set1',
+ num: 'guan2',
value: 50,
id: "echartDiv3"
}
diff --git a/src/views/bim/bimHome/components/DeviceTree.vue b/src/views/bim/bimHome/components/DeviceTree.vue
index 8427c81..1bd872b 100644
--- a/src/views/bim/bimHome/components/DeviceTree.vue
+++ b/src/views/bim/bimHome/components/DeviceTree.vue
@@ -45,7 +45,7 @@ const data = reactive({
{
label: '立仓',
id: '0-1',
- clickName: 'set1',
+ clickName: 'guan2',
info: {
name: '立仓',
type: '生产设备',
@@ -61,7 +61,7 @@ const data = reactive({
{
label: '过滤槽',
id: '0-2',
- clickName: 'set6',
+ clickName: 'guan1',
info: {
name: '过滤槽',
type: '生产设备',
@@ -76,7 +76,7 @@ const data = reactive({
{
label: '设备二',
id: '0-3',
- clickName: 'set2',
+ clickName: 'guan3',
info: {
name: '设备二',
type: '生产设备',
@@ -90,7 +90,7 @@ const data = reactive({
{
label: '设备三',
id: '0-4',
- clickName: 'set3',
+ clickName: 'guan4',
info: {
name: '设备三',
type: '空调设备',
@@ -104,7 +104,7 @@ const data = reactive({
{
label: '设备四',
id: '0-5',
- clickName: 'set4',
+ clickName: 'guan5',
info: {
name: '设备四',
type: '安防设备',
@@ -118,7 +118,7 @@ const data = reactive({
{
label: '设备五',
id: '0-6',
- clickName: 'set5',
+ clickName: 'guan6',
info: {
name: '设备五',
type: '安防设备',
@@ -132,7 +132,7 @@ const data = reactive({
{
label: '设备七',
id: '0-7',
- clickName: 'set7',
+ clickName: 'guan7',
info: {
name: '设备七',
type: '安防设备',
@@ -146,7 +146,7 @@ const data = reactive({
{
label: '设备八',
id: '0-8',
- clickName: 'set8',
+ clickName: 'guan8',
info: {
name: '设备八',
type: '安防设备',
diff --git a/src/views/bim/bimHome/components/ThreeView.vue b/src/views/bim/bimHome/components/ThreeView.vue
index f1129aa..389f83a 100644
--- a/src/views/bim/bimHome/components/ThreeView.vue
+++ b/src/views/bim/bimHome/components/ThreeView.vue
@@ -239,7 +239,7 @@ let selectedObject = null;
let selectedMaterial = null;
// 能选中的组
const enableGroup = [
- 'set1',
+ 'guan2',
'set2',
'set3',
'set4',
diff --git a/src/views/bim/bimHome/components/ThreeView2.vue b/src/views/bim/bimHome/components/ThreeView2.vue
index 9630bdd..735ca59 100644
--- a/src/views/bim/bimHome/components/ThreeView2.vue
+++ b/src/views/bim/bimHome/components/ThreeView2.vue
@@ -219,19 +219,11 @@ window.addEventListener("resize", onWindowResize, false);
// 能选中的组
const enableGroup = [
- 'set1',
- 'set2',
- 'set3',
- 'set4',
- 'set5',
- 'set6',
- 'set7',
- 'set8',
'yuanliao_room',
'tanghua_room',
'touliao_room',
'guan1',
- 'guan2',
+ 'guan2',// 立仓
'guan3',
'guan4',
'guan5',
@@ -685,7 +677,7 @@ const check = () => {
}
}
-.laber_name1 {
+.laber_details {
width: 100px;
height: 50px;
border-radius: 5px;
diff --git a/src/views/bim/bimHome/index.vue b/src/views/bim/bimHome/index.vue
index 181424f..8fc253d 100644
--- a/src/views/bim/bimHome/index.vue
+++ b/src/views/bim/bimHome/index.vue
@@ -97,10 +97,8 @@ const onProgress = () => {
const handleRightClick = (obj) => {
console.log(1,obj.name);
- if(obj.name == 'set1' || obj.name == 'set6') {
- bimStore().setDeviceNum(obj.name);
- dialogVisible2.value = true;
- }
+ bimStore().setDeviceNum(obj.name);
+ dialogVisible2.value = true;
// viewDetail();
}