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 79805ce..7d4a3e0 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ 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库房 +