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:
沈鸿 2025-07-01 17:07:06 +08:00
commit f3faeb75f8
5 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/.env.development
View File

@ -16,6 +16,6 @@ VITE_APP_UPLOAD_API = '/uploadApis'
# VITE_APP_BASE_URL = 'http://47.109.205.240:8080' # VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
# VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300' # VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
# 内网接口地址 # 内网接口地址
VITE_APP_BASE_URL = 'http://192.168.18.88:8080' VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
VITE_APP_UPLOAD_URL = 'http://192.168.18.88:8080' VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
VITE_APP_VIST_URL = 'http://192.168.18.99' VITE_APP_VIST_URL = 'http://192.168.18.99'

4
sub-government-affairs-service/.env.development
View File

@ -13,8 +13,8 @@ VITE_APP_UPLOAD_API = '/uploadApis'
# VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9204' # VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9204'
# 内网测试库接口地址 # 内网测试库接口地址
VITE_APP_BASE_URL = 'http://192.168.18.88:8080' VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
VITE_APP_UPLOAD_URL = 'http://192.168.18.88:8080' VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
# 本地开发接口地址 # 本地开发接口地址
# VITE_APP_BASE_URL = 'http://192.168.18.99:8080' # VITE_APP_BASE_URL = 'http://192.168.18.99:8080'

3
sub-government-affairs-service/src/layouts/component/Header/index.vue
View File

@ -34,10 +34,7 @@ import Breadcrumb from '../Breadcrumb';
import ScreenFull from '../ScreenFull'; import ScreenFull from '../ScreenFull';
import Avatar from '../Avatar'; import Avatar from '../Avatar';
import TagsView from '../TagsView'; import TagsView from '../TagsView';
const { VITE_APP_PLATFORM } = import.meta.env;
const goHome = () => { const goHome = () => {
// window.location.href = VITE_APP_PLATFORM;
window.location.href = '/'; window.location.href = '/';
}; };

12
sub-government-affairs-service/src/views/trace/planting/seedling/use/index.vue
View File

@ -149,7 +149,7 @@ const columns = ref([
{ prop: 'provenanceName', label: '种子种苗名称' }, { prop: 'provenanceName', label: '种子种苗名称' },
{ prop: 'useNumber', label: '使用量', formatter: (row) => `${row.useNumber} ${row.useUnit}` }, { prop: 'useNumber', label: '使用量', formatter: (row) => `${row.useNumber} ${row.useUnit}` },
{ prop: 'useTime', label: '使用时间' }, { prop: 'useTime', label: '使用时间' },
{ prop: 'action', label: '操作', slotName: 'action', width: 100, fixed: 'right' }, // { prop: 'action', label: '操作', slotName: 'action', width: 100, fixed: 'right' },
]); ]);
const handlePaginationChange = ({ page, pageSize }) => { const handlePaginationChange = ({ page, pageSize }) => {
formInline.current = page; formInline.current = page;
@ -224,11 +224,11 @@ const dialogFormRules = ref({
detectionTime: [{ required: true, message: '请选择使用时间', trigger: 'blur' }], detectionTime: [{ required: true, message: '请选择使用时间', trigger: 'blur' }],
}); });
const addItem = async () => { const addItem = async () => {
// ElMessage.success('点击新增!'); ElMessage.success('点击新增!');
restDialogForm(); // restDialogForm();
dialogTitle.value = '新增'; // dialogTitle.value = '新增';
formDisabled.value = false; // formDisabled.value = false;
dialogFormVisible.value = true; // dialogFormVisible.value = true;
}; };
const seeDetails = async (row) => { const seeDetails = async (row) => {
// ElMessage.success('查看详情!'); // ElMessage.success('查看详情!');

3
sub-operation-service/src/layouts/component/Header/index.vue
View File

@ -78,8 +78,6 @@ import { getAssetsFile } from '@/utils';
import { getGoodNum } from '@/apis/agricultural.js'; import { getGoodNum } from '@/apis/agricultural.js';
import { useMethodsStore } from '@/store/modules/methods'; import { useMethodsStore } from '@/store/modules/methods';
const { VITE_APP_PLATFORM } = import.meta.env;
const router = useRouter(); const router = useRouter();
const keyword = ref(''); const keyword = ref('');
@ -145,7 +143,6 @@ function Search() {
const toHome = () => { const toHome = () => {
console.info('toHome', router); console.info('toHome', router);
// window.location.href = VITE_APP_PLATFORM;
window.location.href = '/'; window.location.href = '/';
}; };