diff --git a/component/rightItemssecond/index.vue b/component/rightItemssecond/index.vue index e7ead79..33cc867 100644 --- a/component/rightItemssecond/index.vue +++ b/component/rightItemssecond/index.vue @@ -46,6 +46,15 @@ + + + + + 监控 + + + @@ -68,7 +77,6 @@ - @@ -101,7 +109,7 @@ :key="index0"> - {{item0.time}} + {{item0.time + ":00"}} @@ -121,6 +129,11 @@ @touchstart="rulerTouchStart(item1,index0,index1,$event)" @touchmove="rulerTouchMove" @touchend="rulerTouchEnd()" :data-index0="index0" :data-index1="index1"> + + + {{item1.serve}} + {{item1.time}} - + + {{item1.type}} + - {{splitString(item1.value)[0]}} - {{splitString(item1.value)[0]}} - - {{splitString(item1.value)[1]}} + + {{splitString(item1.value)[1]}} + + @@ -185,21 +206,6 @@ - - - - - - - - - {{ item.name }} - - - - - @@ -250,14 +250,14 @@ + :src="cardsumit.op.index[2]!==index? `/static/index/ridark.png`:`/static/index/ri.png`" /> + :src="cardsumit.op.index[2]==index? `/static/index/zhoudark.png`:`/static/index/zhou.png`" /> + :src="cardsumit.op.index[2]==index? `/static/index/jidark.png`:`/static/index/ji.png`" /> {{item.type}} @@ -417,16 +417,6 @@ } return 'title-time-border'; } - // 初始化下面侧单列表 - const undericonList = ref([ - { url: '/static/index/undericons/alarm.png', targetUrl: '/static/index/undericons/alarmdark.png', name: '服务考核' }, - { url: '/static/index/undericons/linshitime.png', targetUrl: '/static/index/undericons/linshitimedark.png', name: '护理流程' }, - { url: '/static/index/darkicon/zhaomingdark.png', targetUrl: '/static/index/roomicons/zhaomingtar.png', name: '电子医嘱' }, - { url: '/static/index/darkicon/kontiaodark.png', targetUrl: '/static/index/roomicons/kongtiaotar.png', name: '进销存' }, - { url: '/static/index/darkicon/nuanfengdark.png', targetUrl: '/static/index/roomicons/nuanfengtar.png', name: '实时监控' }, - { url: '/static/index/darkicon/dianqidark.png', targetUrl: '/static/index/roomicons/dianqitar.png', name: '我的指令' }, - ]); - // 初始化下面侧单列表 const doctorsayList = ref([ { url: '/static/index/doctorsay/light/clean.png', targetUrl: '/static/index/doctorsay/dark/clean.png', name: '清洁' }, @@ -438,7 +428,7 @@ ]); // 当前选中的菜单索引 const rightListIndex = ref(1); - const undermenuIndex = ref(0); + // const undermenuIndex = ref(0); const upmenuIndex = ref(0); const downmenuIndex = ref(999); // 暗黑模式 @@ -457,10 +447,6 @@ downList.value = bigArray[index].data downmenuIndex.value = 999 } - // 变更底部菜单 - const changeMenuUnder = (index : number) => { - undermenuIndex.value = index; - }; // 变更右部菜单 const rightListClick = (index : number) => { rightListIndex.value = index; @@ -497,7 +483,7 @@ .boundingClientRect((data : any) => { data.forEach(async (res : any) => { // 根据你的条件筛选元素 - if (res.left > 200 && res.left < 1067 && res.top < 500 && res.top > 170 && res.dataset.index0 == index0 && res.dataset.index1 == index1) { + if (res.left > 200 && res.left < 1067 && res.top < 600 && res.top > 170 && res.dataset.index0 == index0 && res.dataset.index1 == index1) { if (res.left > 200 && res.left < 500) { openX.value = Math.floor(res.left) + 520; } else { @@ -543,12 +529,41 @@ } } const deleteRuler = (index0 : number, index1 : number) => { - timearr.value[index0].children[index1].value = ""; - timearr.value[index0].children[index1].time = ""; - timearr.value[index0].children[index1].type = ""; + timearr.value[index0].children[index1] = { value: "" }; isopen.value = false; flyNumber.value.index0 = 999; flyNumber.value.index1 = 999; + let emptyChildIndices = []; + let emptyChildNumber = 0; + timearr.value.forEach((res : any, rowIndex : number) => { + emptyChildIndices = []; + emptyChildNumber = res.children.length; + // 遍历 res.children 数组中的每个子元素 child + res.children.forEach((child, index) => { + // 检查 child 的 value 属性是否为空 + if (child.value === null || child.value === '' || child.value === undefined) { + // 如果是空值，检查其他 res.children 中相同索引的元素 + const isEmptyInAllRows = timearr.value.every((otherRes) => { + const otherChild = otherRes.children[index]; + return otherChild === undefined || otherChild.value === null || otherChild.value === '' || otherChild.value === undefined; + }); + // 如果在所有行中该位置的 value 都为空，记录该索引 + if (isEmptyInAllRows) { + emptyChildIndices.push(index); + } + } + }); + }) + if (emptyChildNumber > 4 && emptyChildIndices.length > 1) { + timearr.value.forEach((res : any, rowIndex : number) => { + res.children.splice(emptyChildIndices[0], 1); + }) + } else { + timearr.value.forEach((res : any, rowIndex : number) => { + res.children.splice(emptyChildIndices[0], 1); + res.children.push({ value: '' }) + }) + } } const longPressTimer = ref(null); const isScrolling = ref(false) @@ -585,7 +600,7 @@ .boundingClientRect((data : any) => { data.forEach((res : any) => { // 根据你的条件筛选元素 - if (res.left > 200 && res.left < 1067 && res.top < 500 && res.top > 170) { + if (res.left > 200 && res.left < 1067 && res.top < 600 && res.top > 170) { reldata.push(res) } }) @@ -657,12 +672,12 @@ cardsumit.value.startTime = "" cardsumit.value.monthTime = "" cardsumit.value.weekTime = "" - if (cardsumit.value.op[2] === index) { - cardsumit.value.op[2] = -1; + if (cardsumit.value.op.index[2] === index) { + cardsumit.value.op.index[2] = -1; cardsumit.value.op.name = "" openOp.value = -1 } else { - cardsumit.value.op[2] = index + cardsumit.value.op.index[2] = index cardsumit.value.op.name = name openOp.value = op } @@ -707,8 +722,8 @@ setTimeout(() => { songisopacity.value = true }, 200) - cardsumit.value.op[0] = upmenuIndex.value - cardsumit.value.op[1] = downmenuIndex.value + cardsumit.value.op.index[0] = upmenuIndex.value + cardsumit.value.op.index[1] = downmenuIndex.value openValue.value.time = timearr.value[props.liang.index0 + (currentNumber.value * 6)].time; openValue.value.array = bigArray[upmenuIndex.value].data[downmenuIndex.value].data indexsave.value = [props.liang.index0 + (currentNumber.value * 6), props.liang.index1] @@ -718,18 +733,72 @@ const movetoruler = async () => { songisopen.value = false; isweek.value = true; - if (!openOp.value) { - timearr.value[indexsave.value[0]].children[indexsave.value[1]].type = "日常"; - } else if (openOp.value === 1) { - timearr.value[indexsave.value[0]].children[indexsave.value[1]].type = cardsumit.value.weekTime || (cardsumit.value.monthTime + '号'); - } else if (openOp.value === 2) { - bottomItems.value.push({ - name: cardsumit.value.op.name, - url: "/static/index/ou.png" + let savaIndex = -1; + let emptyChildIndices = []; + timearr.value.forEach((res : any, rowIndex : number) => { + emptyChildIndices = []; + // 遍历 res.children 数组中的每个子元素 child + res.children.forEach((child, index) => { + // 检查 child 的 value 属性是否为空 + if (child.value === null || child.value === '' || child.value === undefined) { + // 如果是空值，检查其他 res.children 中相同索引的元素 + const isEmptyInAllRows = timearr.value.every((otherRes) => { + const otherChild = otherRes.children[index]; + return otherChild === undefined || otherChild.value === null || otherChild.value === '' || otherChild.value === undefined; + }); + // 如果在所有行中该位置的 value 都为空，记录该索引 + if (isEmptyInAllRows) { + emptyChildIndices.push(index); + } + } + }); + res.children.forEach((item : any, index : number) => { + if (item.serve == bigArray[cardsumit.value.op.index[0]].data[cardsumit.value.op.index[1]].type) { + savaIndex = index + + } }) - return + }) + if (savaIndex === -1) { + savaIndex = emptyChildIndices[0] + } + if (savaIndex !== -1) { + let saveserve = bigArray[cardsumit.value.op.index[0]].data[cardsumit.value.op.index[1]].type + timearr.value.forEach((element : any, index : number) => { + element.children[savaIndex].serve = saveserve; + element.serve = saveserve + }) + + if (!openOp.value) { + timearr.value[indexsave.value[0]].children[savaIndex].type = "日常"; + } else if (openOp.value === 1) { + timearr.value[indexsave.value[0]].children[savaIndex].type = cardsumit.value.weekTime || (cardsumit.value.monthTime + '号'); + } else if (openOp.value === 2) { + bottomItems.value.push({ + name: cardsumit.value.op.name, + url: "/static/index/ou.png" + }) + return + } + timearr.value[indexsave.value[0]].children[savaIndex].value = cardsumit.value.op.name; + } else { + // let saveserve = bigArray[cardsumit.value.op.index[0]].data[cardsumit.value.op.index[1]].type + // timearr.value.forEach((element:any,index:number)=>{ + // element.children[savaIndex].serve = saveserve + // }) + // if (!openOp.value) { + // timearr.value[indexsave.value[0]].children[indexsave.value[1]].type = "日常"; + // } else if (openOp.value === 1) { + // timearr.value[indexsave.value[0]].children[indexsave.value[1]].type = cardsumit.value.weekTime || (cardsumit.value.monthTime + '号'); + // } else if (openOp.value === 2) { + // bottomItems.value.push({ + // name: cardsumit.value.op.name, + // url: "/static/index/ou.png" + // }) + // return + // } + // timearr.value[indexsave.value[0]].children[indexsave.value[1]].value = cardsumit.value.op.name; } - timearr.value[indexsave.value[0]].children[indexsave.value[1]].value = cardsumit.value.op.name; const startHour = Number(openValue.value.time) const startMinute = Number(cardsumit.value.startTime) const endMinute = startMinute + 10 @@ -737,8 +806,14 @@ const endHour = startHour + Math.floor(endMinute / 60) const formattedStart = `${String(startHour)}:${String(startMinute).padStart(2, '0')}` const formattedEnd = `${String(endHour)}:${String(endMinute % 60).padStart(2, '0')}` + if (savaIndex !== -1) { + + timearr.value[indexsave.value[0]].children[savaIndex].time = `${formattedStart}-${formattedEnd}`; + + } else { + timearr.value[indexsave.value[0]].children[indexsave.value[1]].time = `${formattedStart}-${formattedEnd}`; + } - timearr.value[indexsave.value[0]].children[indexsave.value[1]].time = `${formattedStart}-${formattedEnd}`; // 检查是否有任意一个对象的 children 数组最后一个对象的 value 有值 const shouldAdd = timearr.value.some(obj => { const children = obj.children; @@ -775,10 +850,6 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } ] }, { @@ -788,10 +859,6 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } ] }, { @@ -801,10 +868,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -814,10 +878,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -827,10 +888,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -840,10 +898,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -853,10 +908,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -866,10 +918,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -879,31 +928,26 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { time: '09', children: [ { - value: '四肢清洁', - type: '日常', - time: '9:00-9:30', + value: '', + // type: '日常', + // time: '9:00-9:30', + }, { - value: '指甲', - type: '周一', - time: '9:00-9:33', + value: '', + // type: '周一', + // time: '9:00-9:33', + // serve:'' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } ] }, { @@ -913,10 +957,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -926,10 +967,6 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } ] }, { @@ -939,10 +976,6 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } ] }, { @@ -952,10 +985,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -965,10 +995,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -978,10 +1005,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -991,10 +1015,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -1004,10 +1025,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -1017,10 +1035,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -1030,10 +1045,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -1043,10 +1055,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -1056,10 +1065,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -1069,10 +1075,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, { @@ -1082,10 +1085,7 @@ { value: '' }, { value: '' }, { value: '' }, - { value: '' }, - { value: '' }, - { value: '' }, - { value: '' } + ] }, ]) @@ -1509,7 +1509,7 @@ background-color: rgb(241, 247, 253); overflow: hidden; width: 1650rpx; - height: 780rpx; + height: 920rpx; border-radius: 20rpx; border: 1rpx solid black; } @@ -1538,15 +1538,34 @@ display: flex; justify-content: center; align-items: center; - height: 175rpx; + height: 209rpx; width: calc(100%); border-right: 1rpx solid #BFBFCB; border-top: 1rpx solid #BFBFCB; flex-direction: column; background-color: #f3f6fc; + position: relative; + + .boom { + position: absolute; + top: 0; + left: 0; + background-color: #fff; + width: 50rpx; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + font-size: 30rpx; + letter-spacing: 5rpx; + box-shadow: 5rpx 5rpx 10rpx rgba(0, 0, 0, 0.1); + writing-mode: vertical-rl; + /* 竖排文字，从右往左 */ + text-align: center; + z-index: 10; + /* 确保文字在容器内居中 */ + } } - - } .right-container { @@ -1594,11 +1613,11 @@ } .doctorsay-container-card-font { - font-size: 26rpx; + font-size: 30rpx; } .doctorsay-container-card-font-dark { - font-size: 26rpx; + font-size: 30rpx; color: #FFFFFF; } } @@ -1608,20 +1627,21 @@ background-color: rgba(221, 234, 250); backdrop-filter: blur(8rpx); width: 290rpx; - height: 770rpx; + height: 900rpx; border-radius: 40rpx; margin-top: 0rpx; box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1); /* 右下角阴影 */ .doctorsay-container-scroll { - height: 620rpx; + height: 770rpx; } .doctorsay-top { height: 80rpx; display: flex; margin-bottom: 20rpx; + // margin-top: 40rpx; .doctorsay-top-gun { margin-top: 37rpx; @@ -1644,7 +1664,7 @@ display: flex; justify-content: center; align-items: center; - height: 85rpx; + height: 90rpx; position: relative; .doctorsay-container-text-target { @@ -1705,7 +1725,7 @@ .doctorsay-container-container { width: 1730rpx; - height: 1220rpx; + height: 1344rpx; background-color: rgba(255, 255, 255, 0.7); border-radius: 60rpx; box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1); @@ -1714,16 +1734,12 @@ .super-card-end { width: 100%; - // height: 300rpx; - // background-color: #c9e8ff; display: flex; - // align-items: center; .super-end-father { height: 100%; display: flex; flex-direction: column; - // align-items: center; width: 100%; .super-end-items { @@ -1731,14 +1747,12 @@ width: calc(100% - 60rpx); height: 300rpx; margin-left: 30rpx; - // margin-top: 20rpx; overflow-x: auto; .super-end-items-father { margin-left: 10rpx; margin-top: 15rpx; width: 150rpx; - // height: 160rpx; display: flex; justify-content: center; align-items: center; @@ -1759,10 +1773,6 @@ z-index: 10; background-color: #02abfe; color: #fff; - // .super-end-items-father-close { - // width: 30rpx; - // height: 30rpx; - // } } @@ -1894,15 +1904,15 @@ .doctorsay-container-right-kuai-cheng { background-color: #FFDBA1; - height: 45rpx; - width: 45rpx; + height: 35rpx; + width: 35rpx; border-radius: 7rpx; } .doctorsay-container-right-kuai-zi { background-color: #7B61FF; - height: 45rpx; - width: 45rpx; + height: 35rpx; + width: 35rpx; border-radius: 7rpx; } @@ -1936,59 +1946,6 @@ } } - .right-container-sec { - width: 100%; - display: flex; - position: relative; - - .under-father { - position: fixed; - bottom: 0; - width: 100%; - display: flex; - align-items: center; - width: 100%; - height: 150rpx; - - .under-father-view { - margin-left: 10rpx; - margin-right: 150rpx; - position: relative; - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; - - - - .under-father-light { - position: absolute; - bottom: -20rpx; - left: -90rpx; - width: 300rpx; - height: 200rpx; - } - - .under-father-img { - width: 80rpx; - height: 80rpx; - margin-left: -3rpx; - } - - .under-father-img-font { - font-size: 30rpx; - } - - .under-father-img-font-dark { - font-size: 30rpx; - background: linear-gradient(to bottom, #FFFFFF, #B2C8E2); - -webkit-background-clip: text; - color: transparent; - } - } - } - } - .right-container-title-nav { margin-top: 75rpx; margin-bottom: 20rpx; @@ -2084,18 +2041,26 @@ .title-time { display: flex; - + position: relative; .title-time-time { font-size: 32rpx; - margin-right: 10rpx; + margin-right: 80rpx; + margin-top: -10rpx; } .title-time-button { - background-color: #FFC363; - padding: 0 5rpx; - padding-top: 5rpx; - border-radius: 10rpx; + position: absolute; + top: -28rpx; + right: -25rpx; + width: 80rpx; + height: 80rpx; + } + .title-time-font{ + position: absolute; + top: -10rpx; + right: -20rpx; font-size: 25rpx; + color: #fff; } } @@ -2366,7 +2331,6 @@ .button-father { height: 200rpx; - // background-color: red; width: calc(100%-80rpx); display: flex; justify-content: center; @@ -2535,26 +2499,49 @@ } .title-time-border-blue { - margin-top: 4rpx; - margin-left: 4rpx; background-color: #dae8fa; - // border: 1rpx solid black; - width: calc(100% - 8rpx); - height: calc(100% - 8rpx); - border-radius: 20rpx; + width: calc(100%); + height: calc(100%); display: flex; justify-content: space-evenly; 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-top: 3rpx; - margin-left: 3rpx; + margin: 10rpx; border: 1rpx solid #dae8fa; - background-color: #fffaf1; - width: calc(100% - 8rpx); - height: calc(100% - 8rpx); + // background-color: #fffaf1; + // background:linear-gradient(to bottom, #f1eeff, #e3deff); + background:linear-gradient(to bottom, #fff1db, #ffe2b2); + width: calc(100% - 20rpx); + height: calc(100% - 20rpx); border-radius: 20rpx; display: flex; justify-content: space-evenly; @@ -2563,12 +2550,11 @@ } .title-time-border-pouple { - margin-top: 3rpx; - margin-left: 3rpx; + margin: 10rpx; border: 1rpx solid #dae8fa; - background-color: #e8e3ff; - width: calc(100% - 8rpx); - height: calc(100% - 8rpx); + background:linear-gradient(to bottom, #f1eeff, #e3deff); + width: calc(100% - 20rpx); + height: calc(100% - 20rpx); border-radius: 20rpx; display: flex; justify-content: space-evenly; diff --git a/pages/index/index.vue b/pages/index/index.vue index 5146697..626ace3 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -202,20 +202,20 @@ .move-font { position: absolute; // font-size: 45rpx; - font-weight: 700; + // font-weight: 700; z-index: 10; pointer-events: none; - color: #016AD1; - background-color: #fff; + // color: #016AD1; + background-color: rgb(201, 232, 255); border-radius: 20rpx; border: 2rpx solid #fff; - width: 300rpx; + width: 220rpx; height: 100rpx; display: flex; justify-content: center; align-items: center; text-align: center; - font-size: 45rpx; + font-size: 40rpx; box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1); } diff --git a/static/index/puoplebian.png b/static/index/puoplebian.png new file mode 100644 index 0000000..417ac41 Binary files /dev/null and b/static/index/puoplebian.png differ diff --git a/static/index/shexiang.png b/static/index/shexiang.png new file mode 100644 index 0000000..ecc45b3 Binary files /dev/null and b/static/index/shexiang.png differ diff --git a/static/index/yellowbian.png b/static/index/yellowbian.png new file mode 100644 index 0000000..3965760 Binary files /dev/null and b/static/index/yellowbian.png differ diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index b35f26f..b7c25b5 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -253,7 +253,7 @@ if (uni.restoreGlobal) { } }); const _imports_0$2 = "/static/index/customer.png"; - const _imports_0$1 = "/static/index/undericons/upguang.png"; + const _imports_1$1 = "/static/index/undericons/upguang.png"; const _export_sfc = (sfc, props) => { const target = sfc.__vccOpts || sfc; for (const [key, val] of props) { @@ -1312,7 +1312,7 @@ if (uni.restoreGlobal) { "image", { class: "under-father-light", - src: _imports_0$1 + src: _imports_1$1 }, null, 512 @@ -2289,14 +2289,6 @@ if (uni.restoreGlobal) { } return "title-time-border"; }; - const undericonList = vue.ref([ - { url: "/static/index/undericons/alarm.png", targetUrl: "/static/index/undericons/alarmdark.png", name: "服务考核" }, - { url: "/static/index/undericons/linshitime.png", targetUrl: "/static/index/undericons/linshitimedark.png", name: "护理流程" }, - { url: "/static/index/darkicon/zhaomingdark.png", targetUrl: "/static/index/roomicons/zhaomingtar.png", name: "电子医嘱" }, - { url: "/static/index/darkicon/kontiaodark.png", targetUrl: "/static/index/roomicons/kongtiaotar.png", name: "进销存" }, - { url: "/static/index/darkicon/nuanfengdark.png", targetUrl: "/static/index/roomicons/nuanfengtar.png", name: "实时监控" }, - { url: "/static/index/darkicon/dianqidark.png", targetUrl: "/static/index/roomicons/dianqitar.png", name: "我的指令" } - ]); const doctorsayList = vue.ref([ { url: "/static/index/doctorsay/light/clean.png", targetUrl: "/static/index/doctorsay/dark/clean.png", name: "清洁" }, { url: "/static/index/doctorsay/light/drink.png", targetUrl: "/static/index/doctorsay/dark/drink.png", name: "饮食" }, @@ -2305,7 +2297,6 @@ if (uni.restoreGlobal) { { url: "/static/index/doctorsay/light/use.png", targetUrl: "/static/index/doctorsay/dark/use.png", name: "日常" } ]); const rightListIndex = vue.ref(1); - const undermenuIndex = vue.ref(0); const upmenuIndex = vue.ref(0); const downmenuIndex = vue.ref(999); const underFans = vue.ref(false); @@ -2319,9 +2310,6 @@ if (uni.restoreGlobal) { downList.value = bigArray[index].data; downmenuIndex.value = 999; }; - const changeMenuUnder = (index) => { - undermenuIndex.value = index; - }; const rightListClick = (index) => { rightListIndex.value = index; }; @@ -2348,7 +2336,7 @@ if (uni.restoreGlobal) { const query = uni.createSelectorQuery(); query.selectAll(".super-card-time-card").boundingClientRect((data) => { data.forEach(async (res) => { - if (res.left > 200 && res.left < 1067 && res.top < 500 && res.top > 170 && res.dataset.index0 == index0 && res.dataset.index1 == index1) { + if (res.left > 200 && res.left < 1067 && res.top < 600 && res.top > 170 && res.dataset.index0 == index0 && res.dataset.index1 == index1) { if (res.left > 200 && res.left < 500) { openX.value = Math.floor(res.left) + 520; } else { @@ -2384,12 +2372,37 @@ if (uni.restoreGlobal) { } }; const deleteRuler = (index0, index1) => { - timearr.value[index0].children[index1].value = ""; - timearr.value[index0].children[index1].time = ""; - timearr.value[index0].children[index1].type = ""; + timearr.value[index0].children[index1] = { value: "" }; isopen.value = false; flyNumber.value.index0 = 999; flyNumber.value.index1 = 999; + let emptyChildIndices = []; + let emptyChildNumber = 0; + timearr.value.forEach((res, rowIndex) => { + emptyChildIndices = []; + emptyChildNumber = res.children.length; + res.children.forEach((child, index) => { + if (child.value === null || child.value === "" || child.value === void 0) { + const isEmptyInAllRows = timearr.value.every((otherRes) => { + const otherChild = otherRes.children[index]; + return otherChild === void 0 || otherChild.value === null || otherChild.value === "" || otherChild.value === void 0; + }); + if (isEmptyInAllRows) { + emptyChildIndices.push(index); + } + } + }); + }); + if (emptyChildNumber > 4 && emptyChildIndices.length > 1) { + timearr.value.forEach((res, rowIndex) => { + res.children.splice(emptyChildIndices[0], 1); + }); + } else { + timearr.value.forEach((res, rowIndex) => { + res.children.splice(emptyChildIndices[0], 1); + res.children.push({ value: "" }); + }); + } }; const longPressTimer = vue.ref(null); const isScrolling = vue.ref(false); @@ -2418,7 +2431,7 @@ if (uni.restoreGlobal) { const query = uni.createSelectorQuery(); query.selectAll(".super-card-time-card").boundingClientRect((data) => { data.forEach((res) => { - if (res.left > 200 && res.left < 1067 && res.top < 500 && res.top > 170) { + if (res.left > 200 && res.left < 1067 && res.top < 600 && res.top > 170) { reldata.push(res); } }); @@ -2480,12 +2493,12 @@ if (uni.restoreGlobal) { cardsumit.value.startTime = ""; cardsumit.value.monthTime = ""; cardsumit.value.weekTime = ""; - if (cardsumit.value.op[2] === index) { - cardsumit.value.op[2] = -1; + if (cardsumit.value.op.index[2] === index) { + cardsumit.value.op.index[2] = -1; cardsumit.value.op.name = ""; openOp.value = -1; } else { - cardsumit.value.op[2] = index; + cardsumit.value.op.index[2] = index; cardsumit.value.op.name = name; openOp.value = op; } @@ -2529,8 +2542,8 @@ if (uni.restoreGlobal) { setTimeout(() => { songisopacity.value = true; }, 200); - cardsumit.value.op[0] = upmenuIndex.value; - cardsumit.value.op[1] = downmenuIndex.value; + cardsumit.value.op.index[0] = upmenuIndex.value; + cardsumit.value.op.index[1] = downmenuIndex.value; openValue.value.time = timearr.value[props.liang.index0 + currentNumber.value * 6].time; openValue.value.array = bigArray[upmenuIndex.value].data[downmenuIndex.value].data; indexsave.value = [props.liang.index0 + currentNumber.value * 6, props.liang.index1]; @@ -2540,25 +2553,60 @@ if (uni.restoreGlobal) { const movetoruler = async () => { songisopen.value = false; isweek.value = true; - if (!openOp.value) { - timearr.value[indexsave.value[0]].children[indexsave.value[1]].type = "日常"; - } else if (openOp.value === 1) { - timearr.value[indexsave.value[0]].children[indexsave.value[1]].type = cardsumit.value.weekTime || cardsumit.value.monthTime + "号"; - } else if (openOp.value === 2) { - bottomItems.value.push({ - name: cardsumit.value.op.name, - url: "/static/index/ou.png" + let savaIndex = -1; + let emptyChildIndices = []; + timearr.value.forEach((res, rowIndex) => { + emptyChildIndices = []; + res.children.forEach((child, index) => { + if (child.value === null || child.value === "" || child.value === void 0) { + const isEmptyInAllRows = timearr.value.every((otherRes) => { + const otherChild = otherRes.children[index]; + return otherChild === void 0 || otherChild.value === null || otherChild.value === "" || otherChild.value === void 0; + }); + if (isEmptyInAllRows) { + emptyChildIndices.push(index); + } + } }); - return; + res.children.forEach((item, index) => { + if (item.serve == bigArray[cardsumit.value.op.index[0]].data[cardsumit.value.op.index[1]].type) { + savaIndex = index; + } + }); + }); + if (savaIndex === -1) { + savaIndex = emptyChildIndices[0]; + } + if (savaIndex !== -1) { + let saveserve = bigArray[cardsumit.value.op.index[0]].data[cardsumit.value.op.index[1]].type; + timearr.value.forEach((element, index) => { + element.children[savaIndex].serve = saveserve; + element.serve = saveserve; + }); + if (!openOp.value) { + timearr.value[indexsave.value[0]].children[savaIndex].type = "日常"; + } else if (openOp.value === 1) { + timearr.value[indexsave.value[0]].children[savaIndex].type = cardsumit.value.weekTime || cardsumit.value.monthTime + "号"; + } else if (openOp.value === 2) { + bottomItems.value.push({ + name: cardsumit.value.op.name, + url: "/static/index/ou.png" + }); + return; + } + timearr.value[indexsave.value[0]].children[savaIndex].value = cardsumit.value.op.name; } - timearr.value[indexsave.value[0]].children[indexsave.value[1]].value = cardsumit.value.op.name; const startHour = Number(openValue.value.time); const startMinute = Number(cardsumit.value.startTime); const endMinute = startMinute + 10; const endHour = startHour + Math.floor(endMinute / 60); const formattedStart = `${String(startHour)}:${String(startMinute).padStart(2, "0")}`; const formattedEnd = `${String(endHour)}:${String(endMinute % 60).padStart(2, "0")}`; - timearr.value[indexsave.value[0]].children[indexsave.value[1]].time = `${formattedStart}-${formattedEnd}`; + if (savaIndex !== -1) { + timearr.value[indexsave.value[0]].children[savaIndex].time = `${formattedStart}-${formattedEnd}`; + } else { + timearr.value[indexsave.value[0]].children[indexsave.value[1]].time = `${formattedStart}-${formattedEnd}`; + } const shouldAdd = timearr.value.some((obj) => { const children = obj.children; return children[children.length - 1].value.trim() !== ""; @@ -2583,10 +2631,6 @@ if (uni.restoreGlobal) { { time: "00", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2596,10 +2640,6 @@ if (uni.restoreGlobal) { { time: "01", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2609,10 +2649,6 @@ if (uni.restoreGlobal) { { time: "02", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2622,10 +2658,6 @@ if (uni.restoreGlobal) { { time: "03", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2635,10 +2667,6 @@ if (uni.restoreGlobal) { { time: "04", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2648,10 +2676,6 @@ if (uni.restoreGlobal) { { time: "05", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2661,10 +2685,6 @@ if (uni.restoreGlobal) { { time: "06", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2674,10 +2694,6 @@ if (uni.restoreGlobal) { { time: "07", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2687,10 +2703,6 @@ if (uni.restoreGlobal) { { time: "08", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2701,30 +2713,23 @@ if (uni.restoreGlobal) { time: "09", children: [ { - value: "四肢清洁", - type: "日常", - time: "9:00-9:30" + value: "" + // type: '日常', + // time: '9:00-9:30', }, { - value: "指甲", - type: "周一", - time: "9:00-9:33" + value: "" + // type: '周一', + // time: '9:00-9:33', + // serve:'' }, { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" } ] }, { time: "10", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2734,10 +2739,6 @@ if (uni.restoreGlobal) { { time: "11", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2747,10 +2748,6 @@ if (uni.restoreGlobal) { { time: "12", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2760,10 +2757,6 @@ if (uni.restoreGlobal) { { time: "13", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2773,10 +2766,6 @@ if (uni.restoreGlobal) { { time: "14", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2786,10 +2775,6 @@ if (uni.restoreGlobal) { { time: "15", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2799,10 +2784,6 @@ if (uni.restoreGlobal) { { time: "16", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2812,10 +2793,6 @@ if (uni.restoreGlobal) { { time: "17", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2825,10 +2802,6 @@ if (uni.restoreGlobal) { { time: "18", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2838,10 +2811,6 @@ if (uni.restoreGlobal) { { time: "19", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2851,10 +2820,6 @@ if (uni.restoreGlobal) { { time: "20", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2864,10 +2829,6 @@ if (uni.restoreGlobal) { { time: "21", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2877,10 +2838,6 @@ if (uni.restoreGlobal) { { time: "22", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -2890,10 +2847,6 @@ if (uni.restoreGlobal) { { time: "23", children: [ - { value: "" }, - { value: "" }, - { value: "" }, - { value: "" }, { value: "" }, { value: "" }, { value: "" }, @@ -3294,7 +3247,7 @@ if (uni.restoreGlobal) { ] } ]; - const __returned__ = { props, bottomItems, timeArray, weekDays, days, isweek, scrollTop, downList, rightList, isopen, songisopen, isopacity, songisopacity, currentNumber, changecurrentNumber, getClass, undericonList, doctorsayList, rightListIndex, undermenuIndex, upmenuIndex, downmenuIndex, underFans, roomTar, emit, darkFanschange, changLeft, changeMenuUnder, rightListClick, timer, elementsInfo, moveX, moveY, openX, openY, flyNumber, deletebottom, rulerTouchStart, rulerTouchMove, rulerTouchEnd, deleteRuler, longPressTimer, isScrolling, get scrollTimeout() { + const __returned__ = { props, bottomItems, timeArray, weekDays, days, isweek, scrollTop, downList, rightList, isopen, songisopen, isopacity, songisopacity, currentNumber, changecurrentNumber, getClass, doctorsayList, rightListIndex, upmenuIndex, downmenuIndex, underFans, roomTar, emit, darkFanschange, changLeft, rightListClick, timer, elementsInfo, moveX, moveY, openX, openY, flyNumber, deletebottom, rulerTouchStart, rulerTouchMove, rulerTouchEnd, deleteRuler, longPressTimer, isScrolling, get scrollTimeout() { return scrollTimeout; }, set scrollTimeout(v) { scrollTimeout = v; @@ -3303,6 +3256,7 @@ if (uni.restoreGlobal) { return __returned__; } }); + const _imports_0$1 = "/static/index/shexiang.png"; const _imports_1 = "/static/index/cheng.png"; function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) { var _a, _b, _c, _d, _e, _f; @@ -3443,7 +3397,19 @@ if (uni.restoreGlobal) { }), 128 /* KEYED_FRAGMENT */ - )) + )), + vue.createElementVNode("view", null, [ + vue.createElementVNode("view", { + class: "doctorsay-container-card", + style: { "background": "linear-gradient(135deg, #f78499 0%, #f56f87 100%)" } + }, [ + vue.createElementVNode("image", { + class: "doctorsay-container-card-img", + src: _imports_0$1 + }), + vue.createElementVNode("view", { class: "doctorsay-container-card-font-dark" }, " 监控 ") + ]) + ]) ]), vue.createElementVNode("view", { class: "doctorsay-container-down" }, [ vue.createElementVNode("view", { class: "doctorsay-top" }, [ @@ -3492,8 +3458,7 @@ if (uni.restoreGlobal) { 128 /* KEYED_FRAGMENT */ )) - ], 40, ["scroll-y"]), - vue.createCommentVNode(' ') + ], 40, ["scroll-y"]) ]) ]), vue.createElementVNode("view", { class: "doctorsay-container-container" }, [ @@ -3554,7 +3519,7 @@ if (uni.restoreGlobal) { class: "super-card-time", style: vue.normalizeStyle($setup.rightListIndex ? { width: "275rpx" } : { width: "206rpx" }) }, - vue.toDisplayString(item0.time), + vue.toDisplayString(item0.time + ":00"), 5 /* TEXT, STYLE */ ) @@ -3602,6 +3567,19 @@ if (uni.restoreGlobal) { "data-index0": index0, "data-index1": index1 }, [ + vue.createCommentVNode(" 气泡 "), + vue.withDirectives(vue.createElementVNode( + "view", + { + class: "boom", + style: vue.normalizeStyle(index1 > item0.children.length / 2 - 1 ? { background: `linear-gradient(to bottom, #f1eeff, #e3deff)` } : { background: `linear-gradient(to bottom, #fff1db, #ffe2b2)` }) + }, + vue.toDisplayString(item1.serve), + 5 + /* TEXT, STYLE */ + ), [ + [vue.vShow, !$props.canmove && $props.liang.index1 === index1 && item1.serve && !index0] + ]), vue.createElementVNode( "view", { @@ -3626,16 +3604,18 @@ if (uni.restoreGlobal) { 1 /* TEXT */ ), + vue.createElementVNode("image", { + class: "title-time-button", + src: item1.type == "日常" ? `/static/index/yellowbian.png` : `/static/index/pouplebian.png` + }, null, 8, ["src"]), vue.createElementVNode( "view", - { - class: "title-time-button", - style: vue.normalizeStyle(item1.type == "日常" ? { color: `#4A2E00` } : { backgroundColor: `#7B61FF`, color: `#fff` }) - }, + { class: "title-time-font" }, vue.toDisplayString(item1.type), - 5 - /* TEXT, STYLE */ - ) + 1 + /* TEXT */ + ), + vue.createCommentVNode(' \r\n {{item1.type}}\r\n ') ], 512 /* NEED_PATCH */ @@ -3644,7 +3624,7 @@ if (uni.restoreGlobal) { ]), vue.withDirectives(vue.createElementVNode( "view", - { style: { "margin-top": "-15rpx" } }, + { style: { "margin-top": "-15rpx", "font-weight": "700" } }, vue.toDisplayString($setup.splitString(item1.value)[0]), 513 /* TEXT, NEED_PATCH */ @@ -3653,7 +3633,7 @@ if (uni.restoreGlobal) { ]), vue.withDirectives(vue.createElementVNode( "view", - { style: { "margin-top": "-15rpx" } }, + { style: { "margin-top": "-15rpx", "font-weight": "700" } }, vue.toDisplayString($setup.splitString(item1.value)[0]), 513 /* TEXT, NEED_PATCH */ @@ -3662,10 +3642,18 @@ if (uni.restoreGlobal) { ]), vue.withDirectives(vue.createElementVNode( "view", - { style: { "margin-top": "-15rpx" } }, - vue.toDisplayString($setup.splitString(item1.value)[1]), - 513 - /* TEXT, NEED_PATCH */ + { style: { "margin-top": "-15rpx", "width": "100%", "background-color": "rgb(255, 206, 216)" } }, + [ + vue.createElementVNode( + "view", + { class: "" }, + vue.toDisplayString($setup.splitString(item1.value)[1]), + 1 + /* TEXT */ + ) + ], + 512 + /* NEED_PATCH */ ), [ [vue.vShow, $setup.splitString(item1.value)[1]] ]) @@ -3760,49 +3748,6 @@ if (uni.restoreGlobal) { ]) ]) ]), - vue.createElementVNode("view", { class: "right-container-sec" }, [ - vue.createElementVNode("view", { class: "under-father" }, [ - (vue.openBlock(true), vue.createElementBlock( - vue.Fragment, - null, - vue.renderList($setup.undericonList, (item, index) => { - return vue.openBlock(), vue.createElementBlock("view", { - class: "under-father-view", - key: index, - onClick: ($event) => $setup.changeMenuUnder(index) - }, [ - vue.withDirectives(vue.createElementVNode( - "image", - { - class: "under-father-light", - src: _imports_0$1 - }, - null, - 512 - /* NEED_PATCH */ - ), [ - [vue.vShow, index === $setup.undermenuIndex] - ]), - vue.createElementVNode("image", { - class: "under-father-img", - src: index === $setup.undermenuIndex ? item.targetUrl : item.url - }, null, 8, ["src"]), - vue.createElementVNode( - "view", - { - class: vue.normalizeClass($props.darkFans ? `under-father-img-font-dark` : `under-father-img-font`) - }, - vue.toDisplayString(item.name), - 3 - /* TEXT, CLASS */ - ) - ], 8, ["onClick"]); - }), - 128 - /* KEYED_FRAGMENT */ - )) - ]) - ]), vue.createCommentVNode(" 长按的弹出层 "), vue.withDirectives(vue.createElementVNode( "view", @@ -3837,12 +3782,6 @@ if (uni.restoreGlobal) { ) ]), vue.createElementVNode("view", { class: "popup-overlay-content-right" }, [ - vue.createCommentVNode(` 日常\r - \r - {{timearr[flyNumber.index0]?.children[flyNumber.index1]?.type}}\r - `), vue.createElementVNode("image", { class: "right-crush", src: ((_f = (_e = $setup.timearr[$setup.flyNumber.index0]) == null ? void 0 : _e.children[$setup.flyNumber.index1]) == null ? void 0 : _f.type) === "日常" ? `/static/index/crushyellow.png` : `/static/index/crushpouple.png`, @@ -3903,24 +3842,24 @@ if (uni.restoreGlobal) { return vue.openBlock(), vue.createElementBlock("view", { key: index }, [ vue.createElementVNode("view", { style: { "position": "relative" }, - class: vue.normalizeClass($setup.cardsumit.op[2] === index ? `arrayindex-one-target` : `arrayindex-one`), + class: vue.normalizeClass($setup.cardsumit.op.index[2] === index ? `arrayindex-one-target` : `arrayindex-one`), onClick: ($event) => $setup.clickOp(index, item.type, item.op) }, [ vue.withDirectives(vue.createElementVNode("image", { class: "ri-img", - src: $setup.cardsumit.op[2] !== index ? `/static/index/ridark.png` : `/static/index/ri.png` + src: $setup.cardsumit.op.index[2] !== index ? `/static/index/ridark.png` : `/static/index/ri.png` }, null, 8, ["src"]), [ [vue.vShow, !item.op] ]), vue.withDirectives(vue.createElementVNode("image", { class: "ri-img", - src: $setup.cardsumit.op[2] == index ? `/static/index/zhoudark.png` : `/static/index/zhou.png` + src: $setup.cardsumit.op.index[2] == index ? `/static/index/zhoudark.png` : `/static/index/zhou.png` }, null, 8, ["src"]), [ [vue.vShow, item.op === 1] ]), vue.withDirectives(vue.createElementVNode("image", { class: "ri-img", - src: $setup.cardsumit.op[2] == index ? `/static/index/jidark.png` : `/static/index/ji.png` + src: $setup.cardsumit.op.index[2] == index ? `/static/index/jidark.png` : `/static/index/ji.png` }, null, 8, ["src"]), [ [vue.vShow, item.op === 2] ]), diff --git a/unpackage/dist/dev/app-plus/pages/index/index.css b/unpackage/dist/dev/app-plus/pages/index/index.css index f85f0f0..a204355 100644 --- a/unpackage/dist/dev/app-plus/pages/index/index.css +++ b/unpackage/dist/dev/app-plus/pages/index/index.css @@ -3333,7 +3333,7 @@ background-color: #f1f7fd; overflow: hidden; width: 51.5625rem; - height: 24.375rem; + height: 28.75rem; border-radius: 0.625rem; border: 0.03125rem solid black; } @@ -3359,12 +3359,33 @@ display: flex; justify-content: center; align-items: center; - height: 5.46875rem; + height: 6.53125rem; width: calc(100%); border-right: 0.03125rem solid #BFBFCB; border-top: 0.03125rem solid #BFBFCB; flex-direction: column; background-color: #f3f6fc; + position: relative; +} +.super-card .super-card-time-card .boom[data-v-337bb5da] { + position: absolute; + top: 0; + left: 0; + background-color: #fff; + width: 1.5625rem; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + font-size: 0.9375rem; + letter-spacing: 0.15625rem; + box-shadow: 0.15625rem 0.15625rem 0.3125rem rgba(0, 0, 0, 0.1); + -webkit-writing-mode: vertical-rl; + writing-mode: vertical-rl; + /* 竖排文字，从右往左 */ + text-align: center; + z-index: 10; + /* 确保文字在容器内居中 */ } .right-container[data-v-337bb5da] { width: calc(100% - 7.34375rem); @@ -3409,10 +3430,10 @@ height: 2.34375rem; } .right-container .doctorsay-container-view .doctorsay-container-items .doctorsay-container-up .doctorsay-container-card .doctorsay-container-card-font[data-v-337bb5da] { - font-size: 0.8125rem; + font-size: 0.9375rem; } .right-container .doctorsay-container-view .doctorsay-container-items .doctorsay-container-up .doctorsay-container-card .doctorsay-container-card-font-dark[data-v-337bb5da] { - font-size: 0.8125rem; + font-size: 0.9375rem; color: #FFFFFF; } .right-container .doctorsay-container-view .doctorsay-container-items .doctorsay-container-down[data-v-337bb5da] { @@ -3420,14 +3441,14 @@ -webkit-backdrop-filter: blur(0.25rem); backdrop-filter: blur(0.25rem); width: 9.0625rem; - height: 24.0625rem; + height: 28.125rem; border-radius: 1.25rem; margin-top: 0; box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1); /* 右下角阴影 */ } .right-container .doctorsay-container-view .doctorsay-container-items .doctorsay-container-down .doctorsay-container-scroll[data-v-337bb5da] { - height: 19.375rem; + height: 24.0625rem; } .right-container .doctorsay-container-view .doctorsay-container-items .doctorsay-container-down .doctorsay-top[data-v-337bb5da] { height: 2.5rem; @@ -3452,7 +3473,7 @@ display: flex; justify-content: center; align-items: center; - height: 2.65625rem; + height: 2.8125rem; position: relative; } .right-container .doctorsay-container-view .doctorsay-container-items .doctorsay-container-down .doctorsay-container-button .doctorsay-container-text-target[data-v-337bb5da] { @@ -3506,7 +3527,7 @@ } .right-container .doctorsay-container-view .doctorsay-container-container[data-v-337bb5da] { width: 54.0625rem; - height: 38.125rem; + height: 42rem; background-color: rgba(255, 255, 255, 0.7); border-radius: 1.875rem; box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1); @@ -3663,14 +3684,14 @@ } .right-container .doctorsay-container-view .doctorsay-container-container .doctorsay-container-title .doctorsay-container-right .doctorsay-container-right-kuai-cheng[data-v-337bb5da] { background-color: #FFDBA1; - height: 1.40625rem; - width: 1.40625rem; + height: 1.09375rem; + width: 1.09375rem; border-radius: 0.21875rem; } .right-container .doctorsay-container-view .doctorsay-container-container .doctorsay-container-title .doctorsay-container-right .doctorsay-container-right-kuai-zi[data-v-337bb5da] { background-color: #7B61FF; - height: 1.40625rem; - width: 1.40625rem; + height: 1.09375rem; + width: 1.09375rem; border-radius: 0.21875rem; } .right-container .doctorsay-container-view .doctorsay-container-container .doctorsay-container-title .doctorsay-container-right .doctorsay-container-kuai-font[data-v-337bb5da] { @@ -3694,49 +3715,6 @@ font-size: 1.1875rem; font-weight: 700; } -.right-container .right-container-sec[data-v-337bb5da] { - width: 100%; - display: flex; - position: relative; -} -.right-container .right-container-sec .under-father[data-v-337bb5da] { - position: fixed; - bottom: 0; - display: flex; - align-items: center; - width: 100%; - height: 4.6875rem; -} -.right-container .right-container-sec .under-father .under-father-view[data-v-337bb5da] { - margin-left: 0.3125rem; - margin-right: 4.6875rem; - position: relative; - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; -} -.right-container .right-container-sec .under-father .under-father-view .under-father-light[data-v-337bb5da] { - position: absolute; - bottom: -0.625rem; - left: -2.8125rem; - width: 9.375rem; - height: 6.25rem; -} -.right-container .right-container-sec .under-father .under-father-view .under-father-img[data-v-337bb5da] { - width: 2.5rem; - height: 2.5rem; - margin-left: -0.09375rem; -} -.right-container .right-container-sec .under-father .under-father-view .under-father-img-font[data-v-337bb5da] { - font-size: 0.9375rem; -} -.right-container .right-container-sec .under-father .under-father-view .under-father-img-font-dark[data-v-337bb5da] { - font-size: 0.9375rem; - background: linear-gradient(to bottom, #FFFFFF, #B2C8E2); - -webkit-background-clip: text; - color: transparent; -} .right-container .right-container-title-nav[data-v-337bb5da] { margin-top: 2.34375rem; margin-bottom: 0.625rem; @@ -3818,17 +3796,26 @@ } .title-time[data-v-337bb5da] { display: flex; + position: relative; } .title-time .title-time-time[data-v-337bb5da] { font-size: 1rem; - margin-right: 0.3125rem; + margin-right: 2.5rem; + margin-top: -0.3125rem; } .title-time .title-time-button[data-v-337bb5da] { - background-color: #FFC363; - padding: 0 0.15625rem; - padding-top: 0.15625rem; - border-radius: 0.3125rem; + position: absolute; + top: -0.875rem; + right: -0.78125rem; + width: 2.5rem; + height: 2.5rem; +} +.title-time .title-time-font[data-v-337bb5da] { + position: absolute; + top: -0.3125rem; + right: -0.625rem; font-size: 0.78125rem; + color: #fff; } .popup-overlay[data-v-337bb5da] { position: fixed; @@ -4213,24 +4200,23 @@ flex-direction: column; } .title-time-border-blue[data-v-337bb5da] { - margin-top: 0.125rem; - margin-left: 0.125rem; background-color: #dae8fa; - width: calc(100% - 0.25rem); - height: calc(100% - 0.25rem); - border-radius: 0.625rem; + width: calc(100%); + height: calc(100%); display: flex; justify-content: space-evenly; align-items: center; flex-direction: column; + /* 调整 box-shadow 使其向下投影 */ + box-shadow: 0px 0.625rem 1.25rem #dae8fa; + background: linear-gradient(to right, #0184db, #0184db) top left / 1.875rem 0.25rem no-repeat, linear-gradient(to bottom, #0184db, #0184db) top left / 0.25rem 1.875rem no-repeat, linear-gradient(to left, #0184db, #0184db) top right / 1.875rem 0.25rem no-repeat, linear-gradient(to bottom, #0184db, #0184db) top right / 0.25rem 1.875rem no-repeat, linear-gradient(to right, #0184db, #0184db) bottom left / 1.875rem 0.25rem no-repeat, linear-gradient(to top, #0184db, #0184db) bottom left / 0.25rem 1.875rem no-repeat, linear-gradient(to left, #0184db, #0184db) bottom right / 1.875rem 0.25rem no-repeat, linear-gradient(to top, #0184db, #0184db) bottom right / 0.25rem 1.875rem no-repeat; } .title-time-border-yellow[data-v-337bb5da] { - margin-top: 0.09375rem; - margin-left: 0.09375rem; + margin: 0.3125rem; border: 0.03125rem solid #dae8fa; - background-color: #fffaf1; - width: calc(100% - 0.25rem); - height: calc(100% - 0.25rem); + background: linear-gradient(to bottom, #fff1db, #ffe2b2); + width: calc(100% - 0.625rem); + height: calc(100% - 0.625rem); border-radius: 0.625rem; display: flex; justify-content: space-evenly; @@ -4238,12 +4224,11 @@ flex-direction: column; } .title-time-border-pouple[data-v-337bb5da] { - margin-top: 0.09375rem; - margin-left: 0.09375rem; + margin: 0.3125rem; border: 0.03125rem solid #dae8fa; - background-color: #e8e3ff; - width: calc(100% - 0.25rem); - height: calc(100% - 0.25rem); + background: linear-gradient(to bottom, #f1eeff, #e3deff); + width: calc(100% - 0.625rem); + height: calc(100% - 0.625rem); border-radius: 0.625rem; display: flex; justify-content: space-evenly; @@ -4275,20 +4260,18 @@ } .move-font[data-v-1cf27b2a] { position: absolute; - font-weight: 700; z-index: 10; pointer-events: none; - color: #016AD1; - background-color: #fff; + background-color: #c9e8ff; border-radius: 0.625rem; border: 0.0625rem solid #fff; - width: 9.375rem; + width: 6.875rem; height: 3.125rem; display: flex; justify-content: center; align-items: center; text-align: center; - font-size: 1.40625rem; + font-size: 1.25rem; box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1); } .left-container[data-v-1cf27b2a] { diff --git a/unpackage/dist/dev/app-plus/static/index/puoplebian.png b/unpackage/dist/dev/app-plus/static/index/puoplebian.png new file mode 100644 index 0000000..417ac41 Binary files /dev/null and b/unpackage/dist/dev/app-plus/static/index/puoplebian.png differ diff --git a/unpackage/dist/dev/app-plus/static/index/shexiang.png b/unpackage/dist/dev/app-plus/static/index/shexiang.png new file mode 100644 index 0000000..ecc45b3 Binary files /dev/null and b/unpackage/dist/dev/app-plus/static/index/shexiang.png differ diff --git a/unpackage/dist/dev/app-plus/static/index/yellowbian.png b/unpackage/dist/dev/app-plus/static/index/yellowbian.png new file mode 100644 index 0000000..3965760 Binary files /dev/null and b/unpackage/dist/dev/app-plus/static/index/yellowbian.png differ