diff --git a/.gitignore b/.gitignore index 37b6ac6..20f45b3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ .DS_Store node_modules /dist - +/ring-screen # local env files .env.local @@ -23,3 +23,4 @@ pnpm-debug.log* *.sln *.sw? dist.zip +ring-screen.zip diff --git a/src/assets/back.png b/src/assets/back.png index a1d9e77..ba1e239 100644 Binary files a/src/assets/back.png and b/src/assets/back.png differ diff --git a/src/components/screen-popup-ydzl/index.vue b/src/components/screen-popup-ydzl/index.vue index 46aac38..17e060d 100644 --- a/src/components/screen-popup-ydzl/index.vue +++ b/src/components/screen-popup-ydzl/index.vue @@ -4,23 +4,54 @@ opacity: popupVisible ? '1' : '0', '--left': left, '--top': top, - '--width': width, + // '--width': width, '--fontSize': fontSize }" v-show="popupVisible == '1'"> -
-
+ + +
@@ -53,7 +84,7 @@ export default { }, fontSize: { type: String, - default: '20px' + default: '18px' }, memberInfo: { type: Object, @@ -61,8 +92,25 @@ export default { }, memberArr: { type: Array, + required: true, default: () => [] - } + }, + header: { + type: Array, + default: () => [] + }, + headerColor: { + type: String, + default: '#fff' + }, + headerFontSize: { + type: String, + default: '#fff' + }, + headerHeight: { + type: String, + default: '35px' + }, }, watch: { @@ -92,19 +140,26 @@ export default { + +ul { + width: 100%; + height: 100%; + + .table-header { + height: 35px; + width: 100%; + display: flex; + align-items: center; + justify-content: space-around; + color: #fff; + font-size: 15px; + background-image: url("./../../assets/icon/headerBg.png"); + background-size: 100% 100%; + + .table-td { + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + text-align: center; + padding: 0 5px; + } + } + + .table-body { + display: block; + width: 100%; + max-height: 140px; + min-height: 140px; + overflow-y: auto; + position: relative; + &::-webkit-scrollbar { + /*滚动条整体样式*/ + width: 6px; + /*高宽分别对应横竖滚动条的尺寸*/ + height: 1px; + } + + &::-webkit-scrollbar-thumb { + /*滚动条里面小方块*/ + background: linear-gradient(-90deg, #09b8e5 0%, #09f0e3 99%); + border-radius: 3px; + } + + &::-webkit-scrollbar-track { + /*滚动条里面轨道*/ + // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); + background: #428ba2; + border-radius: 3px; + } + + .scroll-view { + width: 100%; + height: 100%; + position: absolute; + left: 0px; + top: 0px; + + .table-tr { + width: 100%; + box-sizing: border-box; + // height: calc(100% / var(--pageSize)); + height: 30px; + display: flex; + align-items: center; + justify-content: space-around; + margin-top: 19px; + position: relative; + + .table-td { + padding: 0 5px; + width: 100%; + height: 100%; + text-align: center; + // display: flex; + align-items: start; + justify-content: center; + color: #fff; + font-size: 14px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + line-height: 18px; + cursor: pointer; + } + + &+.table-tr { + border-top: 1px solid #47556f9b; + } + + // &:hover { + // background: rgba(255, 255, 255, 0.1); + // } + >img { + position: absolute; + bottom: 0px; + width: 591px; + height: 10px; + } + } + } + } + + .loading-box { + width: 100%; + height: calc(100% - 35px); + } + + .no-data { + width: 100%; + height: calc(100% - 35px); + display: flex; + align-items: center; + justify-content: center; + color: rgba(255, 255, 255, 0.8); + font-size: 18px; + } +} diff --git a/src/views/screenCenter/screenCenter.vue b/src/views/screenCenter/screenCenter.vue index 3a3f5d2..bb73fbf 100644 --- a/src/views/screenCenter/screenCenter.vue +++ b/src/views/screenCenter/screenCenter.vue @@ -1,7 +1,7 @@