Accept Merge Request #342: (feature/必填字段label添加星号 -> develop)
Merge Request: 3d模型无法展示的时候用文字替换 Created By: @许何哲 Accepted By: @许何哲 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/342?initial=true
This commit is contained in:
@@ -22,6 +22,7 @@ export class StepViewer extends Component {
|
|||||||
setup() {
|
setup() {
|
||||||
this.props.url = this.formatUrl();
|
this.props.url = this.formatUrl();
|
||||||
}
|
}
|
||||||
|
|
||||||
formatUrl() {
|
formatUrl() {
|
||||||
var url = '';
|
var url = '';
|
||||||
if (this.props.value) {
|
if (this.props.value) {
|
||||||
@@ -30,7 +31,8 @@ export class StepViewer extends Component {
|
|||||||
base_url: session['web.base.url'],
|
base_url: session['web.base.url'],
|
||||||
model: this.props.record.resModel,
|
model: this.props.record.resModel,
|
||||||
id: JSON.stringify(this.props.record.data['id']),
|
id: JSON.stringify(this.props.record.data['id']),
|
||||||
field: this.props.name}
|
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 = 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'
|
// url = 'http://localhost:8069'+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true'
|
||||||
console.log('url111111', url)
|
console.log('url111111', url)
|
||||||
@@ -45,6 +47,9 @@ export class StepViewer extends Component {
|
|||||||
// return new_url
|
// return new_url
|
||||||
// url = "web_widget_model_viewer/static/src/images/not_model.png";
|
// url = "web_widget_model_viewer/static/src/images/not_model.png";
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
var oImg = document.getElementsByClassName('test')[0]
|
||||||
|
console.log(oImg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
<t t-name="web_widget_model_viewer.BinaryField3d" owl="1">
|
<t t-name="web_widget_model_viewer.BinaryField3d" owl="1">
|
||||||
|
|
||||||
|
<t t-if="props.value">
|
||||||
<model-viewer
|
<model-viewer
|
||||||
t-att-src='props.url'
|
t-att-src='props.url'
|
||||||
name="3D model"
|
name="3D model"
|
||||||
@@ -22,6 +23,10 @@
|
|||||||
<!-- </span>-->
|
<!-- </span>-->
|
||||||
<!-- </div>-->
|
<!-- </div>-->
|
||||||
</model-viewer>
|
</model-viewer>
|
||||||
|
</t>
|
||||||
|
<t t-if="!props.value">
|
||||||
|
<div style="color:red">当前制造订单暂无模型</div>
|
||||||
|
</t>
|
||||||
|
|
||||||
<!-- <model-viewer-->
|
<!-- <model-viewer-->
|
||||||
<!-- src='/jikimo_model_viewer/static/src/js/3d_viewer/test.glb'-->
|
<!-- src='/jikimo_model_viewer/static/src/js/3d_viewer/test.glb'-->
|
||||||
|
|||||||
Reference in New Issue
Block a user