diff --git a/src/assets/login/job.png b/src/assets/login/job.png new file mode 100644 index 0000000..61a2427 Binary files /dev/null and b/src/assets/login/job.png differ diff --git a/src/i18n/pages/login/zh-cn.ts b/src/i18n/pages/login/zh-cn.ts index 6a7e674..3d73630 100644 --- a/src/i18n/pages/login/zh-cn.ts +++ b/src/i18n/pages/login/zh-cn.ts @@ -26,7 +26,9 @@ export default { readAccept: '我已仔细阅读并接受', privacyPolicy: '《隐私政策》', phoneAndJobCodeLabel: '手机号/工号', - phoneAndJobCodePlaceholder: '请输入手机号/工号' + phoneAndJobCodePlaceholder: '请输入手机号/工号', + jobCodeLabel: '工号', + jobCodePlaceholder: '请输入工号', }, mobile: { label1: '手机号', diff --git a/src/spdm/config.ts b/src/spdm/config.ts index cea91d1..18a0bcc 100644 --- a/src/spdm/config.ts +++ b/src/spdm/config.ts @@ -5,10 +5,10 @@ // export const CODE_ENV = 'production'; // 生产环境 // 测试环境 -export const SPDM_URL = 'http://192.168.65.161:3000'; // SPDM项目地址 -export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl -export const TENANT_NAME = 'lyric'; // 租户:利元亨 -export const CODE_ENV = 'test'; // 测试环境 +// export const SPDM_URL = 'http://192.168.65.161:3000'; // SPDM项目地址 +// export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl +// export const TENANT_NAME = 'lyric'; // 租户:利元亨 +// export const CODE_ENV = 'test'; // 测试环境 // // 190.100 // export const SPDM_URL = 'http://192.168.190.100:3000'; // SPDM项目地址 @@ -23,8 +23,8 @@ export const CODE_ENV = 'test'; // 测试环境 // export const CODE_ENV = 'lyric-intranet'; // 利元亨内网环境 // // 本地环境 -// // export const SPDM_URL = 'http://192.168.65.64:3001'; // SPDM项目地址(李靖本地) -// export const SPDM_URL = 'http://192.168.65.61:3001'; // SPDM项目地址(董志欢本地) -// export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl -// export const TENANT_NAME = 'lyric'; // 租户:利元亨 -// export const CODE_ENV = 'local-dev'; // 本地开发环境 +// export const SPDM_URL = 'http://192.168.65.64:3001'; // SPDM项目地址(李靖本地) +export const SPDM_URL = 'http://192.168.65.61:3001'; // SPDM项目地址(董志欢本地) +export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl +export const TENANT_NAME = 'lyric'; // 租户:利元亨 +export const CODE_ENV = 'local-dev'; // 本地开发环境 diff --git a/src/spdm/views/index.vue b/src/spdm/views/index.vue index 8372ff7..01dd1ba 100644 --- a/src/spdm/views/index.vue +++ b/src/spdm/views/index.vue @@ -14,10 +14,7 @@ USER_INFO_DATA, jump: jumpFun }" - :plugins="[ - DocElementRectPlugin(), - InstanceofPlugin(), - ]" + :plugins="[DocElementRectPlugin()]" /> @@ -27,7 +24,7 @@ import { useRoute, useRouter } from 'vue-router'; import WujieVue from "wujie-vue3"; import Cookies from 'js-cookie'; import { SPDM_URL } from '../config'; -import { DocElementRectPlugin, InstanceofPlugin } from 'wujie-polyfill'; +import { DocElementRectPlugin } from 'wujie-polyfill'; const USER_INFO_DATA = Cookies.get('cid_user_info'); const USER_ID = Cookies.get('cid_user_id'); diff --git a/src/spdm/views/preview.vue b/src/spdm/views/preview.vue index f51f07f..83e653b 100644 --- a/src/spdm/views/preview.vue +++ b/src/spdm/views/preview.vue @@ -14,10 +14,7 @@ USER_INFO_DATA, VIEW_MODE: 'preview' }" - :plugins="[ - DocElementRectPlugin(), - InstanceofPlugin(), - ]" + :plugins="[DocElementRectPlugin()]" /> @@ -26,7 +23,7 @@ import { watch } from 'vue'; import WujieVue from 'wujie-vue3'; import Cookies from 'js-cookie'; import { SPDM_URL } from '../config'; -import { DocElementRectPlugin, InstanceofPlugin } from 'wujie-polyfill'; +import { DocElementRectPlugin } from 'wujie-polyfill'; const emit = defineEmits(['load']); const { bus } = WujieVue; diff --git a/src/utils/request.ts b/src/utils/request.ts index 6bca2de..7365abd 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -1,6 +1,6 @@ -import axios, {AxiosInstance, AxiosResponse, InternalAxiosRequestConfig} from 'axios'; -import {useMessage, useMessageBox} from '/@/hooks/message'; -import {Session, Token} from '/@/utils/storage'; +import axios, { AxiosInstance, AxiosResponse, InternalAxiosRequestConfig } from 'axios'; +import { useMessage, useMessageBox } from '/@/hooks/message'; +import { Session, Token } from '/@/utils/storage'; import qs from 'qs'; import other from './other'; @@ -14,7 +14,7 @@ const service: AxiosInstance = axios.create({ timeout: 5 * 60 * 1000, // 全局超时时间 paramsSerializer: { serialize: (params: any) => { - return qs.stringify(params, {arrayFormat: 'repeat'}); + return qs.stringify(params, { arrayFormat: 'repeat' }); }, }, }); @@ -86,14 +86,14 @@ const handleResponse = (response: AxiosResponse) => { service.interceptors.response.use(handleResponse, (error) => { const status = Number(error.response.status) || 200; if (status === 423) { - return Promise.reject({msg: '"演示环境,仅供预览"'}); + return Promise.reject({ msg: '"演示环境,仅供预览"' }); } if (status === 424) { if (!reLoginConfirm) { reLoginConfirm = true; useMessageBox() - .confirm('令牌状态已过期,请点击重新登录') + .confirm('登录状态已过期,请点击重新登录') .then(() => { Session.clear(); // 清除浏览器全部临时缓存 window.location.href = '/'; // 去登录页 diff --git a/src/views/admin/system/package/index.vue b/src/views/admin/system/package/index.vue index fee0ac1..197fbcd 100644 --- a/src/views/admin/system/package/index.vue +++ b/src/views/admin/system/package/index.vue @@ -2,7 +2,13 @@
- + @@ -52,10 +58,10 @@ > {{ $t('common.delBtn') }} - +