Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6

wxw

2024-08-21 8520e36378e8e88cbbc45586bb31d1fec3be87ac

 Web/src/views/wcs/wcsDevice/component/editDialog.vue

@@ -15,7 +15,8 @@
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                  <el-form-item label="PlcId" prop="plcId">
                     <el-select clearable filterable v-model="ruleForm.plcId" placeholder="请选择PlcId">
                        <el-option v-for="(item,index) in wcsPlcPlcIdDropdownList" :key="index" :value="item.value" :label="item.label" />
                        <el-option v-for="(item, index) in wcsPlcPlcIdDropdownList" :key="index"
                           :value="item.value" :label="item.label" />
                        
                     </el-select>
                     
@@ -25,7 +26,9 @@
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                  <el-form-item label="设备级别" prop="level">
                     <el-select clearable v-model="ruleForm.level" placeholder="请选择设备级别">
                        <el-option v-for="(item,index) in dl('DeviceLevelEnum')" :key="index" :value="Number(item.value)" :label="`${item.name} (${item.code}) [${item.value}]`"></el-option>
                        <el-option v-for="(item, index) in dl('DeviceLevelEnum')" :key="index"
                           :value="Number(item.value)"
                           :label="`${item.name} (${item.code}) [${item.value}]`"></el-option>
                        
                     </el-select>
                     
@@ -34,49 +37,60 @@
               </el-col>
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                  <el-form-item label="DB区域" prop="dbNumber">
                     <el-input v-model="ruleForm.dbNumber" placeholder="请输入DB区域" maxlength="10" show-word-limit clearable />
                     <el-input v-model="ruleForm.dbNumber" placeholder="请输入DB区域" maxlength="10" show-word-limit
                        clearable />
                     
                  </el-form-item>
                  
               </el-col>
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                  <el-form-item label="工位号" prop="stationNum">
                     <el-input v-model="ruleForm.stationNum" placeholder="请输入工位号" maxlength="4" show-word-limit clearable />
                     <el-input v-model="ruleForm.stationNum" placeholder="请输入工位号" maxlength="4" show-word-limit
                        clearable />
                     
                  </el-form-item>
                  
               </el-col>
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                  <el-form-item label="PLC偏移量" prop="plcPos">
                     <el-input v-model="ruleForm.plcPos" placeholder="请输入PLC偏移量" maxlength="10" show-word-limit clearable />
                     <el-input v-model="ruleForm.plcPos" placeholder="请输入PLC偏移量" maxlength="10" show-word-limit
                        clearable />
                     
                  </el-form-item>
                  
               </el-col>
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                  <el-form-item label="WCS偏移量" prop="wcsPos">
                     <el-input v-model="ruleForm.wcsPos" placeholder="请输入WCS偏移量" maxlength="10" show-word-limit clearable />
                     <el-input v-model="ruleForm.wcsPos" placeholder="请输入WCS偏移量" maxlength="10" show-word-limit
                        clearable />
                     
                  </el-form-item>
                  
               </el-col>
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                  <el-form-item label="流程字类型" prop="posType">
                     <el-input v-model="ruleForm.posType" placeholder="请输入流程字类型" maxlength="10" show-word-limit clearable />
                     <el-select clearable v-model="ruleForm.posType" placeholder="请选择流程字类型">
                        <el-option v-for="(item, index) in dl('PLCDataTypeEnum')" :key="index"
                           :value="Number(item.value)"
                           :label="`${item.name} (${item.code}) [${item.value}]`"></el-option>

                     </el-select>
                     
                  </el-form-item>
                  
               </el-col>
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                  <el-form-item label="显示屏ip地址" prop="ledIP">
                     <el-input v-model="ruleForm.ledIP" placeholder="请输入显示屏ip地址" maxlength="50" show-word-limit clearable />
                     <el-input v-model="ruleForm.ledIP" placeholder="请输入显示屏ip地址" maxlength="50" show-word-limit
                        clearable />
                     
                  </el-form-item>
                  
               </el-col>
               <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                  <el-form-item label="描述" prop="text">
                     <el-input v-model="ruleForm.text" placeholder="请输入描述" maxlength="20" show-word-limit clearable />
                     <el-input v-model="ruleForm.text" placeholder="请输入描述" maxlength="20" show-word-limit
                        clearable />
                     
                  </el-form-item>
                  
@@ -189,7 +203,3 @@
   //将属性或者函数暴露给父组件
   defineExpose({ openDialog });
</script>