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

Accept Merge Request #482: (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/482?initial=true
This commit is contained in:
龚启豪
2023-10-16 17:24:17 +08:00
committed by Coding
parent d532ff8c05 e3bdf9409f
commit d02e0cf455
2 changed files with 73 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
jikimo_frontend/static/src/scss/custom_style.scss
View File

@@ -316,4 +316,28 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
.o_horizontal_separator { .o_horizontal_separator {
font-size: 1.5rem; font-size: 1.5rem;
} }
.o_field_widget input[class='o_input'] {
text-align: center
}
div:has(.o_required_modifier) > label::before {
position: absolute;
left: -3px;
}
.o_form_view .o_form_label {
position: relative;
width: 9rem;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
padding-left: 1rem;
}
.o_form_view .o_form_label:hover {
white-space: normal;
overflow: visible;
}

59
sf_maintenance/views/maintenance_views.xml
View File

@@ -265,6 +265,9 @@
attrs="{'required': [('equipment_type', '=', 'AGV小车')]}" attrs="{'required': [('equipment_type', '=', 'AGV小车')]}"
options="{'format': false}"/> options="{'format': false}"/>
</div> </div>
<div>
</div>
</div> </div>
<label for="AGV_goods_L" string="载货尺寸MAX(mm)"/> <label for="AGV_goods_L" string="载货尺寸MAX(mm)"/>
<div class="test_model"> <div class="test_model">
@@ -288,6 +291,9 @@
attrs="{'required': [('equipment_type', '=', 'AGV小车')]}" attrs="{'required': [('equipment_type', '=', 'AGV小车')]}"
options="{'format': false}"/> options="{'format': false}"/>
</div> </div>
<div>
</div>
</div> </div>
<label for="AGV_velocity" string=""/> <label for="AGV_velocity" string=""/>
<div class="test_model"> <div class="test_model">
@@ -528,6 +534,10 @@
<field name="AGV_security" class="o_address_zip" <field name="AGV_security" class="o_address_zip"
options="{'format': false}"/> options="{'format': false}"/>
</div>
<div>
</div> </div>
</div> </div>
<label for="AGV_operating_temperature" string=""/> <label for="AGV_operating_temperature" string=""/>
@@ -549,6 +559,14 @@
options="{'format': false}"/> options="{'format': false}"/>
<span>°&amp;nbsp;</span> <span>°&amp;nbsp;</span>
</div> </div>
<div>
</div>
<div>
</div>
</div> </div>
</group> </group>
@@ -581,6 +599,9 @@
options="{'format': false}"/> options="{'format': false}"/>
<span>mm&amp;nbsp;</span> <span>mm&amp;nbsp;</span>
</div> </div>
<div>
</div>
</div> </div>
@@ -686,6 +707,9 @@
options="{'format': false}"/> options="{'format': false}"/>
<span>&amp;nbsp;</span> <span>&amp;nbsp;</span>
</div> </div>
<div>
</div>
</div> </div>
@@ -744,6 +768,25 @@
<span>mm&amp;nbsp;</span> <span>mm&amp;nbsp;</span>
</div> </div>
</div> </div>
<label for="detect_x_axis" string="物方视场:"/>
<div class="test_model">
<div>
<label for="detect_object_field_of_view_min" string="最小"/>
<field name="detect_object_field_of_view_min" class="o_address_zip"
options="{'format': false}"/>
<span>mm&amp;nbsp;</span>
</div>
<div>
<label for="detect_object_field_of_view_max" string="最大"/>
<field name="detect_object_field_of_view_max" class="o_address_zip"
options="{'format': false}"/>
<span>mm&amp;nbsp;</span>
</div>
<div>
</div>
</div>
<label for="detect_precision" string=""/> <label for="detect_precision" string=""/>
<div class="test_model"> <div class="test_model">
<div> <div>
@@ -847,14 +890,10 @@
<span>&amp;nbsp;</span> <span>&amp;nbsp;</span>
</div> </div>
<div> <div>
<label for="detect_object_field_of_view_max" string="物方视场:"/> <label for="detect_power_requirements" string="电源要求"/>
<span>最小&amp;nbsp;</span> <field name="detect_power_requirements" class="o_address_zip"
<field name="detect_object_field_of_view_max" class="o_address_zip"
options="{'format': false}"/> options="{'format': false}"/>
<span>mm~最大&amp;nbsp;</span> <span>&amp;nbsp;</span>
<field name="detect_object_field_of_view_min" class="o_address_zip"
options="{'format': false}"/>
<span>mm&amp;nbsp;</span>
</div> </div>
</div> </div>
<label for="detect_operating_temperature" string=""/> <label for="detect_operating_temperature" string=""/>
@@ -872,11 +911,9 @@
<span>&amp;nbsp;</span> <span>&amp;nbsp;</span>
</div> </div>
<div> <div>
<label for="detect_power_requirements" string="电源要求"/>
<field name="detect_power_requirements" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
</div> </div>
</div> </div>
</group> </group>
</page> </page>