diff --git a/.env.development b/.env.development index fe20df3..21892b7 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.159:8898' +VITE_APP_BASE_API = 'http://192.168.110.180:8898' # 无人机接口地址 diff --git a/src/api/design/designChange/index.ts b/src/api/design/designChange/index.ts index 020acf8..41e1e39 100644 --- a/src/api/design/designChange/index.ts +++ b/src/api/design/designChange/index.ts @@ -31,7 +31,7 @@ export const getDesignChange = (id: string | number): AxiosPromise { +export const addDesignChange = (data) => { return request({ url: '/design/designChange', method: 'post', diff --git a/src/api/design/volumeCatalog/index.ts b/src/api/design/volumeCatalog/index.ts index 37bcd37..5eae539 100644 --- a/src/api/design/volumeCatalog/index.ts +++ b/src/api/design/volumeCatalog/index.ts @@ -8,7 +8,7 @@ import { VolumeCatalogVO, VolumeCatalogForm, VolumeCatalogQuery } from '@/api/de * @returns {*} */ -export const listVolumeCatalog = (query?: VolumeCatalogQuery): AxiosPromise => { +export const listVolumeCatalog = (query) => { return request({ url: '/design/volumeCatalog/list', method: 'get', diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 961904a..fc2b092 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -46,7 +46,12 @@ tag="ul" @click.stop > -
  • +
  • {{ getFileName(file.name) }} diff --git a/src/views/design/designChange/index copy.vue b/src/views/design/designChange/index copy.vue new file mode 100644 index 0000000..afa3e43 --- /dev/null +++ b/src/views/design/designChange/index copy.vue @@ -0,0 +1,221 @@ + + + diff --git a/src/views/design/designChange/index.vue b/src/views/design/designChange/index.vue index 97a8492..2131dd5 100644 --- a/src/views/design/designChange/index.vue +++ b/src/views/design/designChange/index.vue @@ -34,56 +34,58 @@ - - - - - - + + + + + - - - + + + + + + + + - - - - - - - - - + + @@ -115,6 +117,10 @@ const multiple = ref(true); const total = ref(0); const { wf_business_status } = toRefs(proxy?.useDict('wf_business_status')); const queryFormRef = ref(); +const uploadUrl = computed(() => { + return `/design/collectFile/upload`; +}); +const ossid = ref(null); const data = reactive({ queryParams: { pageNum: 1, @@ -146,6 +152,7 @@ const getList = async () => { /** 搜索按钮操作 */ const handleQuery = () => { + console.log(ossid.value); queryParams.value.pageNum = 1; getList(); }; @@ -165,15 +172,14 @@ const handleAdd = () => { } }); }; - -/** 修改按钮操作 */ -const handleUpdate = async (row?: DesignChangeVO) => { +// 变更图纸 +const handleAddChange = (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/design-management/designChange/indexEdit`, + path: `/design-management/drawing/indexEdit`, query: { id: row.id, - type: 'update' + type: 'add' } }); }; @@ -181,7 +187,7 @@ const handleUpdate = async (row?: DesignChangeVO) => { const handleViewInfo = (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/design-management/designChange/indexEdit`, + path: `/design-management/drawing/indexEdit`, query: { id: row.id, type: 'view' @@ -204,6 +210,7 @@ const handleView = (row) => { const onOpen = (path: string) => { window.open(path, '_blank'); }; + onMounted(() => { getList(); }); diff --git a/src/views/design/designChange/indexEdit copy.vue b/src/views/design/designChange/indexEdit copy.vue new file mode 100644 index 0000000..fc92386 --- /dev/null +++ b/src/views/design/designChange/indexEdit copy.vue @@ -0,0 +1,500 @@ + + + + diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue index fc92386..209cae5 100644 --- a/src/views/design/designChange/indexEdit.vue +++ b/src/views/design/designChange/indexEdit.vue @@ -1,33 +1,13 @@ diff --git a/src/views/design/drawing/indexEdit.vue b/src/views/design/drawing/indexEdit.vue index 51f076c..f72e2ec 100644 --- a/src/views/design/drawing/indexEdit.vue +++ b/src/views/design/drawing/indexEdit.vue @@ -1,5 +1,5 @@