From bbebcc112d8c0d5e219eeb7659f8055cb5086d2f Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 2 Dec 2024 18:15:13 +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 | 2 + env/.env.dev | 4 +- src/components/PagingComponent/index.vue | 125 +- src/style/scss/common.scss | 11 + src/views/cart/index.vue | 2 +- src/views/order/index.vue | 2 +- src/views/user/goodsManagement/index.vue | 1905 ++++++++++++---------- 7 files changed, 1128 insertions(+), 923 deletions(-) diff --git a/components.d.ts b/components.d.ts index f759a60..f818db3 100644 --- a/components.d.ts +++ b/components.d.ts @@ -18,6 +18,7 @@ declare module 'vue' { ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] + ElCountdown: typeof import('element-plus/es')['ElCountdown'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElEmpty: typeof import('element-plus/es')['ElEmpty'] @@ -31,6 +32,7 @@ declare module 'vue' { 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'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] diff --git a/env/.env.dev b/env/.env.dev index 3fe5b11..b46887f 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/PagingComponent/index.vue b/src/components/PagingComponent/index.vue index 1fd4f04..f96a7a4 100644 --- a/src/components/PagingComponent/index.vue +++ b/src/components/PagingComponent/index.vue @@ -1,66 +1,67 @@ + @current-change="handleCurrentChange" + /> - diff --git a/src/style/scss/common.scss b/src/style/scss/common.scss index e69de29..fd66ee5 100644 --- a/src/style/scss/common.scss +++ b/src/style/scss/common.scss @@ -0,0 +1,11 @@ +.primary-lease { + --el-color-primary:#00a288; + --el-color-primary-light-3:#00ad9d; + --el-color-primary-dark-2:#00ad9d; + --el-color-primary-light-5:#78d3cb +} + +:root { + --el-color-primary:#00a288; + // --el-color-primary-light-9:#78d3cb +} \ No newline at end of file diff --git a/src/views/cart/index.vue b/src/views/cart/index.vue index 82acfd1..ec79519 100644 --- a/src/views/cart/index.vue +++ b/src/views/cart/index.vue @@ -450,7 +450,7 @@ const onCartSubmit = async () => { type: 'success', }) - userStore.editcurrentMenuItem('orderManagementCz') + userStore.editcurrentMenuItem('orderManagement') setTimeout(() => { router.push({ name: 'my-user', diff --git a/src/views/order/index.vue b/src/views/order/index.vue index 248e23f..df608c1 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -387,7 +387,7 @@ const onCartSubmit = async () => { message: '提交成功', type: 'success', }) - userStore.editcurrentMenuItem('orderManagementCz') + userStore.editcurrentMenuItem('orderManagement') setTimeout(() => { router.push({ name: 'my-user', diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue index 7d543de..acc9251 100644 --- a/src/views/user/goodsManagement/index.vue +++ b/src/views/user/goodsManagement/index.vue @@ -1,329 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - 查询 - 重置 - 装备新增 - 批量上架 - 批量下架 - + + + + + + + + + + 查询 + 重置 + 装备新增 + 批量上架 + 批量下架 + + + - - + + - {{ row.firstName }} > {{ row.secondName }}>{{ row.thirdName }} + {{ row.firstName }} > {{ row.secondName + }}>{{ row.thirdName }} @@ -749,23 +827,38 @@ 查看 - + 编辑 - + 下架 - + 上架 + @click="deleteRowInfo(row)" + > 删除 - @@ -775,55 +868,77 @@ @getListChange="getList" v-model:pageSize="queryParams.pageSize" v-model:currentPage="queryParams.pageNum" - :total="total" /> + :total="total" + /> - - - - 关 闭 - - + + + 关 闭 + 草 稿 - + 提 交 - 基本信息 - - + - + - + + > + clearable + style="width: 350px" + > (equipmentDeploymentParams.deviceCount=v.replace(/[^\d.]/g,''))" + @input=" + (v) => + (equipmentDeploymentParams.deviceCount = v.replace(/[^\d.]/g, '')) + " v-model="equipmentDeploymentParams.deviceCount" placeholder="请输入设备数量" - clearable maxlength="20" - style="width: 350px;" :disabled="countDisabled" + clearable + maxlength="20" + style="width: 350px" + :disabled="countDisabled" /> + clearable + /> - + clearable + /> + clearable + /> @@ -874,16 +999,22 @@ v-model="equipmentDeploymentParams.productionDate" placeholder="请选择出厂日期" value-format="YYYY-MM-DD" - type="date" style="width: 350px;"> + type="date" + style="width: 350px" + > (equipmentDeploymentParams.dayLeasePrice=v.replace(/[^\d.]/g,''))" + @input=" + (v) => + (equipmentDeploymentParams.dayLeasePrice = v.replace(/[^\d.]/g, '')) + " v-model="equipmentDeploymentParams.dayLeasePrice" placeholder="请输入租赁价格" - clearable maxlength="20" - style="width: 350px;" + clearable + maxlength="20" + style="width: 350px" /> @@ -892,27 +1023,33 @@ (equipmentDeploymentParams.deviceWeight=v.replace(/[^\d.]/g,''))" + @input=" + (v) => + (equipmentDeploymentParams.deviceWeight = v.replace(/[^\d.]/g, '')) + " v-model="equipmentDeploymentParams.deviceWeight" placeholder="请输入整机重量" - clearable maxlength="20" - style="width: 350px;" + clearable + maxlength="20" + style="width: 350px" /> @@ -1004,20 +1141,31 @@ - - * - 主展示图: + + * + 主展示图: + - - + - 上传文件 + 上传文件 - 支持格式:.jpg .png,单个文件大小不能超过2M + + 支持格式:.jpg .png,单个文件大小不能超过2M + - - + + @@ -1036,37 +1184,46 @@ - + {{ item.fileName }} - - *注:图片排序为平台展示顺序,不得少于1张,不得多于6张 - + *注:图片排序为平台展示顺序,不得少于1张,不得多于6张 - - * - 详情页展示图: + + * + 详情页展示图: + - - + - 上传文件 + 上传文件 - 支持格式:.jpg .png,单个文件大小不能超过2M + + 支持格式:.jpg .png,单个文件大小不能超过2M + - - + + @@ -1074,16 +1231,17 @@ - + {{ item.fileName }} - - *注:图片排序为平台展示顺序,不得少于1张,不得多于6张 - + *注:图片排序为平台展示顺序,不得少于1张,不得多于6张 @@ -1091,24 +1249,33 @@ - - * - 合格证: + + * + 合格证: - - + - 上传文件 + 上传文件 - 支持格式:.jpg .png,单个文件大小不能超过2M + + 支持格式:.jpg .png,单个文件大小不能超过2M + - - + + @@ -1116,7 +1283,7 @@ - + @@ -1126,24 +1293,35 @@ - - * - 检测证明: + + * + 检测证明: + - - + - 上传文件 + 上传文件 - 支持格式:.jpg .png,单个文件大小不能超过2M + + 支持格式:.jpg .png,单个文件大小不能超过2M + - - + + @@ -1151,7 +1329,10 @@ - + @@ -1172,93 +1353,97 @@ - + -
{{ item.fileName }}