Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

2023-11-09 09:44:41 +08:00
parent b2a9088354 8483be5d2d
commit e3e253fab8
27 changed files with 1032 additions and 1253 deletions
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -95,7 +95,7 @@ class QuickEasyOrder(models.Model):
        write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
        # 转化为glb
        output_glb_file = os.path.join('/tmp', str(model_code) + '.glb')
-        util_path = get_resource_path('sf_dlm', 'static/util')
+        util_path = get_resource_path('sf_base', 'static/util')
        cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file)
        os.system(cmd)
        # 转base64