mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test #47

Merged
gtz217 merged 273 commits from test into master 2023-10-17 08:53:54 +08:00
Conversation 0 Commits 273 Files Changed 256 +51 -6
2 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6c21f01fd7 - Show all commits

1
src/views/equipment/analysis/efficiency/index.vue
View File

@ -369,7 +369,6 @@ export default {
params: this.queryParams, params: this.queryParams,
}); });
if (code == 0) { if (code == 0) {
console.log('data', data);
this.list = data; this.list = data;
} }
}, },

56
src/views/monitoring/equipmentProcessAmount/index.vue
View File

@ -10,7 +10,18 @@
<div <div
class="app-container" class="app-container"
style="margin-right: 12px; border-radius: 8px; background: #fff"> style="margin-right: 12px; border-radius: 8px; background: #fff">
<div class="factory-list" style="background: #ccc; height: 36px"></div> <div class="factory-list__selector" style="" title="点击切换工厂">
{{ currentFactory || '工厂名称' }}
<div class="factory-list__wrapper">
<ul class="factory-list">
<li
v-for="fc in factoryList"
:key="fc.id"
@click="factoryChangeHandler"
class="factory-list__item"></li>
</ul>
</div>
</div>
<!-- side bar --> <!-- side bar -->
<div <div
class="side-bar__left" class="side-bar__left"
@ -34,7 +45,7 @@
<el-row> <el-row>
<el-col class="custom-tabs"> <el-col class="custom-tabs">
<el-tabs v-model="activeName" @tab-click="handleTabClick"> <el-tabs v-model="activeName" @tab-click="handleTabClick">
<el-tab-pane label="数据列表" name="table"> <el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
<base-table <base-table
v-if="mode == 'table'" v-if="mode == 'table'"
:table-props="tableProps" :table-props="tableProps"
@ -50,7 +61,7 @@
@clickBtn="handleTableBtnClick" /> --> @clickBtn="handleTableBtnClick" /> -->
</base-table> </base-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="柱状图" name="graph"> <el-tab-pane :label="'\u3000柱状图\u3000'" name="graph">
<div class="graph" style="height: 56vh"> <div class="graph" style="height: 56vh">
<!-- graph --> <!-- graph -->
<Graph v-if="list.length" :equipment-list="list" /> <Graph v-if="list.length" :equipment-list="list" />
@ -369,9 +380,44 @@ export default {
transform: translateY(-12px); transform: translateY(-12px);
} }
.custom-tabs >>> .el-tabs__item { .custom-tabs >>> .el-tabs__item {
padding-left: 8px !important; padding-left: 0px !important;
padding-right: 8px !important; padding-right: 0px !important;
line-height: 36px !important; line-height: 36px !important;
height: 36px; height: 36px;
} }
.factory-list__selector {
position: relative;
height: 36px;
font-size: 16px;
line-height: 36px;
padding-left: 28px;
background: url(../../../assets/images/factory-icon.png) 0 / 10% no-repeat;
}
.factory-list__selector:hover {
cursor: pointer;
color: #0008;
}
.factory-list__selector::after {
content: '';
position: absolute;
top: 16px;
left: 100px;
display: inline-block;
width: 8px;
height: 8px;
/* background: #5c5c5c; */
border-color: #000;
border-width: 4px;
border-style: solid;
border-top-color: transparent;
border-right-color: transparent;
border-bottom-color: transparent;
}
.factory-list__selector:hover::after {
/* cursor: pointer; */
border-left-color: #0008;
}
</style> </style>