From 06ed10bd5e8d60e8477cc13e45889e539dd2112b Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Wed, 16 Aug 2023 09:42:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_plan/views/view.xml | 31 +++++++++++++++---- .../static/src/js/3d_viewer.js | 3 ++ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml index 9e82fd8a..c3cc8218 100644 --- a/sf_plan/views/view.xml +++ b/sf_plan/views/view.xml @@ -27,8 +27,14 @@
+
+

+ +

+
@@ -38,12 +44,25 @@ - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/web_widget_model_viewer/static/src/js/3d_viewer.js b/web_widget_model_viewer/static/src/js/3d_viewer.js index 261590fb..582c887f 100644 --- a/web_widget_model_viewer/static/src/js/3d_viewer.js +++ b/web_widget_model_viewer/static/src/js/3d_viewer.js @@ -20,6 +20,7 @@ import { Component, onWillUpdateProps, useState, useRef, useEffect } from "@odoo export class StepViewer extends Component { setup() { + console.log('setup') this.props.url = this.formatUrl(); } @@ -33,9 +34,11 @@ export class StepViewer extends Component { id: JSON.stringify(this.props.record.data['id']), field: this.props.name} url = url_props['base_url']+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true' + console.log('url', url) } else { url = "data:model/gltf-binary;base64," + this.props.value; + console.log('url222', url) } } return url From 2169c10417c5b167abaae57d15ad069c8b50eb08 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Wed, 16 Aug 2023 10:11:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E9=A9=BE=E9=A9=B6=E8=88=B1=E5=BD=A2=E5=BC=8F=E4=B8=BA?= =?UTF-8?q?searchpanel=EF=BC=8C=E8=B4=B4=E8=BF=91=E6=95=B4=E4=BD=93?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mrp_workcenter_views.xml | 415 +++++++++--------- 1 file changed, 208 insertions(+), 207 deletions(-) diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml index cc3f6015..3bd8260e 100644 --- a/sf_manufacturing/views/mrp_workcenter_views.xml +++ b/sf_manufacturing/views/mrp_workcenter_views.xml @@ -102,197 +102,202 @@ - - - - - - - - - - - - - - - mrp.workcenter.kanban.inherit - mrp.workcenter - - - - - - - - - - - - - - - -
-
-
- - - -
-
- - - -
-
-
-
-
-
- - - - - - -
-
-
-
-
- - To Launch - -
-
- -
-
-
-
- - In Progress - -
-
- -
-
-
-
- - Late - -
-
- -
-
-
-
- - OEE - -
-
- - - % - - -
-
-
-
-
-
- - - -
-
-
- -
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + --> + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -321,22 +326,18 @@ - - - - - - - - - - - - - - + + + mrp.workcenter.inherit + mrp.workcenter + + + + + + + + + - - ======= - >>>>>>> develop