From 0aa4f9751aadb4abb3637bc74fb7f0b48dd7a23e Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 08 十一月 2024 15:01:23 +0800
Subject: [PATCH] Merge branch 'new' of http://122.9.151.159:9090/r/smart-web into new
---
src/views/tpm/MachineGroup.vue | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/views/tpm/MachineGroup.vue b/src/views/tpm/MachineGroup.vue
index e77729e..c7fa5bb 100644
--- a/src/views/tpm/MachineGroup.vue
+++ b/src/views/tpm/MachineGroup.vue
@@ -1,8 +1,8 @@
<!--
* @Date: 2024-04-27 20:02:44
- * @LastEditors: Sneed
- * @LastEditTime: 2024-04-27 21:40:33
- * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/tpm/MachineGroup.vue
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-11-04 20:10:22
+ * @FilePath: /cps-web/src/views/tpm/MachineGroup.vue
-->
<template>
<el-container>
@@ -19,7 +19,7 @@
<el-header>
<div class="left-panel">
<el-button @click="addChild" type="primary" plain>鏂板涓嬬骇</el-button>
- <el-button @click="del" type="danger" plain>鍒犻櫎</el-button>
+ <el-button :disabled="!form.id" @click="del" type="danger" plain>鍒犻櫎</el-button>
</div>
</el-header>
<el-main class="">
@@ -27,7 +27,7 @@
<el-form-item label="涓婄骇鐩綍" prop="parentName">
<el-input disabled style="width: 240px" v-model="form.parentName"></el-input>
</el-form-item>
- <el-form-item label="鏈哄櫒缁勫悕绉�" prop="name">
+ <el-form-item label="璁惧缁勫悕绉�" prop="name">
<el-input :disabled="(form.id === '102' || form.id === '2')" style="width: 240px"
v-model="form.name" clearable></el-input>
</el-form-item>
@@ -61,7 +61,7 @@
},
methods: {
getTreeData() {
- this.$HTTP.get('/api/blade-cps/group/tree?groupCategory=1&groupType=group_machine').then(res => {
+ this.$HTTP.get('/api/smis/group/tree?groupCategory=1&groupType=group_machine').then(res => {
if (res.code === 200) {
this.group = res.data
this.groupClick(res.data[0])
@@ -83,6 +83,9 @@
}
},
addChild() {
+ if (!this.form.id) {
+ return
+ }
let { name, id, groupType, groupCategory } = this.form
this.form.id = ''
this.form.name = ''
@@ -94,7 +97,7 @@
},
del() {
this.$confirm(
- '纭鍒犻櫎璇ユ満鍣ㄧ粍锛�',
+ '纭鍒犻櫎璇ヨ澶囩粍锛�',
{
distinguishCancelAndClose: true,
confirmButtonText: '鍒犻櫎',
@@ -102,7 +105,7 @@
}
)
.then(() => {
- this.$HTTP.delete('/api/blade-cps/group/deleteGroup', {}, { params: { groupId: this.form.id } }).then(res => {
+ this.$HTTP.delete('/api/smis/group/deleteGroup', {}, { params: { groupId: this.form.id } }).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛");
this.getTreeData()
@@ -115,11 +118,20 @@
},
save() {
this.group = []
- this.$HTTP.post('/api/blade-cps/group', this.form).then(res => {
- if (res.code === 200) {
- this.getTreeData()
- }
- })
+ if (this.form.id) {
+ this.$HTTP.put('/api/smis/group', this.form).then(res => {
+ if (res.code === 200) {
+ this.getTreeData()
+ }
+ })
+ } else {
+ this.$HTTP.post('/api/smis/group', this.form).then(res => {
+ if (res.code === 200) {
+ this.getTreeData()
+ }
+ })
+ }
+
}
}
}
--
Gitblit v1.9.3