wangqiujuan0808
/
bw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.shikicc.com/wangqiujuan0808/bw into main

main
瓶中沙 2024-01-08 21:20:50 +08:00
parent d6b51bc428 2b0dc5c042
commit 80642b31c3
3 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/bim/bimHome/components/DeviceInfoDialog.vue
View File

@ -66,7 +66,7 @@ const data = reactive({
{
type: '生产设备',
name: '过滤槽',
num: 'guolvcao',
num: 'guolvcao_1',
value: 130,
id: "echartDiv1"
},
@ -108,7 +108,7 @@ const data = reactive({
{
type: '生产设备',
name: '过滤槽',
num: 'guolvcao',
num: 'guolvcao_1',
value: 50,
id: "echartDiv1"
},
@ -151,7 +151,7 @@ const data = reactive({
{
type: '生产设备',
name: '过滤槽',
num: 'guolvcao',
num: 'guolvcao_1',
value: 80,
id: "echartDiv1"
},

174
src/views/bim/bimHome/components/DeviceTree.vue
View File

@ -61,7 +61,7 @@ const data = reactive({
{
label: '过滤槽',
id: '0-2',
clickName: 'guolvcao',
clickName: 'guolvcao_1',
info: {
name: '过滤槽',
type: '生产设备',
@ -73,90 +73,90 @@ const data = reactive({
children: []
},
{
label: '设备二',
id: '0-3',
clickName: 'T3',
info: {
name: '设备二',
type: '生产设备',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2025-12-15'
},
children: []
},
{
label: '设备三',
id: '0-4',
clickName: 'T4',
info: {
name: '设备三',
type: '空调设备',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2025-12-15'
},
children: []
},
{
label: '设备四',
id: '0-5',
clickName: 'T5',
info: {
name: '设备四',
type: '安防设备',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2025-12-15'
},
children: []
},
{
label: '设备五',
id: '0-6',
clickName: 'T6',
info: {
name: '设备五',
type: '安防设备',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2025-12-15'
},
children: []
},
{
label: '设备七',
id: '0-7',
clickName: 'T7',
info: {
name: '设备七',
type: '安防设备',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2025-12-15'
},
children: []
},
{
label: '设备八',
id: '0-8',
clickName: 'T8',
info: {
name: '设备八',
type: '安防设备',
status: '启用',
location: '漳州厂区糖化间',
belong: '漳州厂区',
date: '2025-12-15'
},
children: []
},
// {
// label: '设备二',
// id: '0-3',
// clickName: 'T3',
// info: {
// name: '设备二',
// type: '生产设备',
// status: '启用',
// location: '漳州厂区糖化间',
// belong: '漳州厂区',
// date: '2025-12-15'
// },
// children: []
// },
// {
// label: '设备三',
// id: '0-4',
// clickName: 'T4',
// info: {
// name: '设备三',
// type: '空调设备',
// status: '启用',
// location: '漳州厂区糖化间',
// belong: '漳州厂区',
// date: '2025-12-15'
// },
// children: []
// },
// {
// label: '设备四',
// id: '0-5',
// clickName: 'T5',
// info: {
// name: '设备四',
// type: '安防设备',
// status: '启用',
// location: '漳州厂区糖化间',
// belong: '漳州厂区',
// date: '2025-12-15'
// },
// children: []
// },
// {
// label: '设备五',
// id: '0-6',
// clickName: 'T6',
// info: {
// name: '设备五',
// type: '安防设备',
// status: '启用',
// location: '漳州厂区糖化间',
// belong: '漳州厂区',
// date: '2025-12-15'
// },
// children: []
// },
// {
// label: '设备七',
// id: '0-7',
// clickName: 'T7',
// info: {
// name: '设备七',
// type: '安防设备',
// status: '启用',
// location: '漳州厂区糖化间',
// belong: '漳州厂区',
// date: '2025-12-15'
// },
// children: []
// },
// {
// label: '设备八',
// id: '0-8',
// clickName: 'T8',
// info: {
// name: '设备八',
// type: '安防设备',
// status: '启用',
// location: '漳州厂区糖化间',
// belong: '漳州厂区',
// date: '2025-12-15'
// },
// children: []
// },
],
}
],
@ -173,9 +173,9 @@ onMounted(() => {
Bus.on('handleTreeClick1', (obj) => {
let o = treeData.value[0].children.find(ele => {
return ele.clickName == obj.parent.name;
return ele.clickName == obj.name;
})
console.log(123, obj.parent.name);
console.log(123, obj.name);
if (o) {
nextTick(() => {
checkedkeys.value = o.id;

4
src/views/bim/bimHome/components/ThreeView2.vue
View File

@ -242,7 +242,7 @@ const enableGroup = [
'yuanliao_room',
'tanghua_room',
'touliao_room',
'guolvcao',// 过滤槽
'guolvcao_1',// 过滤槽
'T3',
'T4',
'T5',
@ -575,7 +575,7 @@ const removeLabel = () => {
// 设置地板
const setBottom = () => {
var target = scene.getObjectByName('floor2F');
var target = scene.getObjectByName('tanghua_1F');
console.log(target);
if (isRemoveBottom.value) {
target.visible = false;