Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

.env.development

@@ -29,5 +29,5 @@ VITE_GLOB_API_URL_PREFIX=
 #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
 #VITE_APP_SUB_APP = [["micro-need-air", "//10.10.150.72:8099/"], ["micro-vent-3dModal", "//localhost:8091/"], ["micro-fire-front", "//localhost:8090/"]]
 VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.154:8091/", "micro-vent-3dModal"], ["micro-need-air", "//localhost:8099/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
-# VITE_APP_SUB_APP = [["micro-vent-3dModal", "//localhost:8091/", "micro-vent-3dModal"], ["micro-need-air", "//localhost:8099/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
+# VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/", "micro-vent-3dModal"], ["micro-need-air", "//182.92.126.35:8099/", "micro-need-air"], ["micro-fire-front", "//182.92.126.35:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//localhost:8091/"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]

README.md

@@ -35,3 +35,32 @@
 ### 构建
 
 `pnpm build`
+
+### 主题
+
+主题可以在 /views/vent/sys/setting/index.vue 中找到设置入口
+
+常规的颜色、变量在 /design/color.less 或 /design/themify/ 下添加，图片资源应在 /assets/images/themify/ 下添加
+
+各个页面的主题化标准模板可以参考登录页 /views/sys/login/Login.vue
+
+下面是配合主题化使用的工具，输入页面的 css 样式，即可输出标准模板所需的资源
+
+```javascript
+// 使用前请确保：1、所有需主题化的 url 引入请以 url(/@/xxx/xxx.yyy) 格式声明。2、除去注释。
+function themifyScript(str) {
+  const reg = /url\('?(\/[@|0-9|a-z|A-Z|\-|_]+)+.(png|svg)'?\)/g;
+  let strcopy = str;
+  let res = reg.exec(str);
+  let varstr = '';
+  while (res) {
+    const [url, image] = res;
+    const varname = `--image-${image.replace('/', '')}`;
+    varstr += `${varname}: ${url};`;
+    strcopy = strcopy.replace(url, `var(${varname})`);
+    res = reg.exec(str);
+  }
+
+  return [varstr, strcopy];
+}
+```

index.html

@@ -39,6 +39,10 @@
         html[data-theme='dark'] .app-loading .app-loading-title {
           color: rgba(255, 255, 255, 0.85);
         }
+        html[data-theme='deepblue'] .app-loading {
+          background-color: none;
+          background-image: url('./src/assets/images/themify/deepblue/loading-bg.png');
+        }
         body{
           background-color: var(--vent-base-color)
         }

npminstall-debug.log

@@ -1,14 +1,22 @@
 {
   root: 'D:\\project\\ventsystem_2.0_front',
   registry: 'https://registry.npmmirror.com',
-  pkgs: [],
+  pkgs: [
+    {
+      name: 'uni-nfc',
+      version: 'latest',
+      type: 'tag',
+      alias: undefined,
+      arg: [Result]
+    }
+  ],
   production: false,
   cacheStrict: false,
   cacheDir: 'C:\\Users\\86175\\.npminstall_tarball',
   env: {
     npm_config_registry: 'https://registry.npmmirror.com',
-    npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\86175\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\86175\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com"]}',
-    npm_config_user_agent: 'npminstall/7.8.0 npm/? node/v16.13.0 win32 x64',
+    npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\86175\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com","uni-nfc"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\86175\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com","uni-nfc"]}',
+    npm_config_user_agent: 'npminstall/7.8.0 npm/? node/v18.14.0 win32 x64',
     npm_config_cache: 'C:\\Users\\86175\\.npminstall_tarball',
     NODE: 'C:\\Program Files\\nodejs\\node.exe',
     npm_node_execpath: 'C:\\Program Files\\nodejs\\node.exe',
@@ -17,6 +25,7 @@
     npm_config_disturl: 'https://cdn.npmmirror.com/binaries/node',
     npm_config_r: 'https://registry.npmmirror.com',
     COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
+    EDGEDRIVER_CDNURL: 'https://npmmirror.com/mirrors/edgedriver',
     NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
     NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
     PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
@@ -35,6 +44,7 @@
     SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
     RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2',
     RE2_DOWNLOAD_SKIP_PATH: 'true',
+    PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma',
     npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3',
     npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar',
     npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp',
@@ -46,6 +56,7 @@
   binaryMirrors: {
     ENVS: {
       COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
+      EDGEDRIVER_CDNURL: 'https://npmmirror.com/mirrors/edgedriver',
       NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
       NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
       PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
@@ -64,6 +75,7 @@
       SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
       RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2',
       RE2_DOWNLOAD_SKIP_PATH: 'true',
+      PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma',
       npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3',
       npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar',
       npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp',
@@ -165,7 +177,8 @@
     argon2: { host: 'https://cdn.npmmirror.com/binaries/argon2' },
     'ali-zeromq': { host: 'https://cdn.npmmirror.com/binaries/ali-zeromq' },
     'ali-usb_ctl': { host: 'https://cdn.npmmirror.com/binaries/ali-usb_ctl' },
-    'gdal-async': { host: 'https://cdn.npmmirror.com/binaries/node-gdal-async' }
+    'gdal-async': { host: 'https://cdn.npmmirror.com/binaries/node-gdal-async' },
+    'libpg-query': { host: 'https://cdn.npmmirror.com/binaries' }
   },
   forbiddenLicenses: null,
   flatten: false,

src/api/sys/model/userModel.ts

@@ -22,6 +22,10 @@ export interface RoleInfo {
   value: string;
 }
 
+export interface TokenInfo {
+  token: string;
+}
+
 /**
  * @description: Login interface return value
  */
@@ -51,6 +55,8 @@ export interface GetUserInfoModel {
   userInfo?: any;
   // 缓存字典项
   sysAllDictItems?: any;
+  // token
+  token?: string;
 }
 
 /**

src/api/sys/user.ts

@@ -1,7 +1,7 @@
 import { defHttp } from '/@/utils/http/axios';
-import { LoginParams, LoginResultModel, GetUserInfoModel, AutoLoginParams } from './model/userModel';
+import { LoginParams, LoginResultModel, GetUserInfoModel, AutoLoginParams, TokenInfo } from './model/userModel';
 
-import { ErrorMessageMode } from '/#/axios';
+import { ErrorMessageMode, SuccessMessageMode } from '/#/axios';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useUserStoreWithOut } from '/@/store/modules/user';
 import { setAuthCache } from '/@/utils/auth';
@@ -16,6 +16,7 @@ enum Api {
   Logout = '/sys/logout',
   autoLogin = '/sys/autoLogin',
   GetUserInfo = '/sys/user/getUserInfo',
+  tokenLogin = '/sys/luanLogin',
   // 获取系统权限
   // 1、查询用户拥有的按钮/表单访问权限
   // 2、所有权限
@@ -49,13 +50,14 @@ enum Api {
 /**
  * @description: user login api
  */
-export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal') {
+export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal', successMode: SuccessMessageMode = 'success') {
   return defHttp.post<LoginResultModel>(
     {
       url: Api.Login,
       params,
     },
     {
+      successMessageMode: successMode,
       errorMessageMode: mode,
     }
   );
@@ -64,7 +66,7 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
 /**
  * @description: user auto login api
  */
-export function autoLoginApi(params: AutoLoginParams, mode: ErrorMessageMode = 'modal') {
+export function autoLoginApi(params: AutoLoginParams, mode: ErrorMessageMode = 'modal', successMode: SuccessMessageMode = 'success') {
   return defHttp.get<LoginResultModel>(
     {
       url: Api.autoLogin,
@@ -74,6 +76,7 @@ export function autoLoginApi(params: AutoLoginParams, mode: ErrorMessageMode = '
       },
     },
     {
+      successMessageMode: successMode,
       errorMessageMode: mode,
     }
   );
@@ -94,6 +97,21 @@ export function phoneLoginApi(params: LoginParams, mode: ErrorMessageMode = 'mod
   );
 }
 
+export function tokenLogin(params: TokenInfo, mode: ErrorMessageMode = 'modal', successMode: SuccessMessageMode = 'success') {
+  return defHttp.get<GetUserInfoModel>(
+    {
+      url: Api.tokenLogin,
+      headers: {
+        Token: params.token,
+      },
+    },
+    {
+      successMessageMode: successMode,
+      errorMessageMode: mode,
+    }
+  );
+}
+
 /**
  * @description: getUserInfo
  */

src/assets/images/themify/deepblue/fire/max.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="31.761" height="46.177" viewBox="0 0 31.761 46.177">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#0a84ff"/>
+      <stop offset="1" stop-color="#0a84ff" stop-opacity="0"/>
+    </linearGradient>
+  </defs>
+  <g id="组_15429" data-name="组 15429" transform="translate(-506.549 -355.112)">
+    <path id="路径_55369" data-name="路径 55369" d="M226.661,25.849V14.585a1.244,1.244,0,0,0-1.242-1.242h-.1a1.2,1.2,0,0,0-1.206,1.206v11.3a4.375,4.375,0,0,0-3.211,4.17,4.486,4.486,0,1,0,5.757-4.17Zm6.6-4.99a1.134,1.134,0,0,1-.443-.861V7.262a7.432,7.432,0,0,0-14.86,0V19.637a1.771,1.771,0,0,1-.6,1.357,11.81,11.81,0,0,0-4.224,9.029,12.264,12.264,0,0,0,24.521,0A11.811,11.811,0,0,0,233.259,20.859Zm-7.873,17.333a8.3,8.3,0,0,1-8.4-8.172,8.1,8.1,0,0,1,3.924-6.905l.595-.365a.659.659,0,0,0,.312-.558V7.262a3.573,3.573,0,0,1,7.143,0v14.93a.659.659,0,0,0,.312.558l.595.365a8.086,8.086,0,0,1,3.92,6.905,8.3,8.3,0,0,1-8.4,8.172Z" transform="translate(293.42 359.295)" fill="url(#linear-gradient)"/>
+    <path id="路径_55370" data-name="路径 55370" d="M282,155.954v9.231h1.865v-9.231l1.958,1.958,1.305-1.4-4.2-4.2-4.2,4.2,1.305,1.305Zm-4.662-4.755h11.189v-1.865H277.333Z" transform="translate(249.788 205.778)" fill="#fff"/>
+  </g>
+</svg>

src/assets/images/themify/deepblue/fire/min.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="31.761" height="46.177" viewBox="0 0 31.761 46.177">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#0a84ff"/>
+      <stop offset="1" stop-color="#0a84ff" stop-opacity="0"/>
+    </linearGradient>
+  </defs>
+  <g id="组_15430" data-name="组 15430" transform="translate(0 0)">
+    <path id="路径_55369" data-name="路径 55369" d="M226.661,25.849V14.585a1.244,1.244,0,0,0-1.242-1.242h-.1a1.2,1.2,0,0,0-1.206,1.206v11.3a4.375,4.375,0,0,0-3.211,4.17,4.486,4.486,0,1,0,5.757-4.17Zm6.6-4.99a1.134,1.134,0,0,1-.443-.861V7.262a7.432,7.432,0,0,0-14.86,0V19.637a1.771,1.771,0,0,1-.6,1.357,11.81,11.81,0,0,0-4.223,9.029,12.264,12.264,0,0,0,24.521,0A11.811,11.811,0,0,0,233.259,20.859Zm-7.873,17.333a8.3,8.3,0,0,1-8.4-8.172,8.1,8.1,0,0,1,3.924-6.905l.595-.365a.659.659,0,0,0,.312-.558V7.262a3.573,3.573,0,0,1,7.143,0v14.93a.659.659,0,0,0,.312.558l.595.365a8.086,8.086,0,0,1,3.92,6.905,8.3,8.3,0,0,1-8.4,8.172Z" transform="translate(-213.129 4.184)" fill="url(#linear-gradient)"/>
+    <path id="路径_55370" data-name="路径 55370" d="M282,158.565v-9.231h1.865v9.231l1.958-1.958,1.305,1.4-4.2,4.2-4.2-4.2,1.305-1.305Zm-4.662,4.755h11.189v1.865H277.333Z" transform="translate(-256.76 -149.334)" fill="#fff"/>
+  </g>
+</svg>

src/assets/images/themify/deepblue/fire/pj.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="31.761" height="46.177" viewBox="0 0 31.761 46.177">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#0a84ff"/>
+      <stop offset="1" stop-color="#0a84ff" stop-opacity="0"/>
+    </linearGradient>
+  </defs>
+  <g id="组_15431" data-name="组 15431" transform="translate(0 0)">
+    <path id="路径_55369" data-name="路径 55369" d="M226.661,25.849V14.585a1.244,1.244,0,0,0-1.242-1.242h-.1a1.2,1.2,0,0,0-1.206,1.206v11.3a4.375,4.375,0,0,0-3.211,4.17,4.486,4.486,0,1,0,5.757-4.17Zm6.6-4.99a1.134,1.134,0,0,1-.443-.861V7.262a7.432,7.432,0,0,0-14.86,0V19.637a1.771,1.771,0,0,1-.6,1.357,11.81,11.81,0,0,0-4.223,9.029,12.264,12.264,0,0,0,24.521,0A11.811,11.811,0,0,0,233.259,20.859Zm-7.873,17.333a8.3,8.3,0,0,1-8.4-8.172,8.1,8.1,0,0,1,3.924-6.905l.595-.365a.659.659,0,0,0,.312-.558V7.262a3.573,3.573,0,0,1,7.143,0v14.93a.659.659,0,0,0,.312.558l.595.365a8.086,8.086,0,0,1,3.92,6.905,8.3,8.3,0,0,1-8.4,8.172Z" transform="translate(-213.129 4.184)" fill="url(#linear-gradient)"/>
+    <path id="路径_55371" data-name="路径 55371" d="M64,120.4v2.264H75.189V120.4Zm0,13.846H75.189v-2.264H64Zm0-5.79H75.189v-2.264H64Z" transform="translate(-43.428 -120.4)" fill="#fff"/>
+  </g>
+</svg>