diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/request.ts b/src/api/request.ts index 43bc556..fedfcda 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -21,9 +21,8 @@ }, }) } - const request = axios.create({ - baseURL: window.localStorage.getItem('baseUrlBusiness')!, + baseURL: window.localStorage.getItem('baseUrlBusiness-eqpt')!, // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', @@ -31,6 +30,7 @@ request.interceptors.request.use( (request) => { + console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/request.ts b/src/api/request.ts index 43bc556..fedfcda 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -21,9 +21,8 @@ }, }) } - const request = axios.create({ - baseURL: window.localStorage.getItem('baseUrlBusiness')!, + baseURL: window.localStorage.getItem('baseUrlBusiness-eqpt')!, // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', @@ -31,6 +30,7 @@ request.interceptors.request.use( (request) => { + console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/assets/images/login-image-new/bg.png b/src/assets/images/login-image-new/bg.png new file mode 100644 index 0000000..692259d --- /dev/null +++ b/src/assets/images/login-image-new/bg.png Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/request.ts b/src/api/request.ts index 43bc556..fedfcda 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -21,9 +21,8 @@ }, }) } - const request = axios.create({ - baseURL: window.localStorage.getItem('baseUrlBusiness')!, + baseURL: window.localStorage.getItem('baseUrlBusiness-eqpt')!, // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', @@ -31,6 +30,7 @@ request.interceptors.request.use( (request) => { + console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/assets/images/login-image-new/bg.png b/src/assets/images/login-image-new/bg.png new file mode 100644 index 0000000..692259d --- /dev/null +++ b/src/assets/images/login-image-new/bg.png Binary files differ diff --git a/src/assets/images/login-image-new/login-bg.png b/src/assets/images/login-image-new/login-bg.png new file mode 100644 index 0000000..8ec31d1 --- /dev/null +++ b/src/assets/images/login-image-new/login-bg.png Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/request.ts b/src/api/request.ts index 43bc556..fedfcda 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -21,9 +21,8 @@ }, }) } - const request = axios.create({ - baseURL: window.localStorage.getItem('baseUrlBusiness')!, + baseURL: window.localStorage.getItem('baseUrlBusiness-eqpt')!, // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', @@ -31,6 +30,7 @@ request.interceptors.request.use( (request) => { + console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/assets/images/login-image-new/bg.png b/src/assets/images/login-image-new/bg.png new file mode 100644 index 0000000..692259d --- /dev/null +++ b/src/assets/images/login-image-new/bg.png Binary files differ diff --git a/src/assets/images/login-image-new/login-bg.png b/src/assets/images/login-image-new/login-bg.png new file mode 100644 index 0000000..8ec31d1 --- /dev/null +++ b/src/assets/images/login-image-new/login-bg.png Binary files differ diff --git a/src/assets/images/login-image-new/logo-border.png b/src/assets/images/login-image-new/logo-border.png new file mode 100644 index 0000000..0d201f6 --- /dev/null +++ b/src/assets/images/login-image-new/logo-border.png Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/request.ts b/src/api/request.ts index 43bc556..fedfcda 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -21,9 +21,8 @@ }, }) } - const request = axios.create({ - baseURL: window.localStorage.getItem('baseUrlBusiness')!, + baseURL: window.localStorage.getItem('baseUrlBusiness-eqpt')!, // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', @@ -31,6 +30,7 @@ request.interceptors.request.use( (request) => { + console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/assets/images/login-image-new/bg.png b/src/assets/images/login-image-new/bg.png new file mode 100644 index 0000000..692259d --- /dev/null +++ b/src/assets/images/login-image-new/bg.png Binary files differ diff --git a/src/assets/images/login-image-new/login-bg.png b/src/assets/images/login-image-new/login-bg.png new file mode 100644 index 0000000..8ec31d1 --- /dev/null +++ b/src/assets/images/login-image-new/login-bg.png Binary files differ diff --git a/src/assets/images/login-image-new/logo-border.png b/src/assets/images/login-image-new/logo-border.png new file mode 100644 index 0000000..0d201f6 --- /dev/null +++ b/src/assets/images/login-image-new/logo-border.png Binary files differ diff --git a/src/assets/images/login-image-new/logo.png b/src/assets/images/login-image-new/logo.png new file mode 100644 index 0000000..6f816cb --- /dev/null +++ b/src/assets/images/login-image-new/logo.png Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/request.ts b/src/api/request.ts index 43bc556..fedfcda 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -21,9 +21,8 @@ }, }) } - const request = axios.create({ - baseURL: window.localStorage.getItem('baseUrlBusiness')!, + baseURL: window.localStorage.getItem('baseUrlBusiness-eqpt')!, // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', @@ -31,6 +30,7 @@ request.interceptors.request.use( (request) => { + console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/assets/images/login-image-new/bg.png b/src/assets/images/login-image-new/bg.png new file mode 100644 index 0000000..692259d --- /dev/null +++ b/src/assets/images/login-image-new/bg.png Binary files differ diff --git a/src/assets/images/login-image-new/login-bg.png b/src/assets/images/login-image-new/login-bg.png new file mode 100644 index 0000000..8ec31d1 --- /dev/null +++ b/src/assets/images/login-image-new/login-bg.png Binary files differ diff --git a/src/assets/images/login-image-new/logo-border.png b/src/assets/images/login-image-new/logo-border.png new file mode 100644 index 0000000..0d201f6 --- /dev/null +++ b/src/assets/images/login-image-new/logo-border.png Binary files differ diff --git a/src/assets/images/login-image-new/logo.png b/src/assets/images/login-image-new/logo.png new file mode 100644 index 0000000..6f816cb --- /dev/null +++ b/src/assets/images/login-image-new/logo.png Binary files differ diff --git "a/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" new file mode 100644 index 0000000..2a79e59 --- /dev/null +++ "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/request.ts b/src/api/request.ts index 43bc556..fedfcda 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -21,9 +21,8 @@ }, }) } - const request = axios.create({ - baseURL: window.localStorage.getItem('baseUrlBusiness')!, + baseURL: window.localStorage.getItem('baseUrlBusiness-eqpt')!, // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', @@ -31,6 +30,7 @@ request.interceptors.request.use( (request) => { + console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/assets/images/login-image-new/bg.png b/src/assets/images/login-image-new/bg.png new file mode 100644 index 0000000..692259d --- /dev/null +++ b/src/assets/images/login-image-new/bg.png Binary files differ diff --git a/src/assets/images/login-image-new/login-bg.png b/src/assets/images/login-image-new/login-bg.png new file mode 100644 index 0000000..8ec31d1 --- /dev/null +++ b/src/assets/images/login-image-new/login-bg.png Binary files differ diff --git a/src/assets/images/login-image-new/logo-border.png b/src/assets/images/login-image-new/logo-border.png new file mode 100644 index 0000000..0d201f6 --- /dev/null +++ b/src/assets/images/login-image-new/logo-border.png Binary files differ diff --git a/src/assets/images/login-image-new/logo.png b/src/assets/images/login-image-new/logo.png new file mode 100644 index 0000000..6f816cb --- /dev/null +++ b/src/assets/images/login-image-new/logo.png Binary files differ diff --git "a/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" new file mode 100644 index 0000000..2a79e59 --- /dev/null +++ "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\345\244\251\345\271\263.png" "b/src/assets/images/login-image-new/\345\244\251\345\271\263.png" new file mode 100644 index 0000000..1e7d249 --- /dev/null +++ "b/src/assets/images/login-image-new/\345\244\251\345\271\263.png" Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/request.ts b/src/api/request.ts index 43bc556..fedfcda 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -21,9 +21,8 @@ }, }) } - const request = axios.create({ - baseURL: window.localStorage.getItem('baseUrlBusiness')!, + baseURL: window.localStorage.getItem('baseUrlBusiness-eqpt')!, // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', @@ -31,6 +30,7 @@ request.interceptors.request.use( (request) => { + console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/assets/images/login-image-new/bg.png b/src/assets/images/login-image-new/bg.png new file mode 100644 index 0000000..692259d --- /dev/null +++ b/src/assets/images/login-image-new/bg.png Binary files differ diff --git a/src/assets/images/login-image-new/login-bg.png b/src/assets/images/login-image-new/login-bg.png new file mode 100644 index 0000000..8ec31d1 --- /dev/null +++ b/src/assets/images/login-image-new/login-bg.png Binary files differ diff --git a/src/assets/images/login-image-new/logo-border.png b/src/assets/images/login-image-new/logo-border.png new file mode 100644 index 0000000..0d201f6 --- /dev/null +++ b/src/assets/images/login-image-new/logo-border.png Binary files differ diff --git a/src/assets/images/login-image-new/logo.png b/src/assets/images/login-image-new/logo.png new file mode 100644 index 0000000..6f816cb --- /dev/null +++ b/src/assets/images/login-image-new/logo.png Binary files differ diff --git "a/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" new file mode 100644 index 0000000..2a79e59 --- /dev/null +++ "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\345\244\251\345\271\263.png" "b/src/assets/images/login-image-new/\345\244\251\345\271\263.png" new file mode 100644 index 0000000..1e7d249 --- /dev/null +++ "b/src/assets/images/login-image-new/\345\244\251\345\271\263.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" "b/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" new file mode 100644 index 0000000..c31d030 --- /dev/null +++ "b/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/request.ts b/src/api/request.ts index 43bc556..fedfcda 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -21,9 +21,8 @@ }, }) } - const request = axios.create({ - baseURL: window.localStorage.getItem('baseUrlBusiness')!, + baseURL: window.localStorage.getItem('baseUrlBusiness-eqpt')!, // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', @@ -31,6 +30,7 @@ request.interceptors.request.use( (request) => { + console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/assets/images/login-image-new/bg.png b/src/assets/images/login-image-new/bg.png new file mode 100644 index 0000000..692259d --- /dev/null +++ b/src/assets/images/login-image-new/bg.png Binary files differ diff --git a/src/assets/images/login-image-new/login-bg.png b/src/assets/images/login-image-new/login-bg.png new file mode 100644 index 0000000..8ec31d1 --- /dev/null +++ b/src/assets/images/login-image-new/login-bg.png Binary files differ diff --git a/src/assets/images/login-image-new/logo-border.png b/src/assets/images/login-image-new/logo-border.png new file mode 100644 index 0000000..0d201f6 --- /dev/null +++ b/src/assets/images/login-image-new/logo-border.png Binary files differ diff --git a/src/assets/images/login-image-new/logo.png b/src/assets/images/login-image-new/logo.png new file mode 100644 index 0000000..6f816cb --- /dev/null +++ b/src/assets/images/login-image-new/logo.png Binary files differ diff --git "a/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" new file mode 100644 index 0000000..2a79e59 --- /dev/null +++ "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\345\244\251\345\271\263.png" "b/src/assets/images/login-image-new/\345\244\251\345\271\263.png" new file mode 100644 index 0000000..1e7d249 --- /dev/null +++ "b/src/assets/images/login-image-new/\345\244\251\345\271\263.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" "b/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" new file mode 100644 index 0000000..c31d030 --- /dev/null +++ "b/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\346\270\251\346\271\277\345\272\246.png" "b/src/assets/images/login-image-new/\346\270\251\346\271\277\345\272\246.png" new file mode 100644 index 0000000..94b0eed --- /dev/null +++ "b/src/assets/images/login-image-new/\346\270\251\346\271\277\345\272\246.png" Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/request.ts b/src/api/request.ts index 43bc556..fedfcda 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -21,9 +21,8 @@ }, }) } - const request = axios.create({ - baseURL: window.localStorage.getItem('baseUrlBusiness')!, + baseURL: window.localStorage.getItem('baseUrlBusiness-eqpt')!, // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', @@ -31,6 +30,7 @@ request.interceptors.request.use( (request) => { + console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/assets/images/login-image-new/bg.png b/src/assets/images/login-image-new/bg.png new file mode 100644 index 0000000..692259d --- /dev/null +++ b/src/assets/images/login-image-new/bg.png Binary files differ diff --git a/src/assets/images/login-image-new/login-bg.png b/src/assets/images/login-image-new/login-bg.png new file mode 100644 index 0000000..8ec31d1 --- /dev/null +++ b/src/assets/images/login-image-new/login-bg.png Binary files differ diff --git a/src/assets/images/login-image-new/logo-border.png b/src/assets/images/login-image-new/logo-border.png new file mode 100644 index 0000000..0d201f6 --- /dev/null +++ b/src/assets/images/login-image-new/logo-border.png Binary files differ diff --git a/src/assets/images/login-image-new/logo.png b/src/assets/images/login-image-new/logo.png new file mode 100644 index 0000000..6f816cb --- /dev/null +++ b/src/assets/images/login-image-new/logo.png Binary files differ diff --git "a/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" new file mode 100644 index 0000000..2a79e59 --- /dev/null +++ "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\345\244\251\345\271\263.png" "b/src/assets/images/login-image-new/\345\244\251\345\271\263.png" new file mode 100644 index 0000000..1e7d249 --- /dev/null +++ "b/src/assets/images/login-image-new/\345\244\251\345\271\263.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" "b/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" new file mode 100644 index 0000000..c31d030 --- /dev/null +++ "b/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\346\270\251\346\271\277\345\272\246.png" "b/src/assets/images/login-image-new/\346\270\251\346\271\277\345\272\246.png" new file mode 100644 index 0000000..94b0eed --- /dev/null +++ "b/src/assets/images/login-image-new/\346\270\251\346\271\277\345\272\246.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\351\200\211\344\270\255.png" "b/src/assets/images/login-image-new/\351\200\211\344\270\255.png" new file mode 100644 index 0000000..b04874c --- /dev/null +++ "b/src/assets/images/login-image-new/\351\200\211\344\270\255.png" Binary files differ diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/request.ts b/src/api/request.ts index 43bc556..fedfcda 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -21,9 +21,8 @@ }, }) } - const request = axios.create({ - baseURL: window.localStorage.getItem('baseUrlBusiness')!, + baseURL: window.localStorage.getItem('baseUrlBusiness-eqpt')!, // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', @@ -31,6 +30,7 @@ request.interceptors.request.use( (request) => { + console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/assets/images/login-image-new/bg.png b/src/assets/images/login-image-new/bg.png new file mode 100644 index 0000000..692259d --- /dev/null +++ b/src/assets/images/login-image-new/bg.png Binary files differ diff --git a/src/assets/images/login-image-new/login-bg.png b/src/assets/images/login-image-new/login-bg.png new file mode 100644 index 0000000..8ec31d1 --- /dev/null +++ b/src/assets/images/login-image-new/login-bg.png Binary files differ diff --git a/src/assets/images/login-image-new/logo-border.png b/src/assets/images/login-image-new/logo-border.png new file mode 100644 index 0000000..0d201f6 --- /dev/null +++ b/src/assets/images/login-image-new/logo-border.png Binary files differ diff --git a/src/assets/images/login-image-new/logo.png b/src/assets/images/login-image-new/logo.png new file mode 100644 index 0000000..6f816cb --- /dev/null +++ b/src/assets/images/login-image-new/logo.png Binary files differ diff --git "a/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" new file mode 100644 index 0000000..2a79e59 --- /dev/null +++ "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\345\244\251\345\271\263.png" "b/src/assets/images/login-image-new/\345\244\251\345\271\263.png" new file mode 100644 index 0000000..1e7d249 --- /dev/null +++ "b/src/assets/images/login-image-new/\345\244\251\345\271\263.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" "b/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" new file mode 100644 index 0000000..c31d030 --- /dev/null +++ "b/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\346\270\251\346\271\277\345\272\246.png" "b/src/assets/images/login-image-new/\346\270\251\346\271\277\345\272\246.png" new file mode 100644 index 0000000..94b0eed --- /dev/null +++ "b/src/assets/images/login-image-new/\346\270\251\346\271\277\345\272\246.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\351\200\211\344\270\255.png" "b/src/assets/images/login-image-new/\351\200\211\344\270\255.png" new file mode 100644 index 0000000..b04874c --- /dev/null +++ "b/src/assets/images/login-image-new/\351\200\211\344\270\255.png" Binary files differ diff --git a/src/main.ts b/src/main.ts index c9ce15a..1ba682b 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,5 +1,5 @@ import { createApp } from 'vue' -import ElementPlus from 'element-plus' +import ElementPlus, { ElMessage } from 'element-plus' import print from 'vue3-print-nb' import axios from 'axios' import * as ElementPlusIconsVue from '@element-plus/icons-vue' @@ -9,6 +9,7 @@ import router from './router' import useSettingsStore from './store/modules/settings' import request from '@/api/index' +import request1 from '@/api/request' // 自定义指令 import directive from '@/utils/directive' // 加载 svg 图标 @@ -39,14 +40,16 @@ axios.get('./config/config.json').then((result) => { console.log('get config') console.log(result) - request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 app.config.globalProperties.config = result.data app.config.globalProperties.$pathDict = result.data.pathDict window.$pathDict = result.data.pathDict - window.localStorage.setItem('baseURL', result.data.baseUrl) - window.localStorage.setItem('baseUrlBusiness', result.data.baseUrlBusiness) + window.localStorage.setItem('baseURL-eqpt', result.data.baseUrl) + window.localStorage.setItem('baseUrlBusiness-eqpt', result.data.baseUrlBusiness) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) + request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 + request1.defaults.baseURL = result.data.baseUrlBusiness // 设置默认请求网址 app.mount('#app') + ElMessage.success('获取默认配置成功') }).catch((error) => { console.error(`get baseConfig error...${error}`) }) diff --git a/src/api/index.ts b/src/api/index.ts index 5a11d44..0cdd702 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -24,7 +24,7 @@ } const request = axios.create({ - baseURL: window.localStorage.getItem('baseURL')!, + baseURL: window.localStorage.getItem('baseURL-eqpt')!, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, timeout: 1000 * 60, responseType: 'json', diff --git a/src/api/request.ts b/src/api/request.ts index 43bc556..fedfcda 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -21,9 +21,8 @@ }, }) } - const request = axios.create({ - baseURL: window.localStorage.getItem('baseUrlBusiness')!, + baseURL: window.localStorage.getItem('baseUrlBusiness-eqpt')!, // baseURL: import.meta.env.VITE_METER_API_BASEURL, timeout: 1000 * 60, responseType: 'json', @@ -31,6 +30,7 @@ request.interceptors.request.use( (request) => { + console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/assets/images/login-image-new/bg.png b/src/assets/images/login-image-new/bg.png new file mode 100644 index 0000000..692259d --- /dev/null +++ b/src/assets/images/login-image-new/bg.png Binary files differ diff --git a/src/assets/images/login-image-new/login-bg.png b/src/assets/images/login-image-new/login-bg.png new file mode 100644 index 0000000..8ec31d1 --- /dev/null +++ b/src/assets/images/login-image-new/login-bg.png Binary files differ diff --git a/src/assets/images/login-image-new/logo-border.png b/src/assets/images/login-image-new/logo-border.png new file mode 100644 index 0000000..0d201f6 --- /dev/null +++ b/src/assets/images/login-image-new/logo-border.png Binary files differ diff --git a/src/assets/images/login-image-new/logo.png b/src/assets/images/login-image-new/logo.png new file mode 100644 index 0000000..6f816cb --- /dev/null +++ b/src/assets/images/login-image-new/logo.png Binary files differ diff --git "a/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" new file mode 100644 index 0000000..2a79e59 --- /dev/null +++ "b/src/assets/images/login-image-new/\344\270\207\347\224\250\350\241\250.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\345\244\251\345\271\263.png" "b/src/assets/images/login-image-new/\345\244\251\345\271\263.png" new file mode 100644 index 0000000..1e7d249 --- /dev/null +++ "b/src/assets/images/login-image-new/\345\244\251\345\271\263.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" "b/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" new file mode 100644 index 0000000..c31d030 --- /dev/null +++ "b/src/assets/images/login-image-new/\346\234\252\351\200\211\344\270\255.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\346\270\251\346\271\277\345\272\246.png" "b/src/assets/images/login-image-new/\346\270\251\346\271\277\345\272\246.png" new file mode 100644 index 0000000..94b0eed --- /dev/null +++ "b/src/assets/images/login-image-new/\346\270\251\346\271\277\345\272\246.png" Binary files differ diff --git "a/src/assets/images/login-image-new/\351\200\211\344\270\255.png" "b/src/assets/images/login-image-new/\351\200\211\344\270\255.png" new file mode 100644 index 0000000..b04874c --- /dev/null +++ "b/src/assets/images/login-image-new/\351\200\211\344\270\255.png" Binary files differ diff --git a/src/main.ts b/src/main.ts index c9ce15a..1ba682b 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,5 +1,5 @@ import { createApp } from 'vue' -import ElementPlus from 'element-plus' +import ElementPlus, { ElMessage } from 'element-plus' import print from 'vue3-print-nb' import axios from 'axios' import * as ElementPlusIconsVue from '@element-plus/icons-vue' @@ -9,6 +9,7 @@ import router from './router' import useSettingsStore from './store/modules/settings' import request from '@/api/index' +import request1 from '@/api/request' // 自定义指令 import directive from '@/utils/directive' // 加载 svg 图标 @@ -39,14 +40,16 @@ axios.get('./config/config.json').then((result) => { console.log('get config') console.log(result) - request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 app.config.globalProperties.config = result.data app.config.globalProperties.$pathDict = result.data.pathDict window.$pathDict = result.data.pathDict - window.localStorage.setItem('baseURL', result.data.baseUrl) - window.localStorage.setItem('baseUrlBusiness', result.data.baseUrlBusiness) + window.localStorage.setItem('baseURL-eqpt', result.data.baseUrl) + window.localStorage.setItem('baseUrlBusiness-eqpt', result.data.baseUrlBusiness) window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) + request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 + request1.defaults.baseURL = result.data.baseUrlBusiness // 设置默认请求网址 app.mount('#app') + ElMessage.success('获取默认配置成功') }).catch((error) => { console.error(`get baseConfig error...${error}`) }) diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue index d1ac53c..949bab7 100644 --- a/src/views/dashboard.vue +++ b/src/views/dashboard.vue @@ -58,20 +58,27 @@