合并代码
This commit is contained in:
parent
edd0dc1d03
commit
eb919fa47d
|
|
@ -591,14 +591,25 @@
|
|||
}
|
||||
|
||||
.title-time-font-rel {
|
||||
font-size: 23rpx;
|
||||
margin-bottom: 5rpx;
|
||||
|
||||
margin-top: 10rpx;
|
||||
font-size: 33rpx;
|
||||
font-weight: 800;
|
||||
/* margin-bottom: 5rpx; */
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
color: #888888;
|
||||
color: black;
|
||||
}
|
||||
.title-time-font-tags {
|
||||
font-size: 24rpx;
|
||||
font-weight: 600;
|
||||
/* margin-bottom: 5rpx; */
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.title-time-items {
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
|
|
@ -811,6 +822,8 @@
|
|||
width: 100%;
|
||||
position: relative;
|
||||
|
||||
|
||||
|
||||
.title-time-time {
|
||||
font-size: 32rpx;
|
||||
margin: 0 auto;
|
||||
|
|
@ -2000,11 +2013,104 @@
|
|||
height: 220rpx;
|
||||
border-radius: 35rpx;
|
||||
|
||||
|
||||
.right-tags-title{
|
||||
width: 100%;
|
||||
height: 80rpx;
|
||||
display: flex;
|
||||
background-color: red;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
.right-setting{
|
||||
position: absolute;
|
||||
right: 20rpx;
|
||||
top: 20rpx;
|
||||
width: 90rpx;
|
||||
height: 46rpx;
|
||||
background-color: #F2F3F8;
|
||||
color: #555555;
|
||||
font-size: 27rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 10rpx;
|
||||
border: 1rpx solid #E5E5E5;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.blue-shu{
|
||||
background-color: #0089FE;
|
||||
width: 9rpx;
|
||||
height: 26rpx;
|
||||
border-radius: 5rpx;
|
||||
margin-right: 13rpx;
|
||||
}
|
||||
.blue-font{
|
||||
font-size: 33rpx;
|
||||
}
|
||||
.title-time-border-hisOk {
|
||||
border: 2rpx solid #D4E4FE;
|
||||
width: calc(100% - 15rpx);
|
||||
height: calc(100% - 15rpx);
|
||||
border-radius: 20rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
background-color: #F6F9FF;
|
||||
flex-direction: column;
|
||||
}
|
||||
.title-time {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
height: 100%;
|
||||
padding: 25rpx;
|
||||
padding-top: 18rpx;
|
||||
|
||||
.card-time {
|
||||
position: absolute;
|
||||
bottom: 35rpx;
|
||||
left: 20rpx;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
|
||||
.card-time-red {
|
||||
position: absolute;
|
||||
bottom: 15rpx;
|
||||
left: 20rpx;
|
||||
font-size: 28rpx;
|
||||
color: #E33B3B;
|
||||
}
|
||||
|
||||
.card-time-blue {
|
||||
position: absolute;
|
||||
bottom: 15rpx;
|
||||
left: 20rpx;
|
||||
font-size: 28rpx;
|
||||
color: #4690FF;
|
||||
}
|
||||
|
||||
.title-time-time {
|
||||
font-size: 32rpx;
|
||||
margin: 0 auto;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.title-time-button {
|
||||
position: absolute;
|
||||
top: -6rpx;
|
||||
right: -4rpx;
|
||||
width: 55rpx;
|
||||
height: 40rpx;
|
||||
}
|
||||
|
||||
.title-time-font {
|
||||
position: absolute;
|
||||
top: 0rpx;
|
||||
right: 4rpx;
|
||||
font-size: 20rpx;
|
||||
color: #1083f8;
|
||||
}
|
||||
}
|
||||
.weight-time{
|
||||
display: flex;
|
||||
}
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
:id="`a${index0}_${index1}`" style="position: relative;"
|
||||
@click="rulerTouchClick(item1,index0,index1)"
|
||||
:data-index0="index0" :data-index1="index1">
|
||||
<view class="time-button-orange-spe"
|
||||
<!-- <view class="time-button-orange-spe"
|
||||
:style="{left:flyNumber.index0?`-130rpx`:`0`}"
|
||||
v-if="flyNumber.index0 === index0 && flyNumber.index1 === index1 && index1==0">
|
||||
请选择服务指令迁移的目标单元格
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
v-if="flyNumber.index0 === index0 && flyNumber.index1 === index1 && index1">
|
||||
请选择服务指令迁移的目标单元格
|
||||
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="title-time-blue"
|
||||
v-show="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule">
|
||||
<image class="blue-img" lazy-load
|
||||
|
|
@ -71,30 +71,34 @@
|
|||
|
||||
<view class="title-time" v-if="item1.startTime"
|
||||
style="flex-direction: column;">
|
||||
<image v-show="item1.startTime"
|
||||
style="width: 50rpx;height: 50rpx;margin: 0 auto;margin-top: 20rpx"
|
||||
:src="item1.netImmediateFile?item1.netImmediateFile:`/static/logo.png`" />
|
||||
<view class="title-time-time" style="font-size: 30rpx;">
|
||||
{{item1.startTime + `-` + item1.endTime}}
|
||||
</view>
|
||||
<image class="title-time-button"
|
||||
style="width: 80rpx;height: 50rpx;"
|
||||
v-if="item1.cycleTypeId!=1"
|
||||
src="/static/index/newruler/jiao.png" />
|
||||
<view class="title-time-font"
|
||||
style="right: 10rpx;top: 5rpx;"
|
||||
v-if="item1.cycleTypeId!=1">
|
||||
{{item1.cycleType}}
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="item1.startTime" class="title-time-font-rel">
|
||||
{{splitString(item1.directiveName)[0]}}
|
||||
<view v-if="item1.startTime"
|
||||
class="title-time-font-rel">
|
||||
{{ item1.directiveName?splitString(item1.directiveName)[0]:""}}
|
||||
</view>
|
||||
<view
|
||||
v-if="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule && !item1.startTime"
|
||||
class="pulic-time">
|
||||
{{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":" + timeArray[index1]}}
|
||||
v-if="item1.startTime&&splitString(item1.directiveName)[1]"
|
||||
class="title-time-font-tags">
|
||||
({{ item1.directiveName?splitString(item1.directiveName)[1]:""}})
|
||||
</view>
|
||||
<view v-if="item1.startTime" class="card-time">
|
||||
|
||||
<view class="weight-time">
|
||||
{{ item1.startTime }}
|
||||
<text style="margin: 0 3rpx;">
|
||||
-
|
||||
</text>
|
||||
{{ item1.endTime }}
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<!-- <view
|
||||
v-if="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && !item1.startTime"
|
||||
class="pulic-time">
|
||||
|
||||
{{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":" + timeArray[index1]}}
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -108,7 +112,17 @@
|
|||
<view class="right-order">
|
||||
<view class="right-tags">
|
||||
<view class="right-tags-title">
|
||||
|
||||
<view class="blue-shu" style="margin-left: 35rpx;"></view>
|
||||
<view class="blue-font">
|
||||
体型标签
|
||||
</view>
|
||||
<view class="blue-shu" style="margin-left: 92rpx;"></view>
|
||||
<view class="blue-font">
|
||||
情绪标签
|
||||
</view>
|
||||
<view class="right-setting">
|
||||
设置
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -677,16 +691,49 @@
|
|||
// 方法：根据条件返回不同的类名
|
||||
const getClass = (item, index0, index1) => {
|
||||
if (item.startTime) {
|
||||
if (flyNumber.value.index0 === (index0) && flyNumber.value.index1 === index1) {
|
||||
return 'title-time-border-yellow-active-transparent';
|
||||
} else if (shakyTable.value) {
|
||||
return 'title-time-border-yellow-active';
|
||||
} else {
|
||||
return 'title-time-border-yellow';
|
||||
}
|
||||
return 'title-time-border-hisOk';
|
||||
// switch (item.executeStatus) {
|
||||
// case 'hisOk':
|
||||
// return 'title-time-border-hisOk';
|
||||
// case 'hisUnExe':
|
||||
// return 'title-time-border-hisFaild';
|
||||
// case 'hisTimeOut':
|
||||
// return 'title-time-border-hisFaild';
|
||||
|
||||
// case 'current':
|
||||
// return 'title-time-border-current';
|
||||
|
||||
// case 'future':
|
||||
// return 'title-time-border-future';
|
||||
|
||||
// }
|
||||
}
|
||||
return 'title-time-border';
|
||||
}
|
||||
// const getFontClass = (item : any, index0, index1) => {
|
||||
|
||||
// switch (item.executeStatus) {
|
||||
// case 'hisUnExe':
|
||||
// return 'card-time-red';
|
||||
// case 'hisTimeOut':
|
||||
// return 'card-time-red';
|
||||
|
||||
// case 'current':
|
||||
// return 'card-time-blue';
|
||||
|
||||
// default:
|
||||
// return 'card-time';
|
||||
// }
|
||||
// }
|
||||
// 处理分钟和小时的函数
|
||||
function parseHourMinutestring(startTime) {
|
||||
// 假设格式固定为 "YYYY-MM-DD HH:MM:SS"
|
||||
const parts = startTime.split(' ');
|
||||
if (parts.length < 2) return { hour: NaN, minute: NaN };
|
||||
|
||||
const [hh, mm] = parts[1].split(':');
|
||||
return { hour: hh, minute: mm };
|
||||
}
|
||||
// 通用的生成函数
|
||||
function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
|
||||
return Array.from({ length: count }, (_, i) => {
|
||||
|
|
@ -1318,6 +1365,7 @@
|
|||
const geteverything = () => {
|
||||
if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
|
||||
getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
|
||||
console.log("zzzz", res)
|
||||
timearr.value = Array.from({ length: 24 }, (_, hour) => ({
|
||||
positioning: hour.toString(),
|
||||
children: minuteArr.map(time => ({
|
||||
|
|
|
|||
Loading…
Reference in New Issue