From 3a05dc4029ceabccebc7d5df77bb056ada490de1 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 2 Dec 2024 17:07:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 3 +++ env/.env.dev | 4 ++-- src/components/equipCardNew/index.vue | 9 ++++++++- src/layout/header.vue | 3 ++- src/views/equip/detail.vue | 11 ++++++++--- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/components.d.ts b/components.d.ts index 9412a02..f759a60 100644 --- a/components.d.ts +++ b/components.d.ts @@ -20,6 +20,7 @@ declare module 'vue' { 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'] ElHeader: typeof import('element-plus/es')['ElHeader'] @@ -33,6 +34,8 @@ declare module 'vue' { ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] 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'] ElStep: typeof import('element-plus/es')['ElStep'] diff --git a/env/.env.dev b/env/.env.dev index b46887f..3fe5b11 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -7,8 +7,8 @@ VITE_API_URL = '/proxyApi' # 开发环境接口地址 # VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭 -# VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅 -VITE_proxyTarget = 'http://192.168.0.244:28580' # 马帅 +VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅 +# VITE_proxyTarget = 'http://192.168.0.244:28580' # 马帅 # VITE_proxyTarget = 'http://192.168.2.129:18080' # 马帅 # VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型) diff --git a/src/components/equipCardNew/index.vue b/src/components/equipCardNew/index.vue index 0f2e5c5..67cb67a 100644 --- a/src/components/equipCardNew/index.vue +++ b/src/components/equipCardNew/index.vue @@ -18,7 +18,13 @@
  • {{ company }} - 立即承租 + 立即承租
  • @@ -29,6 +35,7 @@ import { useRoute, useRouter } from 'vue-router' import { ElMessage, ElMessageBox } from 'element-plus' const router = useRouter() const route = useRoute() +const isType = localStorage.getItem('rolesType') const props: any = defineProps({ url: { type: String, diff --git a/src/layout/header.vue b/src/layout/header.vue index d398141..2e4d307 100644 --- a/src/layout/header.vue +++ b/src/layout/header.vue @@ -9,6 +9,7 @@ import imgSrc from '@/assets/img/logo.png' const store: any = mainStore() const userStore = useStore() const cart = cartStore() +const isType = localStorage.getItem('rolesType') userStore.editMenuList(1) @@ -274,7 +275,7 @@ const onCarts = () => { -
    +
    @@ -380,6 +384,7 @@ const store = mainStore() const ruleFormRef = ref() const pageParams = route.params const cart = cartStore() +const isType = localStorage.getItem('rolesType') console.log(pageParams, 'pageParams') const backPath = ref('')