From a4193f7b5a902b20b33421237bf992d1ff10d63c Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 14 Apr 2025 11:22:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9F=9C=E5=AD=90=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/api/hard/hard-door-manager.ts | 2 +- .../hard/hard-door-manager/info-setting.vue | 43 +++++++------------ .../hard/hard-door-manager/volume-setting.vue | 4 +- 4 files changed, 20 insertions(+), 33 deletions(-) diff --git a/.env.development b/.env.development index e36e34a..9f4034e 100644 --- a/.env.development +++ b/.env.development @@ -11,14 +11,14 @@ ENV = 'development' # VITE_ADMIN_PROXY_PATH = http://47.96.250.9:8089/api/ # 测试线上 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/ # VITE_ADMIN_PROXY_PATH = http://localhost:9999/ -VITE_ADMIN_PROXY_PATH = http://192.168.101.81:9999/ # 邓-本地 +VITE_ADMIN_PROXY_PATH = http://192.168.101.107:9999/ # 邓-本地 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上 # 图片访问基础地址 # VITE_IMAGE_BASE_PATH = http://47.96.250.9:8089/api # 测试线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # VITE_IMAGE_BASE_PATH = http://localhost:9999 -VITE_IMAGE_BASE_PATH = http://192.168.101.81:9999 # 邓-本地 +VITE_IMAGE_BASE_PATH = http://192.168.101.107:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上 # 代码生成服务地址 diff --git a/src/api/hard/hard-door-manager.ts b/src/api/hard/hard-door-manager.ts index fbebb63..6e287d3 100644 --- a/src/api/hard/hard-door-manager.ts +++ b/src/api/hard/hard-door-manager.ts @@ -6,7 +6,7 @@ import request from "/@/utils/request" * @param systemVolume 系统音量 * @param mediaVolume 媒体音量 */ -export function getByCabinetNo(data?: { hardId: any; systemVolume: any; mediaVolume: any }) { +export function changeVolume(data?: { hardId: any; systemVolume: any; mediaVolume: any }) { return request({ url: "/hard/hard-door-manager/change-volume", method: "post", diff --git a/src/views/hard/hard-door-manager/info-setting.vue b/src/views/hard/hard-door-manager/info-setting.vue index 6fb4f0d..a9325f0 100644 --- a/src/views/hard/hard-door-manager/info-setting.vue +++ b/src/views/hard/hard-door-manager/info-setting.vue @@ -7,28 +7,14 @@ - - - + + - - - - - - - - - - - - - - - + + @@ -53,29 +39,30 @@ const form = reactive({ id: "", hardId: "", imei: "", + doorCount: "", deviceCode: "", }) -const dataRules = ref({}) +const dataRules = ref({ + imei: [{ required: true, message: "设备IMEI卡号不能为空", trigger: "blur" }], + deviceCode: [{ required: true, message: "内置设备编号:不能为空", trigger: "blur" }], + doorCount: [{ required: true, message: "柜子层数不能为空", trigger: "blur" }], +}) // 打开弹窗 -const openDialog = async (id: string) => { +const openDialog = async (hardId: string) => { visible.value = true - form.id = "" - + form.hardId = hardId dataFormRef.value?.resetFields() - - if (id) { - form.id = id - const res = await hardDoorManager.getObj(id) + if (hardId) { + const res = await hardDoorManager.getByHardId({ hardId: hardId }) Object.assign(form, res.data) } } // 提交 const onSubmit = async () => { - if (!form.id) return useMessage().error("设备id不存在") - + if (!form.hardId) return useMessage().error("设备id不存在") const valid = await dataFormRef.value.validate().catch(() => {}) if (!valid) return diff --git a/src/views/hard/hard-door-manager/volume-setting.vue b/src/views/hard/hard-door-manager/volume-setting.vue index 3613cbb..a12e713 100644 --- a/src/views/hard/hard-door-manager/volume-setting.vue +++ b/src/views/hard/hard-door-manager/volume-setting.vue @@ -23,7 +23,7 @@