This commit is contained in:
parent
062594b9b5
commit
ffa63f29ee
|
|
@ -138,7 +138,7 @@ import {
|
||||||
getProjectList,
|
getProjectList,
|
||||||
backTask,
|
backTask,
|
||||||
editBackTask,
|
editBackTask,
|
||||||
getAgreementInfoById,
|
getAgreementInfoByIdApi,
|
||||||
detailsBackTask,
|
detailsBackTask,
|
||||||
getUseTypeTree,
|
getUseTypeTree,
|
||||||
} from '@/services/materialsStation'
|
} from '@/services/materialsStation'
|
||||||
|
|
@ -239,7 +239,7 @@ const getAgreement = () => {
|
||||||
teamId: formData.teamId,
|
teamId: formData.teamId,
|
||||||
projectId: formData.projectId,
|
projectId: formData.projectId,
|
||||||
}
|
}
|
||||||
getAgreementInfoById(obj)
|
getAgreementInfoByIdApi(obj)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
console.log(res)
|
console.log(res)
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, computed } from 'vue'
|
import { ref, computed } from 'vue'
|
||||||
import { onLoad } from '@dcloudio/uni-app'
|
import { onLoad } from '@dcloudio/uni-app'
|
||||||
import { getToolsLedgerDetailsList } from '@/services/materialsStation'
|
import { getToolsLedgerDetailsListApi } from '@/services/materialsStation'
|
||||||
const typeId = ref(0)
|
const typeId = ref(0)
|
||||||
const searchCode = ref('')
|
const searchCode = ref('')
|
||||||
const selectedStatusIndex = ref(0)
|
const selectedStatusIndex = ref(0)
|
||||||
|
|
@ -87,7 +87,7 @@ const getDetailsList = async () => {
|
||||||
typeId: typeId.value,
|
typeId: typeId.value,
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const res = await getToolsLedgerDetailsList(params)
|
const res = await getToolsLedgerDetailsListApi(params)
|
||||||
console.log('获取设备详情列表数据:', res)
|
console.log('获取设备详情列表数据:', res)
|
||||||
|
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import { useMemberStore } from '@/stores'
|
||||||
const ENV = process.env.NODE_ENV
|
const ENV = process.env.NODE_ENV
|
||||||
// export const baseURL = ENV === 'development' ? 'http://192.168.0.244:18580' : 'http://192.168.0.244:18580'//测试
|
// export const baseURL = ENV === 'development' ? 'http://192.168.0.244:18580' : 'http://192.168.0.244:18580'//测试
|
||||||
// export const baseURL = ENV === 'development' ? 'http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api/' : 'http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api/'//生产
|
// export const baseURL = ENV === 'development' ? 'http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api/' : 'http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api/'//生产
|
||||||
export const baseURL = ENV === 'development' ? 'http://192.168.1.114:18080' : '/iws/jiju-api'; // 宏源服务
|
export const baseURL = ENV === 'development' ? '/api' : '/iws/jiju-api'; // 宏源服务
|
||||||
// export const baseURL = ENV === 'development' ? 'http://192.168.0.234:18080' : '***'
|
// export const baseURL = ENV === 'development' ? 'http://192.168.0.234:18080' : '***'
|
||||||
// export const baseURL = ENV === 'development' ? 'http://192.168.1.114:18080' : 'http://192.168.1.117:18080'//马
|
// export const baseURL = ENV === 'development' ? 'http://192.168.1.114:18080' : 'http://192.168.1.117:18080'//马
|
||||||
// export const baseURL = ENV === 'development' ? '/api' : '***'
|
// export const baseURL = ENV === 'development' ? '/api' : '***'
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,8 @@ export default defineConfig({
|
||||||
// 在此处编写代理规则
|
// 在此处编写代理规则
|
||||||
'/api': {
|
'/api': {
|
||||||
// target: 'http://192.168.2.76:18080',
|
// target: 'http://192.168.2.76:18080',
|
||||||
// target: 'http://192.168.0.244:18580',
|
target: 'http://192.168.0.41:18080',
|
||||||
target: 'http://36.33.26.201:19988/prod-api/',
|
// target: 'http://36.33.26.201:19988/prod-api/',
|
||||||
// target: 'http://192.168.0.234:18080',
|
// target: 'http://192.168.0.234:18080',
|
||||||
// target: 'http://localhost:18080',
|
// target: 'http://localhost:18080',
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue