From 1a9003261d85370ce2cd8c76b88a1d681ce4e78e Mon Sep 17 00:00:00 2001 From: eafonyang Date: Thu, 16 Jul 2026 09:50:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/routes/models.js | 6 ++- frontend/package.json | 2 +- frontend/pnpm-lock.yaml | 15 ++++-- frontend/src/components/TabsView.vue | 12 +++-- frontend/src/layout/index.vue | 28 +++++----- frontend/src/router/index.js | 8 +-- frontend/src/styles/lux-theme.css | 52 +++++++++++++++--- frontend/src/views/blacklist/index.vue | 14 +++-- frontend/src/views/brand/index.vue | 13 +++-- frontend/src/views/home/index.vue | 14 ++--- frontend/src/views/login/index.vue | 4 +- .../views/model/components/EqCacheDialog.vue | 8 +-- .../model/components/ModelFormDialog.vue | 53 ++++++++++++------- .../model/components/PushProgressDialog.vue | 10 ++-- .../views/model/components/PushViewDialog.vue | 4 +- frontend/src/views/model/index.vue | 53 +++++++++++-------- .../src/views/ota-target-device/index.vue | 14 +++-- frontend/src/views/ota/index.vue | 24 +++++---- frontend/src/views/share-code/log.vue | 13 +++-- frontend/src/views/system/users/index.vue | 14 +++-- .../views/toolbox/luxsin-controller/index.vue | 2 +- frontend/vite.config.js | 2 +- 22 files changed, 241 insertions(+), 124 deletions(-) diff --git a/backend/src/routes/models.js b/backend/src/routes/models.js index bd83c09..400f690 100644 --- a/backend/src/routes/models.js +++ b/backend/src/routes/models.js @@ -455,7 +455,11 @@ router.put('/api/models/:model_id', upload.single('measurement_file'), async (re if (newBrandName !== dbModel.brand_name || newName !== dbModel.name) { const existing = await Model.findOne({ - where: { brand_name: newBrandName, name: newName }, + where: { + brand_name: newBrandName, + name: newName, + id: { [Op.ne]: modelId }, + }, }); if (existing) { logger.warn(`Model already exists: brand_name=${newBrandName}, name=${newName}`); diff --git a/frontend/package.json b/frontend/package.json index 0a4ff9f..db26435 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -8,7 +8,7 @@ "preview": "vite preview" }, "dependencies": { - "@element-plus/icons-vue": "^2.1.0", + "@lucide/vue": "^1.24.0", "axios": "^1.5.0", "element-plus": "^2.3.14", "vue": "^3.3.4", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 94b5375..3868631 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -8,9 +8,9 @@ importers: .: dependencies: - '@element-plus/icons-vue': - specifier: ^2.1.0 - version: 2.3.2(vue@3.5.35) + '@lucide/vue': + specifier: ^1.24.0 + version: 1.24.0(vue@3.5.35) axios: specifier: ^1.5.0 version: 1.17.0 @@ -224,6 +224,11 @@ packages: '@jridgewell/sourcemap-codec@1.5.5': resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} + '@lucide/vue@1.24.0': + resolution: {integrity: sha512-5bNPX0G2YEWdUlBYk7pE8SgDg/f1mkIFpJ9vtE44pW/cwRz7Ioc0tOTESoVJAPvxIELSmYekX+XXIJMjsswNIg==} + peerDependencies: + vue: '>=3.0.1' + '@rollup/rollup-android-arm-eabi@4.62.2': resolution: {integrity: sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==} cpu: [arm] @@ -805,6 +810,10 @@ snapshots: '@jridgewell/sourcemap-codec@1.5.5': {} + '@lucide/vue@1.24.0(vue@3.5.35)': + dependencies: + vue: 3.5.35 + '@rollup/rollup-android-arm-eabi@4.62.2': optional: true diff --git a/frontend/src/components/TabsView.vue b/frontend/src/components/TabsView.vue index e79e10d..0b5d284 100644 --- a/frontend/src/components/TabsView.vue +++ b/frontend/src/components/TabsView.vue @@ -55,20 +55,24 @@