Web/daimp-front
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

Browse Source
This commit is contained in:
13713575202 2025-05-30 11:41:59 +08:00
commit 8aa99b67ec
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/.env.development
View File

@ -18,3 +18,4 @@ VITE_APP_UPLOAD_API = '/uploadApis'
# 内网接口地址 # 内网接口地址
VITE_APP_BASE_URL = 'http://192.168.18.9:8080' VITE_APP_BASE_URL = 'http://192.168.18.9:8080'
VITE_APP_UPLOAD_URL = 'http://192.168.18.9:9300' VITE_APP_UPLOAD_URL = 'http://192.168.18.9:9300'
VITE_APP_VIST_URL = 'http://192.168.18.99'

1
main/.env.production
View File

@ -12,4 +12,5 @@ VITE_APP_BASE_API = '/apis'
VITE_APP_BASE_URL = '' VITE_APP_BASE_URL = ''
VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_API = '/uploadApis'
VITE_APP_UPLOAD_URL = '' VITE_APP_UPLOAD_URL = ''
VITE_APP_VIST_URL = 'http://47.109.205.240'

6
main/src/micro/app.js
View File

@ -1,6 +1,6 @@
import actions from './actions'; import actions from './actions';
const { VITE_APP_SUB_OS, VITE_APP_SUB_OA, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS, VITE_APP_SUB_GSR } = import.meta.env; const { VITE_APP_SUB_OS, VITE_APP_SUB_OA, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS, VITE_APP_SUB_GSR, VITE_APP_VIST_URL } = import.meta.env;
export const leftApps = [ export const leftApps = [
{ {
@ -13,7 +13,7 @@ export const leftApps = [
{ {
name: 'sub-operation-admin', name: 'sub-operation-admin',
entry: VITE_APP_SUB_OA, entry: VITE_APP_SUB_OA,
activeRule: 'http://192.168.18.99:82/login?loginType=2', activeRule: `${VITE_APP_VIST_URL}:82/login`,
title: '管理后台', title: '管理后台',
icon: 'images/platform/icon-admin.png', icon: 'images/platform/icon-admin.png',
}, },
@ -44,7 +44,7 @@ export const rightApps = [
{ {
name: 'sub-government-admin', name: 'sub-government-admin',
entry: VITE_APP_SUB_GAS, entry: VITE_APP_SUB_GAS,
activeRule: 'http://192.168.18.99:81/login?loginType=1', activeRule: `${VITE_APP_VIST_URL}:82/login`,
title: '管理后台', title: '管理后台',
icon: 'images/platform/icon-admin.png', icon: 'images/platform/icon-admin.png',
}, },

1
main/src/views/index.vue
View File

@ -36,6 +36,7 @@ import { getAssetsFile } from '@/utils';
const gotoPage = (row) => { const gotoPage = (row) => {
// window.history.pushState({}, row.name, row.activeRule); // window.history.pushState({}, row.name, row.activeRule);
console.log(row.activeRule);
if (row.name == 'sub-app1') { if (row.name == 'sub-app1') {
window.location.href = 'https://www.pgyer.com/MXd3uUrO'; window.location.href = 'https://www.pgyer.com/MXd3uUrO';
} else if (row.name == 'sub-app2') { } else if (row.name == 'sub-app2') {

1
new-digital-agriculture-screen/.env.production
View File

@ -7,6 +7,7 @@
VITE_APP_MIAN = 'daimp-front-main' VITE_APP_MIAN = 'daimp-front-main'
VITE_APP_MIAN_URL = 'http://47.109.205.240:88' VITE_APP_MIAN_URL = 'http://47.109.205.240:88'
VITE_APP_NAME = 'new-digital-agriculture-screen' VITE_APP_NAME = 'new-digital-agriculture-screen'
VITE_APP_TITLE = '政务云数字农业智慧大屏'
# 接口 # 接口
VITE_APP_BASE_API = '/apis' VITE_APP_BASE_API = '/apis'
VITE_APP_BASE_URL = '' VITE_APP_BASE_URL = ''