diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..73ac3fe Binary files /dev/null and b/dist.zip differ diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js index e0e13bf..5ec2390 100644 --- a/src/assets/js/getData2.js +++ b/src/assets/js/getData2.js @@ -461,7 +461,7 @@ export const workshopCondition = () => { 'point_name': '压机1空盅货位', 'point_status_name': '无货', 'point_code': 'KLHW41', - 'point_status': '0' + 'point_status': '1' }, { 'point_name': '压机1困料货位1', @@ -485,7 +485,7 @@ export const workshopCondition = () => { 'point_name': '压机2空盅货位', 'point_status_name': '无货', 'point_code': 'KLHW45', - 'point_status': '0' + 'point_status': '1' }, { 'point_name': '压机2困料货位1', @@ -497,40 +497,40 @@ export const workshopCondition = () => { 'point_name': '压机2困料货位2', 'point_status_name': '无货', 'point_code': 'KLHW47', - 'point_status': '0' + 'point_status': '1' }, { 'point_name': '压机2困料货位3', 'point_status_name': '无货', 'point_code': 'KLHW48', - 'point_status': '0' + 'point_status': '1' } ], 'MixBlankingList': [ { 'point_name': '混料机1下料位', 'point_code': 'HLJ01XL01', - 'point_status': '0' + 'point_status': '1' }, { 'point_name': '混料机2下料位', 'point_code': 'HLJ02XL01', - 'point_status': '0' + 'point_status': '1' }, { 'point_name': '混料机3下料位', 'point_code': 'HLJ03XL01', - 'point_status': '0' + 'point_status': '1' }, { 'point_name': '混料机4下料位', 'point_code': 'HLJ04XL01', - 'point_status': '0' + 'point_status': '1' }, { 'point_name': '混料机5下料位', 'point_code': 'HLJ05XL01', - 'point_status': '0' + 'point_status': '1' }, { 'point_name': '混料机6下料位', @@ -550,7 +550,7 @@ export const workshopCondition = () => { { 'point_name': '混料机9下料位', 'point_code': 'HLJ09XL01', - 'point_status': '0' + 'point_status': '1' }, { 'point_name': '混料机10下料位', diff --git a/src/images/workshop/cyj_1_gray.png b/src/images/workshop/cyj_1_gray.png deleted file mode 100644 index 84236ad..0000000 Binary files a/src/images/workshop/cyj_1_gray.png and /dev/null differ diff --git a/src/images/workshop/cyj_2_gray.png b/src/images/workshop/cyj_2_gray.png deleted file mode 100644 index 5dfceec..0000000 Binary files a/src/images/workshop/cyj_2_gray.png and /dev/null differ diff --git a/src/images/workshop/robot_1.png b/src/images/workshop/robot_1.png deleted file mode 100644 index f0dbb3f..0000000 Binary files a/src/images/workshop/robot_1.png and /dev/null differ diff --git a/src/images/workshop/robot_2.png b/src/images/workshop/robot_2.png deleted file mode 100644 index d7962b5..0000000 Binary files a/src/images/workshop/robot_2.png and /dev/null differ diff --git a/src/images/workshop/robot_3.png b/src/images/workshop/robot_3.png deleted file mode 100644 index c267c10..0000000 Binary files a/src/images/workshop/robot_3.png and /dev/null differ diff --git a/src/images/workshop/robot_4.png b/src/images/workshop/robot_4.png deleted file mode 100644 index 7563cc8..0000000 Binary files a/src/images/workshop/robot_4.png and /dev/null differ diff --git a/src/images/workshop/robot_4_gray.png b/src/images/workshop/robot_4_gray.png deleted file mode 100644 index 84ec736..0000000 Binary files a/src/images/workshop/robot_4_gray.png and /dev/null differ diff --git a/src/images/workshop/robot_cmd_gray.png b/src/images/workshop/robot_cmd_gray.png new file mode 100644 index 0000000..164d6aa Binary files /dev/null and b/src/images/workshop/robot_cmd_gray.png differ diff --git a/src/images/workshop/robot_cmd_red.png b/src/images/workshop/robot_cmd_red.png new file mode 100644 index 0000000..df72f5e Binary files /dev/null and b/src/images/workshop/robot_cmd_red.png differ diff --git a/src/images/workshop/txtbg.png b/src/images/workshop/txtbg.png new file mode 100644 index 0000000..1555ab4 Binary files /dev/null and b/src/images/workshop/txtbg.png differ diff --git a/src/images/workshop/txtbg1.png b/src/images/workshop/txtbg1.png new file mode 100644 index 0000000..75129db Binary files /dev/null and b/src/images/workshop/txtbg1.png differ diff --git a/src/images/workshop/workshop_l.png b/src/images/workshop/workshop_l.png deleted file mode 100644 index c51f0bd..0000000 Binary files a/src/images/workshop/workshop_l.png and /dev/null differ diff --git a/src/images/workshop/workshop_r.png b/src/images/workshop/workshop_r.png deleted file mode 100644 index bcffa19..0000000 Binary files a/src/images/workshop/workshop_r.png and /dev/null differ diff --git a/src/images/workshop/yj_2500.gif b/src/images/workshop/yj_2500.gif deleted file mode 100644 index c330b8d..0000000 Binary files a/src/images/workshop/yj_2500.gif and /dev/null differ diff --git a/src/images/workshop/yj_630.gif b/src/images/workshop/yj_630.gif deleted file mode 100644 index 4104491..0000000 Binary files a/src/images/workshop/yj_630.gif and /dev/null differ diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue index ccf16f3..cd105bb 100644 --- a/src/pages/modules/homepage/one.vue +++ b/src/pages/modules/homepage/one.vue @@ -37,6 +37,12 @@
+
+

2023-6-10

+

成品1

+

367

+
+
@@ -45,6 +51,11 @@
+
+

2023-6-10

+

成品1  367

+
+
@@ -53,12 +64,12 @@
- +
- +
@@ -74,7 +85,7 @@
- +
@@ -97,233 +108,302 @@
-
-
- +
+
+
+

2023-6-10

+

成品1

+

367

+
+
+
+ +
+
+ +
+
+ + + + +
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+
-
- +
+
+

2023-6-10

+

成品1

+

367

+
+
+
+ +
+
+ +
+
+ + + + +
+
+
+ +
+
+ +
+
+ +
+
+
-
- - - - +
+
+

2023-6-10

+

成品1

+

367

+
+
+
+

2023-6-10

+

成品1

+

367

+
+
+
+ +
+
+ +
+
+ + + + +
+
+ + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
-
-
- +
+
+

2023-6-10

+

成品1

+

367

+
+
+
+

2023-6-10

+

成品1

+

367

+
+
+
+ +
+
+ + + + +
+
+ + + + +
+
+ +
+
+ +
+
+ +
+
+ +
-
- +
+
+

2023-6-10

+

成品1

+

367

+
+
+
+ +
+
+ + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
-
- +
+
+

2023-6-10

+

成品1

+

367

+
+
+
+

2023-6-10

+

成品1

+

367

+
+
+
+ +
+
+ + + + +
+
+ + + + +
+
+ +
+
+ +
+
+ +
+
+ +
-
+
+
+ +
+
-
+
+
+ +
+
-
-
-
- +
+
+ +
+
+ +
-
- +
+
+ +
+
+ +
-
- - - - +
+
+ +
-
-
- -
-
- -
-
- -
-
-
-
-
-
- -
-
- -
-
- - - - -
-
- - - - -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
- - - - -
-
- - - - -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
- - - - -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
- - - - -
-
- - - - -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- - - - -
-
- -
-
- +
+
+
+

2023-6-10

+

成品1

+

367

+
+
+ +
+
+ + + + +
+
+ +
+
+ +
@@ -816,6 +896,9 @@ export default { this.myCharts3.resize() }) } + }, + jumpTakeShape () { + this.$router.push('/takeshapeone') } } } @@ -896,88 +979,120 @@ export default { .hlj_s_wrap width 4% height 85.5% - top 14.5% - left 7% + top 12% + left 11% .hlj_s + height 7% + .yj_info_wrap + width: 210%; + top: -17% + left: -270%; + padding: 5px + _bis('../../../images/workshop/txtbg.png') + p + _font(14px, 16px, #fff,,right) + .bg_line + position absolute + _wh(67%, 2px) + background-color #03fcfd + right -100% + top 50% + transform translate(-50%) &:nth-child(2) - top 5.5% + top 9% &:nth-child(3) - top 11% + top 18% &:nth-child(4) - top 16.5% + top 27% .hlj_wrap width 4% height 66.5% - top 33% + top 44% left 14% .hlj + height 7% + .yj_info_wrap + width: 210%; + top: -2% + left: -270%; + padding: 5px + _bis('../../../images/workshop/txtbg.png') + p + _font(14px, 16px, #fff,,right) + .bg_line + position absolute + _wh(67%, 2px) + background-color #03fcfd + right -100% + top 50% + transform translate(-50%) &:nth-child(2) - top 6% + top 7% &:nth-child(3) - top 12.7% + top 15% &:nth-child(4) - top 18.6% + top 22% &:nth-child(5) - top 25.5% + top 30% &:nth-child(6) - top 31.5% + top 37% &:nth-child(7) - top 38.1% + top 45% &:nth-child(8) - top 44% + top 52% &:nth-child(9) - top 51% + top 60% &:nth-child(10) - top 57% + top 67% &:nth-child(11) - top 63.5% + top 75% &:nth-child(12) - top 69.5% + top 82% .lz_wrap_1 width 2% height 84.6% - top 15.4% - left 22% + top 13% + left 24% .lz &:nth-child(2) - top 5.4% + top 9% &:nth-child(3) - top 11% + top 18% &:nth-child(4) - top 16.2% + top 27% .lz_wrap_2 width 2% height 66.3% - top 33.7% + top 45% left 19% .lz &:nth-child(2) - top 6.1% + top 6.5% &:nth-child(3) - top 12.8% + top 15% &:nth-child(4) - top 18.5% + top 21.5% &:nth-child(5) - top 26% + top 30% &:nth-child(6) - top 31.5% + top 36.5% &:nth-child(7) - top 38.2% + top 45% &:nth-child(8) - top 43.9% + top 51.5% &:nth-child(9) - top 51% + top 60% &:nth-child(10) - top 56.8% + top 66.5% &:nth-child(11) - top 64% + top 75% &:nth-child(12) - top 69.5% + top 81.5% .yjlz_wrap_1 width 2% height 16.442% top 3% - left 38% + left 41% .lz_1 width 100% img @@ -1011,7 +1126,22 @@ export default { width 16% height 16.442% top 3% - left 43% + left 44% + .yj_info_wrap + width 60% + top: 0 + left: -81% + padding: 5px + _bis('../../../images/workshop/txtbg.png') + p + _font(14px, 16px, #fff,,right) + .bg_line + position absolute + _wh(67%, 2px) + background-color #03fcfd + right -100% + top 50% + transform translate(-50%) .yyj width 50% img @@ -1072,6 +1202,13 @@ export default { left: 89%; .yj_wrap_3 top 41% + .yj_info_wrap + top -10% + .bg_line + width: 100%; + right: -150%; + .yj_info_wrap_1 + top 46% .blj_1 width: 18%; top: 14%; @@ -1134,6 +1271,8 @@ export default { top 86% .yj_wrap_7 top 75% + .yj_info_wrap + top 19% .blj_1 top 42% .cyj_1 @@ -1160,28 +1299,61 @@ export default { .yj_wrap_8 top 89% .yj_wrap_17 - left auto - right 13% + left 60% .yyj + left auto + right 0 img - left -23% + left auto + right 37% transform rotate(180deg) + .wzm + left auto + right 0 .yj_wrap_15 - left auto - right 17% + left 60% + .cyj_1 + left auto + right 0 + img + left 0 + right auto .yj_wrap_13 - left auto - right 17% + left 60% + .cyj_1 + left auto + right 0 + img + left 0 + right auto .yj_wrap_12 - left auto - right 17% + left 60% + .cyj_1 + left auto + right 0 + img + left 0 + right auto .yj_wrap_10 - left auto - right 17% - .kongtuopan_3 - left 18% - .kongtuopan_4 - left 18% + left 60% + .yj_info_wrap_1 + left auto + right -81% + _bis('../../../images/workshop/txtbg1.png') + p + text-align left + .bg_line + left -50% + .cyj_1 + left auto + right 0 + img + left 0 + right auto + .kongtuopan_1 + left auto + right 64% + transform rotate(-90deg) .lz_wrap_4 width 2% height 63% diff --git a/src/pages/modules/homepage/one_back.vue b/src/pages/modules/homepage/one_back.vue deleted file mode 100644 index 98d1dd8..0000000 --- a/src/pages/modules/homepage/one_back.vue +++ /dev/null @@ -1,1174 +0,0 @@ - - - - - diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue index 8b46c75..b65cb17 100644 --- a/src/pages/modules/homepage/two.vue +++ b/src/pages/modules/homepage/two.vue @@ -79,6 +79,9 @@
+
+ +
@@ -91,9 +94,6 @@
-
- -
@@ -108,6 +108,9 @@
+
+ +
@@ -115,28 +118,31 @@
- +
-
- -
-
+
- +
+
+ +
+
+ +
@@ -826,7 +832,7 @@ export default { left: 0 .robot_1 left: 48%; - top: 10%; + top: 12%; width 1% height 1% transform: rotate(-90deg) @@ -844,9 +850,9 @@ export default { left auto right 3% .fjfztb - width: 44% - top: 33%; - left: 26% + width: 59%; + top: 9%; + left: 17%; .weilan1 width: 100%; height: 53%; @@ -875,7 +881,7 @@ export default { transform rotate(0deg) .robot_2 top: auto; - bottom: -13% + bottom: -8% left: 48%; width 1% height 1% @@ -890,6 +896,16 @@ export default { _wh(130%, 78%) top 43% left -15% + .cmdssj_1 + width: 4.8%; + top: -11%; + left: 74%; + img + transform rotateY(180deg) + .cmdssj_2 + left: 84%; + img + transform rotate(0deg) .rgv_line_wrap position absolute top 0 diff --git a/src/pages/modules/homepage/two_back.vue b/src/pages/modules/homepage/two_back.vue deleted file mode 100644 index 699651f..0000000 --- a/src/pages/modules/homepage/two_back.vue +++ /dev/null @@ -1,727 +0,0 @@ - - - - - diff --git a/src/pages/modules/processproduction/three.vue b/src/pages/modules/processproduction/three.vue index d360387..fdd5e80 100644 --- a/src/pages/modules/processproduction/three.vue +++ b/src/pages/modules/processproduction/three.vue @@ -8,12 +8,12 @@ +