diff --git a/src/assets/css/mixin.styl b/src/assets/css/mixin.styl index 67f70d8..6b5e583 100644 --- a/src/assets/css/mixin.styl +++ b/src/assets/css/mixin.styl @@ -11,6 +11,8 @@ $green2 = #65d837 background-color #fdfd0f .gray background-color #bfbfbf +.gray1 + background-color #d8d1d1 .red background-color #ff1016 diff --git a/src/images/workshop/jcpmj.png b/src/images/workshop/jcpmj.png deleted file mode 100644 index a602956..0000000 Binary files a/src/images/workshop/jcpmj.png and /dev/null differ diff --git a/src/images/workshop/jcpmj_gray.png b/src/images/workshop/jcpmj_gray.png new file mode 100644 index 0000000..31aee3d Binary files /dev/null and b/src/images/workshop/jcpmj_gray.png differ diff --git a/src/images/workshop/jcpmj_green.png b/src/images/workshop/jcpmj_green.png new file mode 100644 index 0000000..c59cefe Binary files /dev/null and b/src/images/workshop/jcpmj_green.png differ diff --git a/src/images/workshop/jcpmj_red.png b/src/images/workshop/jcpmj_red.png new file mode 100644 index 0000000..09ce459 Binary files /dev/null and b/src/images/workshop/jcpmj_red.png differ diff --git a/src/images/workshop/jcpmj_yellow.png b/src/images/workshop/jcpmj_yellow.png new file mode 100644 index 0000000..7d9b7a2 Binary files /dev/null and b/src/images/workshop/jcpmj_yellow.png differ diff --git a/src/images/workshop/jzjcj_gray.png b/src/images/workshop/jzjcj_gray.png new file mode 100644 index 0000000..3c285f0 Binary files /dev/null and b/src/images/workshop/jzjcj_gray.png differ diff --git a/src/images/workshop/jzjcj_green.png b/src/images/workshop/jzjcj_green.png new file mode 100644 index 0000000..2c876ab Binary files /dev/null and b/src/images/workshop/jzjcj_green.png differ diff --git a/src/images/workshop/jzjcj_red.png b/src/images/workshop/jzjcj_red.png new file mode 100644 index 0000000..3d3d6a6 Binary files /dev/null and b/src/images/workshop/jzjcj_red.png differ diff --git a/src/images/workshop/jzjcj_630.png b/src/images/workshop/jzjcj_yellow.png similarity index 100% rename from src/images/workshop/jzjcj_630.png rename to src/images/workshop/jzjcj_yellow.png diff --git a/src/images/workshop/jzjcss_gray.png b/src/images/workshop/jzjcss_gray.png new file mode 100644 index 0000000..6b4792d Binary files /dev/null and b/src/images/workshop/jzjcss_gray.png differ diff --git a/src/images/workshop/jzjcss_green.png b/src/images/workshop/jzjcss_green.png new file mode 100644 index 0000000..2755cf5 Binary files /dev/null and b/src/images/workshop/jzjcss_green.png differ diff --git a/src/images/workshop/jzjcss_red.png b/src/images/workshop/jzjcss_red.png new file mode 100644 index 0000000..9adbace Binary files /dev/null and b/src/images/workshop/jzjcss_red.png differ diff --git a/src/images/workshop/jzjcss_yellow.png b/src/images/workshop/jzjcss_yellow.png index 84b948e..7d6261a 100644 Binary files a/src/images/workshop/jzjcss_yellow.png and b/src/images/workshop/jzjcss_yellow.png differ diff --git a/src/images/workshop/lmyzj_630.png b/src/images/workshop/lmyzj_630.png deleted file mode 100644 index db903e3..0000000 Binary files a/src/images/workshop/lmyzj_630.png and /dev/null differ diff --git a/src/images/workshop/lmyzj_gray.png b/src/images/workshop/lmyzj_gray.png new file mode 100644 index 0000000..663d60b Binary files /dev/null and b/src/images/workshop/lmyzj_gray.png differ diff --git a/src/images/workshop/lmyzj_green.png b/src/images/workshop/lmyzj_green.png new file mode 100644 index 0000000..9e43fcf Binary files /dev/null and b/src/images/workshop/lmyzj_green.png differ diff --git a/src/images/workshop/lmyzj_red.png b/src/images/workshop/lmyzj_red.png new file mode 100644 index 0000000..6f2d4d8 Binary files /dev/null and b/src/images/workshop/lmyzj_red.png differ diff --git a/src/images/workshop/lmyzj_yellow.png b/src/images/workshop/lmyzj_yellow.png new file mode 100644 index 0000000..8517842 Binary files /dev/null and b/src/images/workshop/lmyzj_yellow.png differ diff --git a/src/images/workshop/lz_hj_gray.png b/src/images/workshop/lz_hj_gray.png index 8e023a7..c45751d 100644 Binary files a/src/images/workshop/lz_hj_gray.png and b/src/images/workshop/lz_hj_gray.png differ diff --git a/src/images/workshop/lz_hj_gray1.png b/src/images/workshop/lz_hj_gray1.png new file mode 100644 index 0000000..8e023a7 Binary files /dev/null and b/src/images/workshop/lz_hj_gray1.png differ diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue index 2fb8cfe..37786c2 100644 --- a/src/pages/modules/homepage/one.vue +++ b/src/pages/modules/homepage/one.vue @@ -136,8 +136,11 @@
+
+
+
+
@@ -193,8 +196,11 @@
+
+
+
+
@@ -279,14 +285,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -445,8 +460,11 @@
+
+
+
+
@@ -1626,7 +1644,7 @@ export default {
left: 54%;
top: 33%;
.weilan
- top 6%
+ top 9%
.robot
left: 79%;
top: 49%;
diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue
index 8be5ada..37fff2a 100644
--- a/src/pages/modules/homepage/two.vue
+++ b/src/pages/modules/homepage/two.vue
@@ -72,6 +72,11 @@
+
@@ -267,7 +272,7 @@
+
+
+
+
@@ -148,8 +155,11 @@
+
+
+
+
@@ -234,14 +244,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -400,8 +419,11 @@
+
+
+
+
@@ -1458,7 +1480,7 @@ export default {
left: 54%;
top: 33%;
.weilan
- top 6%
+ top 9%
.robot
left: 79%;
top: 49%;