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

projects/mes-test #132

Manually merged
gtz217 merged 281 commits from projects/mes-test into projects/mes 2023-11-30 09:11:34 +08:00
Conversation 0 Commits 281 Files Changed 600 +17 -9
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6b4e906e75 - Show all commits

26
src/views/extend/processFlow/index.vue
View File

@ -17,7 +17,7 @@
:key="n" :key="n"
:name="'工艺 ' + n" :name="'工艺 ' + n"
line="产线1" line="产线1"
desc="Lorem ipsum dolor sit amet consectetur, elique! Nemo deserunt quidem facilis eum.sadf sf asdfa skdlj" desc="显示工艺描述的内容"
:isActive="n % 2 == 0" /> :isActive="n % 2 == 0" />
</section> </section>
</div> </div>
@ -37,19 +37,27 @@ const ProcessItem = {
return ( return (
<div <div
class={'process-item' + (this.isActive ? ' active' : '')} class={'process-item' + (this.isActive ? ' active' : '')}
style="display: flex; flex-direction: column;"> style="display: flex; flex-direction: column; position: relative;">
<div class="process-item__content" style="flex: 1;"> <div
<div class="logo"></div> class="process-item__content"
style="flex: 1; display: flex; align-items: center;">
{this.isActive && (
<span style="display: inline-block; width: 10px; height: 10px; border-radius: 100%; background: #0ebe3a; position: absolute; top: 20px; right: 20px;" />
)}
<svg-icon
icon-class="tree-table"
style="margin-left: 12px; width: 48px; height: 48px; color: #0858ff33"
/>
<div <div
class="info" class="info"
style="margin-left: 48px; display: flex; flex-direction: column;"> style="margin-left: 12px; display: flex; flex-direction: column;">
<h2 style="margin: 20px 0 0; font-weight: 600; font-size: 18px; "> <h2 style="margin: 20px 0 0; font-weight: 600; font-size: 18px; ">
{this.name} {this.name}
</h2> </h2>
<h3 style="margin: 0; font-weight: 400; font-size: 14px; line-height: 2; color: #888;"> <h3 style="margin: 0; font-weight: 400; font-size: 14px; line-height: 2; color: #888;">
{this.line} {this.line}
</h3> </h3>
<p style="margin: 0; height: 48px; width: 80%; text-overflow: ellipse; white-space: no-wrap; font-weight: 400; font-size: 14px; line-height: 1.25; color: #888;"> <p style="margin: 0; text-overflow: ellipse; white-space: nowrap; font-weight: 400; font-size: 14px; line-height: 1.25; color: #888;">
{this.desc} {this.desc}
</p> </p>
</div> </div>
@ -132,8 +140,8 @@ export default {
box-shadow: 0 0 6px 1px #ccc; box-shadow: 0 0 6px 1px #ccc;
overflow: hidden; overflow: hidden;
&.active { // &.active {
box-shadow: 0 0 6px 1px #18c8bf66; // box-shadow: 0 0 6px 1px #18c8bf66;
} // }
} }
</style> </style>