diff --git a/src/assets/img/map-test.png b/src/assets/img/map-test.png deleted file mode 100644 index 3af14556..00000000 Binary files a/src/assets/img/map-test.png and /dev/null differ diff --git a/src/assets/img/map.png b/src/assets/img/map.png index 64c9781f..3af14556 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 3b7a3908..238ee839 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -2,12 +2,11 @@
- - + +
- {{(limitUserId.find(item => item.id == 1))?'宏盛农业':mainData.projectName}} - + {{mainData.projectName}}
@@ -24,8 +23,7 @@
-
欢迎,{{(limitUserId.find(item => item.id == 1))?'杭州宏盛农业设施有限公司':userInfo.nickName}} - +
欢迎,{{ 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 b5d62336..6947b88c 100644 --- a/src/views/page/largeScreen.vue +++ b/src/views/page/largeScreen.vue @@ -118,7 +118,7 @@ - +
@@ -3023,70 +3023,71 @@ export default { transparent 97%); } - .axis_1 { - width: 0.4rem; - height: 0.5rem; + .axis_1 { + width: 0.7rem; + height: 0.86rem; position: absolute; - top: 77%; - left: 11%; - z-index: 99; cursor: pointer; + top: 5%; + left: 22%; + z-index: 99; } .axis_2 { - width: 0.4rem; - height: 0.5rem; + width: 0.7rem; + height: 0.86rem; position: absolute; - top: 69%; - left: 25%; - z-index: 99; cursor: pointer; + top: 23%; + left: 41%; + z-index: 99; } .axis_3 { - width: 0.4rem; - height: 0.5rem; + width: 0.7rem; + height: 0.86rem; position: absolute; - top: 59%; - left: 41%; - z-index: 99; cursor: pointer; + top: 43%; + left: 15%; + z-index: 99; } .axis_4 { - width: 0.4rem; - height: 0.5rem; + width: 0.7rem; + height: 0.86rem; position: absolute; - top: 46%; - left:61%; - z-index: 99; cursor: pointer; + top: 3%; + left: 64%; + z-index: 99; } .axis_5 { - width: 0.4rem; - height: 0.5rem; + width: 0.7rem; + height: 0.86rem; position: absolute; - top: 36%; - left: 76%; - z-index: 99; cursor: pointer; + top: 29%; + left: 78%; + z-index: 99; } .axis_6 { - width: 0.4rem; - height: 0.5rem; + width: 0.7rem; + height: 0.86rem; position: absolute; - top: 27%; - left: 87%; - z-index: 99; cursor: pointer; + top: 63%; + left: 65%; + z-index: 99; } .axis_7 { width: 1.04rem; height: 1.18rem; position: absolute; + cursor: pointer; top: 42%; left: 45%; z-index: 99; diff --git a/src/views/page/largeScreen1.vue b/src/views/page/largeScreen1.vue index a601d38f..2cfd4fa9 100644 --- a/src/views/page/largeScreen1.vue +++ b/src/views/page/largeScreen1.vue @@ -24,7 +24,12 @@
- +
+
+ + 控制中心 +
+