diff --git a/src/assets/svg/Operation/LeftBottom/Box.svg b/src/assets/svg/Operation/LeftBottom/Box.svg index b3c346b..69ff66c 100644 --- a/src/assets/svg/Operation/LeftBottom/Box.svg +++ b/src/assets/svg/Operation/LeftBottom/Box.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg/Operation/RightMid/Box.svg b/src/assets/svg/Operation/RightMid/Box.svg index 79d2343..9a04cf2 100644 --- a/src/assets/svg/Operation/RightMid/Box.svg +++ b/src/assets/svg/Operation/RightMid/Box.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg/Operation/RightMid/Emergency.svg b/src/assets/svg/Operation/RightMid/Emergency.svg index fba4855..8882093 100644 --- a/src/assets/svg/Operation/RightMid/Emergency.svg +++ b/src/assets/svg/Operation/RightMid/Emergency.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/svg/Operation/RightMid/Other.svg b/src/assets/svg/Operation/RightMid/Other.svg index aceb165..7922187 100644 --- a/src/assets/svg/Operation/RightMid/Other.svg +++ b/src/assets/svg/Operation/RightMid/Other.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/pageOperation/leftBottom/index copy.vue b/src/views/pageOperation/leftBottom/index copy.vue deleted file mode 100644 index c393f05..0000000 --- a/src/views/pageOperation/leftBottom/index copy.vue +++ /dev/null @@ -1,107 +0,0 @@ - - - - - diff --git a/src/views/pageOperation/leftBottom/index.vue b/src/views/pageOperation/leftBottom/index.vue index c393f05..a1fafb4 100644 --- a/src/views/pageOperation/leftBottom/index.vue +++ b/src/views/pageOperation/leftBottom/index.vue @@ -1,6 +1,6 @@ @@ -21,32 +21,36 @@ export default { xAxis: { type: 'category', boundaryGap: false, - data: ['3月', '4月', '5月', '6月', '7月', '8月'], + data: [], axisLabel: { - color: '#fff', - fontFamily: 'DIN-Bold,Microsoft YaHei', + fontSize: '16px', + color: '#5D49AF', + fontFamily: 'panmen', }, }, yAxis: { type: 'value', axisLabel: { formatter: '{value}%', - color: '#fff', - fontFamily: 'DIN-Bold,Microsoft YaHei', + fontSize: '16px', + color: '#5D49AF', + fontFamily: 'panmen', + opacity: 0.6 }, splitLine: { lineStyle: { - color: 'rgba(0,142,114,0.3)', - width: 0.5, + color: '#624D96', + width: 0.1, }, }, }, series: [ { - data: [95, 97, 96, 98, 99, 96], + data: [], type: 'line', + smooth: true, itemStyle: { - color: '#30FDFF', + color: '#7052E8', }, areaStyle: { color: { @@ -58,11 +62,11 @@ export default { colorStops: [ { offset: 0, - color: 'rgba(0, 128, 255, 0.7)', // 开始颜色 + color: 'rgba(156, 132, 255, 0.6)', }, { offset: 1, - color: 'rgba(200, 254, 255, 0)', // 结束颜色 + color: 'rgba(186, 169, 255, 0.15)', }, ], }, @@ -97,10 +101,13 @@ export default { }; - diff --git a/src/views/pageOperation/rightMid/index.scss b/src/views/pageOperation/rightMid/index.scss new file mode 100644 index 0000000..387df0f --- /dev/null +++ b/src/views/pageOperation/rightMid/index.scss @@ -0,0 +1,113 @@ +.bgRightMidBox { + width: vw(1270); + height: vh(904); + background-image: url('@/assets/svg/Operation/RightMid/Box.svg'); + background-size: auto; + background-position: center; + background-repeat: no-repeat; + + >section { + box-sizing: border-box; + padding-top: vh(32); + height: 100%; + width: vw(1206); + margin: 0 auto; + + header { + height: vh(48); + line-height: vh(48); + text-align: center; + background-color: #E5E6FF; + + >div { + display: inline-block; + + >div { + font-size: vw(16); + color: #5D49AF; + font-weight: 700; + display: inline-block; + } + + } + } + + main { + height: vh(784); + box-sizing: border-box; + padding-top: vh(8); + + :deep(.el-carousel) { + height: 100%; + + .el-carousel__item, + .el-carousel__container { + height: 100%; + + .rowBox { + height: vh(48); + text-align: center; + + &:nth-child(2n+1) { + background: #F3F3F9; + } + + &:nth-child(2n) { + background: #F0F0FC; + } + + >div { + display: inline-block; + + >div { + font-size: vw(16); + color: #5D49AF; + display: inline-block; + + marquee { + font-size: vw(16); + color: #5D49AF; + } + } + + } + } + } + } + + + } + + .col1 { + width: vw(55); + } + + .col2 { + width: vw(120); + } + + .col3 { + width: vw(178); + } + + .col4 { + width: vw(142); + } + + .col5 { + width: vw(180); + } + + .col6 { + width: vw(180); + } + + .col7 { + width: vw(180); + } + + .col8 { + width: vw(120); + } + } +} diff --git a/src/views/pageOperation/rightMid/index.vue b/src/views/pageOperation/rightMid/index.vue index 6e0808d..ee83d08 100644 --- a/src/views/pageOperation/rightMid/index.vue +++ b/src/views/pageOperation/rightMid/index.vue @@ -1,47 +1,48 @@ @@ -107,22 +108,5 @@ export default { diff --git a/src/views/pageScheduling/index.vue b/src/views/pageScheduling/index.vue index 495b315..25faf74 100644 --- a/src/views/pageScheduling/index.vue +++ b/src/views/pageScheduling/index.vue @@ -7,7 +7,7 @@

护理人员: {{ nurseCount }}

- +