From d4f6e25f92f4468878fef455a76c8940dea1139f Mon Sep 17 00:00:00 2001 From: CGD <3030332422@qq.com> Date: Mon, 7 Apr 2025 09:44:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E2=80=9C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/manager-web/src/apis/module/model.js | 2 +- main/manager-web/src/components/AddModelDialog.vue | 2 +- main/manager-web/src/views/ModelConfig.vue | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/main/manager-web/src/apis/module/model.js b/main/manager-web/src/apis/module/model.js index c8bd2cd6..1c760b90 100644 --- a/main/manager-web/src/apis/module/model.js +++ b/main/manager-web/src/apis/module/model.js @@ -52,7 +52,7 @@ export default { modelName: formData.modelName, isDefault: formData.isDefault ? 1 : 0, isEnabled: formData.isEnabled ? 1 : 0, - configJson: JSON.stringify(formData.configJson), + configJson: formData.configJson, docLink: formData.docLink, remark: formData.remark, sort: formData.sort || 0 diff --git a/main/manager-web/src/components/AddModelDialog.vue b/main/manager-web/src/components/AddModelDialog.vue index 8f580d8f..3e6022cd 100644 --- a/main/manager-web/src/components/AddModelDialog.vue +++ b/main/manager-web/src/components/AddModelDialog.vue @@ -140,7 +140,7 @@ export default { this.$emit('confirm', { ...this.formData, - provideType: this.formData.supplier, + provideCode: this.formData.supplier, configJson: this.formData.configJson }); this.$emit('update:visible', false); diff --git a/main/manager-web/src/views/ModelConfig.vue b/main/manager-web/src/views/ModelConfig.vue index e92befd7..227d4f02 100644 --- a/main/manager-web/src/views/ModelConfig.vue +++ b/main/manager-web/src/views/ModelConfig.vue @@ -315,11 +315,12 @@ export default { handleAddConfirm(newModel) { const params = { modelType: this.activeTab, - provideCode: newModel.supplier, + provideCode: newModel.provideCode, formData: { ...newModel, isDefault: newModel.isDefault ? 1 : 0, - isEnabled: newModel.isEnabled ? 1 : 0 + isEnabled: newModel.isEnabled ? 1 : 0, + configJson: newModel.configJson } }; From b2788ac7a0dfb6c69079827a54b50366a8a849c6 Mon Sep 17 00:00:00 2001 From: CGD <3030332422@qq.com> Date: Mon, 7 Apr 2025 10:04:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E2=80=9C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE=E2=80=9D=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/manager-web/src/apis/module/model.js | 32 +++++++++++----------- main/manager-web/src/views/ModelConfig.vue | 3 -- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/main/manager-web/src/apis/module/model.js b/main/manager-web/src/apis/module/model.js index 1c760b90..a78e71d0 100644 --- a/main/manager-web/src/apis/module/model.js +++ b/main/manager-web/src/apis/module/model.js @@ -74,23 +74,23 @@ export default { }) }).send() }, - // 删除模型配置 - deleteModel(id, callback) { - RequestService.sendRequest() - .url(`${getServiceUrl()}/models/${id}`) - .method('DELETE') - .success((res) => { - RequestService.clearRequestTime() - callback(res) +// 删除模型配置 +deleteModel(id, callback) { + RequestService.sendRequest() + .url(`${getServiceUrl()}/models/${id}`) + .method('DELETE') + .success((res) => { + RequestService.clearRequestTime() + callback(res) + }) + .fail((err) => { + console.error('删除模型失败:', err) + this.$message.error(err.msg || '删除模型失败') + RequestService.reAjaxFun(() => { + this.deleteModel(id, callback) }) - .fail((err) => { - console.error('删除模型失败:', err) - this.$message.error(err.msg || '删除模型失败') - RequestService.reAjaxFun(() => { - this.deleteModel(id, callback) - }) - }).send() - }, + }).send() +}, // 获取模型名称列表 getModelNames(modelType, modelName, callback) { RequestService.sendRequest() diff --git a/main/manager-web/src/views/ModelConfig.vue b/main/manager-web/src/views/ModelConfig.vue index 227d4f02..3c4d61ea 100644 --- a/main/manager-web/src/views/ModelConfig.vue +++ b/main/manager-web/src/views/ModelConfig.vue @@ -229,7 +229,6 @@ export default { }).then(() => { const deletePromises = this.selectedModels.map(model => new Promise(resolve => { - // TODO: 删除获取model.id Api.model.deleteModel( model.id, ({ data }) => resolve(data.code === 0) @@ -264,8 +263,6 @@ export default { type: 'warning' }).then(() => { Api.model.deleteModel( - this.activeTab, - model.configJson?.provider || '', // 从configJson获取provider model.id, ({ data }) => { if (data.code === 0) { From 623bfe32f7de551a3bd169db56bd3d3445b0fd6a Mon Sep 17 00:00:00 2001 From: CGD <3030332422@qq.com> Date: Mon, 7 Apr 2025 14:50:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E2=80=9C=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE=E2=80=9D=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/manager-web/src/apis/module/model.js | 50 +++-- .../src/components/ModelEditDialog.vue | 172 +++++++++++++----- 2 files changed, 165 insertions(+), 57 deletions(-) diff --git a/main/manager-web/src/apis/module/model.js b/main/manager-web/src/apis/module/model.js index a78e71d0..54609551 100644 --- a/main/manager-web/src/apis/module/model.js +++ b/main/manager-web/src/apis/module/model.js @@ -74,23 +74,23 @@ export default { }) }).send() }, -// 删除模型配置 -deleteModel(id, callback) { - RequestService.sendRequest() - .url(`${getServiceUrl()}/models/${id}`) - .method('DELETE') - .success((res) => { - RequestService.clearRequestTime() - callback(res) - }) - .fail((err) => { - console.error('删除模型失败:', err) - this.$message.error(err.msg || '删除模型失败') - RequestService.reAjaxFun(() => { - this.deleteModel(id, callback) + // 删除模型配置 + deleteModel(id, callback) { + RequestService.sendRequest() + .url(`${getServiceUrl()}/models/${id}`) + .method('DELETE') + .success((res) => { + RequestService.clearRequestTime() + callback(res) }) - }).send() -}, + .fail((err) => { + console.error('删除模型失败:', err) + this.$message.error(err.msg || '删除模型失败') + RequestService.reAjaxFun(() => { + this.deleteModel(id, callback) + }) + }).send() + }, // 获取模型名称列表 getModelNames(modelType, modelName, callback) { RequestService.sendRequest() @@ -125,4 +125,22 @@ deleteModel(id, callback) { }); }).send(); }, + // 获取单个模型配置 + getModelConfig(id, callback) { + RequestService.sendRequest() + .url(`${getServiceUrl()}/models/${id}`) + .method('GET') + .success((res) => { + RequestService.clearRequestTime() + callback(res) + }) + .fail((err) => { + console.error('获取模型配置失败:', err) + this.$message.error(err.msg || '获取模型配置失败') + RequestService.reAjaxFun(() => { + this.getModelConfig(id, callback) + }) + }).send() + }, + } diff --git a/main/manager-web/src/components/ModelEditDialog.vue b/main/manager-web/src/components/ModelEditDialog.vue index 9e9aa185..594efb17 100644 --- a/main/manager-web/src/components/ModelEditDialog.vue +++ b/main/manager-web/src/components/ModelEditDialog.vue @@ -15,11 +15,11 @@
是否启用 - +
设为默认 - +
@@ -29,16 +29,16 @@
- + - +
- @@ -49,7 +49,7 @@
- + @@ -64,7 +64,7 @@
- + @@ -87,11 +87,37 @@ From a618c2a2c635a4e549e65f28677dafb77b15813f Mon Sep 17 00:00:00 2001 From: CGD <3030332422@qq.com> Date: Mon, 7 Apr 2025 15:15:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E2=80=9C=E5=90=AF?= =?UTF-8?q?=E5=8A=A8-=E5=85=B3=E9=97=AD=E6=A8=A1=E5=9E=8B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E2=80=9D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/manager-web/src/apis/module/model.js | 17 +++++++++++++++ main/manager-web/src/views/ModelConfig.vue | 25 +++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/main/manager-web/src/apis/module/model.js b/main/manager-web/src/apis/module/model.js index 54609551..e27c69ad 100644 --- a/main/manager-web/src/apis/module/model.js +++ b/main/manager-web/src/apis/module/model.js @@ -142,5 +142,22 @@ export default { }) }).send() }, + // 启用/禁用模型状态 + updateModelStatus(id, status, callback) { + RequestService.sendRequest() + .url(`${getServiceUrl()}/models/enable/${id}/${status}`) + .method('PUT') + .success((res) => { + RequestService.clearRequestTime() + callback(res) + }) + .fail((err) => { + console.error('更新模型状态失败:', err) + this.$message.error(err.msg || '更新模型状态失败') + RequestService.reAjaxFun(() => { + this.updateModelStatus(id, status, callback) + }) + }).send() + }, } diff --git a/main/manager-web/src/views/ModelConfig.vue b/main/manager-web/src/views/ModelConfig.vue index 3c4d61ea..f3a378b4 100644 --- a/main/manager-web/src/views/ModelConfig.vue +++ b/main/manager-web/src/views/ModelConfig.vue @@ -75,7 +75,7 @@ @@ -370,6 +370,29 @@ export default { this.$message.error(data.msg || '获取模型列表失败'); } }); + }, + // 处理启用/禁用状态变更 + handleStatusChange(model) { + const newStatus = model.isEnabled ? 1 : 0 + const originalStatus = model.isEnabled + + model.isEnabled = !model.isEnabled + + Api.model.updateModelStatus( + model.id, + newStatus, + ({ data }) => { + if (data.code === 0) { + this.$message.success(newStatus === 1 ? '启用成功' : '禁用成功') + // 保持新状态 + model.isEnabled = newStatus + } else { + // 操作失败时恢复原状态 + model.isEnabled = originalStatus + this.$message.error(data.msg || '操作失败') + } + } + ) } }, };