diff --git a/src/assets/img/logo-test.jpg b/src/assets/img/logo-test.jpg new file mode 100644 index 00000000..017e4396 Binary files /dev/null and b/src/assets/img/logo-test.jpg differ diff --git a/src/assets/img/map-test.png b/src/assets/img/map-test.png new file mode 100644 index 00000000..3af14556 Binary files /dev/null and b/src/assets/img/map-test.png differ diff --git a/src/assets/img/map.png b/src/assets/img/map.png index 3af14556..64c9781f 100644 Binary files a/src/assets/img/map.png and b/src/assets/img/map.png differ diff --git a/src/views/index.vue b/src/views/index.vue index 3e6aab89..3b7a3908 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -2,10 +2,12 @@
- + +
- {{mainData.projectName}} + {{(limitUserId.find(item => item.id == 1))?'宏盛农业':mainData.projectName}} +
@@ -22,7 +24,9 @@
-
欢迎,{{ userInfo.nickName }}
+
欢迎,{{(limitUserId.find(item => item.id == 1))?'杭州宏盛农业设施有限公司':userInfo.nickName}} + +
{{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}
diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue index 32b4ae65..4b208f0e 100644 --- a/src/views/page/largeScreen.vue +++ b/src/views/page/largeScreen.vue @@ -118,7 +118,7 @@ - +
@@ -3026,57 +3026,63 @@ export default { } .axis_1 { - width: 0.7rem; - height: 0.86rem; + width: 0.4rem; + height: 0.5rem; position: absolute; - top: 5%; - left: 22%; + top: 77%; + left: 11%; z-index: 99; + cursor: pointer; } .axis_2 { - width: 0.7rem; - height: 0.86rem; + width: 0.4rem; + height: 0.5rem; position: absolute; - top: 23%; - left: 41%; + top: 69%; + left: 25%; z-index: 99; + cursor: pointer; } .axis_3 { - width: 0.7rem; - height: 0.86rem; + width: 0.4rem; + height: 0.5rem; position: absolute; - top: 43%; - left: 15%; + top: 59%; + left: 41%; z-index: 99; + cursor: pointer; } .axis_4 { - width: 0.7rem; - height: 0.86rem; + width: 0.4rem; + height: 0.5rem; position: absolute; - top: 3%; - left: 64%; + top: 46%; + left:61%; z-index: 99; + cursor: pointer; } .axis_5 { - width: 0.7rem; - height: 0.86rem; + width: 0.4rem; + height: 0.5rem; position: absolute; - top: 29%; - left: 78%; + top: 36%; + left: 76%; z-index: 99; + cursor: pointer; } .axis_6 { - width: 0.7rem; - height: 0.86rem; + width: 0.4rem; + height: 0.5rem; position: absolute; - top: 63%; - left: 65%; + top: 27%; + left: 87%; z-index: 99; + cursor: pointer; } .axis_7 { diff --git a/src/views/page/largeScreen1.vue b/src/views/page/largeScreen1.vue index 75ad6675..f48bc706 100644 --- a/src/views/page/largeScreen1.vue +++ b/src/views/page/largeScreen1.vue @@ -24,13 +24,7 @@
-
-
- - 控制中心 -
- -
+