jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #481: (feature/修改机床参数bug -> develop)

Browse Source 
Merge Request: 修改设备table布局

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/481?initial=true
This commit is contained in:
龚启豪
2023-10-16 17:12:28 +08:00
committed by Coding
parent cbc298f6ad 0f15814916
commit d532ff8c05
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sf_maintenance/views/maintenance_views.xml
View File

@@ -242,7 +242,7 @@
<page string="设备参数" name="sf_equipment" <page string="设备参数" name="sf_equipment"
attrs="{'invisible': [('equipment_type', '!=', 'AGV小车')]}"> attrs="{'invisible': [('equipment_type', '!=', 'AGV小车')]}">
<group string="AGV基础参数"> <group string="基础参数">
<label for="AGV_L" string="设备尺寸(mm)"/> <label for="AGV_L" string="设备尺寸(mm)"/>
<div class="test_model"> <div class="test_model">
<div> <div>
@@ -555,7 +555,7 @@
</page> </page>
<page string="设备参数" name="sf_equipment" <page string="设备参数" name="sf_equipment"
attrs="{'invisible': [('equipment_type', '!=', '机器人')]}"> attrs="{'invisible': [('equipment_type', '!=', '机器人')]}">
<group string="机器人设备参数"> <group string="基础参数">
<label for="robot_gripping_of_workpieces_L" string="抓取工件最大尺寸"/> <label for="robot_gripping_of_workpieces_L" string="抓取工件最大尺寸"/>
<div class="test_model"> <div class="test_model">
<div> <div>
@@ -693,9 +693,9 @@
</group> </group>
</page> </page>
<page string="设备参数" name="sf_equipment" <page string="基础参数" name="sf_equipment"
attrs="{'invisible': [('equipment_type', '!=', '检测设备')]}"> attrs="{'invisible': [('equipment_type', '!=', '检测设备')]}">
<group string="三元检测设备基础参数"> <group string="基础参数">
<label for="detect_L" string="设备尺寸(mm)"/> <label for="detect_L" string="设备尺寸(mm)"/>
<div class="test_model"> <div class="test_model">
<div> <div>
@@ -850,11 +850,9 @@
<label for="detect_object_field_of_view_max" string="物方视场:"/> <label for="detect_object_field_of_view_max" string="物方视场:"/>
<span>最小&amp;nbsp;</span> <span>最小&amp;nbsp;</span>
<field name="detect_object_field_of_view_max" class="o_address_zip" <field name="detect_object_field_of_view_max" class="o_address_zip"
attrs="{'required': [('equipment_type', '=', '检测设备')]}"
options="{'format': false}"/> options="{'format': false}"/>
<span>mm~最大&amp;nbsp;</span> <span>mm~最大&amp;nbsp;</span>
<field name="detect_object_field_of_view_min" class="o_address_zip" <field name="detect_object_field_of_view_min" class="o_address_zip"
attrs="{'required': [('equipment_type', '=', '检测设备')]}"
options="{'format': false}"/> options="{'format': false}"/>
<span>mm&amp;nbsp;</span> <span>mm&amp;nbsp;</span>
</div> </div>