update

gaoshp

2024-04-14 c0843b2ea33479124abca80fe64bb52082575d29

update

 src/views/console/workstation/index.vue

@@ -11,7 +11,7 @@
                                        :current-node-key="treeCheckKey" :highlight-current="true"
                                        :expand-on-click-node="false" :check-on-click-node="true"
                                        :default-expanded-keys="[1]" :render-content="renderContent"
                                        :filter-node-method="groupFilterNode" @node-click="groupClick1"></el-tree>
                                        @node-click="groupClick1"></el-tree>
                                </el-main>
                            </el-container>
                        </el-aside>
@@ -35,14 +35,16 @@
                                            <el-option v-for="item in status" :key="item.value" :label="item.label"
                                                :value="item.value" />
                                        </el-select>
                                        <el-input v-model="keyWord" style="width: 240px" placeholder="请输入工位名称/编号" clearable></el-input>
                                        <el-input v-model="keyWord" style="width: 240px" placeholder="请输入工位名称/编号"
                                            clearable></el-input>
                                        <el-button @click="search" type="primary" icon="el-icon-search"></el-button>
                                    </div>
                                </div>
                            </el-header>
                            <el-main class="nopadding">
                            <div style="display: flex">
                                <scTable highlight-current-row @dataChange="dataChange" @row-click="rowClick" ref="table" :params="params" :apiObj="apiObj"
                                    <scTable highlight-current-row @dataChange="dataChange" @row-click="rowClick"
                                        ref="table" :params="params" :apiObj="apiObj"
                                    @selection-change="selectionChange" stripe>
                                    <el-table-column type="selection" width="50"></el-table-column>
                                    <el-table-column label="工位编号" prop="code" width="120"
@@ -85,17 +87,134 @@
                                                <li>工位编号 {{previewData.code}}</li>
                                                <li>工位组 {{previewData.groupName}}</li>
                                                <li>工位名称 {{previewData.name}}</li>
                                                <li>工位类型 {{types.find(v => v.value == previewData.type)?.label}}</li>
                                                    <li>工位类型 {{ types.find(v => v.value == previewData.type)?.label }}
                                                    </li>
                                                <li>工位日历 {{previewData.calendarName}}</li>
                                                <li>状态 {{previewData.status ? '启用' : '禁用'}}</li>
                                            </ul>
                                        </div>
                                        <el-tabs tab-position="top" class="custom-tabs" v-model="normal">
                                            <el-tab-pane label="机器信息" name="1">
                                                机器信息
                                                    <el-container>
                                                        <el-header>基础数据</el-header>
                                                        <el-main>
                                                            <el-row>
                                                                <el-col :span="4">
                                                                    机器编号
                                                                </el-col>
                                                                <el-col :span="8">
                                                                    {{ basic.machineCode }}
                                                                </el-col>
                                                                <el-col :span="4">
                                                                    机器名称
                                                                </el-col>
                                                                <el-col :span="8">
                                                                    {{ basic.machineName }}
                                                                </el-col>
                                                                <el-col :span="4">
                                                                    机器品牌
                                                                </el-col>
                                                                <el-col :span="8">
                                                                    {{ basic.machineBrand }}
                                                                </el-col>
                                                                <el-col :span="4">
                                                                    驱动名称
                                                                </el-col>
                                                                <el-col :span="8">
                                                                    {{ basic.typeName }}
                                                                </el-col>
                                                            </el-row>
                                                        </el-main>
                                                    </el-container>
                                                    <el-container>
                                                        <el-header>
                                                            <span>采集信息</span>
                                                            <el-button  @click="editFlag = !editFlag" style="margin-left: auto;" text type="primary" size="small">配置工位采集</el-button>
                                                            <el-button v-show="editFlag" @click="saveInfo" text type="primary" size="small">保存</el-button>
                                                            <el-button text type="primary" size="small">修改DMP配置</el-button>
                                                        </el-header>
                                                        <el-main>
                                                            <el-table :data="list" height="200px">
                                                                <el-table-column label="采集变量名称" prop="name" />
                                                                <el-table-column label="工位变量名称" prop="dataItem">
                                                                    <template #default="scope">
                                                                        <el-input :disabled="!editFlag" v-model="scope.row.dataItem"></el-input>
                                                                    </template>
                                                                </el-table-column>
                                                                <el-table-column label="数据标签" prop="description">
                                                                    <template #default="scope">
                                                                        <el-select :disabled="!editFlag" v-model="scope.row.description">
                                                                            <el-option v-for="item in workstation_param_type" :key="item.dictKey" :label="item.dictValue"
                                                                                :value="item.dictKey-0" />
                                                                        </el-select>
                                                                        <!-- {{ dmp_data_type.find(v => v.dictKey == scope.row.wcsDataType)?.dictValue }} -->
                                                                    </template>
                                                                </el-table-column>
                                                                <el-table-column label="数据类别" prop="wcsDataType">
                                                                    <template #default="scope">
                                                                        <el-select disabled v-model="scope.row.wcsDataType">
                                                                            <el-option v-for="item in dmp_data_type" :key="item.dictKey" :label="item.dictValue"
                                                                                :value="item.dictKey-0" />
                                                                        </el-select>
                                                                        <!-- {{ dmp_data_type.find(v => v.dictKey == scope.row.wcsDataType)?.dictValue }} -->
                                                                    </template>
                                                                </el-table-column>
                                                                <el-table-column label="大屏" prop="bigScreen">
                                                                    <template #default="scope">
                                                                        <el-checkbox :disabled="!editFlag" v-model="scope.row.bigScreen"  />
                                                                    </template>
                                                                </el-table-column>
                                                                <el-table-column label="实时数据" prop="realTimeData">
                                                                    <template #default="scope">
                                                                        <el-checkbox :disabled="!editFlag" v-model="scope.row.realTimeData"  />
                                                                    </template>
                                                                </el-table-column>
                                                                <el-table-column label="过程参数" prop="processParameter">
                                                                    <template #default="scope">
                                                                        <el-checkbox :disabled="!editFlag" v-model="scope.row.processParameter"  />
                                                                    </template>
                                                                </el-table-column>
                                                            </el-table>
                                                        </el-main>
                                                    </el-container>
                                            </el-tab-pane>
                                            <el-tab-pane label="扩展信息" name="2">
                                                扩展信息
                                                    <el-row>
                                                        <el-col :span="4">
                                                            工种
                                                        </el-col>
                                                        <el-col :span="8">
                                                            {{ info.deviceType }}
                                                        </el-col>
                                                        <el-col :span="4">
                                                            加工属性
                                                        </el-col>
                                                        <el-col :span="8">
                                                            {{ info.properties }}
                                                        </el-col>
                                                        <el-col :span="4">
                                                            程序传输方式
                                                        </el-col>
                                                        <el-col :span="8">
                                                            {{ info.transmissionMode }}
                                                        </el-col>
                                                        <el-col :span="4">
                                                            FTP目录
                                                        </el-col>
                                                        <el-col :span="8">
                                                            {{ info.ftpCatalogue }}
                                                        </el-col>
                                                        <el-col :span="4">
                                                            工作台
                                                        </el-col>
                                                        <el-col :span="8">
                                                            <ul class="workbench">
                                                                <li v-for="item in workbenchVOList" :key="item.sort">
                                                                    {{`【${item.sort}】`}}{{item.name}}
                                                                </li>
                                                            </ul>
                                                        </el-col>
                                                    </el-row>
                                            </el-tab-pane>
                                        </el-tabs>
                                    </div>
@@ -116,7 +235,7 @@
                                        :current-node-key="treeCheckKey" :highlight-current="true"
                                        :expand-on-click-node="false" :check-on-click-node="true"
                                        :default-expanded-keys="[1]" :render-content="renderContent"
                                        :filter-node-method="groupFilterNode" @node-click="groupClick"></el-tree>
                                        @node-click="groupClick"></el-tree>
                                </el-main>
                            </el-container>
                        </el-aside>
@@ -301,8 +420,25 @@
            treeCheckKey: [],
            beltline_type: [],
            group_tag: [],
            dmp_data_type: [],
            workstation_param_type: [],
            addGroupShow: false,
            selection: []
            selection: [],
            list: [],
            basic: {
                machineCode: '-',
                machineName: '-',
                machineBrand: '-',
                typeName: '-',
            },
            info: {
                deviceType: '-',
                properties: '-',
                transmissionMode: '-',
                ftpCatalogue: '-',
            },
            workbenchVOList: [],
            editFlag: false
        }
    },
    watch: {
@@ -355,6 +491,12 @@
            })
            this.$API.system.dic.getDic.get({ code: 'group_tag' }).then(res => {
                this.group_tag = res.data
            })
            this.$API.system.dic.getDic.get({ code: 'dmp_data_type' }).then(res => {
                this.dmp_data_type = res.data
            })
            this.$API.system.dic.getDic.get({ code: 'workstation_param_type' }).then(res => {
                this.workstation_param_type = res.data
            })

        },
@@ -441,9 +583,6 @@
            this.addGroupShow = true
            this.$refs.dialogForm.resetFields()
        },
        groupFilterNode() {

        },
        groupClick(node) {
            this.treeCheckedNode = node
        },
@@ -452,7 +591,26 @@
        },
        rowClick (data) {
            this.previewData = data
            console.log(data)
            console.log(data, '>>>>>>>>>>>')
            if (!data.id) {
                Object.keys(this.basic).forEach(key => {
                    this.basic[key] = '-'
                })
                this.workbenchVOList = []
                return
            }
            this.$HTTP.get(`/api/blade-cps/workstation/listDmpVariablesByWorkstationId?workstationId=${data.id}`).then(res => {
                this.list = res?.data?.dmpVariablesVOList
                Object.keys(this.basic).forEach(key => {
                    this.basic[key] = res?.data?.[key] || '-'
                })
            })
            this.$HTTP.get(`/api/blade-cps/workstation-workbench/listWorkbench?workstationId=${data.id}`).then(res => {
                Object.keys(this.info).forEach(key => {
                    this.info[key] = res?.data?.[key] || '-'
                })
                this.workbenchVOList = res?.data?.workstationList || []
            })
        },
        groupClick1(data) {
            console.log('-------', data)
@@ -471,9 +629,11 @@
                console.log(data[0], '>>>>>>>>')
                this.$refs.table.setCurrentRow(data[0])
                this.previewData = data[0]
                this.rowClick(data[0])
            }else  {
                this.$refs.table.setCurrentRow()
                this.previewData = {}
                this.rowClick({})
            }
        },
        table_add() {
@@ -494,7 +654,12 @@
            this.$HTTP.delete(`/api/blade-cps/workstation?type=0&workstationIds=${this.selection.map(item => item.id).join(',')}`).then(res => {
                this.search()
            })
        }
        },
        saveInfo () {
            this.$HTTP.post('/api/blade-cps/workstation-wcs/save',this.workbenchVOList).then(res => {
                this.editFlag = false
            })
        },
    }
}
</script>
@@ -504,22 +669,27 @@
    list-style: none;
    font-size: 14px;
}

.preview-title {
    padding: 12px;
    margin-bottom: 14px;
    font-size: 16px;
}

.preview-content {
    font-size: 14px;
    display: flex;
    align-items: center;

    .img {
        width: 30%;
    }

    ul {
        list-style: none;
        display: flex;
        flex-wrap: wrap;

        li {
            width: 50%;
            flex: 1 0 auto;
@@ -527,4 +697,7 @@
        }
    }
}
.workbench {
    list-style: none;
}
</style>