From 76293f5cca2c2d91ccc2bc9aebb835f76786ef32 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 21 Aug 2023 17:22:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=9Dtable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_maintenance/views/maintenance_request_views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_maintenance/views/maintenance_request_views.xml b/sf_maintenance/views/maintenance_request_views.xml index c942deac..39c82384 100644 --- a/sf_maintenance/views/maintenance_request_views.xml +++ b/sf_maintenance/views/maintenance_request_views.xml @@ -21,7 +21,7 @@ - + From b01a5a4216611b8f572f483f51ab2c24b8f90470 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Wed, 23 Aug 2023 14:37:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=80=E6=8A=8A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=96=B0=E5=A2=9Ebt50=20=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=93=81=E7=89=8C=E5=9B=BE=E7=89=87=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/base.py | 2 +- sf_base/views/base_view.xml | 1 + sf_mrs_connect/models/sync_common.py | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sf_base/models/base.py b/sf_base/models/base.py index bb225b9b..a340aaca 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -256,7 +256,7 @@ class MachineToolType(models.Model): name = fields.Char('名称') brand_id = fields.Many2one('sf.machine.brand', string='品牌') knife_type = fields.Selection( - [("BT40", "BT40"), ("BT30", "BT30")], + [("BT40", "BT40"), ("BT30", "BT30"), ("BT50", "BT50")], default="", string="刀把类型") number_of_knife_library = fields.Integer('刀库数量') rotate_speed = fields.Integer('转速') diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml index 88a2dd86..eff588a4 100644 --- a/sf_base/views/base_view.xml +++ b/sf_base/views/base_view.xml @@ -30,6 +30,7 @@ + diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index 6c2003ff..a9ea2c24 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -569,15 +569,20 @@ class MachineBrand(models.Model): result = json.loads(r['result']) if result['status'] == 1: for item in result['machine_brand_all_list']: + brand = self.env['sf.machine.brand'].search( [("code", '=', item['code'])]) if not brand: + if item.get('image_brand'): + image = base64.b64decode(item['image_brand']) + else: + image = '' self.env['sf.machine.brand'].create({ "id": item['id'], "name": item['name'], "code": item['code'], "remark": item['remark'], - "image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand), + "image_brand": image, "tag_ids": self.env['sf.machine.brand.tags'].search( [("name", 'in', item['tag_ids'])]).ids }) From 0b30408aaeaf1f60e9356d6f0282eebf53fb012d Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Wed, 23 Aug 2023 15:47:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B03D=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/src/images/not_model.png | Bin 0 -> 3601 bytes .../static/src/js/3d_viewer.js | 27 ++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 web_widget_model_viewer/static/src/images/not_model.png 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 0000000000000000000000000000000000000000..16e69cea9bd5e71fa915970ada4e7083127f58d7 GIT binary patch literal 3601 zcmV+s4({=ZP)rH#gng-MhQH%*@P0L`1~I z#ICNcA{*QOFu!9g45U}T$)dD%0nKP3R!esJ?Km6ejZUV5Qv8@5;x=6vI=pQh z8R~{NO^nU)zS3)ll@vFkhsb%X;Uz)Enn0*dT1Wk5>kXXlc_>rb z9L{LYuVjPzJU3MuJLjWNXj6E%X>HiJJngvGa@48)cn`L4a_CWx)7SYbr18gFZONW& zQI2*S9as;Eb}?_YnV%)fk@sFu1SsL9+fG|@*pXd_BXv;D?ZSPa%XROnE1t+)R}!ET z!RA*TT`n?UhZl^xv@0_jd}j`tfVwJgbZ{xj@9a`p(2n(67gb23{uPD4Ox3Mr-yt2@ zX#}Q0qOo1~@klSeZdBut>wB%8U&3y}xv!jKkg(uzc1ulwo#%)$(7e$~Fghd%UOy() zNjqAIly!T3cPFSXt(!hA5z)5%|4vAD3zCWna(=Vtd;+-YXqF-lZ*I}#8J`4BTTO}{ zA!s#sz6M}5O3~;a!H{A@j@nCtO;TLC_MVrlM&OMSZdek#POc zpFEg{kL#@G$`D*V*bOzO4LsdG>;_NvQMH%*(R*y##7Am*l=ClF#QMotzt}+pbuRRcoBnbPnR-g*bW1(mdA_ysPDBhhF zA3Eq|c)%RQNBgyArwa1@eri9HM_&NrUYAq2VI+zKC}rHUE=78xPIwVWSh43eZ$LU4 z0ZSuu2~MinHe1sQ?inRundy7MU4+gqHu~UXhQehw%ye)vLxF>9%JPrOJt5mGc#Ii? z8&oxuhRmjr*o6I@9<7JPWW?!RnX_MzSRzp$unDOV>*UlPY!qVPNUX_;&R~UP8sLo27q!ZnD}s~FS4*o z-BBM&uD~egVvQtMU`VC@XpbihNgx&{r1)V^L1p2UWJEZcY>0s~Vtzuc?7QKj%wA&> znsTXe$0RgFYVu=5R-rj}+z(JrZ8mj1o*2gli-OdkiiT;H4T^$V^0k#{bA_wNKN$$h zO=M=}XUngo=eKi}QSS{dU)4B_70n*Z^D-Rc;8P=l|y8~&-P7$OjJ zP{l*~?B760dVZ=2jEi7!Rg=Acv96I)2}%ePM>LNUi9m)ERrvWip+>5LAjaOaSGBo7 zVVb58VLsQA{}Ij0>_9Nv?f2ow@CyKD=?hwp@nA%3UdeR>BMpR-+`zys#d^CP%+@{p1UuF=QeOHRUtEW_<%42w}`-53@}Se<9H z+5QZ`&wfU6*rJAREBBlO;8OmB2tLA3dSHs#-|`GKHL(Rd!$~1s_)Iq}Waq z*%%lefR?*%6+@SuA(x+$v03h_>7rmyjF0c|k_|B2h^G0o`=PiHootAqo3Fi@ZvF1S zC-P@e46lM1R!^_iGu#2wB(kaj6aeI_h8TKzr(_x6`|8|+aDlEO$uiUtLla=xM7dx- z7lKpafLewgRxYyb?iH8;Rk|X>WKzl3gjBUzS!CvgMPf+!@_zt`L{7yogdfcCctJRs z=H+-YKMP0HF_Z-p0BwstIjSj!JzQXDf;iQ`lTg_A?N3$VD>jh&?L>vg;3 z_W)c`ve{a(mtHkcencI^Patfsny5@a#;n)HL zzW&=v!8~un?`4nzs%e5OmeYhGB6!4?R!!9mRi>1o`q2ECo@40Lu23*|etX>?egKI> z?Y#A5WKAW<@IzEnKnzt?L$MQmA&7R&@Em|62^4RRGDdQtDlNSOn_OX9&v3Iuim3*o z`e_PbjkX8DB*#!$rN#_8s@n85r-7{=eq&gA%y2TJL24i=F+q~MT4Y%BjMG0g*j+6L zd8tbOQy0OWeE0xD`5{DUEMZ=#3zC{P2{=oI5*W3PrRt1IDCL%1dB$WCz#P_=pgoJ(Owb2cN-~si9>I8P`I2Cv%0yiHP7f{074EYZ`*aS1^Rv0J*_Tnk{iE zgx{h7M5i_%YMRJYxZSTbIao`zw#q{eX53j++Tk|fKOSIEilgN zDQQfO;TZ&(F~l7VGj%D;*kXbi7TIh{zQZsAI@+jac--P<98x553{f?ZIh2)Qer&-s zJ|qka9=X235a}fGib{q?po#me5@#900AwZ?nHd%)p4gUm-(kZu2%DB+s8cpE!;dAh zk$6s5Em?-Pre!sam0@9w&oobi7=qtut}Vj3G!FMd>YODGrJWWA;UvfK2#95KT51Et@xM^{(hOykDszPhE5m}Y)XjNQuqllvfP`R{ zp-4@VV~A{Z(xMtL&F})W@7(1W85ZZf>+V}nlqpUAJL{sFnwjXMp@MDlzjXc=72KJj zzlx`r!jERmP`&_An80IXSiEn+cJB!(&EcBEKCLv1y?`V}+^3F_mZq=`Ux2iuH@jF_R1cngJIXJlBs_r!Mpa9yV~5OsU-ne9AIj4M3T6mcj>0mwUFg3wE)9UfT~ z-O5&(#ug<}$8-;Pt!j37b1jA@r|!#A*Zarmg%l3orq5QgZ}ATw+krGi@NBU@vjjsUspR!+(><+U#tHH&s&V^nVHfX z4WobV=?$J;8~^i%<9~*9{LcZu!L!`se;$AQdn&xaz8K@*+vE-Qry2hqL*w5k>J9e# z8vlN6Z?Nay`1ehGgS{`uzklf)>_I#JeT3g&FX#d9=gn%E@$bn#{(be|;N1x0f4{{W zyrbj|-ZL})cLlw{`<~w5on7O9@7f!@JMRtNe>nbkSiZq~NZ;UHvTyJ{;5T@ubHCrq zy=X)yM*nX0$zVbnj0gkXau<*ILr>NQL-bkzRj zMZZxOrBLuq0lOasoP;ZxrU}xd(T@j*Ag;5TNfTM%)Zd4}lup{w%KQrLyH^j1S8e)| zWaF`l`^sRHT-<~f^#F@B^KL{fz#-Rf^$xYcztU5Qhc+*wS&(4l>{m?q%Qn}EoJ&5} zK}VK=xDV%dp#t<$Znvosx?OfGv^&omG)LIo^(wt!XUiFMuKQF>&Df2rQU~qQfE1(@ zpYmSYsw#W*LN9o%P6{t=wW)5B6?Wun3MuM7h+|uJlqtXN9W;SHr5wFBngFSjaMRb0 zXB3WdbenF*#-;pv@La1x?Z|OPbIvLowBxwx>-k~mHf;{?uA2}9Y3=j$g!b#l+Yy|o zP5eTCj-;e7qEq?(S|=f|s9)ihDUZ6Vtb{#zpoEp zNs1db60`J_%J+Mu4ugs}O%8OGeoR{4fD}6#b~S#wFxK$4Ic2CDm|T1Wa`9f%3$a8h{JSprF4*@AM*Gg X(6rX59wR)Y00000NkvXXu0mjfct!U| literal 0 HcmV?d00001 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..f93cf207 100644 --- a/web_widget_model_viewer/static/src/js/3d_viewer.js +++ b/web_widget_model_viewer/static/src/js/3d_viewer.js @@ -19,31 +19,34 @@ var QWeb = core.qweb; 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(){ 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) - + 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) + url = "data:model/gltf-binary;base64," + this.props.value; + 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"; } } - return url - } - + } } StepViewer.template = "web_widget_model_viewer.BinaryField3d"; From 11a06df0a46783a4c5c3c3099727aea732432495 Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Wed, 23 Aug 2023 17:32:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E6=89=80=E6=9C=89=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E7=95=8C=E9=9D=A2=E7=9A=84=E5=8A=A0=E7=B2=97=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=83=BD=E6=94=B9=E4=B8=BAname=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9B=E4=BC=98=E5=8C=96=E4=BA=86=E5=88=80=E5=85=B7=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/views/tool_base_views.xml | 26 +- .../views/tool_material_search.xml | 293 +++++++++--------- 2 files changed, 167 insertions(+), 152 deletions(-) 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 @@
- +
+

+ +

+
+ - @@ -143,147 +147,158 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -