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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复

Browse Source
This commit is contained in:
jinling.yang
2023-09-18 17:42:13 +08:00
parent a96c7a34c1 0ac82acbad
commit ab42bde8f2
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,7 @@ td.o_required_modifier {
.o_list_view .o_list_table thead { .o_list_view .o_list_table thead {
position: sticky; position: sticky;
top: 0; top: 0;
z-index: 100000; //z-index: 100000;
} }
//.o_list_view .o_list_table { //.o_list_view .o_list_table {
// height: 1799px !important; // height: 1799px !important;
@@ -172,7 +172,7 @@ td.o_required_modifier {
.o_form_view.o_xxl_form_view .o_form_sheet_bg > .o_form_statusbar { .o_form_view.o_xxl_form_view .o_form_sheet_bg > .o_form_statusbar {
position: sticky !important; position: sticky !important;
top: 0; top: 0;
z-index: 100000; //z-index: 100000;
} }
//----------------------------------------------------------- //-----------------------------------------------------------

4
odoo.conf
View File

@@ -53,8 +53,8 @@ syslog = False
test_enable = False test_enable = False
test_file = test_file =
test_tags = None test_tags = None
transient_age_limit = 1.0 ;transient_age_limit = 1.0
translate_modules = ['all'] ;translate_modules = ['all']
unaccent = False unaccent = False
upgrade_path = upgrade_path =
without_demo = False without_demo = False

6
sf_manufacturing/models/product_template.py
View File

@@ -1,8 +1,8 @@
from odoo import models, fields, api from odoo import models, fields, api
from odoo.exceptions import ValidationError from odoo.exceptions import ValidationError
from odoo.modules import get_resource_path from odoo.modules import get_resource_path
# from OCC.Extend.DataExchange import read_step_file from OCC.Extend.DataExchange import read_step_file
# from OCC.Extend.DataExchange import write_stl_file from OCC.Extend.DataExchange import write_stl_file
import logging import logging
import base64 import base64
import hashlib import hashlib
@@ -738,7 +738,7 @@ class ResProductMo(models.Model):
def transition_glb_file(self, report_path, code): def transition_glb_file(self, report_path, code):
shapes = read_step_file(report_path) shapes = read_step_file(report_path)
output_file = os.path.join('/tmp', str(code) + '.stl') output_file = os.path.join('/tmp', str(code) + '.stl')
# write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
# 转化为glb # 转化为glb
output_glb_file = os.path.join('/tmp', str(code) + '.glb') output_glb_file = os.path.join('/tmp', str(code) + '.glb')
util_path = get_resource_path('sf_dlm', 'static/util') util_path = get_resource_path('sf_dlm', 'static/util')