diff --git a/manifest.json b/manifest.json
index 5f950fd..33fdad5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "护理单元",
"appid" : "__UNI__FB2D473",
"description" : "护理单元",
- "versionName" : "1.0.018",
- "versionCode" : 10018,
+ "versionName" : "1.0.020",
+ "versionCode" : 10020,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/NursingNew/component/equipment.vue b/pages/NursingNew/component/equipment.vue
index 007532b..7583fd6 100644
--- a/pages/NursingNew/component/equipment.vue
+++ b/pages/NursingNew/component/equipment.vue
@@ -1357,6 +1357,10 @@
photoplay.value = true;
init();
yulan();
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
})
const changeallmessage = () => {
diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index e66748e..d648a32 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -283,7 +283,7 @@
const openleft = ref(false)
const menutarget = ref(0)
-
+ const emit = defineEmits(['swip'])
const clickmenu = (index : number) => {
menutarget.value = index
let data = filteredMenu(0)[index]
@@ -291,7 +291,8 @@
uni.setStorageSync('nuName', data.nuName);
uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
uni.setStorageSync('NUall', data);
- getgif()
+ getgif();
+ emit('swip')
}
const tagarray = ["市医保", "半失能", "正常计费"]
@@ -384,6 +385,7 @@
(newVal, oldVal) => {
// 当旧值为false，新值为true时延迟0.2秒调用方法
if (!oldVal && newVal) {
+ console.log(oldVal && newVal)
transition.value = false;
// console.log("????",transition.value)
setTimeout(() => {
@@ -431,17 +433,25 @@
setInterval(updateTime, 1000);
photoplay.value = true;
getmenu();
- getgif();
+ transition.value = false;
+ // console.log("????",transition.value)
+ setTimeout(() => {
+ transition.value = true;
+ // console.log("看看", uni.getStorageSync('NUall'))
+ }, 50)
})
+
const filteredMenu = (index : number) => {
return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
}
const getmenu = () => {
queryPadPageList().then((res => {
+ console.log(res.result)
leftMenuArray.value = res.result.records;
filteredMenu(0).forEach((element : any, index : number) => {
if (element.nuId === uni.getStorageSync('NUall').nuId) {
menutarget.value = index
+ clickmenu(menutarget.value)
}
})
}))
diff --git a/pages/NursingNew/component/leftcontent/leftcontent.vue b/pages/NursingNew/component/leftcontent/leftcontent.vue
index ab1e7ad..9416a6e 100644
--- a/pages/NursingNew/component/leftcontent/leftcontent.vue
+++ b/pages/NursingNew/component/leftcontent/leftcontent.vue
@@ -5,7 +5,7 @@
-
+
{{v.name}}
diff --git a/pages/NursingNew/component/nurse/logistics.vue b/pages/NursingNew/component/nurse/logistics.vue
new file mode 100644
index 0000000..96c5732
--- /dev/null
+++ b/pages/NursingNew/component/nurse/logistics.vue
@@ -0,0 +1,1823 @@
+
+
+
+
+
+ NUID：{{ uni.getStorageSync('nuId')}}
+
+
+ {{ uni.getStorageSync('nuName')}}
+
+
+
+
+
+
+ 预览
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.tagName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":00"}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 请选择服务指令迁移的目标单元格
+
+
+
+ 请选择服务指令迁移的目标单元格
+
+
+
+
+
+
+
+
+
+
+ {{item1.startTime + `-` + item1.endTime}}
+
+
+
+ {{item1.cycleType}}
+
+
+
+ {{splitString(item1.directiveName)[0]}}
+
+
+ {{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":" + timeArray[index1]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 即时指令
+
+
+
+
+
+
+
+
+
+
+
+ {{item.directiveName}}
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ 周
+ 月
+
+
+ 周
+ 月
+
+
+
+
+ {{item}}
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
+
+
+
+ 周期
+
+
+ 即时
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+ 指令包
+
+
+ 包名：{{ item.packageName }}
+
+
+
+ 包含：
+
+
+ 、
+ {{ item1.directiveName }}
+
+
+
+
+
+
+
+ 不能重复添加相同的即时服务指令
+
+
+ 请选择服务指令来进行操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+ 监控
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+ 确定要删除指令吗
+
+
+
+
+
+ {{timearr[saveEditIndex.index0].children[saveEditIndex.index1].startTime + `-` + timearr[saveEditIndex.index0].children[saveEditIndex.index1].endTime}}
+
+
+
+ {{ timearr[saveEditIndex.index0].children[saveEditIndex.index1].cycleType }}
+
+
+
+ {{splitString(timearr[saveEditIndex.index0].children[saveEditIndex.index1].directiveName)[0]}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/NursingNew/component/pleasetake/takehome.vue b/pages/NursingNew/component/pleasetake/takehome.vue
index cdb4ba9..6a9d91d 100644
--- a/pages/NursingNew/component/pleasetake/takehome.vue
+++ b/pages/NursingNew/component/pleasetake/takehome.vue
@@ -37,6 +37,10 @@
});
onMounted(()=>{
hometype.value = 0;
+ transition.value = false;
+ setTimeout(() => {
+ transition.value = true;
+ }, 50)
})
watch(
() => props.isShow,
diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue
index 5cf14dc..954b4cd 100644
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@@ -1,18 +1,22 @@
-
+
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
@@ -23,8 +27,10 @@