1
0
Quellcode durchsuchen

feat: 配置mode

gemercheung vor 10 Monaten
Ursprung
Commit
473ccc7dee
13 geänderte Dateien mit 2348 neuen und 1570 gelöschten Zeilen
  1. 9 0
      .env
  2. 9 0
      .env.criminal
  3. 9 0
      .env.development
  4. 9 0
      .env.fire
  5. 9 0
      .env.ga
  6. 9 0
      .env.xmfire
  7. 7 1
      package.json
  8. 2161 1461
      pnpm-lock.yaml
  9. 6 5
      src/app/index.ts
  10. 1 1
      src/app/map/App.vue
  11. 11 3
      src/view/camera/bind.vue
  12. 1 0
      src/view/case/addPhotoFile.vue
  13. 107 99
      vite.config.ts

+ 9 - 0
.env

@@ -0,0 +1,9 @@
+VITE_APP_APP="fire"
+VITE_SEVER_URL="http://test-mix3d.4dkankan.com"
+VITE_DEVCODE_URL="https://test-mix3d.4dkankan.com/code"
+VITE_SWKK_URL="https://test.4dkankan.com"
+VITE_SERVICE_URL="https://test.4dkankan.com"
+VITE_SWSS_URL="https://uat-laser.4dkankan.com/uat"
+VITE_LASER_URL="https://uat-laser.4dkankan.com"
+VITE_FDKK_URL="https://laser.4dkankan.com"
+VITE_DOC_URL="https://192.168.0.25/docs/#/product/huodiao/README"

+ 9 - 0
.env.criminal

@@ -0,0 +1,9 @@
+VITE_APP_APP="criminal"
+VITE_SEVER_URL="https://test-mix3d.4dkankan.com"
+VITE_DEVCODE_URL="https://test-mix3d.4dkankan.com/code"
+VITE_SWKK_URL="https://test.4dkankan.com"
+VITE_SERVICE_URL="https://test.4dkankan.com"
+VITE_SWSS_URL="https://uat-laser.4dkankan.com/uat"
+VITE_LASER_URL="https://uat-laser.4dkankan.com"
+VITE_FDKK_URL="https://uat-laser.4dkankan.com/uat"
+VITE_DOC_URL="https://192.168.0.25/docs/#/product/huodiao/README"

+ 9 - 0
.env.development

@@ -0,0 +1,9 @@
+VITE_APP_APP="fire"
+VITE_SEVER_URL="https://test-mix3d.4dkankan.com"
+VITE_DEVCODE_URL="https://test-mix3d.4dkankan.com/code"
+VITE_SWKK_URL="https://test.4dkankan.com"
+VITE_SERVICE_URL="https://test.4dkankan.com"
+VITE_SWSS_URL="https://uat-laser.4dkankan.com/uat"
+VITE_LASER_URL="https://uat-laser.4dkankan.com"
+VITE_FDKK_URL="https://uat-laser.4dkankan.com/uat"
+VITE_DOC_URL="https://192.168.0.25/docs/#/product/huodiao/README"

+ 9 - 0
.env.fire

@@ -0,0 +1,9 @@
+VITE_APP_APP="fire"
+VITE_SEVER_URL="https://test-mix3d.4dkankan.com"
+VITE_DEVCODE_URL="https://test-mix3d.4dkankan.com/code"
+VITE_SWKK_URL="https://test.4dkankan.com"
+VITE_SERVICE_URL="https://test.4dkankan.com"
+VITE_SWSS_URL="https://uat-laser.4dkankan.com/uat"
+VITE_LASER_URL="https://uat-laser.4dkankan.com"
+VITE_FDKK_URL="https://uat-laser.4dkankan.com/uat"
+VITE_DOC_URL="https://192.168.0.25/docs/#/product/huodiao/README"

+ 9 - 0
.env.ga

@@ -0,0 +1,9 @@
+VITE_APP_APP="ga"
+VITE_SEVER_URL="https://test-mix3d.4dkankan.com"
+VITE_DEVCODE_URL="https://test-mix3d.4dkankan.com/code"
+VITE_SWKK_URL="https://test.4dkankan.com"
+VITE_SERVICE_URL="https://test.4dkankan.com"
+VITE_SWSS_URL="https://uat-laser.4dkankan.com/uat"
+VITE_LASER_URL="https://uat-laser.4dkankan.com"
+VITE_FDKK_URL="https://uat-laser.4dkankan.com/uat"
+VITE_DOC_URL="https://192.168.0.25/docs/#/product/huodiao/README"

+ 9 - 0
.env.xmfire

@@ -0,0 +1,9 @@
+VITE_APP_APP="xmfire"
+VITE_SEVER_URL="https://test-mix3d.4dkankan.com"
+VITE_DEVCODE_URL="https://test-mix3d.4dkankan.com/code"
+VITE_SWKK_URL="https://test.4dkankan.com"
+VITE_SERVICE_URL="https://test.4dkankan.com"
+VITE_SWSS_URL="https://uat-laser.4dkankan.com/uat"
+VITE_LASER_URL="https://uat-laser.4dkankan.com"
+VITE_FDKK_URL="https://uat-laser.4dkankan.com/uat"
+VITE_DOC_URL="https://192.168.0.25/docs/#/product/huodiao/README"

+ 7 - 1
package.json

@@ -4,9 +4,14 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --mode=fire",
     "build": "npm run build-quisk",
     "build-quisk": "vite build ./ fire && vite build ./ criminal && vite build ./ xmfire && vite build ./ ga",
+    "build-fire": "vite build ./ --mode=fire",
+    "build-criminal": "vite build ./ --mode=criminal",
+    "build-xmfire": "vite build ./ --mode=xmfire",
+    "build-ga": "vite build ./ --mode=ga",
+    "build-all": "npm-run-all --parallel build-fire  build-criminal build-xmfire build-ga",
     "preview": "vite preview"
   },
   "dependencies": {
@@ -38,6 +43,7 @@
   "devDependencies": {
     "@types/node": "^20.4.5",
     "@vitejs/plugin-vue": "^4.2.3",
+    "npm-run-all": "^4.1.5",
     "typescript": "^5.0.2",
     "vite": "^4.4.5",
     "vue-tsc": "^1.8.5"

Datei-Diff unterdrückt, da er zu groß ist
+ 2161 - 1461
pnpm-lock.yaml


+ 6 - 5
src/app/index.ts

@@ -37,21 +37,22 @@ export type AppConstant = {
 export let appConstant: AppConstant;
 export let appRoutes: Routes;
 export let menuRouteNames: string[];
-
+const app = import.meta.env.VITE_APP_APP;
+console.log('app', app)
 // 为了打包去除不需要的app只能固定写法
-if (VITE_APP_APP === "fire") {
+if (app === "fire") {
   appRoutes = fireRoutes;
   menuRouteNames = firelMenuRouteNames;
   appConstant = fireConstant;
-} else if (VITE_APP_APP === "criminal") {
+} else if (app === "criminal") {
   appRoutes = cRoutes;
   menuRouteNames = cMenuRouteNames;
   appConstant = criminalConstant;
-} else if (VITE_APP_APP === "xmfire") {
+} else if (app === "xmfire") {
   appRoutes = xmfireRoutes;
   menuRouteNames = xmfirelMenuRouteNames;
   appConstant = xmfireConstant;
-} else if (VITE_APP_APP === "ga") {
+} else if (app === "ga") {
   appRoutes = policeRoutes;
   menuRouteNames = policeMenuRouteNames;
   appConstant = policeConstant;

+ 1 - 1
src/app/map/App.vue

@@ -111,7 +111,7 @@ const request = axios.create({
 const mapEl = ref<HTMLDivElement>();
 let AMap, map;
 
-const queryURL = `${import.meta.env.VITE_SEVER_URL}/fusion-xj/web/fireProject/queryProject`
+const queryURL = `${import.meta.env.VITE_SEVER_URL}/fusion/web/fireProject/queryProject`
 
 // debugger;
 const getDataQuest = () => {

+ 11 - 3
src/view/camera/bind.vue

@@ -2,7 +2,9 @@
   <el-form ref="form" label-width="100px" class="camera-from">
     <el-form-item label="SN码:" class="mandatory">
       <el-input
-        :disabled="bindCamera.id && !operateIsPermissionByPath('edit', 'sn')"
+        :disabled="
+          !!(bindCamera.id && !operateIsPermissionByPath('edit', 'sn'))
+        "
         :modelValue="bindCamera.snCode"
         placeholder="请输入相机底部SN码,如214D5RE2G8"
         @update:modelValue="(val: string) => (bindCamera.snCode = val.trim())"
@@ -11,12 +13,18 @@
     <el-form-item label="所属架构:" class="mandatory">
       <com-company
         v-model="bindCamera.deptId"
-        :disabled="!!(bindCamera.id && !operateIsPermissionByPath('edit', 'dept'))"
+        :disabled="
+          !!(bindCamera.id && !operateIsPermissionByPath('edit', 'dept'))
+        "
         hide-all
       />
     </el-form-item>
     <el-form-item label="管理员:" class="mandatory">
-      <el-select v-model="bindCamera.userId" placeholder="请选择" style="width: 100%">
+      <el-select
+        v-model="bindCamera.userId"
+        placeholder="请选择"
+        style="width: 100%"
+      >
         <el-option
           v-for="item in users"
           :key="item.id"

+ 1 - 0
src/view/case/addPhotoFile.vue

@@ -35,6 +35,7 @@
         </template>
       </el-upload>
     </el-form-item>
+    
     <el-form-item label="附件标题:" class="mandatory">
       <el-input
         v-model="caseFile.imgInfo"

+ 107 - 99
vite.config.ts

@@ -1,111 +1,119 @@
-import { defineConfig } from "vite";
+import { defineConfig, loadEnv } from "vite";
 import vue from "@vitejs/plugin-vue";
 import { resolve } from "path";
 import ElementPlus from "unplugin-element-plus/vite";
 
-let app = "fire";
-if (process.argv.length > 3) {
-  app = process.argv[process.argv.length - 1].trim();
-}
 
-const dev = true;
+// const dev = true;
 
-export default defineConfig({
-  define: {
-    VITE_APP_APP: JSON.stringify(app),
-  },
-  base: "./",
-  build: {
-    rollupOptions: {
-      input: {
-        index: resolve(__dirname, "index.html"),
-        map: resolve(__dirname, "map.html"),
-        // 在这里继续添加更多页面
+export default ({ mode }: any) =>
+  defineConfig({
+    // define: {
+    //   VITE_APP_APP: JSON.stringify(app),
+    // },
+    base: "./",
+    build: {
+      rollupOptions: {
+        input: {
+          index: resolve(__dirname, "index.html"),
+          map: resolve(__dirname, "map.html"),
+          // 在这里继续添加更多页面
+        },
       },
+      outDir: `dist/${mode}`,
     },
-    outDir: `dist/${app}`,
-  },
-  resolve: {
-    alias: [
-      {
-        find: "@",
-        replacement: resolve(__dirname, "./src"),
-      },
-    ],
-  },
-  css: {
-    preprocessorOptions: {
-      scss: {
-        api: 'modern-compiler',// or "modern"
-        additionalData: `@use "@/app/${app}/useStyle.scss" as *;`,
-        silenceDeprecations: ["legacy-js-api"],
-      },
-
+    resolve: {
+      alias: [
+        {
+          find: "@",
+          replacement: resolve(__dirname, "./src"),
+        },
+      ],
     },
-  },
-  plugins: [
-    vue(),
-    ElementPlus({
-      useSource: true,
-    }),
-  ],
-  server: {
-    port: 5173,
-    host: "0.0.0.0",
-    proxy: {
-      "/api": {
-        target: dev
-          ? "http://test-mix3d.4dkankan.com"
-          : "https://mix3d.4dkankan.com",
-        changeOrigin: true,
-        rewrite: (path) => path.replace(new RegExp(`^/api`), ""),
-      },
-      "/fusion": {
-        target: dev
-          ? "https://test-mix3d.4dkankan.com"
-          : "https://mix3d.4dkankan.com",
-        changeOrigin: true,
-        rewrite: (path) => path.replace(new RegExp(`^/api`), "/fusion"),
-      },
-      "/dev-code": {
-        // target: "https://localhost:7173/",
-        target: dev
-          ? "https://test-mix3d.4dkankan.com/code"
-          : "https://mix3d.4dkankan.com/code",
-        changeOrigin: true,
-        secure: false,
-        rewrite: (path) => path.replace(new RegExp(`^/dev-code`), ""),
-      },
-      "/swkk": {
-        target: dev ? "https://test.4dkankan.com" : "https://www.4dkankan.com",
-        changeOrigin: true,
-        rewrite: (path) => path.replace(new RegExp(`^/swkk`), ""),
-      },
-      "/service": {
-        target: dev ? "https://test.4dkankan.com" : "https://www.4dkankan.com",
-        changeOrigin: true,
-      },
-      "/swss": {
-        target: dev
-          ? "https://uat-laser.4dkankan.com/uat"
-          : "https://laser.4dkankan.com",
-        changeOrigin: true,
-        rewrite: (path) => path.replace(new RegExp(`^/swss`), ""),
-      },
-      "/laser": {
-        target: dev
-          ? "https://uat-laser.4dkankan.com"
-          : "https://laser.4dkankan.com",
-        changeOrigin: true,
-        rewrite: (path) => path.replace(new RegExp(`^/laser`), "/laser"),
+    css: {
+      preprocessorOptions: {
+        scss: {
+          // api: 'modern',
+          additionalData: `@use "@/app/${mode}/useStyle.scss" as *;`,
+          silenceDeprecations: ["legacy-js-api"],
+        },
+
       },
-      "/fdkk": {
-        target: dev
-          ? "https://uat-laser.4dkankan.com/uat"
-          : "https://laser.4dkankan.com",
-        changeOrigin: true,
-        rewrite: (path) => path.replace(new RegExp(`^/swss`), ""),
+    },
+    plugins: [
+      vue(),
+      ElementPlus({
+        useSource: true,
+      }),
+    ],
+    server: {
+      port: 5173,
+      host: "0.0.0.0",
+      proxy: {
+        "/api": {
+          secure: false,
+          // target: dev ? devUrl : "mix3d.4dkankan.com",
+          target: loadEnv(mode, process.cwd()).VITE_SEVER_URL,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(new RegExp(`^/api`), ""),
+        },
+        "/oss": {
+          secure: false,
+          // target: dev ? devUrl : "mix3d.4dkankan.com",
+          target: loadEnv(mode, process.cwd()).VITE_SEVER_URL,
+          changeOrigin: true,
+        },
+        "/fusion-xj": {
+          secure: false,
+          // target: dev ? devUrl : "mix3d.4dkankan.com",
+          target: loadEnv(mode, process.cwd()).VITE_SEVER_URL,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(new RegExp(`^/api`), "/fusion-xj"),
+        },
+        "/dev-code": {
+          target: loadEnv(mode, process.cwd()).VITE_DEVCODE_URL,
+          // target: dev
+          //   ? "https://xj-mix3d.4dkankan.com/code"
+          //   : "https://mix3d.4dkankan.com/code",
+          changeOrigin: true,
+          secure: false,
+          rewrite: (path) => path.replace(new RegExp(`^/dev-code`), ""),
+        },
+        "/swkk": {
+          // target: dev ? "https://test.4dkankan.com" : "https://www.4dkankan.com",
+          target: loadEnv(mode, process.cwd()).VITE_SWKK_URL,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(new RegExp(`^/swkk`), ""),
+        },
+        "/service": {
+          // target: dev ? "https://test.4dkankan.com" : "https://www.4dkankan.com",
+          target: loadEnv(mode, process.cwd()).VITE_SERVICE_URL,
+          changeOrigin: true,
+        },
+        "/swss": {
+          // target: dev
+          //   ? "https://uat-laser.4dkankan.com/uat"
+          //   : "https://laser.4dkankan.com",
+          target: loadEnv(mode, process.cwd()).VITE_SWSS_URL,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(new RegExp(`^/swss`), ""),
+        },
+        "/laser": {
+          // target: dev
+          //   ? "https://uat-laser.4dkankan.com"
+          //   : "https://laser.4dkankan.com",
+          target: loadEnv(mode, process.cwd()).VITE_LASER_URL,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(new RegExp(`^/laser`), "/laser"),
+        },
+        "/fdkk": {
+          // target: dev
+          //   ? "https://uat-laser.4dkankan.com/uat"
+          //   : "https://laser.4dkankan.com",
+          target: loadEnv(mode, process.cwd()).VITE_FDKK_URL,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(new RegExp(`^/fdkk`), "/fdkk"),
+        },
       },
     },
-  },
-});
+  });