update

gaoshp

2024-10-05 65972957e56a31778cc1633b1032ac16627665f3

 src/views/console/workstation/index.vue

@@ -153,65 +153,9 @@
                                                size="small">数据点编辑</el-button>
                                          </el-header>
                                          <el-main>
                                             <el-table :data="list" height="200px"
                                                @selection-change="handleSelectionChange">
                                                <el-table-column type="selection" width="55"
                                                   v-if="editFlag" />
                                                <el-table-column label="采集变量名称" prop="name"
                                                   width="120" />
                                                <el-table-column label="工位变量名称" prop="dataItem"
                                                   width="120">
                                                   <template #default="scope">
                                                      <el-input :disabled="!editFlag"
                                                         v-model="scope.row.dataItem"></el-input>
                                                   </template>
                                                </el-table-column>
                                                <el-table-column label="数据标签" prop="description"
                                                   width="150">
                                                   <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"
                                                   width="150">
                                                   <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-table :data="list" height="200px">
                                             </el-table> -->
                                             <CollTable ref="collTable" :info="previewData"></CollTable>
                                          </el-main>
                                       </el-container>
                                    </el-tab-pane>
@@ -394,7 +338,7 @@
         </el-tabs>
      </el-card>
      <Dialog ref="dialog" @success="success" :option="{ types, status, group }"></Dialog>
      <CollDialog ref="CollDialog" @success="success" :option="{ previewData }"></CollDialog>
      <CollDialog ref="CollDialog" @success="successColl" :option="{ previewData }"></CollDialog>
   </el-main>
</template>

@@ -402,12 +346,14 @@
import pmsPng from '@/assets/pms.png'
import Dialog from './Dialog.vue'
import CollDialog from './CollDialog.vue'
import CollTable from './CollTable.vue'
import machinePng from '@/assets/machine.png'
export default {
   name: 'system',
   components: {
      Dialog,
      CollDialog
      CollDialog,
      CollTable
   },
   data() {
      return {
@@ -518,6 +464,9 @@
      // 数据点编辑
      editCollection() {
         this.$refs.CollDialog.open('edit', this.previewData)
      },
      successColl() {
         this.$refs.collTable.refresh()
      },
      handleSelectionChange(val) {
         val.forEach(v => {
@@ -671,7 +620,13 @@
         }
         console.log(data, '>>>>>>>>>>>')
         this.$HTTP.get(`/api/blade-cps/workstation/listDmpVariablesByMachineId?machineId=${data.machineId}`).then(res => {
            this.list = res?.data?.dmpVariablesVOList
            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] || '-'
            })