From 51fa6f173a5a95e34b4ec31db77035dbaeb968c6 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期日, 29 九月 2024 19:36:11 +0800
Subject: [PATCH] fix some bug
---
src/views/console/workstation/index.vue | 22 ++++++----
src/api/model/workstation.js | 36 +++++++++---------
src/views/console/workstation/Dialog.vue | 20 ++++++++--
src/views/tpm/MachineGroup.vue | 25 ++++++++----
4 files changed, 64 insertions(+), 39 deletions(-)
diff --git a/src/api/model/workstation.js b/src/api/model/workstation.js
index f57954d..bcc8bd9 100644
--- a/src/api/model/workstation.js
+++ b/src/api/model/workstation.js
@@ -1,8 +1,8 @@
/*
* @Date: 2024-03-24 11:37:47
- * @LastEditors: Sneed
- * @LastEditTime: 2024-04-14 15:02:51
- * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/api/model/workstation.js
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-09-29 19:09:15
+ * @FilePath: /cps-web/src/api/model/workstation.js
*/
import config from "@/config"
import http from "@/utils/request"
@@ -11,71 +11,71 @@
getList: {
url: `${config.API_URL}/blade-cps/workstation/page`,
name: "鑾峰彇宸ヤ綅鍒楄〃",
- get: async function(params){
+ get: async function (params) {
return await http.get(this.url, params);
},
- getUrl () {
+ getUrl() {
return this.url
}
},
- getWorkstationGroup: {
+ getWorkstationGroup: {
url: `${config.API_URL}/blade-cps/group/list?groupType=group_workstation&groupCategory=1`,
name: "鑾峰彇宸ヤ綅缁勬爲",
- get: async function(params){
+ get: async function (params) {
return await http.get(this.url, params);
}
},
groupWorkstationType: {
url: `${config.API_URL}/blade-cps/group/groupWorkstation/type`,
name: "鑾峰彇鐘舵�佸弽棣堟爲",
- post: async function(params){
+ post: async function (params) {
return await http.post(this.url, params);
}
},
- calendarList: {
+ calendarList: {
url: `${config.API_URL}/blade-cps/calendar/list`,
name: "鑾峰彇鐢熶骇鏃ュ巻",
- get: async function(params){
+ get: async function (params) {
return await http.get(this.url, params);
}
},
saveWorkstationGroup: {
url: `${config.API_URL}/blade-cps/group`,
name: "淇濆瓨宸ヤ綅缁�",
- put: async function(params){
+ put: async function (params) {
return await http.put(this.url, params);
},
- post: async function(params){
+ post: async function (params) {
return await http.post(this.url, params);
},
},
deleteWorkGroup: {
url: `${config.API_URL}/blade-cps/workstation/deleteGroup`,
name: "鍒犻櫎宸ヤ綅缁�",
- delete: async function(params){
- return await http.delete(this.url, params);
+ delete: async function (params) {
+ return await http.delete(this.url, {}, { params });
}
},
deleteWork: {
url: `${config.API_URL}/blade-cps/workstation`,
name: "鍒犻櫎宸ヤ綅",
- delete: async function(params){
+ delete: async function (params) {
return await http.delete(this.url, params);
}
},
add: {
url: `${config.API_URL}/blade-cps/workstation/submit`,
name: "娣诲姞宸ヤ綅",
- post: async function(params){
+ post: async function (params) {
return await http.post(this.url, params);
},
},
getlistnoband: {
url: `${config.API_URL}/blade-cps/machine/list-no-band`,
name: "鑾峰彇鏈粦瀹氬伐浣�",
- get: async function(params){
+ get: async function (params) {
return await http.get(this.url, params);
}
}
-
+
}
\ No newline at end of file
diff --git a/src/views/console/workstation/Dialog.vue b/src/views/console/workstation/Dialog.vue
index ea60a89..4e0ddc4 100644
--- a/src/views/console/workstation/Dialog.vue
+++ b/src/views/console/workstation/Dialog.vue
@@ -92,7 +92,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="绋嬪簭浼犺緭鏂瑰紡" prop="transmissionMethod">
<el-select v-model="form.transmissionMethod" style="width: 240px">
<el-option label="FTP" :value="1" />
@@ -107,7 +107,7 @@
:value="item.value" />
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12" v-if="form.ftpDirectoryType == 1">
<el-form-item label="鍏宠仈鐩綍" prop="directoryId">
<el-select v-model="form.directoryId" style="width: 240px">
@@ -309,7 +309,7 @@
})
} else {
this.form.id = ''
- this.form.workbenchVOList = res?.data?.workstationList || []
+ this.form.workbenchVOList = []
Object.keys(this.form).forEach(key => {
this.form[key] = ''
})
@@ -318,10 +318,22 @@
},
//琛ㄥ崟鎻愪氦鏂规硶
submit() {
+ if (!this.form.workbenchVOList) {
+ this.form.workbenchVOList = []
+ }
+ if (this.mode === 'add' && this.form.linkWay === 1) {
+ this.form.machineId
+ this.form.machineCode = this.form.code
+ this.form.machineName = this.form.name
+ }
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
- var res = await this.$API.workstation.add.post(this.form);
+ try {
+ var res = await this.$API.workstation.add.post(this.form);
+ } catch (error) {
+ this.isSaveing = false;
+ }
this.isSaveing = false;
if (res.code == 200) {
this.$emit('success', this.form, this.mode)
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index 1464e20..964c685 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -50,7 +50,7 @@
<el-table-column label="宸ヤ綅鍚嶇О" prop="name" width="120"></el-table-column>
<el-table-column label="宸ヤ綅绫诲瀷" prop="type" width="120">
<template #default="scope">
- <span>{{ scope.row.type == '0' ? '鏈哄櫒': '浜哄伐' }}</span>
+ <span>{{ scope.row.type == '0' ? '鏈哄櫒' : '浜哄伐' }}</span>
</template>
</el-table-column>
<el-table-column label="宸ヤ綅鏃ュ巻" prop="calendarName" width="120"></el-table-column>
@@ -128,12 +128,12 @@
<el-col :span="8">
{{ basic.machineBrand }}
</el-col>
- <el-col :span="4">
+ <!-- <el-col :span="4">
椹卞姩鍚嶇О
</el-col>
<el-col :span="8">
{{ basic.typeName }}
- </el-col>
+ </el-col> -->
</el-row>
</el-main>
</el-container>
@@ -143,11 +143,12 @@
<el-button v-show="list.length > 0"
@click="() => { editFlag = !editFlag; showTable = !editFlag }"
style="margin-left: auto;" text type="primary"
- size="small">{{ editFlag ? '鍙栨秷' : '閰嶇疆宸ヤ綅閲囬泦' }}</el-button>
+ size="small">{{ editFlag ? '鍙栨秷' : '閰嶇疆宸ヤ綅閲囬泦'
+ }}</el-button>
<el-button v-show="editFlag" @click="saveInfo" text
type="primary" size="small">淇濆瓨</el-button>
- <el-button text type="primary" size="small"
- @click="editDMP">淇敼DMP閰嶇疆</el-button>
+ <!-- <el-button text type="primary" size="small"
+ @click="editDMP">淇敼DMP閰嶇疆</el-button> -->
</el-header>
<el-main>
<el-table :data="list" height="200px"
@@ -572,15 +573,18 @@
let data = this.formatData(res.data)
this.group = data
this.showGrouploading = false
+ console.log('>>>>>>>>>>>>>>>>>>>>>')
// this.$nextTick(() => {
if (!flag) {
+ debugger
let parent = res.data.filter(item => item.parentId == 0)[0]
this.treeCheckedNode = parent
this.treeCheckKey = parent.id
} else {
- let parent = res.data.filter(item => item.id == this.treeCheckedNode.id)[0]
- this.treeCheckedNode = parent
- this.treeCheckKey = parent.id
+ debugger
+ let parent = res.data.filter(item => item.parentId == 0)[0]
+ parent && (this.treeCheckedNode = parent)
+ parent && (this.treeCheckKey = parent.id)
}
// })
diff --git a/src/views/tpm/MachineGroup.vue b/src/views/tpm/MachineGroup.vue
index 3c561a9..9f54d09 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 22:21:36
- * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/tpm/MachineGroup.vue
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-09-29 19:33:58
+ * @FilePath: /cps-web/src/views/tpm/MachineGroup.vue
-->
<template>
<el-container>
@@ -118,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/blade-cps/group', this.form).then(res => {
+ if (res.code === 200) {
+ this.getTreeData()
+ }
+ })
+ } else {
+ this.$HTTP.post('/api/blade-cps/group', this.form).then(res => {
+ if (res.code === 200) {
+ this.getTreeData()
+ }
+ })
+ }
+
}
}
}
--
Gitblit v1.9.3