+
@@ -307,7 +306,10 @@
-
-
+
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 361ea14a..d7254f4a 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -29,12 +29,12 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index e75344dd..9e844bfd 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -126,12 +126,16 @@
diff --git a/web_widget_model_viewer/static/src/images/not_model.png b/web_widget_model_viewer/static/src/images/not_model.png
new file mode 100644
index 00000000..16e69cea
Binary files /dev/null and b/web_widget_model_viewer/static/src/images/not_model.png differ
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 582c887f..0f8ef168 100644
--- a/web_widget_model_viewer/static/src/js/3d_viewer.js
+++ b/web_widget_model_viewer/static/src/js/3d_viewer.js
@@ -1,14 +1,14 @@
/** @odoo-module **/
-import { registry } from "@web/core/registry";
-import { _lt } from "@web/core/l10n/translation";
-import { standardFieldProps } from "@web/views/fields/standard_field_props";
-import { useInputField } from "@web/views/fields/input_field_hook";
-import { FileUploader } from "@web/views/fields/file_handler";
-import { session } from "@web/session";
-import { useService } from "@web/core/utils/hooks";
-import { isBinarySize } from "@web/core/utils/binary";
-import { download } from "@web/core/network/download";
+import {registry} from "@web/core/registry";
+import {_lt} from "@web/core/l10n/translation";
+import {standardFieldProps} from "@web/views/fields/standard_field_props";
+import {useInputField} from "@web/views/fields/input_field_hook";
+import {FileUploader} from "@web/views/fields/file_handler";
+import {session} from "@web/session";
+import {useService} from "@web/core/utils/hooks";
+import {isBinarySize} from "@web/core/utils/binary";
+import {download} from "@web/core/network/download";
import utils from 'web.utils';
import core from 'web.core';
@@ -16,34 +16,42 @@ import rpc from 'web.rpc';
var QWeb = core.qweb;
-import { Component, onWillUpdateProps, useState, useRef, useEffect } from "@odoo/owl";
+import {Component, onWillUpdateProps, useState, useRef, useEffect} from "@odoo/owl";
export class StepViewer extends Component {
- setup() {
- console.log('setup')
+ setup() {
this.props.url = this.formatUrl();
}
- formatUrl(){
+ formatUrl() {
var url = '';
if (this.props.value) {
- if (utils.is_bin_size(this.props.value)) {
+ if (this.props.value.slice(-1) == 'b' && !isNaN(this.props.value.split(' ')[0])) {
var url_props = {
base_url: session['web.base.url'],
model: this.props.record.resModel,
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)
-
+ field: this.props.name
+ }
+ url = url_props['base_url'].replace('http://', 'https://') + '/web/content/' + url_props['model'] + '/' + url_props['id'] + '/' + url_props['field'] + '?download=true'
+ // url = 'http://localhost:8069'+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true'
+ console.log('url111111', url)
+ return url
} else {
url = "data:model/gltf-binary;base64," + this.props.value;
- console.log('url222', url)
+ console.log('url2', url)
+ return url
+ // localStorage.setItem('url',url)
+ // let new_url = localStorage.getItem(('url'))
+ // var oViewer = document.getElementsByTagName('model-viewer')[0];
+ // return new_url
+ // url = "web_widget_model_viewer/static/src/images/not_model.png";
}
+ } else {
+ var oImg = document.getElementsByClassName('test')[0]
+ console.log(oImg)
}
- return url
}
-
}
StepViewer.template = "web_widget_model_viewer.BinaryField3d";
@@ -53,10 +61,10 @@ StepViewer.supportedTypes = ["binary"];
StepViewer.props = {
...standardFieldProps,
- url: { type: String, optional: true },
+ url: {type: String, optional: true},
};
-StepViewer.extractProps = ({ attrs }) => {
+StepViewer.extractProps = ({attrs}) => {
return {
url: attrs.options.url,
};
diff --git a/web_widget_model_viewer/static/src/js/3d_viewer.xml b/web_widget_model_viewer/static/src/js/3d_viewer.xml
index a9da9606..587c1ac4 100644
--- a/web_widget_model_viewer/static/src/js/3d_viewer.xml
+++ b/web_widget_model_viewer/static/src/js/3d_viewer.xml
@@ -2,37 +2,42 @@
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 当前制造订单暂无模型
+
+
+
+
+
+
+
+
+
+