diff --git a/pages/NursingNew/component/nurse/index.css b/pages/NursingNew/component/nurse/index.css index 5c1a4d1..fa06e8c 100644 --- a/pages/NursingNew/component/nurse/index.css +++ b/pages/NursingNew/component/nurse/index.css @@ -68,8 +68,9 @@ position: absolute; top: 0rpx; right: 0rpx; - width: 55rpx; - height: 45rpx; + width: 200rpx; + height: 100rpx; + /* background-color: red; */ } .title-time-font { @@ -356,18 +357,18 @@ position: absolute; top: -4rpx; right: -4rpx; - width: 65rpx; - height: 30rpx; + width: 70rpx; + height: 40rpx; } .title-time-button-font { - color: #fff; + color: #1083f8; position: absolute; top: 2rpx; right: 8rpx; font-size: 19rpx; - z-index: 9999; + z-index: 99; } .right-box-font { @@ -594,11 +595,12 @@ } .title-time-font-rel { - font-size: 25rpx; + font-size: 23rpx; margin-bottom: 5rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + color: #888888; } .title-time-items { @@ -910,9 +912,9 @@ .title-time-font { position: absolute; top: 0rpx; - right: 5rpx; - font-size: 14rpx; - color: #fff; + right: 4rpx; + font-size: 20rpx; + color: #1083f8; } } @@ -1576,33 +1578,6 @@ flex-direction: column; } -.title-time-border-red { - background-color: #dae8fa; - width: calc(100%); - height: calc(100%); - display: flex; - align-items: center; - flex-direction: column; - /* 调整 box-shadow 使其向下投影 */ - box-shadow: 0px 20rpx 40rpx #dae8fa; - - background: - linear-gradient(to right, red, red) top left / 60rpx 8rpx no-repeat, - /* 左上角垂直 */ - linear-gradient(to bottom, red, red) top left / 8rpx 60rpx no-repeat, - /* 右上角水平 */ - linear-gradient(to left, red, red) top right / 60rpx 8rpx no-repeat, - /* 右上角垂直 */ - linear-gradient(to bottom, red, red) top right / 8rpx 60rpx no-repeat, - /* 左下角水平 */ - linear-gradient(to right, red, red) bottom left / 60rpx 8rpx no-repeat, - /* 左下角垂直 */ - linear-gradient(to top, red, red) bottom left / 8rpx 60rpx no-repeat, - /* 右下角水平 */ - linear-gradient(to left, red, red) bottom right / 60rpx 8rpx no-repeat, - /* 右下角垂直 */ - linear-gradient(to top, red, red) bottom right / 8rpx 60rpx no-repeat; -} .title-time-border-big { transform: scale(1.3); @@ -1638,35 +1613,6 @@ position: relative; } -.title-time-border-blue { - background-color: #dae8fa; - width: calc(100%); - height: calc(100%); - display: flex; - align-items: center; - flex-direction: column; - /* 调整 box-shadow 使其向下投影 */ - box-shadow: 0px 20rpx 40rpx #dae8fa; - background: - /* 左上角水平 */ - linear-gradient(to right, #0184db, #0184db) top left / 60rpx 8rpx no-repeat, - /* 左上角垂直 */ - linear-gradient(to bottom, #0184db, #0184db) top left / 8rpx 60rpx no-repeat, - /* 右上角水平 */ - linear-gradient(to left, #0184db, #0184db) top right / 60rpx 8rpx no-repeat, - /* 右上角垂直 */ - linear-gradient(to bottom, #0184db, #0184db) top right / 8rpx 60rpx no-repeat, - /* 左下角水平 */ - linear-gradient(to right, #0184db, #0184db) bottom left / 60rpx 8rpx no-repeat, - /* 左下角垂直 */ - linear-gradient(to top, #0184db, #0184db) bottom left / 8rpx 60rpx no-repeat, - /* 右下角水平 */ - linear-gradient(to left, #0184db, #0184db) bottom right / 60rpx 8rpx no-repeat, - /* 右下角垂直 */ - linear-gradient(to top, #0184db, #0184db) bottom right / 8rpx 60rpx no-repeat; -} - - .title-time-border-yellow { margin: 10rpx; border: 2rpx solid transparent; @@ -1676,7 +1622,7 @@ border-radius: 20rpx; display: flex; align-items: center; - background-color: #fff; + background-color: rgba(255, 255, 255, 0.5); flex-direction: column; /* box-shadow: 8rpx 8rpx 16rpx rgba(255, 138, 0, 0.7); */ } @@ -1692,7 +1638,7 @@ align-items: center; flex-direction: column; opacity: 0.3; - background-color: #fff; + background-color: rgba(255, 255, 255, 0.5); /* box-shadow: 8rpx 8rpx 16rpx rgba(255, 138, 0, 0.7); */ } @@ -1707,7 +1653,7 @@ align-items: center; flex-direction: column; animation: shakesmall 0.8s infinite; - background-color: #fff; + background-color: rgba(255, 255, 255, 0.5); } .down-icons { @@ -2345,20 +2291,20 @@ top: 0rpx; right: 0rpx; width: 120rpx; - height: 40rpx; + height: 50rpx; } .zhiling-card-font { position: absolute; - top: 0rpx; - right: 0rpx; - width: 120rpx; - height: 40rpx; + top: 5rpx; + right: 20rpx; + /* width: 100rpx; */ + /* height: 40rpx; */ display: flex; justify-content: center; align-items: center; - color: #fff; - font-size: 24rpx; + color: #1083f8; + font-size: 22rpx; } .bag { @@ -2375,7 +2321,7 @@ .overlay { position: fixed; inset: 0; - background: rgba(0, 0, 0, 0.1); + background-color: rgba(236, 237, 241, 0.4); /* 半透明黑色 */ - z-index: 998; + z-index: 999; } \ No newline at end of file diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue index 030d505..d4f8c4e 100644 --- a/pages/NursingNew/component/nurse/index.vue +++ b/pages/NursingNew/component/nurse/index.vue @@ -183,17 +183,17 @@ v-show=" liang.index0 !== index0 || liang.index1 !== index1 || canmove" style="flex-direction: column;"> {{item1.startTime + `-` + item1.endTime}} {{item1.cycleType}} diff --git a/pages/Warehouse/warehome.vue b/pages/Warehouse/warehome.vue index b96d961..6014fc6 100644 --- a/pages/Warehouse/warehome.vue +++ b/pages/Warehouse/warehome.vue @@ -1,395 +1,461 @@ - - - - - + + + + + \ No newline at end of file diff --git a/static/index/newruler/jiao.png b/static/index/newruler/jiao.png index 8c490fe..ad07762 100644 Binary files a/static/index/newruler/jiao.png and b/static/index/newruler/jiao.png differ diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js index 04100f2..12310ff 100644 --- a/unpackage/dist/dev/.nvue/pages/camera.js +++ b/unpackage/dist/dev/.nvue/pages/camera.js @@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { ) ]); } -const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]); +const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]); export { camera as default }; diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js index c959abe..dd59bdc 100644 --- a/unpackage/dist/dev/.nvue/pages/fullcamera.js +++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js @@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { ) ]); } -const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]); +const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]); export { fullcamera as default };