Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new

lzhe

2024-11-02 dacb01570523f6a0eae1da36441891e87f217ed1

Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new

 src/views/console/workstation/Dialog.vue

@@ -137,10 +137,7 @@
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="4">
                    <!-- <el-form-item label="工作台" prop="workbenchVOList"> -->

                    <!-- </el-form-item> -->
                <!-- <el-col :span="4">
                    <span>工作台</span>

                </el-col>
@@ -152,7 +149,7 @@
                        </li>
                    </ul>
                    <el-button style="margin-left: 50px;margin-top: 8px" @click="addWork">添加工作台</el-button>
                </el-col>
                </el-col> -->
                <el-col :span="12">
                    <el-form-item label="数据权限" prop="createDept">
                        <el-tree-select :props="{

 src/views/console/workstation/index.vue

@@ -640,24 +640,26 @@
                return
            }
            console.log(data, '>>>>>>>>>>>')
            data.machineId && this.$HTTP.get(`/api/smis/workstation/listDmpVariablesByMachineId?machineId=${data.machineId}`).then(res => {
                this.list = res?.data


            // data.machineId && this.$HTTP.get(`/api/smis/workstation/listDmpVariablesByMachineId?machineId=${data.machineId}`).then(res => {
            //     this.list = res?.data
            //     // Object.keys(this.basic).forEach(key => {
            //     //     this.basic[key] = res?.data?.[key] || '-'
            //     // })
            // })
            // this.$HTTP.get(`/api/smis/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/smis/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/smis/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 || []
            })
            // })
            // this.$HTTP.get(`/api/smis/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) {
            var params = {