diff --git a/pages/NursingNew/component/nurse/index - 副本.vue b/pages/NursingNew/component/nurse/index - 副本.vue
new file mode 100644
index 0000000..abdd326
--- /dev/null
+++ b/pages/NursingNew/component/nurse/index - 副本.vue
@@ -0,0 +1,1816 @@
+
+
+
+
+
+ NUID：{{ uni.getStorageSync('nuId')}}
+
+
+ {{ uni.getStorageSync('nuName')}}
+
+
+
+
+
+ 老人标签:
+
+
+
+
+
+ 未选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 体型标签
+
+
+
+
+
+
+
+ {{item.tagName}}
+
+
+
+
+
+
+ 情绪标签
+
+
+
+
+
+
+
+ {{item.tagName}}
+
+
+
+
+
+
+
+
+
+
+ 预览
+
+
+
+ 分享
+
+
+
+ 监控
+
+
+
+
+
+
+
+
+
+
+
+
+ {{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/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue
index abdd326..d09652f 100644
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
@@ -594,13 +594,13 @@
if (solveWatch.value) {
solveWatch.value--
} else {
- centerCell();
- cardLeft.value = 1
+ // centerCell();
+ cardLeft.value = 1294
scrollTop.value = 1
nextTick(() => {
scrollTop.value = 0
- cardLeft.value = 775
+ cardLeft.value =1295
})
}
upmenuIndex.value = 0
diff --git a/pages/login/animationpage.vue b/pages/login/animationpage.vue
deleted file mode 100644
index 080c13a..0000000
--- a/pages/login/animationpage.vue
+++ /dev/null
@@ -1,870 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 中控室
-
-
-
-
-
-
-
-
-
- 库房
-
-
-
-
-
-
-
-
-
- 指令矩阵
-
-
-
-
-
-
-
- 指令矩阵
-
-
- 一体化行政调度，驱动高效运营，智能统筹护理资源，提升照护效率。
-
-
-
-
- 护理矩阵
-
-
-
- 医疗矩阵
-
-
-
- 库房矩阵
-
-
-
-
-
- 行政矩阵
-
-
-
- 请领矩阵
-
-
-
-
-
- 退出
-
-
-
-
-
-
-
-
-
- 服务大厅
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 护理单元
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 长者标签
-
-
-
-
-
-
- 设置
-
-
-
-
-
-
-
-
-
- 行政办公室
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 834100d..8f96f12 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -133,7 +133,7 @@
-
+
{{ item.departName }}
@@ -273,6 +273,7 @@
const selectserve = ref(false);
const huakuaiOK = () => {
+ uni.setStorageSync('form', form);
if (allserve.value.length > 1) {
// console.log("aaaaaa");
huakuaiOpen.value = false;
@@ -283,12 +284,38 @@
}, 500)
}
}
- const changeServe = (item : any) => {
+ const changeServe = (item : any,index:number) => {
uni.setStorageSync('serverUrl', item.serverUrl);
uni.setStorageSync('orgListName', item.departName);
uni.setStorageSync('orgListCode', item.orgCode);
+
+
setTimeout(() => {
- gotoindex()
+ // gotoindex()
+ getLoginCode(time.value).then((res : any) => {
+ console.log("啥啊", res)
+ form.captcha = res.message
+ if(index){
+ loginApp(form).then(res => {
+ if (res.success) {
+ uni.setStorageSync('token', res.result.token);
+ uni.setStorageSync('username', form.username);
+ uni.setStorageSync('realname', res.result.userInfo.realname);
+ uni.setStorageSync('userInfo', res.result.userInfo);
+ gotoindex()
+ } else {
+ uni.showToast({
+ title: res.message,
+ icon: 'none', // 可选值：'success'、'loading'、'none'
+ duration: 2000 // 持续时间，单位ms
+ })
+ }
+ })
+ }else{
+ gotoindex()
+ }
+ })
+
}, 500)
}
diff --git a/pages/login/newanimationpage.vue b/pages/login/newanimationpage.vue
index dd115b0..e92d87d 100644
--- a/pages/login/newanimationpage.vue
+++ b/pages/login/newanimationpage.vue
@@ -106,142 +106,6 @@
-
-
@@ -252,7 +116,7 @@
\ No newline at end of file
diff --git a/pages/watch/settings/settings.vue b/pages/watch/settings/settings.vue
index c6fd2d0..1dc3395 100644
--- a/pages/watch/settings/settings.vue
+++ b/pages/watch/settings/settings.vue
@@ -56,7 +56,7 @@
-
@@ -117,6 +117,9 @@
import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue'
import oneseven from '@/pages/login/oneseven.vue'
import twoseven from '@/pages/login/twoseven.vue'
+ import { getServiceTree0, getServiceTree1, getServiceTree2 } from '@/pages/NursingNew/component/nurse/api.js'
+ import { getLoginCode, loginApp } from '@/pages/login/api.js'
+
import {userEdit} from './api.js'
const zyupgrade = ref(null);
const issay = ref(false)
@@ -132,6 +135,9 @@
const uuid = ref("")
const selectserve = ref(false)
const allserve = ref(uni.getStorageSync('orgList'))
+
+
+
const userInfo = ref(uni.getStorageSync('userInfo'));
const avator = ref(false);
const uplod = ()=>{
@@ -200,29 +206,60 @@
uni.setStorageSync('serverUrl', item.serverUrl);
uni.setStorageSync('orgListName', item.departName);
uni.setStorageSync('orgListCode', item.orgCode);
- uni.showToast({
- title: '切换机构成功',
- icon: 'success', // 无图标，仅文字
- duration: 2000 // 显示时长，单位毫秒
- });
+
+ let form = uni.getStorageSync('form');
+ // gotoindex()
+ let time = Date.now();
+ getLoginCode(time).then((res : any) => {
+ // console.log("啥啊", res)
+ form.captcha = res.message
+ form.checkKey = time
+
+ loginApp(form).then(res => {
+
+ if (res.success) {
+ uni.setStorageSync('token', res.result.token);
+ uni.setStorageSync('username', form.username);
+ uni.setStorageSync('realname', res.result.userInfo.realname);
+ uni.setStorageSync('userInfo', res.result.userInfo);
+ // 缓存表格编辑右侧菜单的功能
+ getServiceTree0().then((res : any) => {
+ //缓存护嘱菜单
+ uni.setStorageSync("saveTree0", res)
+ getServiceTree1().then((res : any) => {
+ //缓存护嘱菜单
+ uni.setStorageSync("saveTree1", res)
+ })
+ getServiceTree2().then((res : any) => {
+ //缓存护嘱菜单
+ uni.setStorageSync("saveTree2", res)
+
+ })
+
+ setTimeout(()=>{
+ uni.showToast({
+ title: '切换机构成功',
+ icon: 'success', // 无图标，仅文字
+ duration: 2000 // 显示时长，单位毫秒
+ });
+ },200)
+ })
+ } else {
+ uni.showToast({
+ title: res.message,
+ icon: 'none', // 可选值：'success'、'loading'、'none'
+ duration: 2000 // 持续时间，单位ms
+ })
+ }
+ })
+ })
selectserve.value = false;
- // setTimeout(() => {
- // jumpTo(`/pages/watch/index`)
- // }, 500)
+
+
}
- // 区分首次渲染与动态添加
- // watch(
- // () => props.isShow,
- // (newVal, oldVal) => {
- // if (!oldVal && newVal) {
- // transition.value = false
- // setTimeout(() => (transition.value = true), 50)
- // }
- // }
- // )
const animation = ref(false);
const serverUrl = ref("")
const jumpToTarget = (index : number) => {