yangjun
/
hldy_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

99999

This commit is contained in:
Teng 2025-10-14 15:14:15 +08:00
parent e2ee648bf9
commit 1b716bf920
5 changed files with 60 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
pages/NursingNew/component/nurse/index.vue
View File

@ -101,9 +101,9 @@
<view class="boom">
<view :style="{ marginTop: `-${2 *moveDownNumber}rpx` }">
<view v-for="(item,index) in timearr[0].children" :key="index">
<view class="boom-son" v-show="item.typeName">
<view class="boom-son" v-show="item.tagName">
<text class="boom-text">
{{item.typeName}}
{{item.tagName}}
</text>
</view>
@ -907,20 +907,20 @@
const getNew = () => {
let object = JSON.parse(JSON.stringify(timearr.value[flyNumber.value.index0].children[flyNumber.value.index1]))
indexsave.value = [saveEditIndex.value.index0, saveEditIndex.value.index1]
// 旧的typeName保存了
let typeName = timearr.value[flyNumber.value.index0].children[flyNumber.value.index1].typeName
timearr.value[flyNumber.value.index0].children[flyNumber.value.index1] = { directiveName: '', typeName: typeName }
// 旧的tagName保存了
let tagName = timearr.value[flyNumber.value.index0].children[flyNumber.value.index1].tagName
timearr.value[flyNumber.value.index0].children[flyNumber.value.index1] = { directiveName: '', tagName: tagName }
//然后保存新的
let newtypeName = timearr.value[indexsave.value[0]].children[indexsave.value[1]].typeName
let newtagName = timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName
timearr.value[indexsave.value[0]].children[indexsave.value[1]] = object
timearr.value[indexsave.value[0]].children[indexsave.value[1]].typeName = newtypeName
timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName = newtagName
let startTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime;
let endTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime;
let positioning = timearr.value[indexsave.value[0]].positioning
const rest = startTime.split(":")[1]; // ":20"
const rest0 = endTime.split(":")[1];; // ":20"
let many = Number(rest0) - Number(rest);
let start = newtypeName
let start = newtagName
let end = Number(start) + many
// 用 positioning 替换原来的小时部分
timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime = positioning + ":" + start.padStart(2, '0'); // "9:20"
@ -1312,7 +1312,7 @@
const flyNumber = ref({
index0: 999,
index1: 999,
typeName: ''
tagName: ''
})
const deletebottomindex = ref(-1);
const deletedownisopen = ref(false);
@ -1433,8 +1433,8 @@
}
}
const deleteRuler = (index0 : number, index1 : number) => {
let typeName = timearr.value[index0].children[index1].typeName
timearr.value[index0].children[index1] = { directiveName: "", typeName: typeName };
let tagName = timearr.value[index0].children[index1].tagName
timearr.value[index0].children[index1] = { directiveName: "", tagName: tagName };
saveAll()
}
const longPressTimer = ref(null);
@ -1515,7 +1515,7 @@
const openOp = ref(0);
const clickOp = (index : number, item : any) => {
saveId.value = item.id;
saveTagName.value = item.tagName
// saveTagName.value = item.tagName
cardsumit.value.op.index[2] = index
cardsumit.value.op.name = item.relName
switch (item.cycleType) {
@ -1539,20 +1539,20 @@
const rulerMoveEnd = (object : any) => {
if (props.liang.index0 !== 999 && object.cycleType) {
indexsave.value = [props.liang.index0, props.liang.index1]
// 旧的typeName保存了
let typeName = timearr.value[flyNumber.value.index0].children[flyNumber.value.index1].typeName
timearr.value[flyNumber.value.index0].children[flyNumber.value.index1] = { directiveName: '', typeName: typeName }
// 旧的tagName保存了
let tagName = timearr.value[flyNumber.value.index0].children[flyNumber.value.index1].tagName
timearr.value[flyNumber.value.index0].children[flyNumber.value.index1] = { directiveName: '', tagName: tagName }
//然后保存新的
let newtypeName = timearr.value[indexsave.value[0]].children[indexsave.value[1]].typeName
let newtagName = timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName
timearr.value[indexsave.value[0]].children[indexsave.value[1]] = object
timearr.value[indexsave.value[0]].children[indexsave.value[1]].typeName = newtypeName
timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName = newtagName
let startTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime;
let endTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime;
let positioning = timearr.value[indexsave.value[0]].positioning
const rest = startTime.split(":")[1]; // ":20"
const rest0 = endTime.split(":")[1];; // ":20"
let many = Number(rest0) - Number(rest);
let start = newtypeName
let start = newtagName
let end = Number(start) + many
// 用 positioning 替换原来的小时部分
timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime = positioning + ":" + start.padStart(2, '0'); // "9:20"
@ -1674,7 +1674,7 @@
monthValue.value = "";
}
const startHour = Number(saveEditIndex.value.index0)
const startMinute = Number(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].typeName)
const startMinute = Number(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName)
const endMinute = startMinute + 10
const endHour = startHour + Math.floor(endMinute / 60)
const formattedStart = `${String(startHour)}:${String(startMinute).padStart(2, '0')}`
@ -1689,12 +1689,12 @@
endTime: formattedEnd,
positioning: saveEditIndex.value.index0.toString(),
positioningLong: saveEditIndex.value.index1.toString(),
tagName: allobject.tagName,
// tagName: allobject.tagName,
cycleType: cycleType,
nuId: uni.getStorageSync('nuId'),
customerId: uni.getStorageSync('customerId'),
id: "",
typeName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].typeName,
tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
}
//给表格赋值
timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1] = param;
@ -1713,14 +1713,14 @@
let postArray = [];
timearr.value.forEach((element0, index0) => {
element0.children.forEach((element1, index1) => {
let saveTypeName = ""
let savetagName = ""
if (!element1.directiveName && !element1.id) {
let array = {};
if (element1.typeName) {
saveTypeName = element1.typeName
if (element1.tagName) {
savetagName = element1.tagName
}
array = JSON.parse(JSON.stringify(moBan.value))
saveTypeName ? array.typeName = saveTypeName : ""
savetagName ? array.tagName = savetagName : ""
array.positioning = index0
array.positioningLong = index1
postArray.push(array)
@ -1793,7 +1793,7 @@
Array.from({ length: 24 }, (_, hour) => ({
positioning: hour.toString(),
children: minuteArr.map(time => ({
typeName: time, // 表示分钟，如 '00', '05' 等
tagName: time, // 表示分钟，如 '00', '05' 等
directiveName: '' // 默认的 directiveName
}))
}))
@ -1837,10 +1837,9 @@
if (uni.getStorageSync('nuId') && uni.getStorageSync('customerId')) {
getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('customerId')).then((res : any) => {
if (res.success) {
if (res.success && res.result[0].children.length) {
timearr.value = res.result
}
})
}
uni.$on('where', findback);
@ -1867,12 +1866,12 @@
endTime: "",
positioning: "",
positioningLong: "",
tagName: "",
// tagName: "",
cycleType: "",
nuId: uni.getStorageSync('nuId'),
customerId: uni.getStorageSync('customerId'),
id: "",
typeName: ""
tagName: ""
})
// 切割bigArray

2
pages/watch/index.vue
View File

@ -720,7 +720,7 @@
uni.setStorageSync('nuId', filteredMenu.value[savetypeNow.value].nuId);
uni.setStorageSync('nuName', filteredMenu.value[savetypeNow.value].nuName);
uni.setStorageSync('customerId', filteredMenu.value[savetypeNow.value].elderInfo ? filteredMenu.value[savetypeNow.value].elderInfo?.id : null);
console.log("??????1111",filteredMenu.value[savetypeNow.value])
if (!typeNow.value) {
uni.navigateTo({
url: '/pages/NursingNew/index'

54
unpackage/dist/dev/app-plus/app-service.js vendored
View File

@ -12193,6 +12193,7 @@ if (uni.restoreGlobal) {
uni.setStorageSync("nuId", filteredMenu.value[savetypeNow.value].nuId);
uni.setStorageSync("nuName", filteredMenu.value[savetypeNow.value].nuName);
uni.setStorageSync("customerId", filteredMenu.value[savetypeNow.value].elderInfo ? (_a = filteredMenu.value[savetypeNow.value].elderInfo) == null ? void 0 : _a.id : null);
formatAppLog("log", "at pages/watch/index.vue:723", "??????1111", filteredMenu.value[savetypeNow.value]);
if (!typeNow.value) {
uni.navigateTo({
url: "/pages/NursingNew/index"
@ -17717,18 +17718,18 @@ if (uni.restoreGlobal) {
const getNew = () => {
let object2 = JSON.parse(JSON.stringify(timearr.value[flyNumber.value.index0].children[flyNumber.value.index1]));
indexsave.value = [saveEditIndex.value.index0, saveEditIndex.value.index1];
let typeName = timearr.value[flyNumber.value.index0].children[flyNumber.value.index1].typeName;
timearr.value[flyNumber.value.index0].children[flyNumber.value.index1] = { directiveName: "", typeName };
let newtypeName = timearr.value[indexsave.value[0]].children[indexsave.value[1]].typeName;
let tagName = timearr.value[flyNumber.value.index0].children[flyNumber.value.index1].tagName;
timearr.value[flyNumber.value.index0].children[flyNumber.value.index1] = { directiveName: "", tagName };
let newtagName = timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName;
timearr.value[indexsave.value[0]].children[indexsave.value[1]] = object2;
timearr.value[indexsave.value[0]].children[indexsave.value[1]].typeName = newtypeName;
timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName = newtagName;
let startTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime;
let endTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime;
let positioning = timearr.value[indexsave.value[0]].positioning;
const rest = startTime.split(":")[1];
const rest0 = endTime.split(":")[1];
let many = Number(rest0) - Number(rest);
let start = newtypeName;
let start = newtagName;
let end = Number(start) + many;
timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime = positioning + ":" + start.padStart(2, "0");
timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime = positioning + ":" + String(end % 60).padStart(2, "0");
@ -18096,7 +18097,7 @@ if (uni.restoreGlobal) {
const flyNumber = vue.ref({
index0: 999,
index1: 999,
typeName: ""
tagName: ""
});
const deletebottomindex = vue.ref(-1);
const deletedownisopen = vue.ref(false);
@ -18196,8 +18197,8 @@ if (uni.restoreGlobal) {
}
};
const deleteRuler = (index0, index1) => {
let typeName = timearr.value[index0].children[index1].typeName;
timearr.value[index0].children[index1] = { directiveName: "", typeName };
let tagName = timearr.value[index0].children[index1].tagName;
timearr.value[index0].children[index1] = { directiveName: "", tagName };
saveAll();
};
const longPressTimer = vue.ref(null);
@ -18268,7 +18269,6 @@ if (uni.restoreGlobal) {
const openOp = vue.ref(0);
const clickOp = (index2, item) => {
saveId.value = item.id;
saveTagName.value = item.tagName;
cardsumit.value.op.index[2] = index2;
cardsumit.value.op.name = item.relName;
switch (item.cycleType) {
@ -18287,18 +18287,18 @@ if (uni.restoreGlobal) {
const rulerMoveEnd = (object2) => {
if (props.liang.index0 !== 999 && object2.cycleType) {
indexsave.value = [props.liang.index0, props.liang.index1];
let typeName = timearr.value[flyNumber.value.index0].children[flyNumber.value.index1].typeName;
timearr.value[flyNumber.value.index0].children[flyNumber.value.index1] = { directiveName: "", typeName };
let newtypeName = timearr.value[indexsave.value[0]].children[indexsave.value[1]].typeName;
let tagName = timearr.value[flyNumber.value.index0].children[flyNumber.value.index1].tagName;
timearr.value[flyNumber.value.index0].children[flyNumber.value.index1] = { directiveName: "", tagName };
let newtagName = timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName;
timearr.value[indexsave.value[0]].children[indexsave.value[1]] = object2;
timearr.value[indexsave.value[0]].children[indexsave.value[1]].typeName = newtypeName;
timearr.value[indexsave.value[0]].children[indexsave.value[1]].tagName = newtagName;
let startTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime;
let endTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime;
let positioning = timearr.value[indexsave.value[0]].positioning;
const rest = startTime.split(":")[1];
const rest0 = endTime.split(":")[1];
let many = Number(rest0) - Number(rest);
let start = newtypeName;
let start = newtagName;
let end = Number(start) + many;
timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime = positioning + ":" + start.padStart(2, "0");
timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime = positioning + ":" + String(end % 60).padStart(2, "0");
@ -18405,7 +18405,7 @@ if (uni.restoreGlobal) {
monthValue.value = "";
}
const startHour = Number(saveEditIndex.value.index0);
const startMinute = Number(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].typeName);
const startMinute = Number(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName);
const endMinute = startMinute + 10;
const endHour = startHour + Math.floor(endMinute / 60);
const formattedStart = `${String(startHour)}:${String(startMinute).padStart(2, "0")}`;
@ -18419,12 +18419,12 @@ if (uni.restoreGlobal) {
endTime: formattedEnd,
positioning: saveEditIndex.value.index0.toString(),
positioningLong: saveEditIndex.value.index1.toString(),
tagName: allobject.tagName,
// tagName: allobject.tagName,
cycleType,
nuId: uni.getStorageSync("nuId"),
customerId: uni.getStorageSync("customerId"),
id: "",
typeName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].typeName
tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName
};
timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1] = param;
let data2 = {
@ -18440,14 +18440,14 @@ if (uni.restoreGlobal) {
let postArray = [];
timearr.value.forEach((element0, index0) => {
element0.children.forEach((element1, index1) => {
let saveTypeName = "";
let savetagName = "";
if (!element1.directiveName && !element1.id) {
let array2 = {};
if (element1.typeName) {
saveTypeName = element1.typeName;
if (element1.tagName) {
savetagName = element1.tagName;
}
array2 = JSON.parse(JSON.stringify(moBan.value));
saveTypeName ? array2.typeName = saveTypeName : "";
savetagName ? array2.tagName = savetagName : "";
array2.positioning = index0;
array2.positioningLong = index1;
postArray.push(array2);
@ -18515,7 +18515,7 @@ if (uni.restoreGlobal) {
Array.from({ length: 24 }, (_, hour) => ({
positioning: hour.toString(),
children: minuteArr.map((time) => ({
typeName: time,
tagName: time,
// 表示分钟，如 '00', '05' 等
directiveName: ""
// 默认的 directiveName
@ -18557,7 +18557,7 @@ if (uni.restoreGlobal) {
});
if (uni.getStorageSync("nuId") && uni.getStorageSync("customerId")) {
getNclist(uni.getStorageSync("nuId"), uni.getStorageSync("customerId")).then((res) => {
if (res.success) {
if (res.success && res.result[0].children.length) {
timearr.value = res.result;
}
});
@ -18585,12 +18585,12 @@ if (uni.restoreGlobal) {
endTime: "",
positioning: "",
positioningLong: "",
tagName: "",
// tagName: "",
cycleType: "",
nuId: uni.getStorageSync("nuId"),
customerId: uni.getStorageSync("customerId"),
id: "",
typeName: ""
tagName: ""
});
function splitString(str) {
let result = [];
@ -18938,7 +18938,7 @@ if (uni.restoreGlobal) {
vue.createElementVNode(
"text",
{ class: "boom-text" },
vue.toDisplayString(item.typeName),
vue.toDisplayString(item.tagName),
1
/* TEXT */
)
@ -18946,7 +18946,7 @@ if (uni.restoreGlobal) {
512
/* NEED_PATCH */
), [
[vue.vShow, item.typeName]
[vue.vShow, item.tagName]
])
]);
}),

4
unpackage/dist/dev/app-plus/pages/camera.js vendored
View File

@ -63,7 +63,7 @@ if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
}
});
// ../../../../项目/hldy_app/unpackage/dist/dev/.nvue/pages/camera.js
// ../../../../hldy_app/unpackage/dist/dev/.nvue/pages/camera.js
var import_vue = __toESM(require_vue());
function requireNativePlugin(name) {
return weex.requireModule(name);
@ -657,7 +657,7 @@ if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
)
]);
}
var camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/\u9879\u76EE/hldy_app/pages/camera.nvue"]]);
var camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app/pages/camera.nvue"]]);
// <stdin>
var webview = plus.webview.currentWebview();

2
unpackage/dist/dev/cache/.app-plus/tsc/app-android/.tsbuildInfo vendored
View File

File diff suppressed because one or more lines are too long