root/screen-lnsh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
caill
2023-06-29 10:37:48 +08:00
parent dd504b9715
commit 9cd608ac9d
25 changed files with 83 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/css/mixin.styl
View File

@@ -11,6 +11,8 @@ $green2 = #65d837
background-color #fdfd0f
.gray
background-color #bfbfbf
.gray1
background-color #d8d1d1
.red
background-color #ff1016

BIN
src/images/workshop/jcpmj.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
src/images/workshop/jcpmj_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
src/images/workshop/jcpmj_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
src/images/workshop/jcpmj_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
src/images/workshop/jcpmj_yellow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
src/images/workshop/jzjcj_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
src/images/workshop/jzjcj_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
src/images/workshop/jzjcj_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

0
src/images/workshop/jzjcj_630.png → src/images/workshop/jzjcj_yellow.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
src/images/workshop/jzjcss_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
src/images/workshop/jzjcss_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
src/images/workshop/jzjcss_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
src/images/workshop/jzjcss_yellow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
src/images/workshop/lmyzj_630.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
src/images/workshop/lmyzj_gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
src/images/workshop/lmyzj_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
src/images/workshop/lmyzj_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
src/images/workshop/lmyzj_yellow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
src/images/workshop/lz_hj_gray.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
src/images/workshop/lz_hj_gray1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

44
src/pages/modules/homepage/one.vue
View File

@@ -136,8 +136,11 @@
<div class="sh_machine weilan">
<img src="../../../images/workshop/weilan_2.png" alt="">
</div>
<div class="sh_machine jzjcss">
<img src="../../../images/workshop/jzjcss_yellow.png" alt="">
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine jzjcss">
<img v-show="String(ManipulatorInfoList[0].color_status) === '0'" src="../../../images/workshop/jzjcss_gray.png" alt="">
<img v-show="String(ManipulatorInfoList[0].color_status) === '1'" src="../../../images/workshop/jzjcss_green.png" alt="">
<img v-show="String(ManipulatorInfoList[0].color_status) === '2'" src="../../../images/workshop/jzjcss_red.png" alt="">
<img v-show="String(ManipulatorInfoList[0].color_status) === '3'" src="../../../images/workshop/jzjcss_yellow.png" alt="">
</div>
<div v-if="PressMachineList.length > 0" class="sh_machine yyj">
<img v-show="String(PressMachineList[0].status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
@@ -193,8 +196,11 @@
<div class="sh_machine weilan">
<img src="../../../images/workshop/weilan_1.png" alt="">
</div>
<div class="sh_machine jzjcss">
<img src="../../../images/workshop/jzjcss_yellow.png" alt="">
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine jzjcss">
<img v-show="String(ManipulatorInfoList[1].color_status) === '0'" src="../../../images/workshop/jzjcss_gray.png" alt="">
<img v-show="String(ManipulatorInfoList[1].color_status) === '1'" src="../../../images/workshop/jzjcss_green.png" alt="">
<img v-show="String(ManipulatorInfoList[1].color_status) === '2'" src="../../../images/workshop/jzjcss_red.png" alt="">
<img v-show="String(ManipulatorInfoList[1].color_status) === '3'" src="../../../images/workshop/jzjcss_yellow.png" alt="">
</div>
<div v-if="PressMachineList.length > 0" class="sh_machine yyj">
<img v-show="String(PressMachineList[1].status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
@@ -279,14 +285,23 @@
<div class="sh_machine weilan">
<img src="../../../images/workshop/weilan_3.png" alt="">
</div>
<div class="sh_machine jzjcj_1">
<img src="../../../images/workshop/jzjcj_630.png" alt="">
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine jzjcj_1">
<img v-show="String(ManipulatorInfoList[2].color_status) === '0'" src="../../../images/workshop/jzjcj_gray.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '1'" src="../../../images/workshop/jzjcj_green.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '2'" src="../../../images/workshop/jzjcj_red.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '3'" src="../../../images/workshop/jzjcj_yellow.png" alt="">
</div>
<div class="sh_machine jzjcj_1 jzjcj_2">
<img src="../../../images/workshop/jzjcj_630.png" alt="">
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine jzjcj_1 jzjcj_2">
<img v-show="String(ManipulatorInfoList[2].color_status) === '0'" src="../../../images/workshop/jzjcj_gray.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '1'" src="../../../images/workshop/jzjcj_green.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '2'" src="../../../images/workshop/jzjcj_red.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '3'" src="../../../images/workshop/jzjcj_yellow.png" alt="">
</div>
<div class="sh_machine lmyzj">
<img src="../../../images/workshop/lmyzj_630.png" alt="">
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine lmyzj">
<img v-show="String(ManipulatorInfoList[2].color_status) === '0'" src="../../../images/workshop/lmyzj_gray.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '1'" src="../../../images/workshop/lmyzj_green.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '2'" src="../../../images/workshop/lmyzj_red.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '3'" src="../../../images/workshop/lmyzj_yellow.png" alt="">
</div>
<div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
<img v-show="StackingPositionList[4].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -445,8 +460,11 @@
<div class="zhuan_bg_arrow"></div>
</div>
</div>
<div class="sh_machine jcpmj">
<img src="../../../images/workshop/jcpmj.png" alt="">
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine jcpmj">
<img v-show="String(ManipulatorInfoList[3].color_status) === '0'" src="../../../images/workshop/jcpmj_gray.png" alt="">
<img v-show="String(ManipulatorInfoList[3].color_status) === '1'" src="../../../images/workshop/jcpmj_green.png" alt="">
<img v-show="String(ManipulatorInfoList[3].color_status) === '2'" src="../../../images/workshop/jcpmj_red.png" alt="">
<img v-show="String(ManipulatorInfoList[3].color_status) === '3'" src="../../../images/workshop/jcpmj_yellow.png" alt="">
</div>
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot" :class="{'rotate_630_2': String(ManipulatorInfoList[3].color_status) === '1'}">
<img v-show="String(ManipulatorInfoList[3].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
@@ -1626,7 +1644,7 @@ export default {
left: 54%;
top: 33%;
.weilan
top 6%
top 9%
.robot
left: 79%;
top: 49%;

17
src/pages/modules/homepage/two.vue
View File

@@ -72,6 +72,11 @@
<img src="../../../images/workshop/mtp.png" alt="">
</div>
</div>
<div class="machine_wrap mtp_wrap_3 mtp_wrap_6">
<div v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]" :key="i" class="mtp">
<img src="../../../images/workshop/mtp.png" alt="">
</div>
</div>
<div v-if="SemiFinishedProductShelfList.length > 0" class="machine_wrap mtp_wrap_3 mtp_wrap_4">
<div v-for="(e,i) in SemiFinishedProductShelfList.slice(0, 26)" :key="i" class="mtp">
<img v-show="String(e.point_status) === '0'" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -267,7 +272,7 @@
</div>
<div class="machine_wrap ggtj_wrap_1 ggtj_wrap_6">
<div v-if="PackagingLineList.length > 0" class="machine_wrap ggtj">
<div v-for="(e,i) in PackagingLineList.slice(0,8)" :key="i" class="ggtj_list_wrap" @click.stop="bzxInfo(e)">
<div v-for="(e,i) in PackagingLineList.slice(0,8)" :key="i" class="ggtj_list_wrap">
<div v-show="i === 5" class="sh_machine rgpt">
<img src="../../../images/workshop/rgpt.png" alt="">
</div>
@@ -281,14 +286,14 @@
</div>
</div>
</div>
<div v-if="PackagingLineList.length > 0" class="sh_machine crj" @click.stop="bzxInfo(PackagingLineList[8])">
<div v-if="PackagingLineList.length > 0" class="sh_machine crj">
<img src="../../../images/workshop/crj.png" alt="">
<img v-show="String(PackagingLineList[8].move) === '1'" class="mtp" src="../../../images/workshop/mtp.png" alt="">
</div>
</div>
<div class="machine_wrap ggtj_wrap_1 ggtj_wrap_6 ggtj_wrap_12">
<div v-if="PackagingLineList.length > 0" class="machine_wrap ggtj">
<div v-for="(e,i) in PackagingLineList.slice(9)" :key="i" class="ggtj_list_wrap" @click.stop="bzxInfo(e)">
<div v-for="(e,i) in PackagingLineList.slice(9)" :key="i" class="ggtj_list_wrap">
<img class="sh_machine" src="../../../images/workshop/ggtssj.png">
<img v-show="String(e.move) === '1'" class="mtp" src="../../../images/workshop/mtp.png" alt="">
</div>
@@ -945,6 +950,9 @@ export default {
top: 87%
.mtp_wrap_5
top 105%
.mtp_wrap_6
left: 49.6%;
top: 71.5%;
.cmd_block
width 40%
height 50%
@@ -1134,6 +1142,7 @@ export default {
left: 75%;
.ggtj_wrap_1
width 5%
height 30%
top: 9%;
left: 7%;
.ggtj
@@ -1143,7 +1152,7 @@ export default {
.fmj
width: 120%;
left: -10%;
top 5%
top 20%
.ggtj_wrap_2
left 14%
.ggtj_wrap_3

3
src/pages/modules/sortpack/one.vue
View File

@@ -945,6 +945,7 @@ export default {
left: 75%;
.ggtj_wrap_1
width 5%
height 30%
top: 9%;
left: 7%;
.ggtj
@@ -954,7 +955,7 @@ export default {
.fmj
width: 120%;
left: -10%;
top 5%
top 20%
.ggtj_wrap_2
left 14%
.ggtj_wrap_3

48
src/pages/modules/takeshape/one.vue
View File

@@ -24,6 +24,10 @@
<div class="status_tip red"></div>
<div class="status_name">故障</div>
</div>
<div class="status_item">
<div class="status_tip gray1"></div>
<div class="status_name">空料盅</div>
</div>
</div>
<div class="center_content">
<div v-if="TrappedShelfList.length > 0" class="machine_wrap yjlz_wrap_1">
@@ -91,8 +95,11 @@
<div class="sh_machine weilan">
<img src="../../../images/workshop/weilan_2.png" alt="">
</div>
<div class="sh_machine jzjcss">
<img src="../../../images/workshop/jzjcss_yellow.png" alt="">
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine jzjcss">
<img v-show="String(ManipulatorInfoList[0].color_status) === '0'" src="../../../images/workshop/jzjcss_gray.png" alt="">
<img v-show="String(ManipulatorInfoList[0].color_status) === '1'" src="../../../images/workshop/jzjcss_green.png" alt="">
<img v-show="String(ManipulatorInfoList[0].color_status) === '2'" src="../../../images/workshop/jzjcss_red.png" alt="">
<img v-show="String(ManipulatorInfoList[0].color_status) === '3'" src="../../../images/workshop/jzjcss_yellow.png" alt="">
</div>
<div v-if="PressMachineList.length > 0" class="sh_machine yyj" ref="yj01" @click.stop="yjInfo('yj', 1)">
<img v-show="String(PressMachineList[0].status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
@@ -148,8 +155,11 @@
<div class="sh_machine weilan">
<img src="../../../images/workshop/weilan_1.png" alt="">
</div>
<div class="sh_machine jzjcss">
<img src="../../../images/workshop/jzjcss_yellow.png" alt="">
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine jzjcss">
<img v-show="String(ManipulatorInfoList[1].color_status) === '0'" src="../../../images/workshop/jzjcss_gray.png" alt="">
<img v-show="String(ManipulatorInfoList[1].color_status) === '1'" src="../../../images/workshop/jzjcss_green.png" alt="">
<img v-show="String(ManipulatorInfoList[1].color_status) === '2'" src="../../../images/workshop/jzjcss_red.png" alt="">
<img v-show="String(ManipulatorInfoList[1].color_status) === '3'" src="../../../images/workshop/jzjcss_yellow.png" alt="">
</div>
<div v-if="PressMachineList.length > 0" class="sh_machine yyj" ref="yj02" @click.stop="yjInfo('yj', 2)">
<img v-show="String(PressMachineList[1].status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
@@ -234,14 +244,23 @@
<div class="sh_machine weilan">
<img src="../../../images/workshop/weilan_3.png" alt="">
</div>
<div class="sh_machine jzjcj_1">
<img src="../../../images/workshop/jzjcj_630.png" alt="">
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine jzjcj_1">
<img v-show="String(ManipulatorInfoList[2].color_status) === '0'" src="../../../images/workshop/jzjcj_gray.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '1'" src="../../../images/workshop/jzjcj_green.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '2'" src="../../../images/workshop/jzjcj_red.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '3'" src="../../../images/workshop/jzjcj_yellow.png" alt="">
</div>
<div class="sh_machine jzjcj_1 jzjcj_2">
<img src="../../../images/workshop/jzjcj_630.png" alt="">
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine jzjcj_1 jzjcj_2">
<img v-show="String(ManipulatorInfoList[2].color_status) === '0'" src="../../../images/workshop/jzjcj_gray.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '1'" src="../../../images/workshop/jzjcj_green.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '2'" src="../../../images/workshop/jzjcj_red.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '3'" src="../../../images/workshop/jzjcj_yellow.png" alt="">
</div>
<div class="sh_machine lmyzj">
<img src="../../../images/workshop/lmyzj_630.png" alt="">
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine lmyzj">
<img v-show="String(ManipulatorInfoList[2].color_status) === '0'" src="../../../images/workshop/lmyzj_gray.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '1'" src="../../../images/workshop/lmyzj_green.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '2'" src="../../../images/workshop/lmyzj_red.png" alt="">
<img v-show="String(ManipulatorInfoList[2].color_status) === '3'" src="../../../images/workshop/lmyzj_yellow.png" alt="">
</div>
<div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1" ref="mpgw05" @click.stop="yjInfo('mpgw', 5)">
<img v-show="StackingPositionList[4].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -400,8 +419,11 @@
<div class="zhuan_bg_arrow"></div>
</div>
</div>
<div class="sh_machine jcpmj">
<img src="../../../images/workshop/jcpmj.png" alt="">
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine jcpmj">
<img v-show="String(ManipulatorInfoList[3].color_status) === '0'" src="../../../images/workshop/jcpmj_gray.png" alt="">
<img v-show="String(ManipulatorInfoList[3].color_status) === '1'" src="../../../images/workshop/jcpmj_green.png" alt="">
<img v-show="String(ManipulatorInfoList[3].color_status) === '2'" src="../../../images/workshop/jcpmj_red.png" alt="">
<img v-show="String(ManipulatorInfoList[3].color_status) === '3'" src="../../../images/workshop/jcpmj_yellow.png" alt="">
</div>
<div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot pointer" :class="{'rotate_630_2': String(ManipulatorInfoList[3].color_status) === '1'}" ref="jxs04" @click.stop="yjInfo('jxs', 4)">
<img v-show="String(ManipulatorInfoList[3].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
@@ -1458,7 +1480,7 @@ export default {
left: 54%;
top: 33%;
.weilan
top 6%
top 9%
.robot
left: 79%;
top: 49%;