diff --git a/components.d.ts b/components.d.ts index 5c16790..d030040 100644 --- a/components.d.ts +++ b/components.d.ts @@ -11,22 +11,33 @@ declare module 'vue' { ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] ElCascader: typeof import('element-plus/es')['ElCascader'] + ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] + ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] + ElMenu: typeof import('element-plus/es')['ElMenu'] + ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] + ElPagination: typeof import('element-plus/es')['ElPagination'] + ElProgress: typeof import('element-plus/es')['ElProgress'] ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElSelect: typeof import('element-plus/es')['ElSelect'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] + ElTag: typeof import('element-plus/es')['ElTag'] + ElTimeline: typeof import('element-plus/es')['ElTimeline'] + ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] + ElUpload: typeof import('element-plus/es')['ElUpload'] EquipCard: typeof import('./src/components/equipCard.vue')['default'] EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default'] FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default'] diff --git a/env/.env.dev b/env/.env.dev index bc360d2..6d2769c 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -5,9 +5,9 @@ VITE_BUILD_MODE = 'dev' VITE_API_URL = '/proxyApi' # 开发环境接口地址 -VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭 +# VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭 -# VITE_proxyTarget = 'http://10.40.92.186:8080' # 赵福海 (登录) +VITE_proxyTarget = 'http://10.40.92.186:8080' # 赵福海 (登录) # VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型) # VITE_proxyTarget = 'http://10.40.92.16:9502' # 牛 (个人中心 基础信息企业申请认证) diff --git a/src/assets/img/home/2023_12_01_beijing2/login_bg.png b/src/assets/img/home/2023_12_01_beijing2/login_bg.png new file mode 100644 index 0000000..fa5f7fc Binary files /dev/null and b/src/assets/img/home/2023_12_01_beijing2/login_bg.png differ diff --git a/src/components/uploadComponent/index.vue b/src/components/uploadComponent/index.vue index 9ee5a17..9ecdbad 100644 --- a/src/components/uploadComponent/index.vue +++ b/src/components/uploadComponent/index.vue @@ -35,8 +35,8 @@ import { ElMessage } from 'element-plus' // import { Base64 } from 'js-base64' const tmpUploadUrl = import.meta.env.VITE_API_URL + '/zlpt-file/file/cos/upload' - import { useStore } from 'store/main' - const store = useStore() + import { mainStore } from 'store/main' + const store = mainStore() const headerInfo = reactive({ Authorization: store.token }) diff --git a/src/http/api/usercenter/baseinfo.ts b/src/http/api/usercenter/baseinfo.ts index ca9e749..4319351 100644 --- a/src/http/api/usercenter/baseinfo.ts +++ b/src/http/api/usercenter/baseinfo.ts @@ -15,4 +15,8 @@ export const getOrderCountTotalApi = () => { export const getEquipCountTotalApi = () => { return get('/zlpt-equip/dev/sumType', {}) } +// 获取企业信息 +export const getEnterpriseInfoApi = () => { + return get('/zlpt-company/company_info/getCompanyInfoByUserId', {}) +} diff --git a/src/http/index.ts b/src/http/index.ts index b0b0a82..8676f31 100644 --- a/src/http/index.ts +++ b/src/http/index.ts @@ -2,10 +2,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import axios from 'axios' import NProgress from 'nprogress' -import { useStore } from 'store/main' +import { mainStore } from 'store/main' import { ElMessage } from "element-plus"; import router from "@/router" -const store = useStore() +const store = mainStore() // const CancelToken = axios.CancelToken // const source = CancelToken.source() const baseUrl = import.meta.env.VITE_API_URL diff --git a/src/layout/header.vue b/src/layout/header.vue index 0ba8fa9..655959a 100644 --- a/src/layout/header.vue +++ b/src/layout/header.vue @@ -1,8 +1,8 @@