Merge branch 'hwh'

hwh

2024-08-29 1427584584848e1a8c7997d84945c0d19488d698

 Web/src/views/wcs/wcsDevice/index.vue

@@ -37,7 +37,6 @@
                  style="margin-left:5px;"> 隐藏 </el-button>
                <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWcsDevice"
                  v-auth="'wcsDevice:add'"> 新增 </el-button>

              </el-button-group>
            </el-form-item>

@@ -59,7 +58,7 @@
        <el-table-column prop="level" label="设备级别" show-overflow-tooltip="">
          <template #default="scope">
            <el-tag :type="dv('DeviceLevelEnum', scope.row.level)?.tagType"> {{ dv('DeviceLevelEnum',
              scope.row.level)?.name}}</el-tag>
              scope.row.level)?.name }}</el-tag>
          </template>
        </el-table-column>
        <el-table-column prop="dbNumber" label="DB区域" show-overflow-tooltip="" />
@@ -69,7 +68,7 @@
        <el-table-column prop="posType" label="流程字类型" show-overflow-tooltip="">
          <template #default="scope">
            <el-tag :type="dv('PLCDataTypeEnum', scope.row.posType)?.tagType"> {{ dv('PLCDataTypeEnum',
              scope.row.posType)?.name}}</el-tag>
              scope.row.posType)?.name }}</el-tag>
          </template>
        </el-table-column>
        <el-table-column prop="ledIP" label="显示屏ip地址" show-overflow-tooltip="" />
@@ -79,13 +78,15 @@
            <ModifyRecord :data="scope.row" />
          </template>
        </el-table-column>
        <el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip=""
        <el-table-column label="操作" width="220" align="center" fixed="right" show-overflow-tooltip=""
          v-if="auth('wcsDevice:update') || auth('wcsDevice:delete')">
          <template #default="scope">
            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditWcsDevice(scope.row)"
              v-auth="'wcsDevice:update'"> 编辑 </el-button>
            <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delWcsDevice(scope.row)"
              v-auth="'wcsDevice:delete'"> 删除 </el-button>
            <el-button icon="ele-Plus" size="small" text="" type="primary" @click="generateDevicePos(scope.row)"
              v-auth="'wcsDevice:generate'"> 生成点位 </el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -112,7 +113,7 @@

import printDialog from '/@/views/system/print/component/hiprint/preview.vue'
import editDialog from '/@/views/wcs/wcsDevice/component/editDialog.vue'
import { pageWcsDevice, deleteWcsDevice } from '/@/api/wcs/wcsDevice';
import { pageWcsDevice, deleteWcsDevice, generatePos } from '/@/api/wcs/wcsDevice';
import { getWcsPlcPlcIdDropdown } from '/@/api/wcs/wcsDevice';

const showAdvanceQueryUI = ref(false);
@@ -167,7 +168,20 @@
  editWcsDeviceTitle.value = '编辑设备信息';
  editDialogRef.value.openDialog(row);
};

//生成点位
const generateDevicePos = (row: any) => {
  ElMessageBox.prompt('请输入起始点位', '生成点位', {
    confirmButtonText: '确定',
    cancelButtonText: '取消',
  })
    .then(async ({ value }) => {
      await generatePos({ id: row.id, pos: value });
      ElMessage({
        type: 'success',
        message: `生成点位成功`,
      })
    })
}
// 删除
const delWcsDevice = (row: any) => {
  ElMessageBox.confirm(`确定要删除吗?`, "提示", {