test #47

Merged
gtz217 merged 273 commits from test into master 2023-10-17 08:53:54 +08:00
Showing only changes of commit 45e7f337bf - Show all commits

View File

@ -16,18 +16,23 @@
title="点击切换工厂" title="点击切换工厂"
@mouseenter="factoryListOpen = true" @mouseenter="factoryListOpen = true"
@mouseleave="factoryListOpen = false"> @mouseleave="factoryListOpen = false">
{{ currentFactory || '工厂名称' }} {{ currentFactory?.label || '工厂名称' }}
<div class="factory-list__wrapper" :class="{ open: factoryListOpen }"> <div class="factory-list__wrapper" :class="{ open: factoryListOpen }">
<ul class="factory-list" v-if="factoryList.length" @click.prevent="factoryChangeHandler"> <ul
class="factory-list"
v-if="sidebarContent.length"
@click.prevent="factoryChangeHandler">
<li <li
v-for="fc in factoryList" v-for="fc in sidebarContent"
:key="fc.id" :key="fc.id"
:value="fc.value" :data-value="fc.id"
class="factory-list__item"> class="factory-list__item">
{{ fc.name }} {{ fc.label }}
</li> </li>
</ul> </ul>
<div v-else style="color: #0008; width: 128px; text-align: center;">- -</div> <div v-else style="color: #0008; width: 128px; text-align: center">
- -
</div>
</div> </div>
</div> </div>
<!-- side bar --> <!-- side bar -->
@ -35,7 +40,8 @@
class="side-bar__left" class="side-bar__left"
style="width: 240px; padding: 12px; height: 100%"> style="width: 240px; padding: 12px; height: 100%">
<el-tree <el-tree
:data="sidebarContent" v-if="currentFactory"
:data="currentFactory?.children"
:props="treeProps" :props="treeProps"
@node-click="handleSidebarItemClick" /> @node-click="handleSidebarItemClick" />
</div> </div>
@ -314,12 +320,15 @@ export default {
}, },
factoryChangeHandler(event) { factoryChangeHandler(event) {
console.log('clicked factory change.......');
this.factoryListOpen = false; this.factoryListOpen = false;
const fcId = event.target.dataset.value;
console.log('fc id', fcId);
this.handleSidebarItemClick({ id: fcId, type: '工厂' });
this.currentFactory = this.sidebarContent.find((item) => item.id == fcId);
}, },
handleSidebarItemClick({ label, id, type }) { handleSidebarItemClick({ label, id, type }) {
console.log('lable clicked!', label, id, type); console.log('label clicked!', label, id, type);
switch (type) { switch (type) {
case '设备': case '设备':
this.queryParams.equipmentId = id; this.queryParams.equipmentId = id;
@ -424,10 +433,10 @@ export default {
} }
.factory-list__selector::after { .factory-list__selector::after {
content: ''; /* content: ''; */
position: absolute; position: absolute;
top: 16px; top: 16px;
left: 100px; right: 12px;
display: inline-block; display: inline-block;
width: 8px; width: 8px;
height: 8px; height: 8px;
@ -482,7 +491,7 @@ li {
border-radius: 4px; border-radius: 4px;
font-size: 16px; font-size: 16px;
line-height: 1; line-height: 1;
padding: 8px 4px; padding: 8px 32px 8px 8px;
min-width: 64px; min-width: 64px;
} }