tao.zhang/tianyi_DataV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logo修改

Browse Source
This commit is contained in:
刘佳
2024-03-15 17:29:52 +08:00
parent 93d80fd068
commit 93d4deaa76
5 changed files with 64 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/TyLogo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

src/views/cpcView/index.vue
+4 -7
View File
@@ -20,9 +20,9 @@
:style="{ 'opacity': it.type == 4 ? '0' : '1' }"> :style="{ 'opacity': it.type == 4 ? '0' : '1' }">
<div class="lists"> <div class="lists">
<div>{{ it.location_code }}</div> <div>{{ it.location_code }}</div>
<div v-if="it.type == 2">载具:LX00{{ ind }}</div> <div v-if="it.type == 2 || it.type == 1">载具:{{ it.carry_code }}</div>
<div v-if="it.type == 2">物料:包装袋</div> <div v-if="it.type == 2">物料:{{ it.material_code }}</div>
<div v-if="it.type == 2">数量:10</div> <div v-if="it.type == 2">数量:{{ it.num }}</div>
</div> </div>
</div> </div>
</div> </div>
@@ -76,11 +76,9 @@ export default {
height: 860px; height: 860px;
margin: 30px; margin: 30px;
overflow-y: scroll; overflow-y: scroll;
.box-x { .box-x {
display: flex; display: flex;
margin-bottom: 30px; margin-bottom: 30px;
.index { .index {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -88,7 +86,6 @@ export default {
width: 10px; width: 10px;
} }
} }
.item-x { .item-x {
width: 50px; width: 50px;
height: 60px; height: 60px;
@@ -102,7 +99,7 @@ export default {
.lists { .lists {
line-height: 10px; line-height: 10px;
width: 100%; width: 100%;
font-size: 8px; font-size: 7px;
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
src/views/index.vue
+7 -1
View File
@@ -8,7 +8,13 @@
<div class="d-flex jc-center"> <div class="d-flex jc-center">
<dv-decoration-8 class="dv-dec-8" :color="decorationColor" /> <dv-decoration-8 class="dv-dec-8" :color="decorationColor" />
<div class="title"> <div class="title">
<span class="title-text">天益医疗</span> <img
src="https://omo-oss-image.thefastimg.com/portal-saas/new2022082611383398214/cms/image/0188c1ee-bde0-4411-ae14-2cdeb14a6a9b.png"
alt="">
<!-- <span class="title-text">
天益医疗
</span> -->
<dv-decoration-6 class="dv-dec-6" :reverse="true" :color="['#50e3c2', '#67a1e5']" /> <dv-decoration-6 class="dv-dec-6" :reverse="true" :color="['#50e3c2', '#67a1e5']" />
</div> </div>
<dv-decoration-8 class="dv-dec-8" :reverse="true" :color="decorationColor" /> <dv-decoration-8 class="dv-dec-8" :reverse="true" :color="decorationColor" />
src/views/yclView/index.vue
+45 -18
View File
@@ -12,9 +12,9 @@
<!-- <div>载具:LX001</div> <!-- <div>载具:LX001</div>
<div>物料:包装袋</div> <div>物料:包装袋</div>
<div>数量:10</div> --> <div>数量:10</div> -->
<div v-if="it.type == 2">载具:LX001</div> <div v-if="it.type == 2 || it.type == 1">载具:{{ it.carry_code }}</div>
<div v-if="it.type == 2">物料:包装袋</div> <div v-if="it.type == 2">物料:{{ it.material_code }}</div>
<div v-if="it.type == 2">数量:10</div> <div v-if="it.type == 2">数量:{{ it.num }}</div>
</div> </div>
</div> </div>
</div> </div>
@@ -25,8 +25,8 @@
<div class="lists"> <div class="lists">
<div>{{ it.location_code }}</div> <div>{{ it.location_code }}</div>
<div v-if="it.type == 2 || it.type == 1">载具:{{ it.carry_code }}</div> <div v-if="it.type == 2 || it.type == 1">载具:{{ it.carry_code }}</div>
<div v-if="it.type == 2">物料:包装袋</div> <div v-if="it.type == 2">物料:{{ it.material_code }}</div>
<div v-if="it.type == 2">数量:10</div> <div v-if="it.type == 2">数量:{{ it.num }}</div>
</div> </div>
</div> </div>
</div> </div>
@@ -72,9 +72,28 @@ export default {
const arr = [1] const arr = [1]
const arrone = [3, 7, 10, 13, 14, 17] const arrone = [3, 7, 10, 13, 14, 17]
// const obj = { type: 1, location_code: '', layer: '1' } // const obj = { type: 1, location_code: '', layer: '1' }
if (arrone.some(it => { return it == index + 1 })) {
for (let i = 1; i < 3; i++) {
item.splice(8, 0, { type: 4, location_code: '', layers: i })
}
for (let i = 1; i < 3; i++) {
item.splice(24, 0, { type: 4, location_code: '', layers: i })
}
if (index + 1 !== 17) {
for (let i = 1; i < 3; i++) {
item.splice(50, 0, { type: 4, location_code: '', layers: i })
}
} else {
for (let i = 1; i < 3; i++) {
item.splice(57, 0, { type: 4, location_code: '', layers: i })
}
}
}
if (arr.some(it => { return it !== index + 1 })) { if (arr.some(it => { return it !== index + 1 })) {
let fig = false let fig = false
if (index + 1 == 17 || index + 1 == 18) { if (index + 1 == 18) {
for (let i = 1; i < 3; i++) { for (let i = 1; i < 3; i++) {
item.splice(37, 0, { type: 4, location_code: '', layers: i }) item.splice(37, 0, { type: 4, location_code: '', layers: i })
} }
@@ -87,18 +106,8 @@ export default {
// item.splice(36, 0, { type: 4, location_code: '', layers: i }) // item.splice(36, 0, { type: 4, location_code: '', layers: i })
} }
} }
if (arrone.some(it => { return it == index + 1 })) {
for (let i = 1; i < 3; i++) {
item.splice(8, 0, { type: 4, location_code: '', layers: i })
}
for (let i = 1; i < 3; i++) {
item.splice(24, 0, { type: 4, location_code: '', layers: i })
}
for (let i = 1; i < 3; i++) {
item.splice(52, 0, { type: 4, location_code: '', layers: i })
}
}
}) })
console.log(this.data, 99);
}).finally(e => { loading.close(); }) }).finally(e => { loading.close(); })
} }
} }
@@ -149,7 +158,7 @@ $sysColor: rgba(85, 110, 255, 0.9);
// text-align: center; // text-align: center;
line-height: 10px; line-height: 10px;
width: 100%; width: 100%;
font-size: 8px; font-size: 7px;
// height: 100%; // height: 100%;
// display: flex; // display: flex;
// justify-content: center; // justify-content: center;
@@ -171,7 +180,25 @@ $sysColor: rgba(85, 110, 255, 0.9);
border-right: 2px solid $sysColor; border-right: 2px solid $sysColor;
// padding-bottom: 5px; // padding-bottom: 5px;
padding-left: 5px; padding-left: 5px;
// margin-bottom: 5px; // margin-bottom: 5px;
// div {
// position: relative;
// }
// div:nth-child(18):before {
// width: 45px;
// height: 125px;
// content: "";
// border: solid 2px rgba(85, 110, 255, 0.9);
// padding: 2px;
// margin: 0 10px 0 0;
// position: absolute;
// top: 110%;
// left: 160%;
// transform: translate(-50%, -50%);
// }
} }
.item-bo { .item-bo {
src/views/zccView/index.vue
+8 -8
View File
@@ -11,9 +11,9 @@
:style="{ 'opacity': it.type == 4 ? '0' : '1' }"> :style="{ 'opacity': it.type == 4 ? '0' : '1' }">
<div class="lists"> <div class="lists">
<div>{{ it.location_code }}</div> <div>{{ it.location_code }}</div>
<div v-if="it.type == 1 || it.type == 2">载具:{{ it.carry_code }}</div> <div v-if="it.type == 2 || it.type == 1">载具:{{ it.carry_code }}</div>
<div v-if="it.type == 2">物料:包装袋</div> <div v-if="it.type == 2">物料:{{ it.material_code }}</div>
<div v-if="it.type == 2">数量:10</div> <div v-if="it.type == 2">数量:{{ it.num }}</div>
</div> </div>
</div> </div>
</div> </div>
@@ -107,9 +107,9 @@ $sysColor: rgba(85, 110, 255, 0.9);
} }
.item-x { .item-x {
width: 117px; width: 100px;
height: 135px; height: 115px;
margin-right: 10px; margin-right: 25px;
// margin-bottom: 5px; // margin-bottom: 5px;
color: rgba(0, 0, 0, .5); color: rgba(0, 0, 0, .5);
display: inline-grid; display: inline-grid;
@@ -119,7 +119,7 @@ $sysColor: rgba(85, 110, 255, 0.9);
.lists { .lists {
line-height: 20px; line-height: 20px;
width: 100%; width: 100%;
font-size: 14px; font-size: 12px;
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
@@ -134,7 +134,7 @@ $sysColor: rgba(85, 110, 255, 0.9);
.item-top { .item-top {
border: 2px solid $sysColor; border: 2px solid $sysColor;
border-top: 0px; border-top: 0px;
padding: 5px 5px 0 5px; padding: 8px 8px 0 18px;
} }
.item-top:last-child { .item-top:last-child {