This commit is contained in:
parent
66a2771411
commit
5a3b1a35fe
|
|
@ -902,7 +902,7 @@
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const start = async (v) => {
|
const start = (v) => {
|
||||||
// if(v.izMulti == "Y"){
|
// if(v.izMulti == "Y"){
|
||||||
// console.log(1111111111)
|
// console.log(1111111111)
|
||||||
// plsbuy.value[current2.value].directiveList.map((item,i)=>{
|
// plsbuy.value[current2.value].directiveList.map((item,i)=>{
|
||||||
|
|
@ -911,7 +911,6 @@
|
||||||
// Object.assign(plsbuy.value[current2.value].directiveList[i], { izStart: 'Y' })
|
// Object.assign(plsbuy.value[current2.value].directiveList[i], { izStart: 'Y' })
|
||||||
// console.log(item)
|
// console.log(item)
|
||||||
// })
|
// })
|
||||||
// await nextTick()
|
|
||||||
// timeacde(2)
|
// timeacde(2)
|
||||||
// }
|
// }
|
||||||
// return
|
// return
|
||||||
|
|
@ -925,23 +924,25 @@
|
||||||
// console.log(v)
|
// console.log(v)
|
||||||
if (v.izStart != 'N') { return }
|
if (v.izStart != 'N') { return }
|
||||||
startOrder({ id: v.id }).then(res => {
|
startOrder({ id: v.id }).then(res => {
|
||||||
|
console.log(res)
|
||||||
if (res.result.success) {
|
if (res.result.success) {
|
||||||
if(v.izMulti == "Y"){
|
if(v.izMulti == "Y"){
|
||||||
// console.log(1111111111)
|
// console.log(1111111111)
|
||||||
// plsbuy.value[current2.value].directiveList.map((item,i)=>{
|
plsbuy.value[current2.value].directiveList.map((item,i)=>{
|
||||||
// console.log(2222222222222)
|
console.log(2222222222222)
|
||||||
// plsbuy.value[current2.value].directiveList[i].izStart = "Y"
|
plsbuy.value[current2.value].directiveList[i].izStart = "Y"
|
||||||
// console.log(item)
|
console.log(item)
|
||||||
// })
|
})
|
||||||
firstgetqueryCgdList(uni.getStorageSync('nuId'))
|
// firstgetqueryCgdList(uni.getStorageSync('nuId'))
|
||||||
timeacde(2)
|
timeacde(2)
|
||||||
}else{
|
}else{
|
||||||
v.izStart = "Y";
|
v.izStart = "Y";
|
||||||
timeacde(1)
|
timeacde(1)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
errmsg.value = res.message
|
errmsg.value = res.result.message
|
||||||
openerror.value = true;
|
openerror.value = true;
|
||||||
|
firstgetqueryCgdList(uni.getStorageSync('nuId'))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
@ -967,7 +968,7 @@
|
||||||
const ends = () => {
|
const ends = () => {
|
||||||
// console.log("看看传的", { id: endobj.value.id })
|
// console.log("看看传的", { id: endobj.value.id })
|
||||||
endOrder({ id: endobj.value.id }).then(res => {
|
endOrder({ id: endobj.value.id }).then(res => {
|
||||||
console.log(res)
|
console.log(res,{ id: endobj.value.id })
|
||||||
if (res.result.success) {
|
if (res.result.success) {
|
||||||
open.value = 0;
|
open.value = 0;
|
||||||
endobj.value = {};
|
endobj.value = {};
|
||||||
|
|
|
||||||
|
|
@ -1050,7 +1050,7 @@
|
||||||
positioning: saveEditIndex.value.index0.toString(),
|
positioning: saveEditIndex.value.index0.toString(),
|
||||||
positioningLong: saveEditIndex.value.index1.toString(),
|
positioningLong: saveEditIndex.value.index1.toString(),
|
||||||
tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
|
tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
|
||||||
startTime: allobject.startTime,
|
startTime: allobject.startTime? allobject.startTime?.slice(11, 16):'',
|
||||||
izPackage: ruleritem.value.izPackage,
|
izPackage: ruleritem.value.izPackage,
|
||||||
cycleTypeId: nosave.value.cycleTypeId,
|
cycleTypeId: nosave.value.cycleTypeId,
|
||||||
cycleValue: nosave.value.cycleValue,
|
cycleValue: nosave.value.cycleValue,
|
||||||
|
|
@ -1058,9 +1058,9 @@
|
||||||
optTime: ts,
|
optTime: ts,
|
||||||
instructionTagId:typearray.value[whitchtype.value]?.instructionType
|
instructionTagId:typearray.value[whitchtype.value]?.instructionType
|
||||||
}
|
}
|
||||||
console.log("啥情况data", data)
|
// console.log("啥情况data", data)
|
||||||
editDirective(data).then((res) => {
|
editDirective(data).then((res) => {
|
||||||
console.log("啥情况1111", res)
|
// console.log("啥情况1111", res)
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
geteverything()
|
geteverything()
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
|
@ -1870,10 +1870,10 @@
|
||||||
const emotionTagList = ref([]);
|
const emotionTagList = ref([]);
|
||||||
const bodyTagList = ref([]);
|
const bodyTagList = ref([]);
|
||||||
const geteverything = () => {
|
const geteverything = () => {
|
||||||
console.log("有老人吗",uni.getStorageSync('elderId'),uni.getStorageSync('nuId'))
|
// console.log("有老人吗",uni.getStorageSync('elderId'),uni.getStorageSync('nuId'))
|
||||||
if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
|
if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
|
||||||
getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId'),typearray.value[whitchtype.value]?.instructionType).then((res : any) => {
|
getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId'),typearray.value[whitchtype.value]?.instructionType).then((res : any) => {
|
||||||
console.log( res )
|
// console.log( res )
|
||||||
timearr.value = Array.from({ length: 24 }, (_, hour) => ({
|
timearr.value = Array.from({ length: 24 }, (_, hour) => ({
|
||||||
positioning: hour.toString(),
|
positioning: hour.toString(),
|
||||||
children: minuteArr.map(time => ({
|
children: minuteArr.map(time => ({
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue