gaoshp
2024-09-29 51fa6f173a5a95e34b4ec31db77035dbaeb968c6
fix some bug
已修改4个文件
61 ■■■■ 文件已修改
src/api/model/workstation.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/workstation/Dialog.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/workstation/index.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tpm/MachineGroup.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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"
@@ -53,7 +53,7 @@
        url: `${config.API_URL}/blade-cps/workstation/deleteGroup`,
        name: "删除工位组",
        delete: async function(params){
            return await http.delete(this.url, params);
            return await http.delete(this.url, {}, { params });
        }
    },
    deleteWork: {
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;
                    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)
src/views/console/workstation/index.vue
@@ -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)
                    }
                    // })
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,12 +118,21 @@
        },
        save() {
            this.group = []
            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()
                }
            })
        }
        }
    }
}
</script>