diff --git a/.gitignore b/.gitignore
index 2b8841d..5697567 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,9 +11,9 @@ node_modules
.DS_Store
dist
dist-ssr
+dist.zip
coverage
*.local
-
/cypress/videos/
/cypress/screenshots/
diff --git a/README.md b/README.md
index 2f3b29d..3526cbf 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,11 @@
## 项目描述
-[IofTV-Screen](https://gitee.com/daidaibg/IofTV-Screen/tree/main) 的 Vue3+vite版本，
+Vue3+vite版本，
-### 与vue2版本对比
-
-#### 功能
-
-功能采用与vue2版本相同功能
-
-因为要与vue2版本相同功能，有些组件不兼容vue3版本，例如：胶囊柱图，数字滚动皆重新封装为组件，整体来说，功能属实相同。根据自己需求选择[vue2](#vue2版本地址)版本与[vue3](#本项目地址 vue3+vite)版本
#### 样式
-进行微调，整体看着更加美观
-
-
-
- 项目需要全屏展示（按 F11）。
- 项目部分区域使用了全局注册方式，增加了打包体积，在实际运用中请使用 **按需引入**。
@@ -31,39 +20,10 @@
友情链接：
1. [Vue 官方文档](https://cn.vuejs.org/)
-3. [echarts 实例](https://gitee.com/link?target=https%3A%2F%2Fecharts.apache.org%2Fexamples%2Fzh%2Findex.html)，[echarts API 文档](https://gitee.com/link?target=https%3A%2F%2Fecharts.apache.org%2Fzh%2Fapi.html%23echarts)
-4. [mock.js官网](http://mockjs.com/examples.html)
-5. [axios官网](https://axios-http.com/)
+2. [echarts 实例](https://gitee.com/link?target=https%3A%2F%2Fecharts.apache.org%2Fexamples%2Fzh%2Findex.html)，[echarts API 文档](https://gitee.com/link?target=https%3A%2F%2Fecharts.apache.org%2Fzh%2Fapi.html%23echarts)
+3. [mock.js官网](http://mockjs.com/examples.html)
+4. [axios官网](https://axios-http.com/)
-**项目展示**
-
-
-
-### 项目预览地址
-
-[https://www.daidaibg.com/bigscreen-vue3](https://www.daidaibg.com/bigscreen-vue3)
-
-### 项目仓库地址
-
-#### 本项目地址 vue3+vite
-
-**github地址**
-
-[https://github.com/daidaibg/IofTV-Screen-Vue3](https://github.com/daidaibg/IofTV-Screen-Vue3)
-
-**Gitee地址**
-
-[https://gitee.com/daidaibg/IofTV-Screen-Vue3](https://gitee.com/daidaibg/IofTV-Screen-Vue3)
-
-#### vue2版本地址
-
-**github地址**
-
-[https://github.com/daidaibg/IofTV-Screen](https://github.com/daidaibg/IofTV-Screen)
-
-**Gitee地址**
-
-[https://gitee.com/daidaibg/IofTV-Screen](https://gitee.com/daidaibg/IofTV-Screen)
@@ -73,10 +33,6 @@
项目中可以进行滚动配置，内容是否滚动
-点击右上角设置按钮
-
-
-
可以进行以下配置，可以自行代码中进行修改或增加配置
@@ -308,15 +264,6 @@ isSouthChinaSea:false,//默认不显示南海，改为true可显示南海
{{10.23123|montionFilter }}
```
-## 大屏交流反馈（面条的群）
-
-### 大屏QQ群
-
-QQ群号：
-
-一群：713105837 （已满）
-
-二群：495755841
diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index 7ec58e2..0000000
Binary files a/dist.zip and /dev/null differ
diff --git a/index.html b/index.html
index 538cf6d..2b16763 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
- IofTV-Screen-Vue3
+ 迎新系统数据大屏
diff --git a/src/main.ts b/src/main.ts
index f7ac8ee..1ec85da 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -9,8 +9,8 @@ import '@/assets/css/tailwind.css'
import {registerEcharts} from "@/plugins/echarts"
//不使用mock 请注释掉
-import { mockXHR } from "@/mock/index";
-mockXHR()
+// import { mockXHR } from "@/mock/index";
+// mockXHR()
const app = createApp(App)
registerEcharts(app)
diff --git a/src/stores/setting/setting.ts b/src/stores/setting/setting.ts
index 4ba8ec3..a48e753 100644
--- a/src/stores/setting/setting.ts
+++ b/src/stores/setting/setting.ts
@@ -3,7 +3,7 @@ import { defineStore } from 'pinia'
// import { storeToRefs } from 'pinia';
export const useSettingStore = defineStore('setting', () => {
const settingShow = ref(false);//设置弹窗显隐
- const isScale = ref(false);//是否进行全局适配
+ const isScale = ref(true);//是否进行全局适配 --- 默认是适配的
const indexConfig = ref({
leftBottomSwiper: true,//左轮播
rightBottomSwiper: true,//右下轮播
diff --git a/src/views/header.vue b/src/views/header.vue
index 7dda80d..2fcd0a2 100644
--- a/src/views/header.vue
+++ b/src/views/header.vue
@@ -43,7 +43,7 @@ const returnHome = () => {
diff --git a/src/views/index/center-bottom.vue b/src/views/index/center-bottom.vue
index f0fceec..6ded596 100644
--- a/src/views/index/center-bottom.vue
+++ b/src/views/index/center-bottom.vue
@@ -6,6 +6,7 @@ import { ElMessage } from "element-plus";
const option = ref({});
const getData = () => {
+ return
installationPlan()
.then((res) => {
console.log("中下--安装计划", res);
diff --git a/src/views/index/center-map.vue b/src/views/index/center-map.vue
index 9f39a38..5113f74 100644
--- a/src/views/index/center-map.vue
+++ b/src/views/index/center-map.vue
@@ -44,6 +44,7 @@ const dataSetHandle = async (regionCode: string, list: object[]) => {
};
const getData = async (regionCode: string) => {
+ return
centerMap({ regionCode: regionCode })
.then((res) => {
console.log("中上--设备分布", res);
diff --git a/src/views/index/left-bottom.vue b/src/views/index/left-bottom.vue
index 6a9c4e1..d16e3f9 100644
--- a/src/views/index/left-bottom.vue
+++ b/src/views/index/left-bottom.vue
@@ -20,6 +20,7 @@ const state = reactive({
});
const getData = () => {
+ return
leftBottom( { limitNum: 20 })
.then((res) => {
console.log("左下--设备提醒", res);
diff --git a/src/views/index/left-center.vue b/src/views/index/left-center.vue
index 58574ea..b1b69ea 100644
--- a/src/views/index/left-center.vue
+++ b/src/views/index/left-center.vue
@@ -20,6 +20,7 @@ const echartsGraphic = (colors: string[]) => {
]);
};
const getData = () => {
+ return
countUserNum().then((res) => {
console.log("左中--用户总览",res);
if (res.success) {
diff --git a/src/views/index/left-top.vue b/src/views/index/left-top.vue
index b12e263..fc27bba 100644
--- a/src/views/index/left-top.vue
+++ b/src/views/index/left-top.vue
@@ -14,6 +14,7 @@ const state = reactive({
const getData = () => {
+ return
countDeviceNum().then((res) => {
console.log("左上--设备总览",res);
if (res.success) {
diff --git a/src/views/index/right-bottom.vue b/src/views/index/right-bottom.vue
index 1ebed4c..2b630a9 100644
--- a/src/views/index/right-bottom.vue
+++ b/src/views/index/right-bottom.vue
@@ -21,6 +21,7 @@ const state = reactive({
});
const getData = () => {
+ return
rightBottom({ limitNum: 20 })
.then((res) => {
console.log("右下", res);
diff --git a/src/views/index/right-center.vue b/src/views/index/right-center.vue
index 27d9332..889c623 100644
--- a/src/views/index/right-center.vue
+++ b/src/views/index/right-center.vue
@@ -10,6 +10,7 @@ const config = ref({
});
const data = ref([]);
const getData = () => {
+ return
ranking()
.then((res) => {
console.log("右中--报警排名", res);
diff --git a/src/views/index/right-top.vue b/src/views/index/right-top.vue
index 1164a78..0a144c5 100644
--- a/src/views/index/right-top.vue
+++ b/src/views/index/right-top.vue
@@ -6,6 +6,7 @@ import { ElMessage } from "element-plus";
const option = ref({});
const getData = () => {
+ return
alarmNum()
.then((res) => {
console.log("右上--报警次数 ", res);