叶松
2023-10-12 c81bc4b256af86289c0071c752adb48a8871278d
AGV监控状态判断,模具修改
已修改2个文件
86 ■■■■ 文件已修改
web/src/views/Basics/MouldIndex.vue 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/DuctpiecePLM/ReportCenter/VideoAgv.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/Basics/MouldIndex.vue
@@ -13,8 +13,8 @@
        </el-select>
      </div>
      <div class="header_item">
        <span class="header_label">模具类型(块号):</span>
        <el-select v-model="mouldTypeId" :size="size" clearable placeholder="请选择模具类型(块号)">
        <span class="header_label">管片块号:</span>
        <el-select v-model="mouldTypeId" :size="size" clearable placeholder="请选择管片块号">
          <el-option
            v-for="item in mouldTypeData"
            :key="item.blockNum"
@@ -65,15 +65,17 @@
          </template>
        </el-table-column>
        <el-table-column prop="proName" label="项目名称" align="center"></el-table-column>
        <el-table-column prop="mouldNum" label="模具编号" align="center"></el-table-column>
        <el-table-column prop="mouldCode" label="模具型号" align="center"></el-table-column>
        <el-table-column prop="mouldTypeName" label="模具类型(块号)" align="center"></el-table-column>
        <el-table-column prop="mouldNum" label="模具编号" align="center"></el-table-column>
        <el-table-column prop="groutingHolesName" label="注浆孔" align="center"></el-table-column>
        <el-table-column prop="mouldTypeName" label="管片块号" align="center"></el-table-column>
        <el-table-column prop="mouldSizeName" label="尺寸" align="center"></el-table-column>
        <el-table-column prop="mouldTurnName" label="转向" align="center"></el-table-column>
        <el-table-column prop="groutingHolesName" label="注浆孔" align="center"></el-table-column>
        <el-table-column prop="supplierName" label="供应商" align="center"></el-table-column>
        <el-table-column prop="maxCycleTime" label="最大循环次数" align="center"></el-table-column>
        <el-table-column prop="currentCycleTime" label="累计循环次数" align="center"></el-table-column>
        <el-table-column prop="" label="次数" align="center"></el-table-column>
        <el-table-column prop="" label="天数" align="center"></el-table-column>
        <el-table-column label="使用状态" align="center">
          <template #default="{ row }">
            <div>
@@ -86,7 +88,7 @@
            <el-button class="table_btn" size="mini" v-if="showButton('update')" @click="propUpdate(row)">修改</el-button>
            <el-button class="delete_btn" size="mini" v-if="showButton('delete')" @click="deleteInfo(row)">删除</el-button>
            <el-button class="table_btn" size="mini" v-if="showButton('delete')" @click="propScanCode(row)">打印</el-button>
            <el-button class="table_btn" size="mini" v-if="showButton('update')" @click="showScanCode(row)">模具二维码</el-button>
            <!-- <el-button class="table_btn" size="mini" v-if="showButton('update')" @click="showScanCode(row)">模具二维码</el-button> -->
          </template>
        </el-table-column>
      </el-table>
@@ -126,11 +128,21 @@
        <el-form-item label="模具编号:" prop="mouldNum" v-if="!asyncTitle">
          <el-input v-model="formMould.mouldNum" :disabled="true" clearable placeholder="请输入模具编号"></el-input>
        </el-form-item>
        <el-form-item label="模具MN号:" prop="mouldMn">
        <!-- <el-form-item label="模具MN号:" prop="mouldMn">
          <el-input v-model="formMould.mouldMn" :size="size" clearable placeholder="请输入模具MN号"></el-input>
        </el-form-item> -->
        <el-form-item label="注浆孔:" prop="groutingHoles">
        <el-select v-model="formMould.groutingHoles" :size="size" clearable placeholder="请选择注浆孔">
          <el-option
            v-for="item in groutingHolesData"
            :key="item.groutingHoles"
            :label="item.dictName"
            :value="item.groutingHoles">
          </el-option>
        </el-select>
        </el-form-item>
        <el-form-item label="模具类型(块号):" prop="mouldType">
        <el-select v-model="formMould.mouldType" :size="size" clearable placeholder="请选择模具类型(块号)">
        <el-form-item label="管片块号:" prop="mouldType">
        <el-select v-model="formMould.mouldType" :size="size" clearable placeholder="请选择管片块号">
          <el-option
            v-for="item in mouldTypeDatas"
            :key="item.blockNum"
@@ -159,17 +171,7 @@
          </el-option>
        </el-select>
        </el-form-item>
        <el-form-item label="注浆孔:" prop="groutingHoles">
        <el-select v-model="formMould.groutingHoles" :size="size" clearable placeholder="请选择注浆孔">
          <el-option
            v-for="item in groutingHolesData"
            :key="item.groutingHoles"
            :label="item.dictName"
            :value="item.groutingHoles">
          </el-option>
        </el-select>
        </el-form-item>
        <el-form-item label="模具状态:" prop="status">
        <!-- <el-form-item label="模具状态:" prop="status">
        <el-select v-model="formMould.status" :size="size" clearable placeholder="请选择模具状态">
          <el-option
            v-for="item in mouldStatusData"
@@ -178,7 +180,7 @@
            :value="item.value">
          </el-option>
        </el-select>
        </el-form-item>
        </el-form-item> -->
        <el-form-item label="供应商:" prop="supplierId">
        <el-select v-model="formMould.supplierId" :size="size" clearable placeholder="请选择供应商">
          <el-option
@@ -189,6 +191,24 @@
          </el-option>
        </el-select>
        </el-form-item>
        <el-form-item label="模具检查预警值:" prop="supplierId">
          <el-input placeholder="请输入次数" v-model="input2" style="margin-right:15px">
            <template slot="append">次数</template>
          </el-input>
          <el-input placeholder="请输入天数" v-model="input2">
            <template slot="append">天数</template>
          </el-input>
        </el-form-item>
        <el-form-item label="使用状态:" prop="status">
        <el-select v-model="formMould.status" :size="size" clearable placeholder="请选择使用状态">
          <el-option
            v-for="item in mouldStatusData"
            :key="item.value"
            :label="item.label"
            :value="item.value">
          </el-option>
        </el-select>
        </el-form-item>
        <el-form-item label="最大循环次数:" prop="maxCycleTime">
          <el-input v-model="formMould.maxCycleTime" :size="size" clearable placeholder="请输入最大循环次数"></el-input>
        </el-form-item>
web/src/views/DuctpiecePLM/ReportCenter/VideoAgv.vue
@@ -34,10 +34,26 @@
        </el-table-column>
        <el-table-column prop="mouldCode" label="时间" align="center" ></el-table-column>
        <el-table-column prop="mouldNum" label="AGV名称" align="center" ></el-table-column>
        <el-table-column prop="agvTaskState" label="AGV状态" align="center" ></el-table-column>
        <el-table-column prop="agvJackingState" label="顶升机构状态" align="center" ></el-table-column>
        <el-table-column prop="agvLiftupHeavyState" label="是否存在重物" align="center" ></el-table-column>
        <el-table-column prop="agvTaskState" label="AGV任务状态" align="center" ></el-table-column>
        <el-table-column prop="agvWorkingState" label="AGV状态" align="center" >
            <template #default="{row}">
                <div>{{row.agvWorkingState ==='idle'?'空闲状态':row.agvWorkingState ==='busy'?'繁忙状态':row.agvWorkingState ==='error'?'故障状态':""}}</div>
            </template>
        </el-table-column>
        <el-table-column prop="agvJackingState" label="顶升机构状态" align="center" >
            <template #default="{row}">
                <div>{{row.agvJackingState ==='jackingUp'?'液压顶升':row.agvJackingState ==='jackingDown'?'液压下降':row.agvJackingState ==='jackingMiddle'?'液压中间位置':""}}</div>
            </template>
        </el-table-column>
        <el-table-column prop="agvLiftupHeavyState" label="是否存在重物" align="center" >
            <template #default="{row}">
                <div>{{row.agvLiftupHeavyState ==='heavyExistence'?'存在模具':row.agvLiftupHeavyState ==='heavyNoExistence'?'不存在模具':""}}</div>
            </template>
        </el-table-column>
        <el-table-column prop="agvTaskState" label="AGV任务状态" align="center" >
            <template #default="{row}">
                <div>{{row.agvTaskState ==='idle'?'空闲状态':row.agvTaskState ==='busy'?'繁忙状态':row.agvTaskState ==='error'?'故障状态':""}}</div>
            </template>
        </el-table-column>
        <el-table-column prop="agvCurrentLandmarkRFID" label="AGV当前位置" align="center" ></el-table-column>
        <el-table-column prop="battery1Voltage" label="电压" align="center"></el-table-column>
        <el-table-column prop="battery1Current" label="电流" align="center"></el-table-column>