Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

package.json

@@ -21,20 +21,20 @@
   "author": "",
   "license": "MIT",
   "engines": {
-    "node": ">=16.0.0",
+    "node": ">=20.19.0",
     "pnpm": ">=8.0.0"
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.2",
     "@vueuse/core": "^14.0.0",
-    "dayjs": "^1.11.18",
+    "dayjs": "^1.11.19",
     "element-plus": "^2.11.5",
     "vant": "^4.9.21"
   },
   "devDependencies": {
     "@vant/auto-import-resolver": "^1.3.0",
     "less": "^4.4.2",
-    "unplugin-auto-import": "^0.17.0",
+    "unplugin-auto-import": "^20.2.0",
     "unplugin-vue-components": "^0.26.0"
   }
 }

packages/mobile/package.json

@@ -9,17 +9,17 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.4.0",
+    "vue": "^3.5.18",
-    "vue-router": "^4.2.0",
+    "vue-router": "^4.6.3",
-    "pinia": "^2.1.0",
+    "pinia": "^3.0.3",
-    "vant": "^4.8.0",
+    "vant": "^4.9.21",
-    "axios": "^1.6.0"
+    "axios": "^1.13.2"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^5.0.0",
+    "@vitejs/plugin-vue": "^6.0.1",
-    "vite": "^5.0.0",
+    "vite": "^7.2.0",
-    "sass": "^1.70.0",
+    "sass": "^1.93.3",
     "unplugin-vue-components": "^0.26.0",
-    "unplugin-auto-import": "^0.17.0"
+    "unplugin-auto-import": "^20.2.0"
   }
 }

packages/mobile/vite.config.js

@@ -1,37 +1,86 @@
-import { defineConfig } from 'vite'
+import { defineConfig, loadEnv } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import { resolve } from 'path'
 import Components from 'unplugin-vue-components/vite'
 import { VantResolver } from 'unplugin-vue-components/resolvers'
 
-export default defineConfig({
+const DEFAULT_BUILD_BASE = '/bxztapp/'
-  base: '/bxztapp/',
+
-  plugins: [
+const normalizeBasePath = (value) => {
-    vue(),
+  if (!value || value === '/') {
-    Components({
+    return '/'
-      resolvers: [VantResolver()]
+  }
-    })
+  let base = value.trim()
-  ],
+  if (!base.startsWith('/')) {
-  resolve: {
+    base = `/${base}`
-    alias: {
+  }
-      '@': resolve(__dirname, 'src'),
+  if (!base.endsWith('/')) {
-      '@shared': resolve(__dirname, '../shared')
+    base = `${base}/`
+  }
+  return base
+}
+
+const resolveCliBase = () => {
+  const argv = process.argv || []
+  const directFlagIndex = argv.indexOf('--base')
+  if (directFlagIndex !== -1 && argv[directFlagIndex + 1]) {
+    return argv[directFlagIndex + 1]
+  }
+  const customFlagIndex = argv.indexOf('--basePath')
+  if (customFlagIndex !== -1 && argv[customFlagIndex + 1]) {
+    return argv[customFlagIndex + 1]
+  }
+  const equalArg = argv.find(arg => arg.startsWith('--base='))
+  if (equalArg) {
+    return equalArg.split('=')[1]
+  }
+  const equalCustomArg = argv.find(arg => arg.startsWith('--basePath='))
+  if (equalCustomArg) {
+    return equalCustomArg.split('=')[1]
+  }
+  return undefined
+}
+
+export default defineConfig(({ command, mode }) => {
+  const env = loadEnv(mode, process.cwd(), '')
+  const baseCandidate =
+    command === 'build'
+      ? resolveCliBase() ??
+        env.VITE_BASE_PATH ??
+        env.BASE_PATH ??
+        process.env.BASE_PATH ??
+        DEFAULT_BUILD_BASE
+      : '/'
+
+  return {
+    base: process.env.NODE_ENV === 'production' ? normalizeBasePath(baseCandidate) : '/',
+    plugins: [
+      vue(),
+      Components({
+        resolvers: [VantResolver()]
+      })
+    ],
+    resolve: {
+      alias: {
+        '@': resolve(__dirname, 'src'),
+        '@shared': resolve(__dirname, '../shared')
+      }
+    },
+    server: {
+      port: 8080,
+      host: '0.0.0.0',
+      open: true,
+      proxy: {
+        '/snow-ops-platform': {
+          target: 'http://8.137.54.85:8661/',
+          changeOrigin: true,
+        },
+      }
+    },
+    build: {
+      outDir: 'dist',
+      assetsDir: 'assets',
+      sourcemap: false
     }
-  },
-  server: {
-    port: 8080,
-    host: '0.0.0.0',
-    open: true,
-    proxy: {
-      '/snow-ops-platform': {
-        target: 'http://8.137.54.85:8661/',
-        changeOrigin: true,
-      },
-    }
-  },
-  build: {
-    outDir: 'dist',
-    assetsDir: 'assets',
-    sourcemap: false
   }
 })

packages/screen/package.json

@@ -9,17 +9,17 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.4.0",
+    "vue": "^3.5.18",
-    "vue-router": "^4.2.0",
+    "vue-router": "^4.6.3",
-    "pinia": "^2.1.0",
+    "pinia": "^3.0.3",
-    "axios": "^1.6.0",
+    "axios": "^1.13.2",
-    "echarts": "^5.5.0",
+    "echarts": "^6.0.0",
-    "vue-echarts": "^6.6.0"
+    "vue-echarts": "^8.0.1"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^5.0.0",
+    "@vitejs/plugin-vue": "^6.0.1",
-    "vite": "^5.0.0",
+    "vite": "^7.2.0",
-    "sass": "^1.70.0",
+    "sass": "^1.93.3",
     "less": "^4.4.2"
   }
 }

packages/screen/src/styles/index.scss

@@ -1,4 +1,4 @@
-@import './mixins.scss';
+@use './mixins.scss' as *;
 
 * {
   margin: 0;

packages/screen/src/views/cockpit/components/BlockEvent.vue

@@ -36,7 +36,7 @@ const stats = ref([
 </script>
 
 <style scoped lang="scss">
-@import '@/styles/mixins.scss';
+@use '@/styles/mixins.scss' as *;
 
 .block-event {
   background: url(../assets/img/block-panel-bg.png) no-repeat;

packages/screen/src/views/cockpit/components/CockpitLayout.vue

@@ -29,7 +29,7 @@ import YearStatistics from './YearStatistics.vue'
 </script>
 
 <style scoped lang="scss">
-@import '@/styles/mixins.scss';
+@use '@/styles/mixins.scss' as *;
 
 .cockpit-layout {
   width: 100vw;

packages/screen/src/views/cockpit/components/EmergencyResources.vue

@@ -99,7 +99,7 @@ const resources = ref([
 </script>
 
 <style scoped lang="scss">
-@import '@/styles/mixins.scss';
+@use '@/styles/mixins.scss' as *;
 
 .emergency-resources {
   background: url(../assets/img/emergency-panel-bg.png) no-repeat;

packages/screen/src/views/cockpit/components/MapCenter.vue

@@ -110,7 +110,7 @@ const markers = ref([
 </script>
 
 <style scoped lang="scss">
-@import '@/styles/mixins.scss';
+@use '@/styles/mixins.scss' as *;
 
 .map-center {
   width: 100%;

packages/screen/src/views/cockpit/components/PageHeader.vue

@@ -11,7 +11,7 @@
 </script>
 
 <style scoped lang="scss">
-@import '@/styles/mixins.scss';
+@use '@/styles/mixins.scss' as *;
 
 .page-header {
   height: vh(137);

packages/screen/src/views/cockpit/components/WeatherWarning.vue

@@ -116,7 +116,7 @@ const districts = ref([
 </script>
 
 <style scoped lang="scss">
-@import '@/styles/mixins.scss';
+@use '@/styles/mixins.scss' as *;
 
 .weather-warning {
   background: url(../assets/img/weather-panel-bg.png) no-repeat;

packages/screen/src/views/cockpit/components/YearStatistics.vue

@@ -51,7 +51,7 @@ const xAxisYears = ref([
 </script>
 
 <style scoped lang="scss">
-@import '@/styles/mixins.scss';
+@use '@/styles/mixins.scss' as *;
 
 .year-statistics {
   background: url(../assets/img/statistics-panel-bg.png) no-repeat;

packages/screen/vite.config.js

@@ -1,48 +1,97 @@
-import { defineConfig } from 'vite'
+import { defineConfig, loadEnv } from 'vite'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
 import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
 import vue from '@vitejs/plugin-vue'
 import { resolve } from 'path'
 
-export default defineConfig({
+const DEFAULT_BUILD_BASE = '/bxztpc/'
-  base: '/bxztpc/',
+
-  plugins: [
+const normalizeBasePath = (value) => {
-    vue(),
+  if (!value || value === '/') {
-    AutoImport({
+    return '/'
-      resolvers: [ElementPlusResolver()],
+  }
-    }),
+  let base = value.trim()
-    Components({
+  if (!base.startsWith('/')) {
-      resolvers: [ElementPlusResolver()],
+    base = `/${base}`
-    }),
+  }
-  ],
+  if (!base.endsWith('/')) {
-  resolve: {
+    base = `${base}/`
-    alias: {
+  }
-      '@': resolve(__dirname, 'src'),
+  return base
-      '@shared': resolve(__dirname, '../shared')
+}
-    }
+
-  },
+const resolveCliBase = () => {
-  server: {
+  const argv = process.argv || []
-    port: 3000,
+  const directFlagIndex = argv.indexOf('--base')
-    open: true,
+  if (directFlagIndex !== -1 && argv[directFlagIndex + 1]) {
-    cors: true,
+    return argv[directFlagIndex + 1]
-    proxy: {
+  }
-      '/snow-ops-platform': {
+  const customFlagIndex = argv.indexOf('--basePath')
-        target: 'http://8.137.54.85:8661/',
+  if (customFlagIndex !== -1 && argv[customFlagIndex + 1]) {
-        changeOrigin: true,
+    return argv[customFlagIndex + 1]
-      },
+  }
-    }
+  const equalArg = argv.find(arg => arg.startsWith('--base='))
-  },
+  if (equalArg) {
-  build: {
+    return equalArg.split('=')[1]
-    outDir: 'dist',
+  }
-    assetsDir: 'assets',
+  const equalCustomArg = argv.find(arg => arg.startsWith('--basePath='))
-    sourcemap: false,
+  if (equalCustomArg) {
-    minify: 'terser',
+    return equalCustomArg.split('=')[1]
-    rollupOptions: {
+  }
-      output: {
+  return undefined
-        chunkFileNames: 'js/[name]-[hash].js',
+}
-        entryFileNames: 'js/[name]-[hash].js',
+
-        assetFileNames: '[ext]/[name]-[hash].[ext]'
+export default defineConfig(({ command, mode }) => {
+  const env = loadEnv(mode, process.cwd(), '')
+  const baseCandidate =
+    command === 'build'
+      ? resolveCliBase() ??
+        env.VITE_BASE_PATH ??
+        env.BASE_PATH ??
+        process.env.BASE_PATH ??
+        DEFAULT_BUILD_BASE
+      : '/'
+
+  return {
+    base: process.env.NODE_ENV === 'production' ? normalizeBasePath(baseCandidate) : '/',
+    plugins: [
+      vue(),
+      AutoImport({
+        resolvers: [ElementPlusResolver()],
+      }),
+      Components({
+        resolvers: [ElementPlusResolver()],
+      }),
+    ],
+    resolve: {
+      alias: {
+        '@': resolve(__dirname, 'src'),
+        '@shared': resolve(__dirname, '../shared')
+      }
+    },
+    server: {
+      port: 3000,
+      open: true,
+      cors: true,
+      proxy: {
+        '/snow-ops-platform': {
+          target: 'http://8.137.54.85:8661/',
+          changeOrigin: true,
+        },
+      }
+    },
+    build: {
+      outDir: 'dist',
+      assetsDir: 'assets',
+      sourcemap: false,
+      minify: 'terser',
+      rollupOptions: {
+        output: {
+          chunkFileNames: 'js/[name]-[hash].js',
+          entryFileNames: 'js/[name]-[hash].js',
+          assetFileNames: '[ext]/[name]-[hash].[ext]'
+        }
       }
     }
   }

packages/shared/package.json

@@ -6,6 +6,6 @@
   "main": "index.js",
   "scripts": {},
   "dependencies": {
-    "axios": "^1.6.0"
+    "axios": "^1.13.2"
   }
 }