diff --git a/.env.development b/.env.development index 488868c..8fd4e86 100644 --- a/.env.development +++ b/.env.development @@ -12,5 +12,9 @@ VITE_APP_ROUTER_PREFIX = '/' # 默认上传地址 VITE_APP_UPLOAD_URL = '/Common/UploadFile' + +#设备检查项 +MES_DEVICE_INSPECT ="/device/inspect" + #socket API VITE_APP_SOCKET_API = '/msghub' \ No newline at end of file diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 0d4c18c..80a6fba 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -83,22 +83,26 @@ const props = defineProps({ // 上传携带的参数 data: { type: Object + }, + baseUrl: { + type: String, + default: import.meta.env.VITE_APP_BASE_API } }) - const { proxy } = getCurrentInstance() const emit = defineEmits() const number = ref(0) const uploadList = ref([]) const dialogImageUrl = ref('') const dialogVisible = ref(false) -const baseUrl = import.meta.env.VITE_APP_BASE_API -const uploadImgUrl = ref(baseUrl + import.meta.env.VITE_APP_UPLOAD_URL) // 上传的图片服务器地址 +//const baseUrl = import.meta.env.VITE_APP_BASE_API +const uploadImgUrl = ref(props.baseUrl + import.meta.env.VITE_APP_UPLOAD_URL) // 上传的图片服务器地址 + const headers = ref({ Authorization: 'Bearer ' + getToken() }) const fileList = ref([]) const showTip = computed(() => props.isShowTip && (props.fileType || props.fileSize)) const uploadData = computed(() => props.data) - +// 文件上传地址 watch( () => props.modelValue, (val) => { diff --git a/src/views/deviceManagement/deviceinspect/index.vue b/src/views/deviceManagement/deviceinspect/index.vue index e1ddcec..728fb95 100644 --- a/src/views/deviceManagement/deviceinspect/index.vue +++ b/src/views/deviceManagement/deviceinspect/index.vue @@ -82,6 +82,7 @@ + @@ -131,7 +132,7 @@ @@ -141,6 +142,9 @@ import { listDeviceInspect, addDeviceInspect, delDeviceInspect, updateDeviceInspect, getDeviceInspect } from '@/api/deviceManagement/deviceinspect' import { default as formconfig } from '@/views/deviceManagement/deviceformconfig/index' + +//const baseUrl = import.meta.env.MES_DEVICE_INSPECT + const { proxy } = getCurrentInstance() const ids = ref([]) const loading = ref(false)