diff --git a/.env b/.env index 87a241d..0a20353 100644 --- a/.env +++ b/.env @@ -4,7 +4,7 @@ VITE_APP_NAME=垃圾回收监管平台 # 服务器基础地址 VITE_HTTP_SERVER_BASE_URL=/api VITE_WS_SERVER_BASE_URL=/ws -VITE_OSS_UPLOAD_BASE_URL=http://localhost:9000/zsy +VITE_OSS_UPLOAD_BASE_URL=/api/oss VITE_OSS_DOWNLOAD_BASE_URL=/api/oss/download VITE_OSS_BUCKET_NAME=zsy diff --git a/src/common/index.ts b/src/common/index.ts index cbb67bd..b9c8e4c 100644 --- a/src/common/index.ts +++ b/src/common/index.ts @@ -12,9 +12,9 @@ export const appName = import.meta.env.VITE_APP_NAME * 服务器基础地址 */ export const serverBaseUrl = import.meta.env.VITE_HTTP_SERVER_BASE_URL ?? '/' -export const uploadBaseUrl = import.meta.env.VITE_OSS_UPLOAD_BASE_URL ?? '/' export const downloadBaseUrl = import.meta.env.VITE_OSS_DOWNLOAD_BASE_URL ?? '/' export const bucketName = import.meta.env.VITE_OSS_BUCKET_NAME ?? 'zsy' +export const uploadBaseUrl = import.meta.env.VITE_OSS_UPLOAD_BASE_URL ?? '/' + bucketName /** * Axios 超时时间 diff --git a/src/components/district/District.vue b/src/components/district/District.vue index 3004813..c1b4932 100644 --- a/src/components/district/District.vue +++ b/src/components/district/District.vue @@ -12,7 +12,7 @@ import DistrictTree from '@/components/district/district-tree.ts' import District from '@/components/district/district.ts' import Colls from '@/common/utils/colls.ts' -const props = defineProps<{ +defineProps<{ 'model:value': { provinceCode: number // 省 (名称); sys_district.name @@ -32,17 +32,26 @@ const emits = defineEmits([ 'update:modelValue' ]) const value = reactive([]) -const map = Colls.keyArr(District, it => it.id) +const map: { + [p: string]: { + id: string + pid: string + name: string + }[] +} = Colls.keyArr(District, it => it.id) function valueChangeHandle(data: string[]) { value.splice(0, 3, ...data) + const d0 = map[data[0]][0] + const d1 = map[data[1]][0] + const d2 = map[data[2]][0] const districtValue = { - provinceCode: +map[data[0]].id, - provinceName: map[data[0]].name, - cityCode: +map[data[1]].id, - cityName: map[data[1]].name, - countyCode: +map[data[2]].id, - countyName: map[data[2]].name, + provinceCode: +d0.id, + provinceName: d0.name, + cityCode: +d1.id, + cityName: d1.name, + countyCode: +d2.id, + countyName: d2.name, } emits('update:modelValue', districtValue) } diff --git a/src/components/iconfont/icons.ts b/src/components/iconfont/icons.ts new file mode 100644 index 0000000..d713cae --- /dev/null +++ b/src/components/iconfont/icons.ts @@ -0,0 +1,16 @@ +export default reactive([ + {name: 'igw-f-role'}, + {name: 'menu'}, + {name: 'cog'}, + {name: 'user'}, + {name: 'bar-chart'}, + {name: 'arrow-up'}, + {name: 'exclamationcircle-f'}, + {name: 'check-circle-fill'}, + {name: 'map-pin'}, + {name: 'wenbenkuang'}, + {name: 'zujian'}, + {name: 'shanchu'}, + {name: 'mapmarker'}, + {name: 'xunhuan'} +]) \ No newline at end of file diff --git a/src/dts/components.d.ts b/src/dts/components.d.ts index 55f3c06..20fc2e8 100644 --- a/src/dts/components.d.ts +++ b/src/dts/components.d.ts @@ -13,33 +13,24 @@ declare module 'vue' { Funbar: typeof import('./../components/fun-bar/Funbar.vue')['default'] Iconfont: typeof import('./../components/iconfont/Iconfont.vue')['default'] IxAvatar: typeof import('@idux/components/avatar')['IxAvatar'] - IxBreadcrumb: typeof import('@idux/components/breadcrumb')['IxBreadcrumb'] - IxBreadcrumbItem: typeof import('@idux/components/breadcrumb')['IxBreadcrumbItem'] IxButton: typeof import('@idux/components/button')['IxButton'] IxButtonGroup: typeof import('@idux/components/button')['IxButtonGroup'] IxCard: typeof import('@idux/components/card')['IxCard'] - IxCascader: typeof import('@idux/components/cascader')['IxCascader'] - IxCheckbox: typeof import('@idux/components/checkbox')['IxCheckbox'] IxCol: typeof import('@idux/components/grid')['IxCol'] - IxCollapse: typeof import('@idux/components/collapse')['IxCollapse'] - IxCollapsePanel: typeof import('@idux/components/collapse')['IxCollapsePanel'] IxDatePicker: typeof import('@idux/components/date-picker')['IxDatePicker'] IxDivider: typeof import('@idux/components/divider')['IxDivider'] - IxDrawer: typeof import('@idux/components/drawer')['IxDrawer'] IxDropdown: typeof import('@idux/components/dropdown')['IxDropdown'] IxEmpty: typeof import('@idux/components/empty')['IxEmpty'] IxForm: typeof import('@idux/components/form')['IxForm'] IxFormItem: typeof import('@idux/components/form')['IxFormItem'] IxFormWrapper: typeof import('@idux/components/form')['IxFormWrapper'] IxIcon: typeof import('@idux/components/icon')['IxIcon'] - IxIconClose: typeof import('@idux/components/icon')['IxIconClose'] IxInput: typeof import('@idux/components/input')['IxInput'] IxInputNumber: typeof import('@idux/components/input-number')['IxInputNumber'] IxLayoutSiderTrigger: typeof import('@idux/components/layout')['IxLayoutSiderTrigger'] IxList: typeof import('@idux/components/list')['IxList'] IxListItem: typeof import('@idux/components/list')['IxListItem'] IxLoadingBarProvider: typeof import('@idux/components/loading-bar')['IxLoadingBarProvider'] - IxMenu: typeof import('@idux/components/menu')['IxMenu'] IxMessage: typeof import('@idux/components/message')['IxMessage'] IxModal: typeof import('@idux/components/modal')['IxModal'] IxPagination: typeof import('@idux/components/pagination')['IxPagination'] @@ -47,16 +38,12 @@ declare module 'vue' { IxPopover: typeof import('@idux/components/popover')['IxPopover'] IxProLayout: typeof import('@idux/pro/layout')['IxProLayout'] IxPwdInput: typeof import('./../components/input/IxPwdInput.vue')['default'] - IxRadio: typeof import('@idux/components/radio')['IxRadio'] - IxRadioGroup: typeof import('@idux/components/radio')['IxRadioGroup'] IxRow: typeof import('@idux/components/grid')['IxRow'] IxSelect: typeof import('@idux/components/select')['IxSelect'] - IxSelector: typeof import('@idux/components/selector')['IxSelector'] IxSpace: typeof import('@idux/components/space')['IxSpace'] IxTable: typeof import('@idux/components/table')['IxTable'] IxTabs: typeof import('@idux/components/tabs')['IxTabs'] IxTag: typeof import('@idux/components/tag')['IxTag'] - IxTextarea: typeof import('@idux/components/textarea')['IxTextarea'] IxTooltip: typeof import('@idux/components/tooltip')['IxTooltip'] IxTreeSelect: typeof import('@idux/components/tree-select')['IxTreeSelect'] IxUpload: typeof import('@idux/components/upload')['IxUpload'] diff --git a/src/pages/home/Home.vue b/src/pages/home/Home.vue index d1528ef..8fad76a 100644 --- a/src/pages/home/Home.vue +++ b/src/pages/home/Home.vue @@ -1,5 +1,5 @@ diff --git a/src/pages/main-zone/tab-list/TabList.vue b/src/pages/main-zone/tab-list/TabList.vue index 7e80982..ee4d963 100644 --- a/src/pages/main-zone/tab-list/TabList.vue +++ b/src/pages/main-zone/tab-list/TabList.vue @@ -24,10 +24,7 @@