处理显示名称

gaoshp

2024-11-05 e2fdfe540eaf160dc7d063c60667041edcc64e86

 src/views/console/workstation/index.vue

@@ -177,7 +177,7 @@
                                          <el-col :span="8">
                                             {{ info.properties }}
                                          </el-col>
                                          <el-col :span="4">
                                          <!-- <el-col :span="4">
                                             程序传输方式
                                          </el-col>
                                          <el-col :span="8">
@@ -191,7 +191,7 @@
                                          </el-col>
                                          <el-col :span="4">
                                             工作台
                                          </el-col>
                                          </el-col> -->
                                          <el-col :span="8">
                                             <ul class="workbench">
                                                <li v-for="item in workbenchVOList" :key="item.sort">
@@ -228,13 +228,13 @@
                     <el-main class="" v-show="addGroupShow">
                        <el-form v-show="treeCheckedNode.id == 1" :model="form" :rules="rules" ref="dialogForm"
                           label-width="200px" label-position="left">
                           <el-form-item label="产线标签" prop="groupTag">
                           <!-- <el-form-item label="产线标签" prop="groupTag">
                              <el-select v-model="form.groupTag" clearable placeholder="产线标签"
                                 style="width: 240px">
                                 <el-option v-for="item in beltline_type" :key="item.dictKey"
                                    :label="item.dictValue" :value="item.dictKey" />
                              </el-select>
                           </el-form-item>
                           </el-form-item> -->
                           <el-form-item label="产线名称" prop="name">
                              <el-input style="width: 240px" v-model="form.name" clearable
                                 placeholder="产线名称"></el-input>
@@ -274,9 +274,8 @@
                     <el-header v-show="!addGroupShow">
                        <div class="left-panel">
                           <el-button @click="addChild" type="primary" plain>新增下级</el-button>
                           <el-popconfirm width="220" cancel-button-text="停用" confirm-button-text="删除"
                              title="删除会将工位组下的工位移动到默认组中，请确认是否删除？" @confirm="deleteWorkGroup"
                              @cancel="table_del([scope.row], '1')">
                           <el-popconfirm width="220" cancel-button-text="取消" confirm-button-text="删除"
                              title="删除会将工位组下的工位移动到默认组中，请确认是否删除？" @confirm="deleteWorkGroup">
                              <template #reference>
                                 <el-button v-show="!['1', '101'].includes(treeCheckedNode.id)" type="danger"
                                    plain>删除</el-button>
@@ -405,7 +404,7 @@
         previewData: {},
         // --------
         form: {
            groupTag: '',
            groupTag: 'beltline',
            name: '',
            sort: '',
            remark: ''
@@ -475,7 +474,7 @@
   methods: {
      // 数据点导出
      getExport() {
         this.$HTTP.get(`/api/blade-cps/workstation/export-dp?` + this.$TOOL.qsStringify({
         this.$HTTP.get(`/api/smis/workstation/export-dp?` + this.$TOOL.qsStringify({
            workstationId: this.previewData.id
         })).then(res => {
            if (res.code == 200) {
@@ -641,24 +640,26 @@
            return
         }
         console.log(data, '>>>>>>>>>>>')
         data.machineId && this.$HTTP.get(`/api/blade-cps/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/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 || []
         })


         // 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-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 = {
@@ -689,7 +690,7 @@
         this.$refs.dialog.open('edit', row)
      },
      table_del(row, index, type) {
         this.$HTTP.delete(`/api/blade-cps/workstation?type=0&workstationIds=${row.id}`).then(res => {
         this.$HTTP.delete(`/api/smis/workstation?type=0&workstationIds=${row.id}`).then(res => {
            this.search()
         })
      },
@@ -697,12 +698,12 @@
         this.selection = selection
      },
      batchDel() {
         this.$HTTP.delete(`/api/blade-cps/workstation?type=0&workstationIds=${this.selection.map(item => item.id).join(',')}`).then(res => {
         this.$HTTP.delete(`/api/smis/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.$HTTP.post('/api/smis/workstation-wcs/save', this.workbenchVOList).then(res => {
            this.editFlag = false
            this.showTable = true
         })