zd-before.git - Gitblit

spring

14 小时以前 ac0cd006719a2db71625610460f6537c15eaa9f4

打包配置

已修改12个文件

	.env.development	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.env.production	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.env.staging	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	index.html	49 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	package.json	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	public/favicon.ico	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/assets/logo/logo.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/Breadcrumb/index.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/layout/components/Sidebar/Logo.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/router/index.js	164 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/login.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	vite.config.js	72 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .env.development

@@ -1,8 +1,8 @@
# 页面标题
VITE_APP_TITLE = 陕西昭德环保型煤有限公司
VITE_APP_TITLE = 创巨能源有限公司

# 开发环境配置
VITE_APP_ENV = 'development'

# 陕西昭德环保型煤有限公司/开发环境
# 创巨能源有限公司/开发环境
VITE_APP_BASE_API = '/dev-api'

 .env.production

@@ -1,10 +1,10 @@
# 页面标题
VITE_APP_TITLE = 陕西昭德环保型煤有限公司
VITE_APP_TITLE = 创巨能源有限公司

# 生产环境配置
VITE_APP_ENV = 'production'

# 陕西昭德环保型煤有限公司/生产环境
# 创巨能源有限公司/生产环境
VITE_APP_BASE_API = '/zd'

# 是否在打包时开启压缩，支持 gzip 和 brotli

 .env.staging

@@ -1,10 +1,10 @@
# 页面标题
VITE_APP_TITLE = 陕西昭德环保型煤有限公司
VITE_APP_TITLE = 创巨能源有限公司

# 生产环境配置
VITE_APP_ENV = 'staging'

# 陕西昭德环保型煤有限公司/生产环境
# 创巨能源有限公司/生产环境
VITE_APP_BASE_API = '/stage-api'

# 是否在打包时开启压缩，支持 gzip 和 brotli

 index.html

@@ -1,14 +1,20 @@
<!DOCTYPE html>
<html>

<head>
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
  <meta name="renderer" content="webkit">
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
  <link rel="icon" href="/favicon.ico">
  <title>陕西昭德环保型煤有限公司</title>
  <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
    <meta charset="utf-8" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
    <meta name="renderer" content="webkit" />
    <meta
      name="viewport"
      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
    />
    <link rel="icon" href="/favicon.ico" />
    <title>创巨能源有限公司</title>
    <!--[if lt IE 11
      ]><script>
        window.location.href = "/html/ie.html";
      </script><!
    [endif]-->
  <style>
    html,
    body,
@@ -44,7 +50,7 @@
      margin: -75px 0 0 -75px;
      border-radius: 50%;
      border: 3px solid transparent;
      border-top-color: #FFF;
        border-top-color: #fff;
      -webkit-animation: spin 2s linear infinite;
      -ms-animation: spin 2s linear infinite;
      -moz-animation: spin 2s linear infinite;
@@ -62,7 +68,7 @@
      bottom: 5px;
      border-radius: 50%;
      border: 3px solid transparent;
      border-top-color: #FFF;
        border-top-color: #fff;
      -webkit-animation: spin 3s linear infinite;
      -moz-animation: spin 3s linear infinite;
      -o-animation: spin 3s linear infinite;
@@ -79,14 +85,13 @@
      bottom: 15px;
      border-radius: 50%;
      border: 3px solid transparent;
      border-top-color: #FFF;
        border-top-color: #fff;
      -moz-animation: spin 1.5s linear infinite;
      -o-animation: spin 1.5s linear infinite;
      -ms-animation: spin 1.5s linear infinite;
      -webkit-animation: spin 1.5s linear infinite;
      animation: spin 1.5s linear infinite;
    }


    @-webkit-keyframes spin {
      0% {
@@ -116,13 +121,12 @@
      }
    }


    #loader-wrapper .loader-section {
      position: fixed;
      top: 0;
      width: 51%;
      height: 100%;
      background: #7171C6;
        background: #7171c6;
      z-index: 1000;
      -webkit-transform: translateX(0);
      -ms-transform: translateX(0);
@@ -137,21 +141,20 @@
      right: 0;
    }


    .loaded #loader-wrapper .loader-section.section-left {
      -webkit-transform: translateX(-100%);
      -ms-transform: translateX(-100%);
      transform: translateX(-100%);
      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
        -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
        transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
    }

    .loaded #loader-wrapper .loader-section.section-right {
      -webkit-transform: translateX(100%);
      -ms-transform: translateX(100%);
      transform: translateX(100%);
      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
        -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
        transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
    }

    .loaded #loader {
@@ -178,8 +181,8 @@
    }

    #loader-wrapper .load_title {
      font-family: 'Open Sans';
      color: #FFF;
        font-family: "Open Sans";
        color: #fff;
      font-size: 19px;
      width: 100%;
      text-align: center;
@@ -194,10 +197,9 @@
      font-weight: normal;
      font-style: italic;
      font-size: 13px;
      color: #FFF;
        color: #fff;
      opacity: 0.5;
    }
    
  </style>
</head>

@@ -212,5 +214,4 @@
  </div>
  <script type="module" src="/src/main.js"></script>
</body>

</html>

 package.json

@@ -1,7 +1,7 @@
{
  "name": "ruoyi",
  "version": "3.8.9",
  "description": "陕西昭德环保型煤有限公司",
  "description": "创巨能源有限公司",
  "author": "若依",
  "license": "MIT",
  "type": "module",

 public/favicon.ico



 src/assets/logo/logo.png



 src/components/Breadcrumb/index.vue

@@ -34,7 +34,7 @@
  }
  // 判断是否为首页
  if (!isDashboard(matched[0])) {
    matched = [{ path: "/index", meta: { title: "首页" } }].concat(matched)
    matched = [{ path: "/index", meta: { title: "生产报表" } }].concat(matched)
  }
  levelList.value = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
}

 src/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
    <div class="sidebar-logo-container" :class="{ 'collapse': collapse }">
        <transition name="sidebarLogoFade">
            <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
                <img v-if="logo" :src="logo" class="sidebar-logo" />
                <h1 v-else class="sidebar-title">{{ title }}</h1>
                <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
                <h1 class="sidebar-title">{{ title }}</h1>
            </router-link>
            <router-link v-else key="expand" class="sidebar-logo-link" to="/">
                <img v-if="logo" :src="logo" class="sidebar-logo" />
                <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
                <h1 class="sidebar-title">{{ title }}</h1>
            </router-link>
        </transition>
@@ -74,7 +74,7 @@
        & .sidebar-logo {
            height: 32px;
            vertical-align: middle;
            margin-right: 12px;
            //margin-right: 12px;
        }
        
        & .sidebar-title {

 src/router/index.js

@@ -1,6 +1,6 @@
import { createWebHistory, createRouter } from 'vue-router'
import { createWebHistory, createRouter } from "vue-router";
/* Layout */
import Layout from '@/layout'
import Layout from "@/layout";

/**
 * Note: 路由配置项
@@ -27,148 +27,148 @@
// 公共路由
export const constantRoutes = [
  {
    path: '/redirect',
    path: "/redirect",
    component: Layout,
    hidden: true,
    children: [
      {
        path: '/redirect/:path(.*)',
        component: () => import('@/views/redirect/index.vue')
      }
    ]
        path: "/redirect/:path(.*)",
        component: () => import("@/views/redirect/index.vue"),
      },
    ],
  },
  {
    path: '/login',
    component: () => import('@/views/login'),
    hidden: true
    path: "/login",
    component: () => import("@/views/login"),
    hidden: true,
  },
  {
    path: '/register',
    component: () => import('@/views/register'),
    hidden: true
    path: "/register",
    component: () => import("@/views/register"),
    hidden: true,
  },
  {
    path: "/:pathMatch(.*)*",
    component: () => import('@/views/error/404'),
    hidden: true
    component: () => import("@/views/error/404"),
    hidden: true,
  },
  {
    path: '/401',
    component: () => import('@/views/error/401'),
    hidden: true
    path: "/401",
    component: () => import("@/views/error/401"),
    hidden: true,
  },
  {
    path: '',
    path: "",
    component: Layout,
    redirect: '/index',
    redirect: "/index",
    children: [
      {
        path: '/index',
        component: () => import('@/views/index'),
        name: 'Index',
        meta: { title: '首页', icon: 'dashboard', affix: true }
      }
    ]
        path: "/index",
        component: () => import("@/views/index"),
        name: "Index",
        meta: { title: "生产报表", icon: "dashboard", affix: true },
      },
    ],
  },
  {
    path: '/user',
    path: "/user",
    component: Layout,
    hidden: true,
    redirect: 'noredirect',
    redirect: "noredirect",
    children: [
      {
        path: 'profile',
        component: () => import('@/views/system/user/profile/index'),
        name: 'Profile',
        meta: { title: '个人中心', icon: 'user' }
      }
    ]
  }
]
        path: "profile",
        component: () => import("@/views/system/user/profile/index"),
        name: "Profile",
        meta: { title: "个人中心", icon: "user" },
      },
    ],
  },
];

// 动态路由，基于用户权限动态去加载
export const dynamicRoutes = [
  {
    path: '/system/user-auth',
    path: "/system/user-auth",
    component: Layout,
    hidden: true,
    permissions: ['system:user:edit'],
    permissions: ["system:user:edit"],
    children: [
      {
        path: 'role/:userId(\\d+)',
        component: () => import('@/views/system/user/authRole'),
        name: 'AuthRole',
        meta: { title: '分配角色', activeMenu: '/system/user' }
      }
    ]
        path: "role/:userId(\\d+)",
        component: () => import("@/views/system/user/authRole"),
        name: "AuthRole",
        meta: { title: "分配角色", activeMenu: "/system/user" },
      },
    ],
  },
  {
    path: '/system/role-auth',
    path: "/system/role-auth",
    component: Layout,
    hidden: true,
    permissions: ['system:role:edit'],
    permissions: ["system:role:edit"],
    children: [
      {
        path: 'user/:roleId(\\d+)',
        component: () => import('@/views/system/role/authUser'),
        name: 'AuthUser',
        meta: { title: '分配用户', activeMenu: '/system/role' }
      }
    ]
        path: "user/:roleId(\\d+)",
        component: () => import("@/views/system/role/authUser"),
        name: "AuthUser",
        meta: { title: "分配用户", activeMenu: "/system/role" },
      },
    ],
  },
  {
    path: '/system/dict-data',
    path: "/system/dict-data",
    component: Layout,
    hidden: true,
    permissions: ['system:dict:list'],
    permissions: ["system:dict:list"],
    children: [
      {
        path: 'index/:dictId(\\d+)',
        component: () => import('@/views/system/dict/data'),
        name: 'Data',
        meta: { title: '字典数据', activeMenu: '/system/dict' }
      }
    ]
        path: "index/:dictId(\\d+)",
        component: () => import("@/views/system/dict/data"),
        name: "Data",
        meta: { title: "字典数据", activeMenu: "/system/dict" },
      },
    ],
  },
  {
    path: '/monitor/job-log',
    path: "/monitor/job-log",
    component: Layout,
    hidden: true,
    permissions: ['monitor:job:list'],
    permissions: ["monitor:job:list"],
    children: [
      {
        path: 'index/:jobId(\\d+)',
        component: () => import('@/views/monitor/job/log'),
        name: 'JobLog',
        meta: { title: '调度日志', activeMenu: '/monitor/job' }
      }
    ]
        path: "index/:jobId(\\d+)",
        component: () => import("@/views/monitor/job/log"),
        name: "JobLog",
        meta: { title: "调度日志", activeMenu: "/monitor/job" },
      },
    ],
  },
  {
    path: '/tool/gen-edit',
    path: "/tool/gen-edit",
    component: Layout,
    hidden: true,
    permissions: ['tool:gen:edit'],
    permissions: ["tool:gen:edit"],
    children: [
      {
        path: 'index/:tableId(\\d+)',
        component: () => import('@/views/tool/gen/editTable'),
        name: 'GenEdit',
        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
      }
    ]
  }
]
        path: "index/:tableId(\\d+)",
        component: () => import("@/views/tool/gen/editTable"),
        name: "GenEdit",
        meta: { title: "修改生成配置", activeMenu: "/tool/gen" },
      },
    ],
  },
];

const router = createRouter({
  history: createWebHistory(),
  routes: constantRoutes,
  scrollBehavior(to, from, savedPosition) {
    if (savedPosition) {
      return savedPosition
      return savedPosition;
    }
    return { top: 0 }
    return { top: 0 };
  },
})
});

export default router
export default router;

 src/views/login.vue

@@ -1,7 +1,7 @@
<template>
  <div class="login">
    <div class="login-card">
      <div class="title">陕西昭德环保型煤有限公司</div>
      <div class="title">创巨能源有限公司</div>
      <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form" label-position="top">
        <el-form-item prop="username" label="账号">
          <el-input

 vite.config.js

@@ -1,8 +1,8 @@
import { defineConfig, loadEnv } from 'vite'
import path from 'path'
import createVitePlugins from './vite/plugins'
import { defineConfig, loadEnv } from "vite";
import path from "path";
import createVitePlugins from "./vite/plugins";

const baseUrl = 'http://114.132.189.42:7016' // 后端接口
const baseUrl = "http://114.132.189.42:8097"; // 后端接口
// const baseUrl = 'http://114.132.189.42:7016'
// const baseUrl = 'http://10.42.128.207:7016' // 后端接口
// const baseUrl = 'http://192.168.1.144:7016' // 后端接口
@@ -10,74 +10,74 @@

// https://vitejs.dev/config/
export default defineConfig(({ mode, command }) => {
  const env = loadEnv(mode, process.cwd())
  const { VITE_APP_ENV } = env
  const env = loadEnv(mode, process.cwd());
  const { VITE_APP_ENV } = env;
  return {
    // 部署生产环境和开发环境下的URL。
    // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
    // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
    base: VITE_APP_ENV === 'production' ? './' : './',
    plugins: createVitePlugins(env, command === 'build'),
    base: VITE_APP_ENV === "production" ? "./" : "./",
    plugins: createVitePlugins(env, command === "build"),
    resolve: {
      // https://cn.vitejs.dev/config/#resolve-alias
      alias: {
        // 设置路径
        '~': path.resolve(__dirname, './'),
        "~": path.resolve(__dirname, "./"),
        // 设置别名
        '@': path.resolve(__dirname, './src')
        "@": path.resolve(__dirname, "./src"),
      },
      // https://cn.vitejs.dev/config/#resolve-extensions
      extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
      extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue"],
    },
    // 打包配置
    build: {
      // https://vite.dev/config/build-options.html
      sourcemap: command === 'build' ? false : 'inline',
      outDir: 'dist',
      assetsDir: 'assets',
      sourcemap: command === "build" ? false : "inline",
      outDir: "dist",
      assetsDir: "assets",
      chunkSizeWarningLimit: 2000,
      rollupOptions: {
        output: {
          chunkFileNames: 'static/js/[name]-[hash].js',
          entryFileNames: 'static/js/[name]-[hash].js',
          assetFileNames: 'static/[ext]/[name]-[hash].[ext]'
        }
      }
          chunkFileNames: "static/js/[name]-[hash].js",
          entryFileNames: "static/js/[name]-[hash].js",
          assetFileNames: "static/[ext]/[name]-[hash].[ext]",
        },
      },
    },
    // vite 相关配置
    server: {
      port: 80,
      port: 8001,
      host: true,
      open: true,
      proxy: {
        // https://cn.vitejs.dev/config/#server-proxy
        '/dev-api': {
        "/dev-api": {
          target: baseUrl,
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api/, '')
          rewrite: (p) => p.replace(/^\/dev-api/, ""),
        },
         // springdoc proxy
         '^/v3/api-docs/(.*)': {
        "^/v3/api-docs/(.*)": {
          target: baseUrl,
          changeOrigin: true,
        }
      }
        },
      },
    },
    css: {
      postcss: {
        plugins: [
          {
            postcssPlugin: 'internal:charset-removal',
            postcssPlugin: "internal:charset-removal",
            AtRule: {
              charset: (atRule) => {
                if (atRule.name === 'charset') {
                  atRule.remove()
                if (atRule.name === "charset") {
                  atRule.remove();
                }
              }
            }
          }
        ]
      }
    }
  }
})
              },
            },
          },
        ],
      },
    },
  };
});

			@@ -1,8 +1,8 @@
			# 页面标题
			VITE_APP_TITLE = 陕西昭德环保型煤有限公司
			VITE_APP_TITLE = 创巨能源有限公司

			# 开发环境配置
			VITE_APP_ENV = 'development'

			# 陕西昭德环保型煤有限公司/开发环境
			# 创巨能源有限公司/开发环境
			VITE_APP_BASE_API = '/dev-api'

			@@ -1,10 +1,10 @@
			# 页面标题
			VITE_APP_TITLE = 陕西昭德环保型煤有限公司
			VITE_APP_TITLE = 创巨能源有限公司

			# 生产环境配置
			VITE_APP_ENV = 'production'

			# 陕西昭德环保型煤有限公司/生产环境
			# 创巨能源有限公司/生产环境
			VITE_APP_BASE_API = '/zd'

			# 是否在打包时开启压缩，支持 gzip 和 brotli

			@@ -1,14 +1,20 @@
			<!DOCTYPE html>
			<html>

			<head>
			<meta charset="utf-8">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="renderer" content="webkit">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
			<link rel="icon" href="/favicon.ico">
			<title>陕西昭德环保型煤有限公司</title>
			<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
			<meta charset="utf-8" />
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			<meta name="renderer" content="webkit" />
			<meta
			name="viewport"
			content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
			/>
			<link rel="icon" href="/favicon.ico" />
			<title>创巨能源有限公司</title>
			<!--[if lt IE 11
			]><script>
			window.location.href = "/html/ie.html";
			</script><!
			[endif]-->
			<style>
			html,
			body,
			@@ -44,7 +50,7 @@
			margin: -75px 0 0 -75px;
			border-radius: 50%;
			border: 3px solid transparent;
			border-top-color: #FFF;
			border-top-color: #fff;
			-webkit-animation: spin 2s linear infinite;
			-ms-animation: spin 2s linear infinite;
			-moz-animation: spin 2s linear infinite;
			@@ -62,7 +68,7 @@
			bottom: 5px;
			border-radius: 50%;
			border: 3px solid transparent;
			border-top-color: #FFF;
			border-top-color: #fff;
			-webkit-animation: spin 3s linear infinite;
			-moz-animation: spin 3s linear infinite;
			-o-animation: spin 3s linear infinite;
			@@ -79,14 +85,13 @@
			bottom: 15px;
			border-radius: 50%;
			border: 3px solid transparent;
			border-top-color: #FFF;
			border-top-color: #fff;
			-moz-animation: spin 1.5s linear infinite;
			-o-animation: spin 1.5s linear infinite;
			-ms-animation: spin 1.5s linear infinite;
			-webkit-animation: spin 1.5s linear infinite;
			animation: spin 1.5s linear infinite;
			}


			@-webkit-keyframes spin {
			0% {
			@@ -116,13 +121,12 @@
			}
			}


			#loader-wrapper .loader-section {
			position: fixed;
			top: 0;
			width: 51%;
			height: 100%;
			background: #7171C6;
			background: #7171c6;
			z-index: 1000;
			-webkit-transform: translateX(0);
			-ms-transform: translateX(0);
			@@ -137,21 +141,20 @@
			right: 0;
			}


			.loaded #loader-wrapper .loader-section.section-left {
			-webkit-transform: translateX(-100%);
			-ms-transform: translateX(-100%);
			transform: translateX(-100%);
			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
			}

			.loaded #loader-wrapper .loader-section.section-right {
			-webkit-transform: translateX(100%);
			-ms-transform: translateX(100%);
			transform: translateX(100%);
			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
			-webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
			transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
			}

			.loaded #loader {
			@@ -178,8 +181,8 @@
			}

			#loader-wrapper .load_title {
			font-family: 'Open Sans';
			color: #FFF;
			font-family: "Open Sans";
			color: #fff;
			font-size: 19px;
			width: 100%;
			text-align: center;
			@@ -194,10 +197,9 @@
			font-weight: normal;
			font-style: italic;
			font-size: 13px;
			color: #FFF;
			color: #fff;
			opacity: 0.5;
			}

			</style>
			</head>

			@@ -212,5 +214,4 @@
			</div>
			<script type="module" src="/src/main.js"></script>
			</body>

			</html>

			@@ -1,7 +1,7 @@
			{
			"name": "ruoyi",
			"version": "3.8.9",
			"description": "陕西昭德环保型煤有限公司",
			"description": "创巨能源有限公司",
			"author": "若依",
			"license": "MIT",
			"type": "module",

			@@ -34,7 +34,7 @@
			}
			// 判断是否为首页
			if (!isDashboard(matched[0])) {
			matched = [{ path: "/index", meta: { title: "首页" } }].concat(matched)
			matched = [{ path: "/index", meta: { title: "生产报表" } }].concat(matched)
			}
			levelList.value = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
			}

			@@ -2,11 +2,11 @@
			<div class="sidebar-logo-container" :class="{ 'collapse': collapse }">
			<transition name="sidebarLogoFade">
			<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
			<img v-if="logo" :src="logo" class="sidebar-logo" />
			<h1 v-else class="sidebar-title">{{ title }}</h1>
			<!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
			<h1 class="sidebar-title">{{ title }}</h1>
			</router-link>
			<router-link v-else key="expand" class="sidebar-logo-link" to="/">
			<img v-if="logo" :src="logo" class="sidebar-logo" />
			<!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
			<h1 class="sidebar-title">{{ title }}</h1>
			</router-link>
			</transition>
			@@ -74,7 +74,7 @@
			& .sidebar-logo {
			height: 32px;
			vertical-align: middle;
			margin-right: 12px;
			//margin-right: 12px;
			}

			& .sidebar-title {

			@@ -1,6 +1,6 @@
			import { createWebHistory, createRouter } from 'vue-router'
			import { createWebHistory, createRouter } from "vue-router";
			/* Layout */
			import Layout from '@/layout'
			import Layout from "@/layout";

			/**
			* Note: 路由配置项
			@@ -27,148 +27,148 @@
			// 公共路由
			export const constantRoutes = [
			{
			path: '/redirect',
			path: "/redirect",
			component: Layout,
			hidden: true,
			children: [
			{
			path: '/redirect/:path(.*)',
			component: () => import('@/views/redirect/index.vue')
			}
			]
			path: "/redirect/:path(.*)",
			component: () => import("@/views/redirect/index.vue"),
			},
			],
			},
			{
			path: '/login',
			component: () => import('@/views/login'),
			hidden: true
			path: "/login",
			component: () => import("@/views/login"),
			hidden: true,
			},
			{
			path: '/register',
			component: () => import('@/views/register'),
			hidden: true
			path: "/register",
			component: () => import("@/views/register"),
			hidden: true,
			},
			{
			path: "/:pathMatch(.)",
			component: () => import('@/views/error/404'),
			hidden: true
			component: () => import("@/views/error/404"),
			hidden: true,
			},
			{
			path: '/401',
			component: () => import('@/views/error/401'),
			hidden: true
			path: "/401",
			component: () => import("@/views/error/401"),
			hidden: true,
			},
			{
			path: '',
			path: "",
			component: Layout,
			redirect: '/index',
			redirect: "/index",
			children: [
			{
			path: '/index',
			component: () => import('@/views/index'),
			name: 'Index',
			meta: { title: '首页', icon: 'dashboard', affix: true }
			}
			]
			path: "/index",
			component: () => import("@/views/index"),
			name: "Index",
			meta: { title: "生产报表", icon: "dashboard", affix: true },
			},
			],
			},
			{
			path: '/user',
			path: "/user",
			component: Layout,
			hidden: true,
			redirect: 'noredirect',
			redirect: "noredirect",
			children: [
			{
			path: 'profile',
			component: () => import('@/views/system/user/profile/index'),
			name: 'Profile',
			meta: { title: '个人中心', icon: 'user' }
			}
			]
			}
			]
			path: "profile",
			component: () => import("@/views/system/user/profile/index"),
			name: "Profile",
			meta: { title: "个人中心", icon: "user" },
			},
			],
			},
			];

			// 动态路由，基于用户权限动态去加载
			export const dynamicRoutes = [
			{
			path: '/system/user-auth',
			path: "/system/user-auth",
			component: Layout,
			hidden: true,
			permissions: ['system:user:edit'],
			permissions: ["system:user:edit"],
			children: [
			{
			path: 'role/:userId(\\d+)',
			component: () => import('@/views/system/user/authRole'),
			name: 'AuthRole',
			meta: { title: '分配角色', activeMenu: '/system/user' }
			}
			]
			path: "role/:userId(\\d+)",
			component: () => import("@/views/system/user/authRole"),
			name: "AuthRole",
			meta: { title: "分配角色", activeMenu: "/system/user" },
			},
			],
			},
			{
			path: '/system/role-auth',
			path: "/system/role-auth",
			component: Layout,
			hidden: true,
			permissions: ['system:role:edit'],
			permissions: ["system:role:edit"],
			children: [
			{
			path: 'user/:roleId(\\d+)',
			component: () => import('@/views/system/role/authUser'),
			name: 'AuthUser',
			meta: { title: '分配用户', activeMenu: '/system/role' }
			}
			]
			path: "user/:roleId(\\d+)",
			component: () => import("@/views/system/role/authUser"),
			name: "AuthUser",
			meta: { title: "分配用户", activeMenu: "/system/role" },
			},
			],
			},
			{
			path: '/system/dict-data',
			path: "/system/dict-data",
			component: Layout,
			hidden: true,
			permissions: ['system:dict:list'],
			permissions: ["system:dict:list"],
			children: [
			{
			path: 'index/:dictId(\\d+)',
			component: () => import('@/views/system/dict/data'),
			name: 'Data',
			meta: { title: '字典数据', activeMenu: '/system/dict' }
			}
			]
			path: "index/:dictId(\\d+)",
			component: () => import("@/views/system/dict/data"),
			name: "Data",
			meta: { title: "字典数据", activeMenu: "/system/dict" },
			},
			],
			},
			{
			path: '/monitor/job-log',
			path: "/monitor/job-log",
			component: Layout,
			hidden: true,
			permissions: ['monitor:job:list'],
			permissions: ["monitor:job:list"],
			children: [
			{
			path: 'index/:jobId(\\d+)',
			component: () => import('@/views/monitor/job/log'),
			name: 'JobLog',
			meta: { title: '调度日志', activeMenu: '/monitor/job' }
			}
			]
			path: "index/:jobId(\\d+)",
			component: () => import("@/views/monitor/job/log"),
			name: "JobLog",
			meta: { title: "调度日志", activeMenu: "/monitor/job" },
			},
			],
			},
			{
			path: '/tool/gen-edit',
			path: "/tool/gen-edit",
			component: Layout,
			hidden: true,
			permissions: ['tool:gen:edit'],
			permissions: ["tool:gen:edit"],
			children: [
			{
			path: 'index/:tableId(\\d+)',
			component: () => import('@/views/tool/gen/editTable'),
			name: 'GenEdit',
			meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
			}
			]
			}
			]
			path: "index/:tableId(\\d+)",
			component: () => import("@/views/tool/gen/editTable"),
			name: "GenEdit",
			meta: { title: "修改生成配置", activeMenu: "/tool/gen" },
			},
			],
			},
			];

			const router = createRouter({
			history: createWebHistory(),
			routes: constantRoutes,
			scrollBehavior(to, from, savedPosition) {
			if (savedPosition) {
			return savedPosition
			return savedPosition;
			}
			return { top: 0 }
			return { top: 0 };
			},
			})
			});

			export default router
			export default router;

			@@ -1,7 +1,7 @@
			<template>
			<div class="login">
			<div class="login-card">
			<div class="title">陕西昭德环保型煤有限公司</div>
			<div class="title">创巨能源有限公司</div>
			<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form" label-position="top">
			<el-form-item prop="username" label="账号">
			<el-input

			@@ -1,8 +1,8 @@
			import { defineConfig, loadEnv } from 'vite'
			import path from 'path'
			import createVitePlugins from './vite/plugins'
			import { defineConfig, loadEnv } from "vite";
			import path from "path";
			import createVitePlugins from "./vite/plugins";

			const baseUrl = 'http://114.132.189.42:7016' // 后端接口
			const baseUrl = "http://114.132.189.42:8097"; // 后端接口
			// const baseUrl = 'http://114.132.189.42:7016'
			// const baseUrl = 'http://10.42.128.207:7016' // 后端接口
			// const baseUrl = 'http://192.168.1.144:7016' // 后端接口
			@@ -10,74 +10,74 @@

			// https://vitejs.dev/config/
			export default defineConfig(({ mode, command }) => {
			const env = loadEnv(mode, process.cwd())
			const { VITE_APP_ENV } = env
			const env = loadEnv(mode, process.cwd());
			const { VITE_APP_ENV } = env;
			return {
			// 部署生产环境和开发环境下的URL。
			// 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
			// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
			base: VITE_APP_ENV === 'production' ? './' : './',
			plugins: createVitePlugins(env, command === 'build'),
			base: VITE_APP_ENV === "production" ? "./" : "./",
			plugins: createVitePlugins(env, command === "build"),
			resolve: {
			// https://cn.vitejs.dev/config/#resolve-alias
			alias: {
			// 设置路径
			'~': path.resolve(__dirname, './'),
			"~": path.resolve(__dirname, "./"),
			// 设置别名
			'@': path.resolve(__dirname, './src')
			"@": path.resolve(__dirname, "./src"),
			},
			// https://cn.vitejs.dev/config/#resolve-extensions
			extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
			extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue"],
			},
			// 打包配置
			build: {
			// https://vite.dev/config/build-options.html
			sourcemap: command === 'build' ? false : 'inline',
			outDir: 'dist',
			assetsDir: 'assets',
			sourcemap: command === "build" ? false : "inline",
			outDir: "dist",
			assetsDir: "assets",
			chunkSizeWarningLimit: 2000,
			rollupOptions: {
			output: {
			chunkFileNames: 'static/js/[name]-[hash].js',
			entryFileNames: 'static/js/[name]-[hash].js',
			assetFileNames: 'static/[ext]/[name]-[hash].[ext]'
			}
			}
			chunkFileNames: "static/js/[name]-[hash].js",
			entryFileNames: "static/js/[name]-[hash].js",
			assetFileNames: "static/[ext]/[name]-[hash].[ext]",
			},
			},
			},
			// vite 相关配置
			server: {
			port: 80,
			port: 8001,
			host: true,
			open: true,
			proxy: {
			// https://cn.vitejs.dev/config/#server-proxy
			'/dev-api': {
			"/dev-api": {
			target: baseUrl,
			changeOrigin: true,
			rewrite: (p) => p.replace(/^\/dev-api/, '')
			rewrite: (p) => p.replace(/^\/dev-api/, ""),
			},
			// springdoc proxy
			'^/v3/api-docs/(.*)': {
			"^/v3/api-docs/(.*)": {
			target: baseUrl,
			changeOrigin: true,
			}
			}
			},
			},
			},
			css: {
			postcss: {
			plugins: [
			{
			postcssPlugin: 'internal:charset-removal',
			postcssPlugin: "internal:charset-removal",
			AtRule: {
			charset: (atRule) => {
			if (atRule.name === 'charset') {
			atRule.remove()
			if (atRule.name === "charset") {
			atRule.remove();
			}
			}
			}
			}
			]
			}
			}
			}
			})
			},
			},
			},
			],
			},
			},
			};
			});