diff --git a/src/App.vue b/src/App.vue
index 162ec5d..ee6a9da 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,22 +1,9 @@
-
-
-
-
-
-
-
+
diff --git a/src/api/index.js b/src/api/index.js
index cd75d54..26fb176 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,5 +1,6 @@
import axios from "@/utils/axios.js";
-export const test = () => {
- return axios.get('/common/home');
-}
\ No newline at end of file
+// 登录
+export const login = (data) => {
+ return axios.post('dataview/login', data);
+}
diff --git a/src/assets/login_img/BKH.png b/src/assets/login_img/BKH.png
new file mode 100644
index 0000000..bde8156
Binary files /dev/null and b/src/assets/login_img/BKH.png differ
diff --git a/src/assets/login_img/DL.png b/src/assets/login_img/DL.png
new file mode 100644
index 0000000..6e017db
Binary files /dev/null and b/src/assets/login_img/DL.png differ
diff --git a/src/assets/login_img/DLBG.png b/src/assets/login_img/DLBG.png
new file mode 100644
index 0000000..1a0e842
Binary files /dev/null and b/src/assets/login_img/DLBG.png differ
diff --git a/src/assets/login_img/KJ.png b/src/assets/login_img/KJ.png
new file mode 100644
index 0000000..863c1ff
Binary files /dev/null and b/src/assets/login_img/KJ.png differ
diff --git a/src/assets/login_img/MM.png b/src/assets/login_img/MM.png
new file mode 100644
index 0000000..43fca71
Binary files /dev/null and b/src/assets/login_img/MM.png differ
diff --git a/src/assets/login_img/ZH.png b/src/assets/login_img/ZH.png
new file mode 100644
index 0000000..4053e0c
Binary files /dev/null and b/src/assets/login_img/ZH.png differ
diff --git a/src/assets/login_img/bg.png b/src/assets/login_img/bg.png
new file mode 100644
index 0000000..4d945fe
Binary files /dev/null and b/src/assets/login_img/bg.png differ
diff --git a/src/components/headView.vue b/src/components/headView.vue
index 7564d20..610942d 100644
--- a/src/components/headView.vue
+++ b/src/components/headView.vue
@@ -53,6 +53,12 @@ const updateClock = () => {
seconds.toString().padStart(2, '0');
}
+const logout = () => {
+ // router.replace('/login')
+ router.push('/login')
+}
+
+
onMounted(() => {
mitt.emit('map_info', info);
@@ -92,7 +98,7 @@ onMounted(() => {
多云
-
diff --git a/src/components/videoFlv.vue b/src/components/videoFlv.vue
index 8eba60d..449e711 100644
--- a/src/components/videoFlv.vue
+++ b/src/components/videoFlv.vue
@@ -180,11 +180,11 @@ export default {
})
this.jessibuca.on('stats', function (stats) {
- console.log('stats', stats);
+ // console.log('stats', stats);
})
this.jessibuca.on('kBps', function (kBps) {
- console.log('kBps', kBps);
+ // console.log('kBps', kBps);
});
this.jessibuca.on("play", () => {
diff --git a/src/layout/index.vue b/src/layout/index.vue
new file mode 100644
index 0000000..cd850cd
--- /dev/null
+++ b/src/layout/index.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index d0595db..b862fb2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,17 +4,24 @@ const routes = [
{
path: '/',
name: 'index',
- component: () => import('../view/index/index.vue')
+ component: () => import('../layout/index.vue'),
+ children: [
+ {
+ path: '/',
+ name: '',
+ component: () => import('../view/index/index.vue')
+ },
+ {
+ path: '/delivery',
+ name: 'delivery',
+ component: () => import('../view/delivery/index.vue')
+ },
+ ]
},
{
- path: '/delivery',
- name: 'delivery',
- component: () => import('../view/delivery/index.vue')
- },
- {
- path: '/test',
- name: 'test',
- component: () => import('../view/test/index.vue')
+ path: '/login',
+ name: '/login',
+ component: () => import('../view/login/index.vue')
}
]
diff --git a/src/store/user.js b/src/store/user.js
new file mode 100644
index 0000000..b9cab3d
--- /dev/null
+++ b/src/store/user.js
@@ -0,0 +1,26 @@
+import { defineStore } from "pinia"
+import { ref } from "vue"
+
+export const useUserStore = defineStore('user', () => {
+
+ const userInfo = ref(JSON.parse(localStorage.getItem('userInfo') || '{}'));
+
+ const setUserInfo = (data) => {
+ userInfo.value = data;
+ localStorage.setItem('userInfo', JSON.stringify(data));
+ }
+
+ const token = ref(localStorage.getItem('token') || '');
+
+ const setToken = (data) => {
+ token.value = data;
+ localStorage.setItem('token', data);
+ }
+
+ return {
+ userInfo,
+ token,
+ setUserInfo,
+ setToken
+ }
+})
\ No newline at end of file
diff --git a/src/view/delivery/components/center.vue b/src/view/delivery/components/center.vue
index f5bcb8b..451f9c6 100644
--- a/src/view/delivery/components/center.vue
+++ b/src/view/delivery/components/center.vue
@@ -184,7 +184,7 @@ const initMap = () => {
tooltip: {
trigger: 'item',
formatter: function (params) {
- console.log(params);
+ // console.log(params);
if (params.data) {
return `基地名称
${'泸县原生态养殖基地'}
+ align-items: center;">${params.data.name}
`;
} else return '';
},
@@ -273,6 +273,14 @@ const initMap = () => {
}
// 使用配置项显示图表
chart.setOption(option);
+
+ // 监听标记点的点击事件
+ chart.on('click', function (params) {
+ if (params.seriesType === 'scatter') {
+ // 处理你的点击事件逻辑
+ console.log('点击了', params.data.name);
+ }
+});
}
const filterMap = () => {
@@ -288,6 +296,7 @@ onMounted(() => {
}
dataValue = props.list;
dataValue[0] = {
+ name: '福集镇养殖基地',
value: [105.36, 29.20]
}
changeType('luxian');
diff --git a/src/view/index/components/left.vue b/src/view/index/components/left.vue
index 387ce88..e6df8c8 100644
--- a/src/view/index/components/left.vue
+++ b/src/view/index/components/left.vue
@@ -191,7 +191,7 @@ onMounted(() => {
泸县原生态养殖基地
diff --git a/src/view/login/index.vue b/src/view/login/index.vue
new file mode 100644
index 0000000..ad11c72
--- /dev/null
+++ b/src/view/login/index.vue
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+
+
+
+