From 9a1f4202eef9895cdf3576aa627c410cb00ba416 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Thu, 14 Jul 2022 17:13:55 +0800 Subject: [PATCH] =?UTF-8?q?3D=E5=BA=93=E6=88=BF=E6=A0=B7=E5=BC=8F/?= =?UTF-8?q?=E7=BD=91=E7=AB=99=E6=A0=87=E9=A2=98logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/favicon.svg | 50 ++++++++----- public/webA/index.js | 69 +++++++++++++----- public/webB/index.js | 49 +++++++++---- public/webC/index.js | 48 ++++++++---- public/webTotal/index.js | 4 +- src/assets/icons/svg/logo-title.svg | 44 +++++++++++ src/assets/icons/svg/logo.svg | 44 +++++++++++ src/assets/images/logo.png | Bin 8282 -> 8232 bytes src/assets/styles/lend-manage.scss | 15 ++-- src/layout/components/Sidebar/Logo.vue | 17 ++++- .../caseManage/caseLog/index.vue | 6 +- .../warehouse3D/fullView/index.vue | 16 ++-- 12 files changed, 274 insertions(+), 88 deletions(-) create mode 100644 src/assets/icons/svg/logo-title.svg create mode 100644 src/assets/icons/svg/logo.svg diff --git a/public/favicon.svg b/public/favicon.svg index c468967..5d6f050 100644 --- a/public/favicon.svg +++ b/public/favicon.svg @@ -3,30 +3,42 @@ + + + + + + + - - - - - - - + + + - - - - + + + + - - - + + + diff --git a/public/webA/index.js b/public/webA/index.js index 7b24652..395bdf6 100644 --- a/public/webA/index.js +++ b/public/webA/index.js @@ -667,19 +667,40 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { x.overlayColor = BABYLON.Color3.White(); x.renderOverlay = true; - //修改贴图 - - var bluexMat = new BABYLON.StandardMaterial("bluex", scene); - var tempddx = new BABYLON.Texture("./asset/blue.png", scene); - bluexMat.emissiveTexture = tempddx; - scene.getMeshByName("平面_1").material = bluexMat; - tempddx.uAng = (180 * Math.PI) / 180; - - var redMat = new BABYLON.StandardMaterial("redMat", scene); - var tempddx2 = new BABYLON.Texture("./asset/red.png", scene); - redMat.emissiveTexture = tempddx2; - scene.getMeshByName("平面_1_2").material = redMat; - tempddx2.uAng = (180 * Math.PI) / 180; + //修改贴图 + + var bluexMat = new BABYLON.PBRMaterial("bluex", scene); + var tempddxa = new BABYLON.Texture("./asset/blue.png", scene); + + var tempddxb = new BABYLON.Texture("./asset/blue.png", scene); + tempddxa.hasAlpha = true; + tempddxa.hasAlpha = true; + tempddxa.uAng = 180 * Math.PI / 180; + tempddxb.uAng = 180 * Math.PI / 180; + + bluexMat.useAlphaFromAlbedoTexture = true; + bluexMat.albedoTexture =tempddxa; + bluexMat.reflectionColor = new BABYLON.Color3(0,0,0); + bluexMat.lightmapTexture =tempddxb; + + scene.getMeshByName("平面_1").material = bluexMat; + + + var redMat = new BABYLON.PBRMaterial("redMat", scene); + var tempddx2 = new BABYLON.Texture("./asset/red.png", scene); + var tempddx3 = new BABYLON.Texture("./asset/red.png", scene); + tempddx2.hasAlpha = true; + tempddx3.hasAlpha = true; + tempddx2.uAng = 180 * Math.PI / 180; + tempddx3.uAng = 180 * Math.PI / 180; + + redMat.useAlphaFromAlbedoTexture = true; + redMat.reflectionColor = new BABYLON.Color3(0,0,0); + //redMat.emissiveTexture =tempddx2; + redMat.albedoTexture =tempddx2; + redMat.lightmapTexture =tempddx3; + + scene.getMeshByName("平面_1_2").material = redMat; //平面2 //Set font @@ -722,6 +743,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { mat.disableLighting = true; mat.emissiveTexture = dynamicTexture; + // mat.alpha = 0.75; + // mat.alphaMode = 6; + // mat.diffuseColor = new BABYLON.Color3(0, 0, 0); mat.reflectivityColor = new BABYLON.Color3(0, 0, 0); dynamicTexture.uAng = (166.39 * Math.PI) / 180; @@ -748,6 +772,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { //mat2.ambientTexture = dynamicTexture2; mat2.emissiveTexture = dynamicTexture2; + // mat2.alpha = 0.75; + // mat2.alphaMode=6; + // mat2.diffuseColor = new BABYLON.Color3(0, 0, 0); mat2.reflectivityColor = new BABYLON.Color3(0, 0, 0); dynamicTexture2.uAng = (166.39 * Math.PI) / 180; @@ -773,6 +800,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { //mat2.ambientTexture = dynamicTexture2; mat3.emissiveTexture = dynamicTexture3; + // mat3.alpha = 0.75; + // mat3.alphaMode=6; + // mat3.diffuseColor = new BABYLON.Color3(0, 0, 0); mat3.reflectivityColor = new BABYLON.Color3(0, 0, 0); dynamicTexture3.uAng = (166.39 * Math.PI) / 180; @@ -798,6 +828,9 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { //mat2.ambientTexture = dynamicTexture2; mat4.emissiveTexture = dynamicTexture4; + // mat4.alpha = 0.75; + // mat4.alphaMode=6; + // mat4.diffuseColor = new BABYLON.Color3(0, 0, 0); mat4.reflectivityColor = new BABYLON.Color3(0, 0, 0); dynamicTexture4.uAng = (166.39 * Math.PI) / 180; @@ -831,7 +864,7 @@ var createScene = function() { camera.attachControl(canvas, true); camera.lowerRadiusLimit = 2.0; // 这里是最大的位置，值越大，物体越小 camera.upperRadiusLimit = 40; - camera.radius = 19.328; + camera.radius = 11.558; camera.alpha = (Math.PI * -211.4) / 180; camera.beta = (Math.PI * 66) / 180; camera.inertia = 0.1; // 缩放的快慢 @@ -1386,7 +1419,7 @@ var createScene = function() { if (dynamicTexture != null && PointerOverYangan != null) { var textx = scene.getTransformNodeByName(PointerOverYangan).wendu; - var font_size = 36; + var font_size = 48; var font = "bold " + font_size + "px Arial"; dynamicTexture.drawText( @@ -1404,7 +1437,7 @@ var createScene = function() { if (dynamicTexture2 != null && PointerOverYangan != null) { var textx = scene.getTransformNodeByName(PointerOverYangan).sidu; - var font_size = 36; + var font_size = 50; var font = "bold " + font_size + "px Arial"; dynamicTexture2.drawText( @@ -1420,7 +1453,7 @@ var createScene = function() { if (dynamicTexture3 != null && PointerOverYangan != null) { var textx = scene.getTransformNodeByName(PointerOverYangan).wendu; - var font_size = 36; + var font_size = 48; var font = "bold " + font_size + "px Arial"; dynamicTexture3.drawText( @@ -1436,7 +1469,7 @@ var createScene = function() { if (dynamicTexture4 != null && PointerOverYangan != null) { var textx = scene.getTransformNodeByName(PointerOverYangan).sidu; - var font_size = 36; + var font_size = 50; var font = "bold " + font_size + "px Arial"; dynamicTexture4.drawText( textx + "%", diff --git a/public/webB/index.js b/public/webB/index.js index ec02457..6a45806 100644 --- a/public/webB/index.js +++ b/public/webB/index.js @@ -293,19 +293,38 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { x.overlayColor = BABYLON.Color3.White(); x.renderOverlay = true; - //修改贴图 - - var bluexMat = new BABYLON.StandardMaterial("bluex", scene); - var tempddx = new BABYLON.Texture("./asset/blue.png", scene); - bluexMat.emissiveTexture = tempddx; - scene.getMeshByName("平面_1").material = bluexMat; - tempddx.uAng = (180 * Math.PI) / 180; - - var redMat = new BABYLON.StandardMaterial("redMat", scene); - var tempddx2 = new BABYLON.Texture("./asset/red.png", scene); - redMat.emissiveTexture = tempddx2; - scene.getMeshByName("平面_1_2").material = redMat; - tempddx2.uAng = (180 * Math.PI) / 180; + //修改贴图 + + var bluexMat = new BABYLON.PBRMaterial("bluex", scene); + var tempddxa = new BABYLON.Texture("./asset/blue.png", scene); + var tempddxb = new BABYLON.Texture("./asset/blue.png", scene); + tempddxa.hasAlpha = true; + tempddxa.hasAlpha = true; + tempddxa.uAng = 180 * Math.PI / 180; + tempddxb.uAng = 180 * Math.PI / 180; + + bluexMat.useAlphaFromAlbedoTexture = true; + bluexMat.albedoTexture =tempddxa; + bluexMat.reflectionColor = new BABYLON.Color3(0,0,0); + bluexMat.lightmapTexture =tempddxb; + + scene.getMeshByName("平面_1").material = bluexMat; + + var redMat = new BABYLON.PBRMaterial("redMat", scene); + var tempddx2 = new BABYLON.Texture("./asset/red.png", scene); + var tempddx3 = new BABYLON.Texture("./asset/red.png", scene); + tempddx2.hasAlpha = true; + tempddx3.hasAlpha = true; + tempddx2.uAng = 180 * Math.PI / 180; + tempddx3.uAng = 180 * Math.PI / 180; + + redMat.useAlphaFromAlbedoTexture = true; + redMat.reflectionColor = new BABYLON.Color3(0,0,0); + //redMat.emissiveTexture =tempddx2; + redMat.albedoTexture =tempddx2; + redMat.lightmapTexture =tempddx3; + + scene.getMeshByName("平面_1_2").material = redMat; var font_size = 48; var font = "bold " + font_size + "px Arial"; @@ -455,8 +474,8 @@ var createScene = function() { camera.attachControl(canvas, true); camera.lowerRadiusLimit = 2.0; // 这里是最大的位置，值越大，物体越小 camera.upperRadiusLimit = 40; - camera.radius = 19.328; - camera.alpha = (Math.PI * -211.4) / 180; + camera.radius = 14.888; + camera.alpha = (Math.PI * -240.2) / 180; camera.beta = (Math.PI * 66) / 180; camera.inertia = 0.1; // 缩放的快慢 camera.useAutoRotationBehavior = true; // 自动旋转 diff --git a/public/webC/index.js b/public/webC/index.js index d5711b8..0936cf2 100644 --- a/public/webC/index.js +++ b/public/webC/index.js @@ -290,19 +290,37 @@ BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function() { prepareGroupButtonOther(camera08, new BABYLON.Color3(0, 0, 1)); prepareGroupButtonOther(yangan06, new BABYLON.Color3(0, 0, 1)); - //修改贴图 - - var bluexMat = new BABYLON.StandardMaterial("bluex", scene); - var tempddx = new BABYLON.Texture("./asset/blue.png", scene); - bluexMat.emissiveTexture = tempddx; - scene.getMeshByName("平面_1").material = bluexMat; - tempddx.uAng = (180 * Math.PI) / 180; - - var redMat = new BABYLON.StandardMaterial("redMat", scene); - var tempddx2 = new BABYLON.Texture("./asset/red.png", scene); - redMat.emissiveTexture = tempddx2; - scene.getMeshByName("平面_1_2").material = redMat; - tempddx2.uAng = (180 * Math.PI) / 180; + //修改贴图 + var bluexMat = new BABYLON.PBRMaterial("bluex", scene); + var tempddxa = new BABYLON.Texture("./asset/blue.png", scene); + var tempddxb = new BABYLON.Texture("./asset/blue.png", scene); + tempddxa.hasAlpha = true; + tempddxa.hasAlpha = true; + tempddxa.uAng = 180 * Math.PI / 180; + tempddxb.uAng = 180 * Math.PI / 180; + + bluexMat.useAlphaFromAlbedoTexture = true; + bluexMat.albedoTexture =tempddxa; + bluexMat.reflectionColor = new BABYLON.Color3(0,0,0); + bluexMat.lightmapTexture =tempddxb; + + scene.getMeshByName("平面_1").material = bluexMat; + + var redMat = new BABYLON.PBRMaterial("redMat", scene); + var tempddx2 = new BABYLON.Texture("./asset/red.png", scene); + var tempddx3 = new BABYLON.Texture("./asset/red.png", scene); + tempddx2.hasAlpha = true; + tempddx3.hasAlpha = true; + tempddx2.uAng = 180 * Math.PI / 180; + tempddx3.uAng = 180 * Math.PI / 180; + + redMat.useAlphaFromAlbedoTexture = true; + redMat.reflectionColor = new BABYLON.Color3(0,0,0); + //redMat.emissiveTexture =tempddx2; + redMat.albedoTexture =tempddx2; + redMat.lightmapTexture =tempddx3; + + scene.getMeshByName("平面_1_2").material = redMat; var font_size = 48; var font = "bold " + font_size + "px Arial"; @@ -452,8 +470,8 @@ var createScene = function() { camera.attachControl(canvas, true); camera.lowerRadiusLimit = 2.0; // 这里是最大的位置，值越大，物体越小 camera.upperRadiusLimit = 40; - camera.radius = 19.328; - camera.alpha = (Math.PI * -211.4) / 180; + camera.radius = 14.888; + camera.alpha = (Math.PI * -223.57) / 180; camera.beta = (Math.PI * 66) / 180; camera.inertia = 0.1; // 缩放的快慢 camera.useAutoRotationBehavior = true; // 自动旋转 diff --git a/public/webTotal/index.js b/public/webTotal/index.js index 1fca452..d098727 100644 --- a/public/webTotal/index.js +++ b/public/webTotal/index.js @@ -396,8 +396,8 @@ var createScene = function() { camera.attachControl(canvas, true); camera.lowerRadiusLimit = 2.0; // 这里是最大的位置，值越大，物体越小 camera.upperRadiusLimit = 40; - camera.radius = 19.328; - camera.alpha = (Math.PI * -211.4) / 180; + camera.radius = 15.998; + camera.alpha = (Math.PI * -248.8) / 180; camera.beta = (Math.PI * 66) / 180; camera.inertia = 0.1; // 缩放的快慢 camera.useAutoRotationBehavior = true; // 自动旋转 diff --git a/src/assets/icons/svg/logo-title.svg b/src/assets/icons/svg/logo-title.svg new file mode 100644 index 0000000..48d5adb --- /dev/null +++ b/src/assets/icons/svg/logo-title.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + diff --git a/src/assets/icons/svg/logo.svg b/src/assets/icons/svg/logo.svg new file mode 100644 index 0000000..5d6f050 --- /dev/null +++ b/src/assets/icons/svg/logo.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index 79805ce7616918b8d24dde30059dd49950017225..7d4a3e0741beec9c54c5d91e974f4099a4582cef 100644 GIT binary patch literal 8232 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 RXd&Ql)QGWBM~7)X{Wn9gt0Mpa literal 8282 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 OejQB%jf&g$QU3?^wKR(W diff --git a/src/assets/styles/lend-manage.scss b/src/assets/styles/lend-manage.scss index 8d77d2c..5cb1bf7 100644 --- a/src/assets/styles/lend-manage.scss +++ b/src/assets/styles/lend-manage.scss @@ -71,13 +71,17 @@ color:#F65163; flex: 1; } .warehouse-right{ - width: 460px; + width: 458px; } } +::v-deep .el-table__header-wrapper{ + background: url('~@/assets/images/table_head_bg.png') no-repeat !important; +} ::v-deep .warehose-el-table .el-table__header .el-table__cell{ padding: 0; height: 30px; + background: transparent; .cell{ font-size: 14px; } @@ -88,25 +92,26 @@ color:#F65163; .title-arrow{ position: relative; + width: 460px; &::before{ content:''; width: 36px; height: 12px; position: absolute; - left: -70px; + left: 110px; top: 50%; transform: translateY(-50%); - background: url('~@/assets/images/warehouse_arrow_left.png') no-repeat; + background: url('~@/assets/images/warehouse_arrow_right.png') no-repeat; } &::after{ content:''; width: 36px; height: 12px; position: absolute; - right: -70px; + right: 110px; top: 50%; transform: translateY(-50%); - background: url('~@/assets/images/warehouse_arrow_right.png') no-repeat; + background: url('~@/assets/images/warehouse_arrow_left.png') no-repeat; } } .table-title{ diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 3134aee..adba877 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -4,11 +4,15 @@ -

{{ title }}

+ + + -

{{ title }}

+ + + @@ -47,9 +51,10 @@ export default { .sidebar-logo-container { position: relative; - width: $sideBarWidth; + // width: $sideBarWidth; height: 100px; line-height: 100px; + padding-left: 52px; text-align: center; overflow: hidden; @@ -63,7 +68,11 @@ export default { vertical-align: middle; margin-right: 6px; } - + & .sidebar-logo-title{ + width: 220px; + height: 32px; + vertical-align: middle; + } & .sidebar-title { display: inline-block; margin: 0; diff --git a/src/views/archivesManage/caseManage/caseLog/index.vue b/src/views/archivesManage/caseManage/caseLog/index.vue index c17ab0c..c8cb11d 100644 --- a/src/views/archivesManage/caseManage/caseLog/index.vue +++ b/src/views/archivesManage/caseManage/caseLog/index.vue @@ -2,11 +2,11 @@
- 导出 - + 导出 + - + diff --git a/src/views/storeManage/warehouse3D/fullView/index.vue b/src/views/storeManage/warehouse3D/fullView/index.vue index 1960046..2685b01 100644 --- a/src/views/storeManage/warehouse3D/fullView/index.vue +++ b/src/views/storeManage/warehouse3D/fullView/index.vue @@ -2,6 +2,9 @@
+

+ 3D库房 +