소스 검색

no message

xiaoxin 2 년 전
부모
커밋
4ab6edd892

+ 1 - 1
.env.development

@@ -2,4 +2,4 @@
 NODE_ENV = 'development'
 NODE_ENV = 'development'
 # VITE_APP_TITLE = '硅谷甄选运营平台'
 # VITE_APP_TITLE = '硅谷甄选运营平台'
 VITE_APP_BASE_API = '/api'
 VITE_APP_BASE_API = '/api'
-VITE_SERVE="http://sph-api.atguigu.cn"
+VITE_SERVE="https://www.campussmartlife.com/smartApi"

+ 2 - 2
.env.production

@@ -1,5 +1,5 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
 NODE_ENV = 'production'
 NODE_ENV = 'production'
 # VITE_APP_TITLE = '硅谷甄选运营平台'
 # VITE_APP_TITLE = '硅谷甄选运营平台'
-VITE_APP_BASE_API = 'http://sph-api.atguigu.cn'
-VITE_SERVE="http://sph-api.atguigu.cn"
+VITE_APP_BASE_API = '/api'
+VITE_SERVE="https://www.campussmartlife.com/smartApi"

+ 141 - 141
package-lock.json

@@ -14,7 +14,7 @@
         "echarts": "^5.4.3",
         "echarts": "^5.4.3",
         "element-plus": "^2.4.4",
         "element-plus": "^2.4.4",
         "sass": "^1.69.6",
         "sass": "^1.69.6",
-        "vue": "^3.3.11",
+        "vue": "^3.4.21",
         "vue-router": "^4.2.5"
         "vue-router": "^4.2.5"
       },
       },
       "devDependencies": {
       "devDependencies": {
@@ -65,9 +65,9 @@
       }
       }
     },
     },
     "node_modules/@babel/parser": {
     "node_modules/@babel/parser": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.6.tgz",
-      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
+      "version": "7.24.4",
+      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.24.4.tgz",
+      "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==",
       "bin": {
       "bin": {
         "parser": "bin/babel-parser.js"
         "parser": "bin/babel-parser.js"
       },
       },
@@ -742,49 +742,49 @@
       }
       }
     },
     },
     "node_modules/@vue/compiler-core": {
     "node_modules/@vue/compiler-core": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.3.tgz",
-      "integrity": "sha512-u8jzgFg0EDtSrb/hG53Wwh1bAOQFtc1ZCegBpA/glyvTlgHl+tq13o1zvRfLbegYUw/E4mSTGOiCnAJ9SJ+lsg==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.21.tgz",
+      "integrity": "sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==",
       "dependencies": {
       "dependencies": {
-        "@babel/parser": "^7.23.6",
-        "@vue/shared": "3.4.3",
+        "@babel/parser": "^7.23.9",
+        "@vue/shared": "3.4.21",
         "entities": "^4.5.0",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.0.2"
         "source-map-js": "^1.0.2"
       }
       }
     },
     },
     "node_modules/@vue/compiler-dom": {
     "node_modules/@vue/compiler-dom": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.3.tgz",
-      "integrity": "sha512-oGF1E9/htI6JWj/lTJgr6UgxNCtNHbM6xKVreBWeZL9QhRGABRVoWGAzxmtBfSOd+w0Zi5BY0Es/tlJrN6WgEg==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz",
+      "integrity": "sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==",
       "dependencies": {
       "dependencies": {
-        "@vue/compiler-core": "3.4.3",
-        "@vue/shared": "3.4.3"
+        "@vue/compiler-core": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
       }
     },
     },
     "node_modules/@vue/compiler-sfc": {
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.3.tgz",
-      "integrity": "sha512-NuJqb5is9I4uzv316VRUDYgIlPZCG8D+ARt5P4t5UDShIHKL25J3TGZAUryY/Aiy0DsY7srJnZL5ryB6DD63Zw==",
-      "dependencies": {
-        "@babel/parser": "^7.23.6",
-        "@vue/compiler-core": "3.4.3",
-        "@vue/compiler-dom": "3.4.3",
-        "@vue/compiler-ssr": "3.4.3",
-        "@vue/shared": "3.4.3",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.21.tgz",
+      "integrity": "sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==",
+      "dependencies": {
+        "@babel/parser": "^7.23.9",
+        "@vue/compiler-core": "3.4.21",
+        "@vue/compiler-dom": "3.4.21",
+        "@vue/compiler-ssr": "3.4.21",
+        "@vue/shared": "3.4.21",
         "estree-walker": "^2.0.2",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.5",
-        "postcss": "^8.4.32",
+        "magic-string": "^0.30.7",
+        "postcss": "^8.4.35",
         "source-map-js": "^1.0.2"
         "source-map-js": "^1.0.2"
       }
       }
     },
     },
     "node_modules/@vue/compiler-ssr": {
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.3.tgz",
-      "integrity": "sha512-wnYQtMBkeFSxgSSQbYGQeXPhQacQiog2c6AlvMldQH6DB+gSXK/0F6DVXAJfEiuBSgBhUc8dwrrG5JQcqwalsA==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.21.tgz",
+      "integrity": "sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==",
       "dependencies": {
       "dependencies": {
-        "@vue/compiler-dom": "3.4.3",
-        "@vue/shared": "3.4.3"
+        "@vue/compiler-dom": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
       }
     },
     },
     "node_modules/@vue/devtools-api": {
     "node_modules/@vue/devtools-api": {
@@ -818,48 +818,48 @@
       }
       }
     },
     },
     "node_modules/@vue/reactivity": {
     "node_modules/@vue/reactivity": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.4.3.tgz",
-      "integrity": "sha512-q5f9HLDU+5aBKizXHAx0w4whkIANs1Muiq9R5YXm0HtorSlflqv9u/ohaMxuuhHWCji4xqpQ1eL04WvmAmGnFg==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.4.21.tgz",
+      "integrity": "sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==",
       "dependencies": {
       "dependencies": {
-        "@vue/shared": "3.4.3"
+        "@vue/shared": "3.4.21"
       }
       }
     },
     },
     "node_modules/@vue/runtime-core": {
     "node_modules/@vue/runtime-core": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.4.3.tgz",
-      "integrity": "sha512-C1r6QhB1qY7D591RCSFhMULyzL9CuyrGc+3PpB0h7dU4Qqw6GNyo4BNFjHZVvsWncrUlKX3DIKg0Y7rNNr06NQ==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.4.21.tgz",
+      "integrity": "sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==",
       "dependencies": {
       "dependencies": {
-        "@vue/reactivity": "3.4.3",
-        "@vue/shared": "3.4.3"
+        "@vue/reactivity": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
       }
     },
     },
     "node_modules/@vue/runtime-dom": {
     "node_modules/@vue/runtime-dom": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.4.3.tgz",
-      "integrity": "sha512-wrsprg7An5Ec+EhPngWdPuzkp0BEUxAKaQtN9dPU/iZctPyD9aaXmVtehPJerdQxQale6gEnhpnfywNw3zOv2A==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.4.21.tgz",
+      "integrity": "sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==",
       "dependencies": {
       "dependencies": {
-        "@vue/runtime-core": "3.4.3",
-        "@vue/shared": "3.4.3",
+        "@vue/runtime-core": "3.4.21",
+        "@vue/shared": "3.4.21",
         "csstype": "^3.1.3"
         "csstype": "^3.1.3"
       }
       }
     },
     },
     "node_modules/@vue/server-renderer": {
     "node_modules/@vue/server-renderer": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.4.3.tgz",
-      "integrity": "sha512-BUxt8oVGMKKsqSkM1uU3d3Houyfy4WAc2SpSQRebNd+XJGATVkW/rO129jkyL+kpB/2VRKzE63zwf5RtJ3XuZw==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.4.21.tgz",
+      "integrity": "sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==",
       "dependencies": {
       "dependencies": {
-        "@vue/compiler-ssr": "3.4.3",
-        "@vue/shared": "3.4.3"
+        "@vue/compiler-ssr": "3.4.21",
+        "@vue/shared": "3.4.21"
       },
       },
       "peerDependencies": {
       "peerDependencies": {
-        "vue": "3.4.3"
+        "vue": "3.4.21"
       }
       }
     },
     },
     "node_modules/@vue/shared": {
     "node_modules/@vue/shared": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.3.tgz",
-      "integrity": "sha512-rIwlkkP1n4uKrRzivAKPZIEkHiuwY5mmhMJ2nZKCBLz8lTUlE73rQh4n1OnnMurXt1vcUNyH4ZPfdh8QweTjpQ=="
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.21.tgz",
+      "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g=="
     },
     },
     "node_modules/@vue/tsconfig": {
     "node_modules/@vue/tsconfig": {
       "version": "0.5.1",
       "version": "0.5.1",
@@ -1471,9 +1471,9 @@
       }
       }
     },
     },
     "node_modules/magic-string": {
     "node_modules/magic-string": {
-      "version": "0.30.5",
-      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.5.tgz",
-      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "version": "0.30.9",
+      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.9.tgz",
+      "integrity": "sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==",
       "dependencies": {
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
         "@jridgewell/sourcemap-codec": "^1.4.15"
       },
       },
@@ -1662,13 +1662,13 @@
       }
       }
     },
     },
     "node_modules/postcss": {
     "node_modules/postcss": {
-      "version": "8.4.32",
-      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.32.tgz",
-      "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
+      "version": "8.4.38",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.38.tgz",
+      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
       "dependencies": {
       "dependencies": {
         "nanoid": "^3.3.7",
         "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
         "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "source-map-js": "^1.2.0"
       },
       },
       "engines": {
       "engines": {
         "node": "^10 || ^12 || >=14"
         "node": "^10 || ^12 || >=14"
@@ -1805,9 +1805,9 @@
       "dev": true
       "dev": true
     },
     },
     "node_modules/source-map-js": {
     "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
       "engines": {
       "engines": {
         "node": ">=0.10.0"
         "node": ">=0.10.0"
       }
       }
@@ -1963,15 +1963,15 @@
       }
       }
     },
     },
     "node_modules/vue": {
     "node_modules/vue": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/vue/-/vue-3.4.3.tgz",
-      "integrity": "sha512-GjN+culMAGv/mUbkIv8zMKItno8npcj5gWlXkSxf1SPTQf8eJ4A+YfHIvQFyL1IfuJcMl3soA7SmN1fRxbf/wA==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/vue/-/vue-3.4.21.tgz",
+      "integrity": "sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==",
       "dependencies": {
       "dependencies": {
-        "@vue/compiler-dom": "3.4.3",
-        "@vue/compiler-sfc": "3.4.3",
-        "@vue/runtime-dom": "3.4.3",
-        "@vue/server-renderer": "3.4.3",
-        "@vue/shared": "3.4.3"
+        "@vue/compiler-dom": "3.4.21",
+        "@vue/compiler-sfc": "3.4.21",
+        "@vue/runtime-dom": "3.4.21",
+        "@vue/server-renderer": "3.4.21",
+        "@vue/shared": "3.4.21"
       },
       },
       "peerDependencies": {
       "peerDependencies": {
         "typescript": "*"
         "typescript": "*"
@@ -2079,9 +2079,9 @@
       }
       }
     },
     },
     "@babel/parser": {
     "@babel/parser": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.6.tgz",
-      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ=="
+      "version": "7.24.4",
+      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.24.4.tgz",
+      "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg=="
     },
     },
     "@ctrl/tinycolor": {
     "@ctrl/tinycolor": {
       "version": "3.6.1",
       "version": "3.6.1",
@@ -2453,49 +2453,49 @@
       }
       }
     },
     },
     "@vue/compiler-core": {
     "@vue/compiler-core": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.3.tgz",
-      "integrity": "sha512-u8jzgFg0EDtSrb/hG53Wwh1bAOQFtc1ZCegBpA/glyvTlgHl+tq13o1zvRfLbegYUw/E4mSTGOiCnAJ9SJ+lsg==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.21.tgz",
+      "integrity": "sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==",
       "requires": {
       "requires": {
-        "@babel/parser": "^7.23.6",
-        "@vue/shared": "3.4.3",
+        "@babel/parser": "^7.23.9",
+        "@vue/shared": "3.4.21",
         "entities": "^4.5.0",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.0.2"
         "source-map-js": "^1.0.2"
       }
       }
     },
     },
     "@vue/compiler-dom": {
     "@vue/compiler-dom": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.3.tgz",
-      "integrity": "sha512-oGF1E9/htI6JWj/lTJgr6UgxNCtNHbM6xKVreBWeZL9QhRGABRVoWGAzxmtBfSOd+w0Zi5BY0Es/tlJrN6WgEg==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz",
+      "integrity": "sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==",
       "requires": {
       "requires": {
-        "@vue/compiler-core": "3.4.3",
-        "@vue/shared": "3.4.3"
+        "@vue/compiler-core": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
       }
     },
     },
     "@vue/compiler-sfc": {
     "@vue/compiler-sfc": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.3.tgz",
-      "integrity": "sha512-NuJqb5is9I4uzv316VRUDYgIlPZCG8D+ARt5P4t5UDShIHKL25J3TGZAUryY/Aiy0DsY7srJnZL5ryB6DD63Zw==",
-      "requires": {
-        "@babel/parser": "^7.23.6",
-        "@vue/compiler-core": "3.4.3",
-        "@vue/compiler-dom": "3.4.3",
-        "@vue/compiler-ssr": "3.4.3",
-        "@vue/shared": "3.4.3",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.21.tgz",
+      "integrity": "sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==",
+      "requires": {
+        "@babel/parser": "^7.23.9",
+        "@vue/compiler-core": "3.4.21",
+        "@vue/compiler-dom": "3.4.21",
+        "@vue/compiler-ssr": "3.4.21",
+        "@vue/shared": "3.4.21",
         "estree-walker": "^2.0.2",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.5",
-        "postcss": "^8.4.32",
+        "magic-string": "^0.30.7",
+        "postcss": "^8.4.35",
         "source-map-js": "^1.0.2"
         "source-map-js": "^1.0.2"
       }
       }
     },
     },
     "@vue/compiler-ssr": {
     "@vue/compiler-ssr": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.3.tgz",
-      "integrity": "sha512-wnYQtMBkeFSxgSSQbYGQeXPhQacQiog2c6AlvMldQH6DB+gSXK/0F6DVXAJfEiuBSgBhUc8dwrrG5JQcqwalsA==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.21.tgz",
+      "integrity": "sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==",
       "requires": {
       "requires": {
-        "@vue/compiler-dom": "3.4.3",
-        "@vue/shared": "3.4.3"
+        "@vue/compiler-dom": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
       }
     },
     },
     "@vue/devtools-api": {
     "@vue/devtools-api": {
@@ -2521,45 +2521,45 @@
       }
       }
     },
     },
     "@vue/reactivity": {
     "@vue/reactivity": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.4.3.tgz",
-      "integrity": "sha512-q5f9HLDU+5aBKizXHAx0w4whkIANs1Muiq9R5YXm0HtorSlflqv9u/ohaMxuuhHWCji4xqpQ1eL04WvmAmGnFg==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.4.21.tgz",
+      "integrity": "sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==",
       "requires": {
       "requires": {
-        "@vue/shared": "3.4.3"
+        "@vue/shared": "3.4.21"
       }
       }
     },
     },
     "@vue/runtime-core": {
     "@vue/runtime-core": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.4.3.tgz",
-      "integrity": "sha512-C1r6QhB1qY7D591RCSFhMULyzL9CuyrGc+3PpB0h7dU4Qqw6GNyo4BNFjHZVvsWncrUlKX3DIKg0Y7rNNr06NQ==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.4.21.tgz",
+      "integrity": "sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==",
       "requires": {
       "requires": {
-        "@vue/reactivity": "3.4.3",
-        "@vue/shared": "3.4.3"
+        "@vue/reactivity": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
       }
     },
     },
     "@vue/runtime-dom": {
     "@vue/runtime-dom": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.4.3.tgz",
-      "integrity": "sha512-wrsprg7An5Ec+EhPngWdPuzkp0BEUxAKaQtN9dPU/iZctPyD9aaXmVtehPJerdQxQale6gEnhpnfywNw3zOv2A==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.4.21.tgz",
+      "integrity": "sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==",
       "requires": {
       "requires": {
-        "@vue/runtime-core": "3.4.3",
-        "@vue/shared": "3.4.3",
+        "@vue/runtime-core": "3.4.21",
+        "@vue/shared": "3.4.21",
         "csstype": "^3.1.3"
         "csstype": "^3.1.3"
       }
       }
     },
     },
     "@vue/server-renderer": {
     "@vue/server-renderer": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.4.3.tgz",
-      "integrity": "sha512-BUxt8oVGMKKsqSkM1uU3d3Houyfy4WAc2SpSQRebNd+XJGATVkW/rO129jkyL+kpB/2VRKzE63zwf5RtJ3XuZw==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.4.21.tgz",
+      "integrity": "sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==",
       "requires": {
       "requires": {
-        "@vue/compiler-ssr": "3.4.3",
-        "@vue/shared": "3.4.3"
+        "@vue/compiler-ssr": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
       }
     },
     },
     "@vue/shared": {
     "@vue/shared": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.3.tgz",
-      "integrity": "sha512-rIwlkkP1n4uKrRzivAKPZIEkHiuwY5mmhMJ2nZKCBLz8lTUlE73rQh4n1OnnMurXt1vcUNyH4ZPfdh8QweTjpQ=="
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.21.tgz",
+      "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g=="
     },
     },
     "@vue/tsconfig": {
     "@vue/tsconfig": {
       "version": "0.5.1",
       "version": "0.5.1",
@@ -3036,9 +3036,9 @@
       "dev": true
       "dev": true
     },
     },
     "magic-string": {
     "magic-string": {
-      "version": "0.30.5",
-      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.5.tgz",
-      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "version": "0.30.9",
+      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.9.tgz",
+      "integrity": "sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==",
       "requires": {
       "requires": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
         "@jridgewell/sourcemap-codec": "^1.4.15"
       }
       }
@@ -3174,13 +3174,13 @@
       "dev": true
       "dev": true
     },
     },
     "postcss": {
     "postcss": {
-      "version": "8.4.32",
-      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.32.tgz",
-      "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
+      "version": "8.4.38",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.38.tgz",
+      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
       "requires": {
       "requires": {
         "nanoid": "^3.3.7",
         "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
         "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "source-map-js": "^1.2.0"
       }
       }
     },
     },
     "proxy-from-env": {
     "proxy-from-env": {
@@ -3282,9 +3282,9 @@
       "dev": true
       "dev": true
     },
     },
     "source-map-js": {
     "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg=="
     },
     },
     "spdx-correct": {
     "spdx-correct": {
       "version": "3.2.0",
       "version": "3.2.0",
@@ -3381,15 +3381,15 @@
       }
       }
     },
     },
     "vue": {
     "vue": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/vue/-/vue-3.4.3.tgz",
-      "integrity": "sha512-GjN+culMAGv/mUbkIv8zMKItno8npcj5gWlXkSxf1SPTQf8eJ4A+YfHIvQFyL1IfuJcMl3soA7SmN1fRxbf/wA==",
-      "requires": {
-        "@vue/compiler-dom": "3.4.3",
-        "@vue/compiler-sfc": "3.4.3",
-        "@vue/runtime-dom": "3.4.3",
-        "@vue/server-renderer": "3.4.3",
-        "@vue/shared": "3.4.3"
+      "version": "3.4.21",
+      "resolved": "https://registry.npmmirror.com/vue/-/vue-3.4.21.tgz",
+      "integrity": "sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==",
+      "requires": {
+        "@vue/compiler-dom": "3.4.21",
+        "@vue/compiler-sfc": "3.4.21",
+        "@vue/runtime-dom": "3.4.21",
+        "@vue/server-renderer": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
       }
     },
     },
     "vue-router": {
     "vue-router": {

+ 1 - 1
package.json

@@ -17,7 +17,7 @@
     "echarts": "^5.4.3",
     "echarts": "^5.4.3",
     "element-plus": "^2.4.4",
     "element-plus": "^2.4.4",
     "sass": "^1.69.6",
     "sass": "^1.69.6",
-    "vue": "^3.3.11",
+    "vue": "^3.4.21",
     "vue-router": "^4.2.5"
     "vue-router": "^4.2.5"
   },
   },
   "devDependencies": {
   "devDependencies": {

+ 15 - 0
src/api/energy/index.ts

@@ -0,0 +1,15 @@
+import request from "@/utils/request";
+
+// 能耗管理页面相关的请求地址
+enum API {
+  // 能耗统计(总量)信息接口地址
+  ENERGYALL_URL = "/wanzai/api/driver/getEnergyTj",
+  // 能耗统计(平均)信息接口地址
+  ENERGYEVENLY_URL = "/wanzai/api/driver/getEnergyTjAvg",
+}
+
+// 能耗统计(总量)信息接口
+export const reqGetEnergyAll = () => request.get(API.ENERGYALL_URL);
+
+// 能耗统计(平均)信息接口地址
+export const reqGetEnergyevenly = () => request.get(API.ENERGYEVENLY_URL);

+ 24 - 0
src/api/school/index.ts

@@ -0,0 +1,24 @@
+import request from "@/utils/request";
+import type { smartWarningQuery } from "./type";
+
+//校园概览页面相关的请求地址
+enum API {
+  // 办学规模信息接口地址
+  SCALE_URL = "/wanzai/api/driver/getClassTj",
+  // 近一年访客管理信息接口地址
+  VISITOR_URL = "/wanzai/api/driver/getVisitorTj",
+  // 预警推送信息接口地址
+  WARNING_URL = "/wanzai/api/driver/queryPageSmartWarning",
+}
+
+// 办学规模信息接口
+export const reqGetSchoolScale = () => request.get(API.SCALE_URL);
+
+// 近一年访客管理信息接口
+export const reqGetSchoolVisitor = () => request.get(API.VISITOR_URL);
+
+// 预警推送信息接口
+export const reqGetSmartWarning = (data: smartWarningQuery) =>
+  request.get(
+    `${API.WARNING_URL}?currentPage=${data.currentPage}&pageCount=${data.pageCount}`
+  );

+ 12 - 0
src/api/school/type.ts

@@ -0,0 +1,12 @@
+// 办学规模数组对象数据类型
+export interface classData {
+  name: string;
+  num: number;
+  value: number;
+}
+
+// 预警推送信息接口参数数据类型
+export interface smartWarningQuery {
+  currentPage: number;
+  pageCount: number;
+}

+ 0 - 1
src/assets/logo.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 261.76 226.69"><path d="M161.096.001l-30.225 52.351L100.647.001H-.005l130.877 226.688L261.749.001z" fill="#41b883"/><path d="M161.096.001l-30.225 52.351L100.647.001H52.346l78.526 136.01L209.398.001z" fill="#34495e"/></svg>

+ 39 - 8
src/components/energy/energyLeft.vue

@@ -100,19 +100,30 @@
 import { ref, onMounted } from "vue";
 import { ref, onMounted } from "vue";
 import * as Echarts from "echarts";
 import * as Echarts from "echarts";
 import { countUpNum } from "@/utils/countUpNum";
 import { countUpNum } from "@/utils/countUpNum";
+import { reqGetEnergyAll, reqGetEnergyevenly } from "@/api/energy/index";
 
 
+// 用电总量
 const eleValue = ref(888.88);
 const eleValue = ref(888.88);
-const eleSpeed = ref(10.06);
-const waterValue = ref(88.88);
-const waterSpeed = ref(10.06);
-const eleValueAv = ref(88.88);
-const waterValueAv = ref(38.88);
-
 const eleValueDom = ref();
 const eleValueDom = ref();
+
+// 用电速率
+const eleSpeed = ref(10.06);
 const eleSpeedDom = ref();
 const eleSpeedDom = ref();
+
+// 用水总量
+const waterValue = ref(88.88);
 const waterValueDom = ref();
 const waterValueDom = ref();
+
+// 用水速率
+const waterSpeed = ref(10.06);
 const waterSpeedDom = ref();
 const waterSpeedDom = ref();
+
+// 人均用电量
+const eleValueAv = ref(88.88);
 const eleValueAvDom = ref();
 const eleValueAvDom = ref();
+
+// 人均用水量
+const waterValueAv = ref(38.88);
 const waterValueAvDom = ref();
 const waterValueAvDom = ref();
 
 
 // 区域能耗统计图表实例
 // 区域能耗统计图表实例
@@ -124,12 +135,31 @@ const barChart = ref(null);
 const currentIndex = ref("水");
 const currentIndex = ref("水");
 
 
 onMounted(() => {
 onMounted(() => {
-  myBarChart = Echarts.init(barChart.value);
+  // 获取能耗统计(总量)信息
+  getEnergyAll();
+
+  // 能耗统计(平均)信息接口地址
+  getEnergyevenly();
+
+  // 初始化区域能耗统计图表
   initBarChart();
   initBarChart();
 
 
+  // 让数字跳动
   getCountUpNum();
   getCountUpNum();
 });
 });
 
 
+// 获取能耗统计(总量)信息
+const getEnergyAll = async () => {
+  const res = await reqGetEnergyAll();
+  // console.log(res);
+};
+
+// 能耗统计(平均)信息接口地址
+const getEnergyevenly = async () => {
+  const res = await reqGetEnergyevenly();
+  // console.log(res);
+};
+
 // 点击水 按钮回调
 // 点击水 按钮回调
 const handleClickWater = () => {
 const handleClickWater = () => {
   if (currentIndex.value !== "水") {
   if (currentIndex.value !== "水") {
@@ -148,6 +178,8 @@ const handleClickEle = () => {
 
 
 // 初始化区域能耗统计
 // 初始化区域能耗统计
 const initBarChart = () => {
 const initBarChart = () => {
+  myBarChart = Echarts.init(barChart.value);
+  // 图表配置
   const options = {
   const options = {
     tooltip: {
     tooltip: {
       trigger: "axis",
       trigger: "axis",
@@ -235,7 +267,6 @@ const initBarChart = () => {
       },
       },
     ],
     ],
   };
   };
-
   myBarChart.setOption(options);
   myBarChart.setOption(options);
 };
 };
 
 

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 85 - 59
src/components/school/schoolLeft.vue


+ 28 - 0
src/components/school/schoolRight.vue

@@ -95,14 +95,22 @@
 import { ref, onMounted } from "vue";
 import { ref, onMounted } from "vue";
 import { useRouter } from "vue-router";
 import { useRouter } from "vue-router";
 import { countUpNum } from "@/utils/countUpNum";
 import { countUpNum } from "@/utils/countUpNum";
+import { reqGetSmartWarning } from "@/api/school/index";
 
 
+// 监控摄像头数据
 const deviceNum = ref(100);
 const deviceNum = ref(100);
+// 报警器数据
 const deviceNum2 = ref(150);
 const deviceNum2 = ref(150);
+// 消防设施数据
 const deviceNum3 = ref(10);
 const deviceNum3 = ref(10);
+// 监控摄像头DOM元素
 const deviceDom = ref();
 const deviceDom = ref();
+// 报警器DOM元素
 const deviceDom2 = ref();
 const deviceDom2 = ref();
+// 消防设施DOM元素
 const deviceDom3 = ref();
 const deviceDom3 = ref();
 
 
+// 预警推送数据
 const tableData = [
 const tableData = [
   {
   {
     name: "张三",
     name: "张三",
@@ -162,17 +170,37 @@ const tableData = [
   },
   },
 ];
 ];
 
 
+// 路由器实例
 const router = useRouter();
 const router = useRouter();
 
 
+// 当前页
+const currentPage = ref(1);
+// 每页多少条
+const pageCount = ref(10);
+
 onMounted(() => {
 onMounted(() => {
+  // 让数字动起来
   getCountUpNum();
   getCountUpNum();
+
+  // 获取预警推送信息
+  getSmartWarning();
 });
 });
 
 
+// 获取预警推送信息
+const getSmartWarning = async () => {
+  const res = await reqGetSmartWarning({
+    currentPage: currentPage.value,
+    pageCount: pageCount.value,
+  });
+  // console.log(res);
+};
+
 // 查看更多按钮回调
 // 查看更多按钮回调
 const handleCheckMore = () => {
 const handleCheckMore = () => {
   router.push("/more");
   router.push("/more");
 };
 };
 
 
+// 让数字动起来
 const getCountUpNum = () => {
 const getCountUpNum = () => {
   countUpNum(deviceDom.value, deviceNum.value);
   countUpNum(deviceDom.value, deviceNum.value);
   countUpNum(deviceDom2.value, deviceNum2.value);
   countUpNum(deviceDom2.value, deviceNum2.value);

+ 1 - 1
tsconfig.app.json

@@ -1,6 +1,6 @@
 {
 {
   "extends": "@vue/tsconfig/tsconfig.dom.json",
   "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
+  "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "src/**/*.ts"],
   "exclude": ["src/**/__tests__/*"],
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {
   "compilerOptions": {
     "composite": true,
     "composite": true,