26 changed files with 1341 additions and 1311 deletions
@ -1,59 +1,67 @@ |
|||||
# 1.0.0 (2022-01-11) |
# 1.0.0 (2022-01-11) |
||||
|
|
||||
### 🌟 新功能 |
### 🌟 新功能 |
||||
范围|描述|commitId |
|
||||
--|--|-- |
|
||||
- | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) |
|
||||
- | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) |
|
||||
project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) |
|
||||
theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) |
|
||||
- | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) |
|
||||
- | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) |
|
||||
- | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) |
|
||||
- | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) |
|
||||
- | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005) |
|
||||
- | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) |
|
||||
- | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) |
|
||||
- | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) |
|
||||
- | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) |
|
||||
- | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) |
|
||||
|
|
||||
|
| 范围 | 描述 | commitId | |
||||
|
| ------- | ------------------------ | ------------------------------------------------------------------------ | |
||||
|
| - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) | |
||||
|
| - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) | |
||||
|
| project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) | |
||||
|
| theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) | |
||||
|
| - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) | |
||||
|
| - | 使用 uview 完成 api 请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) | |
||||
|
| - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) | |
||||
|
| - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) | |
||||
|
| - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) | |
||||
|
| - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) | |
||||
|
| - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) | |
||||
|
| - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005) | |
||||
|
| - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) | |
||||
|
| - | 使用 uview 完成 api 请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) | |
||||
|
| - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) | |
||||
|
| - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) | |
||||
|
| - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) | |
||||
|
| - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) | |
||||
|
| - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) | |
||||
|
| - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) | |
||||
|
| project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) | |
||||
|
| theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) | |
||||
|
| - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) | |
||||
|
|
||||
### 🎨 代码样式 |
### 🎨 代码样式 |
||||
范围|描述|commitId |
|
||||
--|--|-- |
|
||||
- | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b) |
|
||||
- | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) |
|
||||
|
|
||||
|
| 范围 | 描述 | commitId | |
||||
|
| ---- | ----------------------- | ------------------------------------------------------------------------ | |
||||
|
| - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) | |
||||
|
| - | calender 格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b) | |
||||
|
|
||||
### 🐛 Bug 修复 |
### 🐛 Bug 修复 |
||||
范围|描述|commitId |
|
||||
--|--|-- |
|
||||
app.vue | 修复获取token报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54) |
|
||||
createTask | 修复createTask v-model的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0) |
|
||||
- | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) |
|
||||
|
|
||||
|
| 范围 | 描述 | commitId | |
||||
|
| ---------- | ------------------------------ | ------------------------------------------------------------------------ | |
||||
|
| - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) | |
||||
|
| app.vue | 修复获取 token 报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54) | |
||||
|
| createTask | 修复 createTask v-model 的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0) | |
||||
|
|
||||
### 🔨 代码重构 |
### 🔨 代码重构 |
||||
范围|描述|commitId |
|
||||
--|--|-- |
|
||||
- | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) |
|
||||
- | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) |
|
||||
|
|
||||
|
| 范围 | 描述 | commitId | |
||||
|
| ---- | ---------------------- | ------------------------------------------------------------------------ | |
||||
|
| - | 重构 project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) | |
||||
|
| - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) | |
||||
|
|
||||
### 🚀 性能优化 |
### 🚀 性能优化 |
||||
范围|描述|commitId |
|
||||
--|--|-- |
|
||||
- | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b) |
|
||||
|
|
||||
|
| 范围 | 描述 | commitId | |
||||
|
| ---- | -------- | ------------------------------------------------------------------------ | |
||||
|
| - | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b) | |
||||
|
|
||||
### chore |
### chore |
||||
范围|描述|commitId |
|
||||
--|--|-- |
|
||||
- | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089) |
|
||||
|
|
||||
|
| 范围 | 描述 | commitId | |
||||
|
| ---- | ------------------- | ------------------------------------------------------------------------ | |
||||
|
| - | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089) | |
||||
|
|
||||
范围|描述|commitId |
| 范围 | 描述 | commitId | |
||||
--|--|-- |
| ---- | -------------- | ------------------------------------------------------------------------ | |
||||
- | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49) |
| - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49) | |
||||
|
|
||||
|
|||||
|
After Width: | Height: | Size: 8.6 KiB |
@ -0,0 +1,48 @@ |
|||||
|
/** |
||||
|
* 设置粘贴板数据 |
||||
|
* @param {String} text 要设置的字符串 |
||||
|
* 如果未设置参数，则清空数据 |
||||
|
*/ |
||||
|
function setClipboardText(text) { |
||||
|
try { |
||||
|
var os = plus.os.name; |
||||
|
text = text || ''; |
||||
|
if ('iOS' == os) { |
||||
|
// var UIPasteboard = plus.ios.importClass('UIPasteboard');
|
||||
|
// var pasteboard = UIPasteboard.generalPasteboard();
|
||||
|
// pasteboard.setValueforPasteboardType(text, 'public.utf8-plain-text');
|
||||
|
var pasteboard = plus.ios.invoke('UIPasteboard', 'generalPasteboard'); |
||||
|
plus.ios.invoke(pasteboard, 'setValue:forPasteboardType:', text, 'public.utf8-plain-text'); |
||||
|
} else { |
||||
|
var main = plus.android.runtimeMainActivity(); |
||||
|
// var Context = plus.android.importClass('android.content.Context');
|
||||
|
// var clip = main.getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
|
var clip = main.getSystemService('clipboard'); |
||||
|
plus.android.invoke(clip, 'setText', text); |
||||
|
} |
||||
|
} catch (e) { |
||||
|
console.error('error @setClipboardText!!'); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
function getClipboardText() { |
||||
|
try { |
||||
|
var os = plus.os.name; |
||||
|
if ('iOS' == os) { |
||||
|
var pasteboard = plus.ios.invoke('UIPasteboard', 'generalPasteboard'); |
||||
|
return plus.ios.invoke(pasteboard, 'valueForPasteboardType:', 'public.utf8-plain-text') |
||||
|
} else { |
||||
|
var main = plus.android.runtimeMainActivity(); |
||||
|
var clip = main.getSystemService('clipboard'); |
||||
|
return plus.android.invoke(clip, 'getText'); |
||||
|
} |
||||
|
} catch (e) { |
||||
|
console.error('error @getClipboardText!!'); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
|
||||
|
export default { |
||||
|
setClipboardText, |
||||
|
getClipboardText |
||||
|
} |
||||
@ -0,0 +1,2 @@ |
|||||
|
// 每页加载颗粒度的个数
|
||||
|
export default { pageCount: 10 }; |
||||
@ -1,449 +0,0 @@ |
|||||
import { |
|
||||
ref, |
|
||||
onMounted, |
|
||||
computed, |
|
||||
watch, |
|
||||
nextTick |
|
||||
} from 'vue'; |
|
||||
import { |
|
||||
onLoad |
|
||||
} from '@dcloudio/uni-app'; |
|
||||
import useGetUserIdFromLocal from '@/hooks/user/useGetUserIdFromLocal'; |
|
||||
import { |
|
||||
useStore |
|
||||
} from 'vuex'; |
|
||||
import { |
|
||||
flatten |
|
||||
} from 'lodash'; |
|
||||
|
|
||||
export default function useInit() { |
|
||||
const store = useStore(); |
|
||||
const token = computed(() => store.state.user.token); |
|
||||
const userId = useGetUserIdFromLocal(); |
|
||||
const roleId = computed(() => store.state.role.roleId); |
|
||||
const timeNode = computed(() => store.state.task.timeNode); |
|
||||
const timeUnit = computed(() => store.state.task.timeUnit); |
|
||||
const tasks = computed(() => store.state.task.tasks); |
|
||||
const newProjectInfo = computed(() => store.state.task.newProjectInfo); |
|
||||
const showScrollTo = computed(() => store.state.task.showScrollTo); |
|
||||
const timeGranularity = computed(() => store.getters['task/timeGranularity']); |
|
||||
const projectId = computed(() => store.getters['project/projectId']); |
|
||||
const height = ref(null); |
|
||||
const timeLine = ref(null); |
|
||||
|
|
||||
onLoad(options => { |
|
||||
console.log('onLoad options: ', options); |
|
||||
if (options.share && options.share === '1') { |
|
||||
shareInit(options); |
|
||||
} else { |
|
||||
init(options); |
|
||||
} |
|
||||
}); |
|
||||
|
|
||||
/** |
|
||||
* 当时间基准点发生变化时 |
|
||||
* 重新根据时间和角色查询普通日常任务 |
|
||||
* 永久日常任务不发生 改变 |
|
||||
*/ |
|
||||
watch(timeNode, newValue => { |
|
||||
if (newValue && roleId.value) { |
|
||||
console.log('当时间基准点发生变化时') |
|
||||
clearTasksData(); |
|
||||
getGlobalData(); // 查可变日常任务
|
|
||||
initPlanTasks(); // 处理定期任务
|
|
||||
} |
|
||||
}); |
|
||||
|
|
||||
/** |
|
||||
* 当角色发生变化时 |
|
||||
* 重新查询永久日常任务和普通日常任务 |
|
||||
* 注意: 切换角色后 重新设置了时间基准点 时间基准点一定会变 |
|
||||
* 所以监听时间基准点获取 可变日常任务即可 这里不用获取 避免重复获取 |
|
||||
*/ |
|
||||
watch(roleId, newValue => { |
|
||||
if (newValue) { |
|
||||
console.log('当角色发生变化时') |
|
||||
store.commit('task/setTimeNode', Date.now()); |
|
||||
// 根据角色查找永久的日常任务
|
|
||||
const params = { |
|
||||
roleId: newValue.value, |
|
||||
projectId: projectId.value |
|
||||
}; |
|
||||
store.dispatch('task/getPermanent', params); |
|
||||
} |
|
||||
}); |
|
||||
|
|
||||
/** |
|
||||
* 当时间基准点发生变化时 |
|
||||
* 重新根据时间和角色查询普通日常任务 |
|
||||
* 永久日常任务不发生改变 |
|
||||
*/ |
|
||||
watch(newProjectInfo, newValue => { |
|
||||
console.log('当时间基准点发生变化时') |
|
||||
if (newValue && newValue.value.projectId && newValue.value.url) { |
|
||||
uni.$u.route('/', { |
|
||||
u: userId.value, |
|
||||
p: newValue.value.projectId, |
|
||||
url: newValue.value.url |
|
||||
}); |
|
||||
clearTasksData(); |
|
||||
store.commit('role/setRoleId', ''); |
|
||||
const options = uni.$route.query; |
|
||||
init(options); |
|
||||
} |
|
||||
}); |
|
||||
|
|
||||
onMounted(() => { |
|
||||
const system = uni.getSystemInfoSync(); |
|
||||
height.value = `${system.windowHeight}px`; |
|
||||
}); |
|
||||
|
|
||||
/** |
|
||||
* 初始化 |
|
||||
* @param {object | null} options |
|
||||
*/ |
|
||||
function init(options) { |
|
||||
console.log('初始化init') |
|
||||
if (!token.value) { |
|
||||
// 不论有没有token都直接从userId获取token
|
|
||||
// token有过期时间 从本地获取可能是过期 干脆直接从userId获取
|
|
||||
if (!options || !options.u) { |
|
||||
uni.$ui.showToast('缺少用户信息参数'); // 参数里没有u (userId)提示
|
|
||||
} else { |
|
||||
store.dispatch('user/getToken', options.u); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
// 参数里有项目名称 就设置标题里的项目名称
|
|
||||
options && options.pname && store.commit('project/setProjectName', options.pname); |
|
||||
|
|
||||
if (!options || !options.p) { |
|
||||
uni.$ui.showToast('缺少项目信息参数'); // 没有项目id参数
|
|
||||
} else { |
|
||||
if (options.p !== uni.$storage.getStorageSync('projectId')) { |
|
||||
console.log('切项目了'); |
|
||||
uni.$storage.setStorageSync('roleId', ''); |
|
||||
} |
|
||||
// 根据项目id获取项目信息
|
|
||||
const params = { |
|
||||
projectId: options.p, |
|
||||
num: 0 |
|
||||
} |
|
||||
getProjectById(params); |
|
||||
// 查询医院是否填写了调查问卷
|
|
||||
// this.handleQueryNotWrite(options.p);
|
|
||||
// 根据项目id获取成员列表
|
|
||||
store.dispatch('role/getAllMembers', { |
|
||||
projectId: options.p |
|
||||
}); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
// 初始化 定期任务
|
|
||||
async function initPlanTasks() { |
|
||||
setPrevPlaceholderTasks(); // 向上加载空数据
|
|
||||
setNextPlaceholderTasks(); // 向下加载空数据
|
|
||||
await getInitTasks(); // 获取初始数据
|
|
||||
|
|
||||
// 滚动到对应位置
|
|
||||
let timer = null; |
|
||||
timer = setInterval(() => { |
|
||||
if (showScrollTo.value) { |
|
||||
clearInterval(timer); |
|
||||
// nextTick(() => timeLine.setScrollPosition());
|
|
||||
} |
|
||||
}, 500); |
|
||||
} |
|
||||
|
|
||||
// 切换了 颗粒度 || 角色时候 获取初始定期任务
|
|
||||
function getInitTasks() { |
|
||||
// 预加载 上下的定期任务
|
|
||||
function preloadFn(that) { |
|
||||
const detailId = tasks.value.findIndex(task => task.detailId); |
|
||||
const arr = []; |
|
||||
tasks.value.forEach(task => { |
|
||||
if (task.detailId) { |
|
||||
arr.push(task); |
|
||||
} |
|
||||
}); |
|
||||
if (detailId !== -1) { |
|
||||
// 只要有1个真实的任务 就预加载上下周期的任务
|
|
||||
const { |
|
||||
pageCount |
|
||||
} = uni.$task; |
|
||||
nextTick(() => { |
|
||||
// 向上拿数据
|
|
||||
getTasks({ |
|
||||
timeNode: +tasks.value[detailId].planStart, |
|
||||
queryType: 0, |
|
||||
queryNum: pageCount |
|
||||
}); |
|
||||
// 向下拿数据
|
|
||||
const nextQueryTime = +uni.$time.add(+arr[arr.length - 1].planStart, 1, timeGranularity.value); |
|
||||
getTasks({ |
|
||||
timeNode: nextQueryTime, |
|
||||
queryType: 1, |
|
||||
queryNum: pageCount |
|
||||
}); |
|
||||
}); |
|
||||
} else { |
|
||||
// 没有任务 上下显示时间刻度
|
|
||||
// 向上加载
|
|
||||
setPrevPlaceholderTasks(); |
|
||||
// // 向下加载
|
|
||||
setNextPlaceholderTasks(); |
|
||||
} |
|
||||
} |
|
||||
// 根据时间基准点和角色查找定期任务
|
|
||||
getTasks({ |
|
||||
queryType: 0 |
|
||||
}); // 向上获取定期任务数据
|
|
||||
|
|
||||
// 根据项目id获取角色列表
|
|
||||
getTasks({ |
|
||||
queryType: 1 |
|
||||
}, preloadFn); // 向下获取定期任务数据
|
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 根据时间基准点和角色查找定期任务 |
|
||||
* @param {object} query |
|
||||
* @param {string} query.roleId 角色id |
|
||||
* @param {string} query.timeNode 时间基准点 默认当前 |
|
||||
* @param {string} query.timeUnit 时间颗粒度 默认天 |
|
||||
* @param {string} query.queryNum 查找颗粒度数量 默认3个 |
|
||||
* @param {number} query.queryType 0向上查找 1向下查找(默认) 下查包含自己，上查不包含 |
|
||||
*/ |
|
||||
function getTasks(query, fn) { |
|
||||
store.commit('task/setShowSkeleton', false); |
|
||||
const params = generateGetTaskParam(query); |
|
||||
uni.$catchReq.getRegularTask(params, (err, data) => { |
|
||||
store.commit('task/setShowSkeleton', false); |
|
||||
if (err) { |
|
||||
// TODO: 提示错误
|
|
||||
console.error('err: ', err); |
|
||||
} else { |
|
||||
store.commit('task/setShowScrollTo', true); |
|
||||
// 有数据用数据替换刻度
|
|
||||
// 没有数据 继续加载刻度
|
|
||||
if (data && data.length) { |
|
||||
replacePrevData(data, params.queryType); |
|
||||
params.queryType === 0 ? store.commit('task/setTopEnd', false) : store.commit('task/setBottomEnd', false); |
|
||||
} else { |
|
||||
// TODO: 0 -> 向上 1 -> 向下
|
|
||||
params.queryType === 0 ? setPrevPlaceholderTasks() : setNextPlaceholderTasks(); |
|
||||
} |
|
||||
if (tasks.value.length && fn) { |
|
||||
fn(this); |
|
||||
} |
|
||||
} |
|
||||
}); |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 生成getTasks所用的参数 |
|
||||
* @param {object} query getTasks传递的参数 |
|
||||
*/ |
|
||||
function generateGetTaskParam(query) { |
|
||||
return { |
|
||||
roleId: roleId.value, |
|
||||
timeNode: query.timeNode || timeNode.value, |
|
||||
timeUnit: query.timeUnit || timeUnit.value, |
|
||||
queryNum: query.queryNum || 3, |
|
||||
queryType: query.queryType, |
|
||||
projectId: projectId.value, |
|
||||
}; |
|
||||
} |
|
||||
|
|
||||
// 设置时间轴向上的空数据
|
|
||||
function setPrevPlaceholderTasks() { |
|
||||
store.commit('task/setTopEnd', true); |
|
||||
let startTime = ''; |
|
||||
if (!tasks.value || !tasks.value.length) { |
|
||||
startTime = Date.now(); // 没有任务就应该是时间基准点
|
|
||||
} else { |
|
||||
startTime = tasks[0].planStart - 0; // 有任务就是第一个任务的计划开始时间
|
|
||||
} |
|
||||
const placeholderTasks = uni.$task.setPlaceholderTasks(startTime, true, timeGranularity.value); |
|
||||
store.commit('task/setUpTasks', placeholderTasks); |
|
||||
} |
|
||||
|
|
||||
// 设置时间轴向下的空数据
|
|
||||
function setNextPlaceholderTasks() { |
|
||||
store.commit('task/setBottomEnd', true); |
|
||||
let startTime = ''; |
|
||||
if (!tasks.value || !tasks.value.length) { |
|
||||
startTime = Date.now(); |
|
||||
} else { |
|
||||
startTime = +tasks.value[tasks.value.length - 1].planStart; |
|
||||
} |
|
||||
const initData = uni.$task.setPlaceholderTasks(startTime, false, timeGranularity.value); |
|
||||
store.commit('task/setDownTasks', initData); |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 用拿到的新数据 替换 时间刻度/旧数据 |
|
||||
* 先对比 新旧数据的 始末时间 补齐刻度 |
|
||||
* 再遍历对比 用任务替换刻度 |
|
||||
* @param {array} data 服务端返回的新数据 上边已经处理过空值 |
|
||||
* @param {number} type 0 -> 向上 1->向下 |
|
||||
*/ |
|
||||
function replacePrevData(data, type) { |
|
||||
let oldTasks = fillPlaceholderTask({ tasks.value, data, timeGranularity.value }); // 已经上下补齐时间刻度的
|
|
||||
// 遍历对比 用任务替换刻度
|
|
||||
// TODO: tasks越来越多 遍历越来越多 需要优化
|
|
||||
oldTasks.forEach((taskItem, index) => { |
|
||||
const arr = data.filter(dataItem => dayjs(+dataItem.planStart).isSame(+taskItem.planStart, timeGranularity |
|
||||
.value)); |
|
||||
if (arr && arr.length) { |
|
||||
oldTasks.splice(index, 1, [...arr]); // 这里加入的数据是array类型的, [{},{},[],[],{}]
|
|
||||
} |
|
||||
}); |
|
||||
|
|
||||
oldTasks = flatten(oldTasks); // 1维拍平
|
|
||||
|
|
||||
store.commit('task/clearTasks'); |
|
||||
type === 0 ? store.commit('task/setUpTasks', oldTasks) : store.commit('task/setDownTasks', oldTasks); |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 超出旧数据上、下限 补齐时间刻度到新数据的起始时间颗粒度 |
|
||||
*/ |
|
||||
function fillPlaceholderTask({ |
|
||||
tasks, |
|
||||
data, |
|
||||
timeGranularity |
|
||||
}) { |
|
||||
const { |
|
||||
prev, |
|
||||
next |
|
||||
} = uni.$task.computeFillPlaceholderTaskCount({ |
|
||||
tasks, |
|
||||
data, |
|
||||
timeGranularity |
|
||||
}); |
|
||||
if (prev) { |
|
||||
const newTasks = uni.$task.setPlaceholderTasks(+tasks[0].planStart, true, timeGranularity, prev); |
|
||||
store.commit('task/setUpTasks', newTasks); |
|
||||
} |
|
||||
if (next) { |
|
||||
const newTasks = uni.$task.setPlaceholderTasks(+tasks[tasks.length - 1].planStart, false, timeGranularity, next); |
|
||||
store.commit('task/setDownTasks', newTasks); |
|
||||
} |
|
||||
return tasks.value; |
|
||||
} |
|
||||
|
|
||||
// 分享链接来的初始化
|
|
||||
async function shareInit(options) { |
|
||||
console.log('分享链接来的初始化init') |
|
||||
const storageUser = uni.$storage.getStorageSync('user'); |
|
||||
const user = storageUser ? JSON.parse(storageUser) : null; |
|
||||
if (user && user.id) { |
|
||||
await store.dispatch('user/getToken', user.id); |
|
||||
const res = await clickShare({ |
|
||||
code: options.shareId |
|
||||
}); |
|
||||
if (res && res.projectId) { |
|
||||
let query = { |
|
||||
...uni.$route.query |
|
||||
}; |
|
||||
query = { |
|
||||
u: user.id, |
|
||||
p: res.projectId, |
|
||||
}; |
|
||||
uni.$router.push({ |
|
||||
path: uni.$route.path, |
|
||||
query |
|
||||
}); |
|
||||
console.log('query',query) |
|
||||
init(query); |
|
||||
} |
|
||||
} else { |
|
||||
uni.$ui.showToast('缺少用户信息参数,请登录'); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 点击分享连接 |
|
||||
* @param {any} commit |
|
||||
* @param {object} param 请求参数 |
|
||||
*/ |
|
||||
async function clickShare(param) { |
|
||||
try { |
|
||||
const data = await uni.$catchReq.clickShare(param); |
|
||||
return data; |
|
||||
} catch (error) { |
|
||||
uni.$ui.showToast(error.msg || '获取失败'); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 通过项目id获取项目信息 |
|
||||
* @param {object} params 提交的参数 |
|
||||
*/ |
|
||||
async function getProjectById(params) { |
|
||||
try { |
|
||||
const data = await uni.$u.api.findProjectById(params); |
|
||||
store.commit('project/setProject', data); |
|
||||
// 根据项目id获取角色列表
|
|
||||
getRoles(params); |
|
||||
} catch (error) { |
|
||||
console.log('error: ', error || '获取项目信息失败'); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 通过项目id获取角色信息 |
|
||||
* @param {string} projectId |
|
||||
* @param {object} params 提交的参数 |
|
||||
*/ |
|
||||
function getRoles(params) { |
|
||||
uni.$catchReq.findShowRole(params, (err, data) => { |
|
||||
if (err) { |
|
||||
console.error('err: ', err || '获取角色信息失败'); |
|
||||
} else { |
|
||||
store.commit('role/setInvisibleRoles', data ? data.invisibleList : []); |
|
||||
store.commit('role/setVisibleRoles', data ? data.visibleList : []); |
|
||||
setInitialRoleId(data ? data.visibleList : []); |
|
||||
} |
|
||||
}); |
|
||||
} |
|
||||
|
|
||||
// 设置 初始显示角色信息
|
|
||||
function setInitialRoleId(visibleList) { |
|
||||
if (!visibleList || !visibleList.length) return; |
|
||||
const index = visibleList.findIndex(item => +item.mine === 1); |
|
||||
const currentRole = index > 0 ? visibleList[index] : visibleList[0]; |
|
||||
const storageRoleId = uni.$storage.getStorageSync('roleId'); |
|
||||
const currentRoleId = storageRoleId || (currentRole ? currentRole.id : ''); |
|
||||
store.commit('role/setRoleId', currentRoleId); |
|
||||
// 清空storage
|
|
||||
uni.$storage.setStorageSync('roleId', ''); |
|
||||
} |
|
||||
|
|
||||
// 获取可变全局任务
|
|
||||
function getGlobalData() { |
|
||||
const param = { |
|
||||
roleId: roleId.value, |
|
||||
timeNode: timeNode.value, |
|
||||
timeUnit: timeUnit.value, |
|
||||
projectId: projectId.value |
|
||||
}; |
|
||||
store.dispatch('task/getGlobal', param); |
|
||||
} |
|
||||
|
|
||||
// 清除已有的任务数据
|
|
||||
function clearTasksData() { |
|
||||
// 清空日常任务的数据
|
|
||||
store.commit('task/setPermanents', []); |
|
||||
store.commit('task/setDailyTasks', []); |
|
||||
// 清空定期任务数据
|
|
||||
store.commit('task/clearTasks'); |
|
||||
// 到顶的标志复位
|
|
||||
// 到底的标志复位
|
|
||||
store.commit('task/clearEndFlag'); |
|
||||
} |
|
||||
|
|
||||
|
|
||||
|
|
||||
} |
|
||||
@ -0,0 +1,285 @@ |
|||||
|
import { ref, computed } from 'vue'; |
||||
|
import { useStore } from 'vuex'; |
||||
|
import clipboard from "@/common/js/dc-clipboard/clipboard.js" |
||||
|
|
||||
|
export default function mixinInit { |
||||
|
const store = useStore(); |
||||
|
const user = computed(() => store.state.user.user); |
||||
|
const rules = ref({ |
||||
|
phone: [ |
||||
|
{ |
||||
|
required: true, |
||||
|
message: '请输入手机号', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
validator: (rule, value, callback) => { |
||||
|
// 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
|
||||
|
return this.$u.test.mobile(value); |
||||
|
}, |
||||
|
message: '手机号码不正确', |
||||
|
// 触发器可以同时用blur和change，二者之间用英文逗号隔开
|
||||
|
trigger: ['change','blur'], |
||||
|
} |
||||
|
], |
||||
|
verificationCodeValue: [ |
||||
|
{ |
||||
|
required: true, |
||||
|
message: '请输入图形验证码', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
type: 'number', |
||||
|
message: '图形验证码只能为数字', |
||||
|
trigger: ['change','blur'], |
||||
|
} |
||||
|
], |
||||
|
smsCode: [ |
||||
|
{ |
||||
|
required: true, |
||||
|
message: '请输入验证码', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
type: 'number', |
||||
|
message: '验证码只能为数字', |
||||
|
trigger: ['change','blur'], |
||||
|
} |
||||
|
], |
||||
|
account: [ |
||||
|
{ |
||||
|
required: true, |
||||
|
message: '请输入用户名', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
min: 2, |
||||
|
max: 20, |
||||
|
message: '用户名长度在2到20个字符', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
pattern: /^[a-zA-Z0-9._-]{2,20}$/, |
||||
|
message: '请输入2-20位字母、数字、汉字或字符"_ - ."', |
||||
|
trigger: ['change','blur'], |
||||
|
} |
||||
|
], |
||||
|
password: [ |
||||
|
{ |
||||
|
required: true, |
||||
|
message: '请输入密码', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
min: 6, |
||||
|
max: 20, |
||||
|
message: '密码长度在6到20个字符', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
// 正则不能含有两边的引号
|
||||
|
pattern: /^[a-zA-Z0-9._-]{6,20}$/, |
||||
|
message: '请输入6-20位字母、数字、汉字或字符"_ - ."', |
||||
|
trigger: ['change','blur'], |
||||
|
} |
||||
|
], |
||||
|
}); |
||||
|
const errorType = ref(['message']); |
||||
|
const labelPosition = ref('left'); |
||||
|
const border = ref(false); |
||||
|
const smsCode = ref(''); // 短信验证码
|
||||
|
const showInterval = ref(false); |
||||
|
const interval = ref(120); |
||||
|
const codeTimer = ref(null); |
||||
|
const showPaste = ref(false); |
||||
|
|
||||
|
// 获取图形验证码
|
||||
|
async function getImageCode() { |
||||
|
console.log('5555') |
||||
|
uni.$ui.showLoading(); |
||||
|
try { |
||||
|
const data = await uni.$u.api.getImageCode(); |
||||
|
const { imageBase64, verificationCodeId } = data; |
||||
|
imageBase64 = imageBase64 || ''; |
||||
|
verificationCodeId = verificationCodeId || ''; |
||||
|
uni.$ui.hideLoading(); |
||||
|
} catch (error) { |
||||
|
uni.$ui.hideLoading(); |
||||
|
uni.$ui.showToast(error); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
return { |
||||
|
// errorType,
|
||||
|
// rules,
|
||||
|
// labelPosition,
|
||||
|
// border,
|
||||
|
getImageCode, |
||||
|
// hasvalue,
|
||||
|
// getCode,
|
||||
|
// getCodeInterval,
|
||||
|
// checkRules,
|
||||
|
// setCode,
|
||||
|
// getClipboardContents,
|
||||
|
// verifyPhone,
|
||||
|
// verifyLoginname,
|
||||
|
// handleWxLogin
|
||||
|
} |
||||
|
} |
||||
|
|
||||
|
|
||||
|
// const mixin = {
|
||||
|
// computed: mapState('user', ['user']),
|
||||
|
|
||||
|
// onReady() {
|
||||
|
// this.$refs.uForm.setRules(this.rules);
|
||||
|
// },
|
||||
|
|
||||
|
// methods: {
|
||||
|
// ...mapActions('user', ['sendCode']),
|
||||
|
|
||||
|
// 获取图形验证码
|
||||
|
// async getImageCode() {
|
||||
|
// this.$util.showLoading();
|
||||
|
// try {
|
||||
|
// const data = await uni.$u.api.getImageCode();
|
||||
|
// const { imageBase64, verificationCodeId } = data;
|
||||
|
// this.imageBase64 = imageBase64 || '';
|
||||
|
// this.verificationCodeId = verificationCodeId || '';
|
||||
|
// uni.hideLoading();
|
||||
|
// } catch (error) {
|
||||
|
// uni.hideLoading();
|
||||
|
// uni.$ui.showToast(error);
|
||||
|
// }
|
||||
|
// },
|
||||
|
|
||||
|
// //有图片验证码的值
|
||||
|
// hasvalue() {
|
||||
|
// if(this.model.smsCode || this.model.showPaste) return
|
||||
|
// if (!this.verifyPhone(this.model.phone)) {
|
||||
|
// uni.$ui.showToast('请输入正确的手机号');
|
||||
|
// return;
|
||||
|
// }
|
||||
|
// if (!this.model.verificationCodeValue) {
|
||||
|
// uni.$ui.showToast('请输入图形验证码');
|
||||
|
// return;
|
||||
|
// }
|
||||
|
// this.getCode();
|
||||
|
// },
|
||||
|
|
||||
|
// // 获取验证码
|
||||
|
// async getCode() {
|
||||
|
// try {
|
||||
|
// const { phone, verificationCodeValue } = this.model;
|
||||
|
// const { verificationCodeId } = this;
|
||||
|
|
||||
|
// if (!verificationCodeId || !verificationCodeValue) {
|
||||
|
// uni.$ui.showToast('缺少图形验证码参数');
|
||||
|
// return;
|
||||
|
// }
|
||||
|
// const params = {
|
||||
|
// phone,
|
||||
|
// verificationCodeId,
|
||||
|
// verificationCodeValue,
|
||||
|
// };
|
||||
|
// const date = await store.dispatch('user/sendCode', params);
|
||||
|
// getCodeInterval();
|
||||
|
// showPaste.value = true;
|
||||
|
// } catch (err) {
|
||||
|
// throw err;
|
||||
|
// }
|
||||
|
// },
|
||||
|
|
||||
|
// // 获取验证码倒计时
|
||||
|
// getCodeInterval() {
|
||||
|
// this.showInterval = true;
|
||||
|
// this.codeTimer = setInterval(() => {
|
||||
|
// if (this.interval === 0) {
|
||||
|
// clearInterval(this.codeTimer);
|
||||
|
// this.codeTimer = null;
|
||||
|
// this.showInterval = false;
|
||||
|
// this.interval = 120;
|
||||
|
// return;
|
||||
|
// }
|
||||
|
// this.interval = this.interval - 1;
|
||||
|
// }, 1000);
|
||||
|
// },
|
||||
|
|
||||
|
// // 验证信息
|
||||
|
// checkRules() {
|
||||
|
// // const { smsCode, phone, user } = this;
|
||||
|
// if (!this.verifyPhone(phone.value)) {
|
||||
|
// uni.$ui.showToast('请输入正确的手机号');
|
||||
|
// return false;
|
||||
|
// }
|
||||
|
// if (!smsCode.value) {
|
||||
|
// uni.$ui.showToast('验证码无效');
|
||||
|
// return false;
|
||||
|
// }
|
||||
|
|
||||
|
// if (phone.value === user.value.phone) {
|
||||
|
// uni.$ui.showToast('新手机号不能与旧手机号相同');
|
||||
|
// return;
|
||||
|
// }
|
||||
|
// return true;
|
||||
|
// },
|
||||
|
|
||||
|
// // 粘贴
|
||||
|
// setCode() {
|
||||
|
// // 获取粘贴板内容
|
||||
|
// // 小程序平台
|
||||
|
// //#ifdef MP-WEIXIN
|
||||
|
// var _this = this
|
||||
|
// uni.getClipboardData({
|
||||
|
// success (res) {
|
||||
|
// _this.smsCode = res.data;
|
||||
|
// }
|
||||
|
// });
|
||||
|
// //#endif
|
||||
|
|
||||
|
// // 非小程序平台
|
||||
|
// //#ifndef MP-WEIXIN
|
||||
|
// this.getClipboardContents()
|
||||
|
// //#endif
|
||||
|
// },
|
||||
|
|
||||
|
// // 非小程序平台粘贴
|
||||
|
// async getClipboardContents() {
|
||||
|
// try {
|
||||
|
// const text = await navigator.clipboard.readText();
|
||||
|
// this.smsCode = text;
|
||||
|
// } catch (err) {
|
||||
|
// console.error('Failed to read clipboard contents: ', err);
|
||||
|
// }
|
||||
|
// },
|
||||
|
|
||||
|
// /**
|
||||
|
// * 验证手机号格式
|
||||
|
// * @param {string} phone 手机号
|
||||
|
// */
|
||||
|
// verifyPhone(phone) {
|
||||
|
// const phoneExg = /^1\d{10}$/;
|
||||
|
// return phoneExg.test(phone);
|
||||
|
// },
|
||||
|
|
||||
|
// /**
|
||||
|
// * 验证账号/密码 格式
|
||||
|
// * @param {string} account 账号
|
||||
|
// */
|
||||
|
// verifyLoginname(account) {
|
||||
|
// const accountExg = /^[a-zA-Z0-9._-]{2,20}$/;
|
||||
|
// return accountExg.test(account);
|
||||
|
// },
|
||||
|
|
||||
|
// // 微信登录
|
||||
|
// handleWxLogin() {
|
||||
|
// const origin = 'https://test.tall.wiki/pt-mui'; // 测试
|
||||
|
// const appid = 'wxd1842e073e0e6d91';
|
||||
|
// const state = 'wx_web';
|
||||
|
// const href = 'https://open.weixin.qq.com/connect/qrconnect';
|
||||
|
// // eslint-disable-next-line
|
||||
|
// window.location.href =
|
||||
|
// `${href}?appid=${appid}&redirect_uri=${origin}&response_type=code&scope=snsapi_login&state=${state}#wechat_redirect`;
|
||||
|
// },
|
||||
|
// // }
|
||||
|
// };
|
||||
@ -0,0 +1,123 @@ |
|||||
|
import { ref, computed } from 'vue'; |
||||
|
import { useStore } from 'vuex'; |
||||
|
import clipboard from "@/common/js/dc-clipboard/clipboard.js" |
||||
|
|
||||
|
export default function userMixin() { |
||||
|
const store = useStore(); |
||||
|
const user = computed(() => store.state.user.user); |
||||
|
const rules = ref({ |
||||
|
phone: [{ |
||||
|
required: true, |
||||
|
message: '请输入手机号', |
||||
|
trigger: ['change', 'blur'], |
||||
|
}, |
||||
|
{ |
||||
|
validator: (rule, value, callback) => { |
||||
|
// 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
|
||||
|
return this.$u.test.mobile(value); |
||||
|
}, |
||||
|
message: '手机号码不正确', |
||||
|
// 触发器可以同时用blur和change，二者之间用英文逗号隔开
|
||||
|
trigger: ['change', 'blur'], |
||||
|
} |
||||
|
], |
||||
|
verificationCodeValue: [{ |
||||
|
required: true, |
||||
|
message: '请输入图形验证码', |
||||
|
trigger: ['change', 'blur'], |
||||
|
}, |
||||
|
{ |
||||
|
type: 'number', |
||||
|
message: '图形验证码只能为数字', |
||||
|
trigger: ['change', 'blur'], |
||||
|
} |
||||
|
], |
||||
|
smsCode: [{ |
||||
|
required: true, |
||||
|
message: '请输入验证码', |
||||
|
trigger: ['change', 'blur'], |
||||
|
}, |
||||
|
{ |
||||
|
type: 'number', |
||||
|
message: '验证码只能为数字', |
||||
|
trigger: ['change', 'blur'], |
||||
|
} |
||||
|
], |
||||
|
account: [{ |
||||
|
required: true, |
||||
|
message: '请输入用户名', |
||||
|
trigger: ['change', 'blur'], |
||||
|
}, |
||||
|
{ |
||||
|
min: 2, |
||||
|
max: 20, |
||||
|
message: '用户名长度在2到20个字符', |
||||
|
trigger: ['change', 'blur'], |
||||
|
}, |
||||
|
{ |
||||
|
pattern: /^[a-zA-Z0-9._-]{2,20}$/, |
||||
|
message: '请输入2-20位字母、数字、汉字或字符"_ - ."', |
||||
|
trigger: ['change', 'blur'], |
||||
|
} |
||||
|
], |
||||
|
password: [{ |
||||
|
required: true, |
||||
|
message: '请输入密码', |
||||
|
trigger: ['change', 'blur'], |
||||
|
}, |
||||
|
{ |
||||
|
min: 6, |
||||
|
max: 20, |
||||
|
message: '密码长度在6到20个字符', |
||||
|
trigger: ['change', 'blur'], |
||||
|
}, |
||||
|
{ |
||||
|
// 正则不能含有两边的引号
|
||||
|
pattern: /^[a-zA-Z0-9._-]{6,20}$/, |
||||
|
message: '请输入6-20位字母、数字、汉字或字符"_ - ."', |
||||
|
trigger: ['change', 'blur'], |
||||
|
} |
||||
|
], |
||||
|
}); |
||||
|
const errorType = ['message']; |
||||
|
const labelPosition = 'left'; |
||||
|
const border = false; |
||||
|
const smsCode = ref(''); // 短信验证码
|
||||
|
const showInterval = ref(false); |
||||
|
const interval = ref(120); |
||||
|
const codeTimer = ref(null); |
||||
|
const showPaste = ref(false); |
||||
|
|
||||
|
// 获取图形验证码
|
||||
|
async function getImageCode() { |
||||
|
console.log('5555') |
||||
|
uni.$ui.showLoading(); |
||||
|
try { |
||||
|
const data = await uni.$u.api.getImageCode(); |
||||
|
const { imageBase64, verificationCodeId } = data; |
||||
|
imageBase64 = imageBase64 || ''; |
||||
|
verificationCodeId = verificationCodeId || ''; |
||||
|
uni.$ui.hideLoading(); |
||||
|
} catch (error) { |
||||
|
uni.$ui.hideLoading(); |
||||
|
uni.$ui.showToast(error); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
return { |
||||
|
rules, |
||||
|
errorType, |
||||
|
labelPosition, |
||||
|
border, |
||||
|
getImageCode, |
||||
|
// hasvalue,
|
||||
|
// getCode,
|
||||
|
// getCodeInterval,
|
||||
|
// checkRules,
|
||||
|
// setCode,
|
||||
|
// getClipboardContents,
|
||||
|
// verifyPhone,
|
||||
|
// verifyLoginname,
|
||||
|
// handleWxLogin
|
||||
|
} |
||||
|
} |
||||
@ -1,32 +1,38 @@ |
|||||
{ |
{ |
||||
"pages": [ |
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages |
||||
//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages |
{ |
||||
{ |
"path": "pages/index/index", |
||||
"path": "pages/index/index", |
"style": { |
||||
"style": { |
"navigationBarText": "TALL" |
||||
"navigationBarText": "TALL" |
} |
||||
} |
}, |
||||
}, |
{ |
||||
{ |
"path": "pages/project/project", |
||||
"path": "pages/project/project", |
"style": { |
||||
"style": { |
"navigationStyle": "custom", |
||||
"navigationStyle": "custom", |
"navigationBarTextStyle": "white" |
||||
"navigationBarTextStyle": "white" |
} |
||||
} |
}, |
||||
} |
{ |
||||
], |
"path": "pages/user/accountLogin", |
||||
"globalStyle": { |
"style": { |
||||
"navigationBarTextStyle": "black", |
"navigationStyle": "custom", |
||||
"navigationBarTitleText": "TALL", |
"navigationBarTextStyle": "white" |
||||
"navigationBarBackgroundColor": "#F8F8F8", |
} |
||||
"backgroundColor": "#F8F8F8" |
} |
||||
}, |
], |
||||
"easycom": { |
"globalStyle": { |
||||
"autoscan": true, |
"navigationBarTextStyle": "black", |
||||
"custom": { |
"navigationBarTitleText": "TALL", |
||||
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue", |
"navigationBarBackgroundColor": "#F8F8F8", |
||||
"^p-(.*)": "@/plugins/p-$1/p-$1.vue", |
"backgroundColor": "#F8F8F8" |
||||
"theme": "@/components/Theme/Theme.vue" |
}, |
||||
} |
"easycom": { |
||||
} |
"autoscan": true, |
||||
|
"custom": { |
||||
|
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue", |
||||
|
"^p-(.*)": "@/plugins/p-$1/p-$1.vue", |
||||
|
"theme": "@/components/Theme/Theme.vue" |
||||
|
} |
||||
|
} |
||||
} |
} |
||||
|
|||||
@ -1,434 +0,0 @@ |
|||||
<template> |
|
||||
<view :style="{ height: height }" class="flex flex-col overflow-hidden u-font-14"> |
|
||||
<!-- 标题栏 --> |
|
||||
<Title /> |
|
||||
|
|
||||
<view class="container flex flex-col flex-1 mx-auto overflow-hidden bg-gray-100"> |
|
||||
<!-- 角色栏 --> |
|
||||
<Roles /> |
|
||||
|
|
||||
<!-- 日常任务面板 --> |
|
||||
<Globals /> |
|
||||
|
|
||||
<!-- 定期任务面板 --> |
|
||||
<!-- <TimeLine @getTasks="getTasks" class="flex-1 overflow-hidden" ref="timeLine" /> --> |
|
||||
</view> |
|
||||
</view> |
|
||||
</template> |
|
||||
|
|
||||
<script> |
|
||||
import { defineComponent, ref, onMounted, computed, watch, nextTick } from 'vue'; |
|
||||
import { useStore } from 'vuex'; |
|
||||
import { flatten } from 'lodash'; |
|
||||
|
|
||||
export default defineComponent({ |
|
||||
setup(options) { |
|
||||
const store = useStore(); |
|
||||
const token = computed(() => store.state.user.token); |
|
||||
const userId = computed(() => store.getters['user/userId']); |
|
||||
const roleId = computed(() => store.state.role.roleId); |
|
||||
const timeNode = computed(() => store.state.task.timeNode); |
|
||||
const timeUnit = computed(() => store.state.task.timeUnit); |
|
||||
const tasks = computed(() => store.state.task.tasks); |
|
||||
const newProjectInfo = computed(() => store.state.task.newProjectInfo); |
|
||||
const showScrollTo = computed(() => store.state.task.showScrollTo); |
|
||||
const timeGranularity = computed(() => store.getters['task/timeGranularity']); |
|
||||
const projectId = computed(() => store.getters['project/projectId']); |
|
||||
const height = ref(null); |
|
||||
const timeLine = ref(null); |
|
||||
|
|
||||
/** |
|
||||
* 当时间基准点发生变化时 |
|
||||
* 重新根据时间和角色查询普通日常任务 |
|
||||
* 永久日常任务不发生 改变 |
|
||||
*/ |
|
||||
watch(timeNode, newValue => { |
|
||||
if (newValue && roleId.value) { |
|
||||
clearTasksData(); |
|
||||
getGlobalData(); // 查可变日常任务 |
|
||||
initPlanTasks(); // 处理定期任务 |
|
||||
} |
|
||||
}); |
|
||||
|
|
||||
/** |
|
||||
* 当角色发生变化时 |
|
||||
* 重新查询永久日常任务和普通日常任务 |
|
||||
* 注意: 切换角色后 重新设置了时间基准点 时间基准点一定会变 |
|
||||
* 所以监听时间基准点获取 可变日常任务即可 这里不用获取 避免重复获取 |
|
||||
*/ |
|
||||
watch(roleId, newValue => { |
|
||||
if (newValue) { |
|
||||
store.commit('task/setTimeNode', Date.now()); |
|
||||
// 根据角色查找永久的日常任务 |
|
||||
const params = { roleId: newValue, projectId: projectId.value }; |
|
||||
store.dispatch('task/getPermanent', params); |
|
||||
} |
|
||||
}); |
|
||||
|
|
||||
/** |
|
||||
* 当时间基准点发生变化时 |
|
||||
* 重新根据时间和角色查询普通日常任务 |
|
||||
* 永久日常任务不发生改变 |
|
||||
*/ |
|
||||
watch(newProjectInfo, newValue => { |
|
||||
if (newValue && newValue.projectId && newValue.url) { |
|
||||
uni.$u.route('/', { u: userId.value, p: newValue.projectId, url: newValue.url }); |
|
||||
clearTasksData(); |
|
||||
store.commit('role/setRoleId', ''); |
|
||||
const options = uni.$route.query; |
|
||||
init(options); |
|
||||
} |
|
||||
}); |
|
||||
|
|
||||
onMounted(() => { |
|
||||
const system = uni.getSystemInfoSync(); |
|
||||
height.value = `${system.windowHeight}px`; |
|
||||
}); |
|
||||
|
|
||||
// 初始化 定期任务 |
|
||||
async function initPlanTasks() { |
|
||||
setPrevPlaceholderTasks(); // 向上加载空数据 |
|
||||
setNextPlaceholderTasks(); // 向下加载空数据 |
|
||||
await getInitTasks(); // 获取初始数据 |
|
||||
|
|
||||
// 滚动到对应位置 |
|
||||
let timer = null; |
|
||||
timer = setInterval(() => { |
|
||||
if (showScrollTo.value) { |
|
||||
clearInterval(timer); |
|
||||
// nextTick(() => timeLine.setScrollPosition()); |
|
||||
} |
|
||||
}, 500); |
|
||||
} |
|
||||
|
|
||||
// 切换了 颗粒度 || 角色时候 获取初始定期任务 |
|
||||
function getInitTasks() { |
|
||||
// 预加载 上下的定期任务 |
|
||||
function preloadFn(that) { |
|
||||
const detailId = tasks.value.findIndex(task => task.detailId); |
|
||||
const arr = []; |
|
||||
tasks.value.forEach(task => { |
|
||||
if (task.detailId) { |
|
||||
arr.push(task); |
|
||||
} |
|
||||
}); |
|
||||
if (detailId !== -1) { |
|
||||
// 只要有1个真实的任务 就预加载上下周期的任务 |
|
||||
const { pageCount } = uni.$task; |
|
||||
nextTick(() => { |
|
||||
// 向上拿数据 |
|
||||
getTasks({ timeNode: +tasks.value[detailId].planStart, queryType: 0, queryNum: pageCount }); |
|
||||
// 向下拿数据 |
|
||||
const nextQueryTime = +uni.$time.add(+arr[arr.length - 1].planStart, 1, timeGranularity.value); |
|
||||
getTasks({ timeNode: nextQueryTime, queryType: 1, queryNum: pageCount }); |
|
||||
}); |
|
||||
} else { |
|
||||
// 没有任务 上下显示时间刻度 |
|
||||
// 向上加载 |
|
||||
setPrevPlaceholderTasks(); |
|
||||
// // 向下加载 |
|
||||
setNextPlaceholderTasks(); |
|
||||
} |
|
||||
} |
|
||||
// 根据时间基准点和角色查找定期任务 |
|
||||
getTasks({ queryType: 0 }); // 向上获取定期任务数据 |
|
||||
|
|
||||
// 根据项目id获取角色列表 |
|
||||
getTasks({ queryType: 1 }, preloadFn); // 向下获取定期任务数据 |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 根据时间基准点和角色查找定期任务 |
|
||||
* @param {object} query |
|
||||
* @param {string} query.roleId 角色id |
|
||||
* @param {string} query.timeNode 时间基准点 默认当前 |
|
||||
* @param {string} query.timeUnit 时间颗粒度 默认天 |
|
||||
* @param {string} query.queryNum 查找颗粒度数量 默认3个 |
|
||||
* @param {number} query.queryType 0向上查找 1向下查找(默认) 下查包含自己，上查不包含 |
|
||||
*/ |
|
||||
function getTasks(query, fn) { |
|
||||
store.commit('task/setShowSkeleton', false); |
|
||||
const params = generateGetTaskParam(query); |
|
||||
uni.$catchReq.getRegularTask(params, (err, data) => { |
|
||||
store.commit('task/setShowSkeleton', false); |
|
||||
if (err) { |
|
||||
// TODO: 提示错误 |
|
||||
console.error('err: ', err); |
|
||||
} else { |
|
||||
store.commit('task/setShowScrollTo', true); |
|
||||
// 有数据用数据替换刻度 |
|
||||
// 没有数据 继续加载刻度 |
|
||||
if (data && data.length) { |
|
||||
replacePrevData(data, params.queryType); |
|
||||
params.queryType === 0 ? store.commit('task/setTopEnd', false) : store.commit('task/setBottomEnd', false); |
|
||||
} else { |
|
||||
// TODO: 0 -> 向上 1 -> 向下 |
|
||||
params.queryType === 0 ? setPrevPlaceholderTasks() : setNextPlaceholderTasks(); |
|
||||
} |
|
||||
if (tasks.value.length && fn) { |
|
||||
fn(this); |
|
||||
} |
|
||||
} |
|
||||
}); |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 生成getTasks所用的参数 |
|
||||
* @param {object} query getTasks传递的参数 |
|
||||
*/ |
|
||||
function generateGetTaskParam(query) { |
|
||||
return { |
|
||||
roleId: roleId.value, |
|
||||
timeNode: query.timeNode || timeNode.value, |
|
||||
timeUnit: query.timeUnit || timeUnit.value, |
|
||||
queryNum: query.queryNum || 3, |
|
||||
queryType: query.queryType, |
|
||||
projectId: projectId.value, |
|
||||
}; |
|
||||
} |
|
||||
|
|
||||
// 设置时间轴向上的空数据 |
|
||||
function setPrevPlaceholderTasks() { |
|
||||
store.commit('task/setTopEnd', true); |
|
||||
let startTime = ''; |
|
||||
if (!tasks.value || !tasks.value.length) { |
|
||||
startTime = Date.now(); // 没有任务就应该是时间基准点 |
|
||||
} else { |
|
||||
startTime = tasks[0].planStart - 0; // 有任务就是第一个任务的计划开始时间 |
|
||||
} |
|
||||
const placeholderTasks = uni.$task.setPlaceholderTasks(startTime, true, timeGranularity.value); |
|
||||
store.commit('task/setUpTasks', placeholderTasks); |
|
||||
} |
|
||||
|
|
||||
// 设置时间轴向下的空数据 |
|
||||
function setNextPlaceholderTasks() { |
|
||||
store.commit('task/setBottomEnd', true); |
|
||||
let startTime = ''; |
|
||||
if (!tasks.value || !tasks.value.length) { |
|
||||
startTime = Date.now(); |
|
||||
} else { |
|
||||
startTime = +tasks.value[tasks.value.length - 1].planStart; |
|
||||
} |
|
||||
const initData = uni.$task.setPlaceholderTasks(startTime, false, timeGranularity.value); |
|
||||
store.commit('task/setDownTasks', initData); |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 用拿到的新数据 替换 时间刻度/旧数据 |
|
||||
* 先对比 新旧数据的 始末时间 补齐刻度 |
|
||||
* 再遍历对比 用任务替换刻度 |
|
||||
* @param {array} data 服务端返回的新数据 上边已经处理过空值 |
|
||||
* @param {number} type 0 -> 向上 1->向下 |
|
||||
*/ |
|
||||
function replacePrevData(data, type) { |
|
||||
let oldTasks = fillPlaceholderTask({ tasks.value, data, timeGranularity.value }); // 已经上下补齐时间刻度的 |
|
||||
|
|
||||
// 遍历对比 用任务替换刻度 |
|
||||
// TODO: tasks越来越多 遍历越来越多 需要优化 |
|
||||
oldTasks.forEach((taskItem, index) => { |
|
||||
const arr = data.filter(dataItem => dayjs(+dataItem.planStart).isSame(+taskItem.planStart, timeGranularity.value)); |
|
||||
if (arr && arr.length) { |
|
||||
oldTasks.splice(index, 1, [...arr]); // 这里加入的数据是array类型的, [{},{},[],[],{}] |
|
||||
} |
|
||||
}); |
|
||||
|
|
||||
oldTasks = flatten(oldTasks); // 1维拍平 |
|
||||
|
|
||||
store.commit('task/clearTasks'); |
|
||||
type === 0 ? store.commit('task/setUpTasks', oldTasks) : store.commit('task/setDownTasks', oldTasks); |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 超出旧数据上、下限 补齐时间刻度到新数据的起始时间颗粒度 |
|
||||
*/ |
|
||||
function fillPlaceholderTask({ tasks, data, timeGranularity }) { |
|
||||
const { prev, next } = uni.$task.computeFillPlaceholderTaskCount({ tasks, data, timeGranularity }); |
|
||||
if (prev) { |
|
||||
const newTasks = uni.$task.setPlaceholderTasks(+tasks[0].planStart, true, timeGranularity, prev); |
|
||||
store.commit('task/setUpTasks', newTasks); |
|
||||
} |
|
||||
if (next) { |
|
||||
const newTasks = uni.$task.setPlaceholderTasks(+tasks[tasks.length - 1].planStart, false, timeGranularity, next); |
|
||||
store.commit('task/setDownTasks', newTasks); |
|
||||
} |
|
||||
return tasks.value; |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 初始化 |
|
||||
* @param {object | null} options |
|
||||
*/ |
|
||||
function init(options) { |
|
||||
if (!token.value) { |
|
||||
// 不论有没有token都直接从userId获取token |
|
||||
// token有过期时间 从本地获取可能是过期 干脆直接从userId获取 |
|
||||
if (!options || !options.u) { |
|
||||
uni.$ui.showToast('缺少用户信息参数'); // 参数里没有u (userId)提示 |
|
||||
} else { |
|
||||
store.dispatch('user/getToken', options.u); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
// 参数里有项目名称 就设置标题里的项目名称 |
|
||||
options && options.pname && store.commit('project/setProjectName', options.pname); |
|
||||
|
|
||||
if (!options || !options.p) { |
|
||||
uni.$ui.showToast('缺少项目信息参数'); // 没有项目id参数 |
|
||||
} else { |
|
||||
if (options.p !== uni.$storage.getStorageSync('projectId')) { |
|
||||
console.log('切项目了'); |
|
||||
uni.$storage.setStorageSync('roleId', ''); |
|
||||
} |
|
||||
// TODO |
|
||||
getProjectById({ projectId: options.p, num: 0 }); // 根据项目id获取项目信息 |
|
||||
// 查询医院是否填写了调查问卷 |
|
||||
// this.handleQueryNotWrite(options.p); |
|
||||
// 根据项目id获取成员列表 |
|
||||
store.dispatch('role/getAllMembers', { projectId: options.p }); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
// 分享链接来的初始化 |
|
||||
async function shareInit(options) { |
|
||||
const storageUser = uni.$storage.getStorageSync('user'); |
|
||||
const user = storageUser ? JSON.parse(storageUser) : null; |
|
||||
if (user && user.id) { |
|
||||
await store.dispatch('user/getToken', user.id); |
|
||||
const res = await clickShare({ code: options.shareId }); |
|
||||
if (res && res.projectId) { |
|
||||
let query = { ...uni.$route.query }; |
|
||||
query = { |
|
||||
u: user.id, |
|
||||
p: res.projectId, |
|
||||
}; |
|
||||
uni.$router.push({ path: uni.$route.path, query }); |
|
||||
init(query); |
|
||||
} |
|
||||
} else { |
|
||||
uni.$ui.showToast('缺少用户信息参数,请登录'); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
function setOptions(options) { |
|
||||
if (options.share && options.share === '1') { |
|
||||
shareInit(options); |
|
||||
} else { |
|
||||
init(options); |
|
||||
} |
|
||||
} |
|
||||
setOptions(options); |
|
||||
|
|
||||
/** |
|
||||
* 点击分享连接 |
|
||||
* @param {any} commit |
|
||||
* @param {object} param 请求参数 |
|
||||
*/ |
|
||||
async function clickShare(param) { |
|
||||
try { |
|
||||
const data = await uni.$catchReq.clickShare(param); |
|
||||
return data; |
|
||||
} catch (error) { |
|
||||
uni.$ui.showToast(error.msg || '获取失败'); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 通过项目id获取项目信息 |
|
||||
* @param {object} params 提交的参数 |
|
||||
*/ |
|
||||
async function getProjectById(params) { |
|
||||
try { |
|
||||
const data = await uni.$u.api.findProjectById(params); |
|
||||
store.commit('project/setProject', data); |
|
||||
// 根据项目id获取角色列表 |
|
||||
getRoles(params); |
|
||||
} catch (error) { |
|
||||
console.log('error: ', error || '获取项目信息失败'); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
/** |
|
||||
* 通过项目id获取角色信息 |
|
||||
* @param {string} projectId |
|
||||
* @param {object} params 提交的参数 |
|
||||
*/ |
|
||||
function getRoles(params) { |
|
||||
uni.$catchReq.findShowRole(params, (err, data) => { |
|
||||
if (err) { |
|
||||
console.error('err: ', err || '获取角色信息失败'); |
|
||||
} else { |
|
||||
store.commit('role/setInvisibleRoles', data ? data.invisibleList : []); |
|
||||
store.commit('role/setVisibleRoles', data ? data.visibleList : []); |
|
||||
setInitialRoleId(data ? data.visibleList : []); |
|
||||
} |
|
||||
}); |
|
||||
} |
|
||||
|
|
||||
// 设置 初始显示角色信息 |
|
||||
function setInitialRoleId(visibleList) { |
|
||||
if (!visibleList || !visibleList.length) return; |
|
||||
const index = visibleList.findIndex(item => +item.mine === 1); |
|
||||
const currentRole = index > 0 ? visibleList[index] : visibleList[0]; |
|
||||
const storageRoleId = uni.$storage.getStorageSync('roleId'); |
|
||||
const currentRoleId = storageRoleId || (currentRole ? currentRole.id : ''); |
|
||||
store.commit('role/setRoleId', currentRoleId); |
|
||||
// 清空storage |
|
||||
uni.$storage.setStorageSync('roleId', ''); |
|
||||
} |
|
||||
|
|
||||
// 获取可变全局任务 |
|
||||
function getGlobalData() { |
|
||||
const param = { roleId: roleId.value, timeNode: timeNode.value, timeUnit: timeUnit.value, projectId: projectId.value }; |
|
||||
store.dispatch('task/getGlobal', param); |
|
||||
} |
|
||||
|
|
||||
// 清除已有的任务数据 |
|
||||
function clearTasksData() { |
|
||||
// 清空日常任务的数据 |
|
||||
store.commit('task/setPermanents', []); |
|
||||
store.commit('task/setDailyTasks', []); |
|
||||
// 清空定期任务数据 |
|
||||
store.commit('task/clearTasks'); |
|
||||
// 到顶的标志复位 |
|
||||
// 到底的标志复位 |
|
||||
store.commit('task/clearEndFlag'); |
|
||||
} |
|
||||
return { |
|
||||
height, |
|
||||
timeLine, |
|
||||
roleId, |
|
||||
timeNode, |
|
||||
timeUnit, |
|
||||
tasks, |
|
||||
newProjectInfo, |
|
||||
showScrollTo, |
|
||||
timeGranularity, |
|
||||
projectId, |
|
||||
userId, |
|
||||
initPlanTasks, |
|
||||
getInitTasks, |
|
||||
getTasks, |
|
||||
generateGetTaskParam, |
|
||||
setPrevPlaceholderTasks, |
|
||||
setNextPlaceholderTasks, |
|
||||
replacePrevData, |
|
||||
fillPlaceholderTask, |
|
||||
init, |
|
||||
shareInit, |
|
||||
setOptions, |
|
||||
clickShare, |
|
||||
getProjectById, |
|
||||
getRoles, |
|
||||
setInitialRoleId, |
|
||||
getGlobalData, |
|
||||
clearTasksData, |
|
||||
}; |
|
||||
}, |
|
||||
}); |
|
||||
</script> |
|
||||
|
|
||||
<style lang="scss" scoped> |
|
||||
.border-b { |
|
||||
border-bottom: 1px solid #e4e7ed; |
|
||||
} |
|
||||
</style> |
|
||||
@ -0,0 +1,96 @@ |
|||||
|
<template> |
||||
|
<view class="u-p-l-50 u-p-r-50 u-p-t-30"> |
||||
|
<u-form :model="model" ref="loginForm" :rules="mixinInit.rules" :error-type="mixinInit.errorType"> |
||||
|
<u-form-item :label-position="mixinInit.labelPosition" label="用户名" prop="account" label-width="150"> |
||||
|
<u-input :border="mixinInit.border" placeholder="请输入用户名" v-model="model.account" type="text"></u-input> |
||||
|
</u-form-item> |
||||
|
<u-form-item :label-position="mixinInit.labelPosition" label="密码" prop="password" label-width="150"> |
||||
|
<u-input :password-icon="true" :border="mixinInit.border" type="password" v-model="model.password" placeholder="请输入密码"> |
||||
|
</u-input> |
||||
|
</u-form-item> |
||||
|
<view class="flex flex-nowrap"> |
||||
|
<view class="flex-sub"></view> |
||||
|
<view class="u-m-t-30 u-font-12 text-gray-400" @click="openPage('/pages/user/forgetPassword')">忘记密码</view> |
||||
|
</view> |
||||
|
</u-form> |
||||
|
|
||||
|
<view class="u-m-t-50"> |
||||
|
<u-button @click="submit" type="primary">立即登录</u-button> |
||||
|
</view> |
||||
|
|
||||
|
<view class="flex justify-between"> |
||||
|
<view class="u-m-t-30" style="color: #2885ED;" @click="openPage('/pages/user/rigister')"> 新用户注册</view> |
||||
|
<view class="u-m-t-30" style="color: #2885ED;" @click="openPage('/pages/user/login')">手机号登录 </view> |
||||
|
</view> |
||||
|
|
||||
|
<view style="margin-top: 200rpx;text-align: center; color: #999999;font-size: 35rpx;"> |
||||
|
快速登录 |
||||
|
</view> |
||||
|
<view style="text-align: center; margin-top: 20rpx;"> |
||||
|
<image src="/common/img/weixinIcon.png" mode="" style="width: 85rpx;height: 85rpx;"></image> |
||||
|
</view> |
||||
|
</view> |
||||
|
</template> |
||||
|
|
||||
|
<script setup> |
||||
|
import { ref, computed } from 'vue'; |
||||
|
import { useStore } from 'vuex'; |
||||
|
import userMixin from '@/hooks/user/userMixin' |
||||
|
|
||||
|
const store = useStore(); |
||||
|
const mixinInit = userMixin(); |
||||
|
const userInfo = uni.$storage.getStorageSync('user'); |
||||
|
const user = ref({}); |
||||
|
const loginForm = ref(null); |
||||
|
const model = ref({ |
||||
|
account: '', |
||||
|
password: '' |
||||
|
}) |
||||
|
|
||||
|
|
||||
|
if (userInfo) { |
||||
|
user.value = JSON.parse(userInfo); |
||||
|
} |
||||
|
|
||||
|
const submit = () => { |
||||
|
loginForm.value.validate(data => { |
||||
|
console.log(data); |
||||
|
}); |
||||
|
} |
||||
|
|
||||
|
async function login() { |
||||
|
try { |
||||
|
uni.$ui.showLoading(); |
||||
|
if (account.value === user.value.account) { |
||||
|
uni.$ui.showToast('当前账户已登录'); |
||||
|
} else { |
||||
|
const params = ref({ |
||||
|
client: 1, |
||||
|
data: { |
||||
|
identifier: account.value, |
||||
|
credential: password.value, |
||||
|
}, |
||||
|
type: 3, |
||||
|
}); |
||||
|
|
||||
|
let res = await uni.$u.api.signin(params.value); |
||||
|
store.commit('user/setToken', res.token); |
||||
|
store.commit('user/setUser', res); |
||||
|
uni.$storage.setStorageSync('anyringToken', res.token || ''); |
||||
|
uni.$storage.setStorageSync('user', JSON.stringify(res)); |
||||
|
} |
||||
|
|
||||
|
uni.navigateTo({ |
||||
|
url: '/pages/index/index' |
||||
|
}); |
||||
|
|
||||
|
uni.$ui.hideLoading(); |
||||
|
} catch (error) { |
||||
|
uni.$ui.hideLoading(); |
||||
|
uni.$ui.showToast(error); |
||||
|
} |
||||
|
} |
||||
|
</script> |
||||
|
|
||||
|
<style> |
||||
|
</style> |
||||
@ -0,0 +1,266 @@ |
|||||
|
import { ref, computed } from 'vue'; |
||||
|
import { useStore } from 'vuex'; |
||||
|
import clipboard from "@/common/js/dc-clipboard/clipboard.js" |
||||
|
|
||||
|
export default function mixinInit { |
||||
|
const store = useStore(); |
||||
|
const user = computed(() => store.state.user.user); |
||||
|
const rules = ref({ |
||||
|
phone: [ |
||||
|
{ |
||||
|
required: true, |
||||
|
message: '请输入手机号', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
validator: (rule, value, callback) => { |
||||
|
// 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
|
||||
|
return this.$u.test.mobile(value); |
||||
|
}, |
||||
|
message: '手机号码不正确', |
||||
|
// 触发器可以同时用blur和change，二者之间用英文逗号隔开
|
||||
|
trigger: ['change','blur'], |
||||
|
} |
||||
|
], |
||||
|
verificationCodeValue: [ |
||||
|
{ |
||||
|
required: true, |
||||
|
message: '请输入图形验证码', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
type: 'number', |
||||
|
message: '图形验证码只能为数字', |
||||
|
trigger: ['change','blur'], |
||||
|
} |
||||
|
], |
||||
|
smsCode: [ |
||||
|
{ |
||||
|
required: true, |
||||
|
message: '请输入验证码', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
type: 'number', |
||||
|
message: '验证码只能为数字', |
||||
|
trigger: ['change','blur'], |
||||
|
} |
||||
|
], |
||||
|
account: [ |
||||
|
{ |
||||
|
required: true, |
||||
|
message: '请输入用户名', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
min: 2, |
||||
|
max: 20, |
||||
|
message: '用户名长度在2到20个字符', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
pattern: /^[a-zA-Z0-9._-]{2,20}$/, |
||||
|
message: '请输入2-20位字母、数字、汉字或字符"_ - ."', |
||||
|
trigger: ['change','blur'], |
||||
|
} |
||||
|
], |
||||
|
password: [ |
||||
|
{ |
||||
|
required: true, |
||||
|
message: '请输入密码', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
min: 6, |
||||
|
max: 20, |
||||
|
message: '密码长度在6到20个字符', |
||||
|
trigger: ['change','blur'], |
||||
|
}, |
||||
|
{ |
||||
|
// 正则不能含有两边的引号
|
||||
|
pattern: /^[a-zA-Z0-9._-]{6,20}$/, |
||||
|
message: '请输入6-20位字母、数字、汉字或字符"_ - ."', |
||||
|
trigger: ['change','blur'], |
||||
|
} |
||||
|
], |
||||
|
}); |
||||
|
const errorType = ref(['message']); |
||||
|
const labelPosition = ref('left'); |
||||
|
const border = ref(false); |
||||
|
const smsCode = ref(''); // 短信验证码
|
||||
|
const showInterval = ref(false); |
||||
|
const interval = ref(120); |
||||
|
const codeTimer = ref(null); |
||||
|
const showPaste = ref(false); |
||||
|
|
||||
|
return { |
||||
|
errorType, |
||||
|
// getImageCode,
|
||||
|
// hasvalue,
|
||||
|
// getCode,
|
||||
|
// getCodeInterval,
|
||||
|
// checkRules,
|
||||
|
// setCode,
|
||||
|
// getClipboardContents,
|
||||
|
// verifyPhone,
|
||||
|
// verifyLoginname,
|
||||
|
// handleWxLogin
|
||||
|
} |
||||
|
} |
||||
|
|
||||
|
|
||||
|
// const mixin = {
|
||||
|
// computed: mapState('user', ['user']),
|
||||
|
|
||||
|
// onReady() {
|
||||
|
// this.$refs.uForm.setRules(this.rules);
|
||||
|
// },
|
||||
|
|
||||
|
// methods: {
|
||||
|
// ...mapActions('user', ['sendCode']),
|
||||
|
|
||||
|
// 获取图形验证码
|
||||
|
// async getImageCode() {
|
||||
|
// this.$util.showLoading();
|
||||
|
// try {
|
||||
|
// const data = await uni.$u.api.getImageCode();
|
||||
|
// const { imageBase64, verificationCodeId } = data;
|
||||
|
// this.imageBase64 = imageBase64 || '';
|
||||
|
// this.verificationCodeId = verificationCodeId || '';
|
||||
|
// uni.hideLoading();
|
||||
|
// } catch (error) {
|
||||
|
// uni.hideLoading();
|
||||
|
// uni.$ui.showToast(error);
|
||||
|
// }
|
||||
|
// },
|
||||
|
|
||||
|
// //有图片验证码的值
|
||||
|
// hasvalue() {
|
||||
|
// if(this.model.smsCode || this.model.showPaste) return
|
||||
|
// if (!this.verifyPhone(this.model.phone)) {
|
||||
|
// uni.$ui.showToast('请输入正确的手机号');
|
||||
|
// return;
|
||||
|
// }
|
||||
|
// if (!this.model.verificationCodeValue) {
|
||||
|
// uni.$ui.showToast('请输入图形验证码');
|
||||
|
// return;
|
||||
|
// }
|
||||
|
// this.getCode();
|
||||
|
// },
|
||||
|
|
||||
|
// // 获取验证码
|
||||
|
// async getCode() {
|
||||
|
// try {
|
||||
|
// const { phone, verificationCodeValue } = this.model;
|
||||
|
// const { verificationCodeId } = this;
|
||||
|
|
||||
|
// if (!verificationCodeId || !verificationCodeValue) {
|
||||
|
// uni.$ui.showToast('缺少图形验证码参数');
|
||||
|
// return;
|
||||
|
// }
|
||||
|
// const params = {
|
||||
|
// phone,
|
||||
|
// verificationCodeId,
|
||||
|
// verificationCodeValue,
|
||||
|
// };
|
||||
|
// const date = await store.dispatch('user/sendCode', params);
|
||||
|
// getCodeInterval();
|
||||
|
// showPaste.value = true;
|
||||
|
// } catch (err) {
|
||||
|
// throw err;
|
||||
|
// }
|
||||
|
// },
|
||||
|
|
||||
|
// // 获取验证码倒计时
|
||||
|
// getCodeInterval() {
|
||||
|
// this.showInterval = true;
|
||||
|
// this.codeTimer = setInterval(() => {
|
||||
|
// if (this.interval === 0) {
|
||||
|
// clearInterval(this.codeTimer);
|
||||
|
// this.codeTimer = null;
|
||||
|
// this.showInterval = false;
|
||||
|
// this.interval = 120;
|
||||
|
// return;
|
||||
|
// }
|
||||
|
// this.interval = this.interval - 1;
|
||||
|
// }, 1000);
|
||||
|
// },
|
||||
|
|
||||
|
// // 验证信息
|
||||
|
// checkRules() {
|
||||
|
// // const { smsCode, phone, user } = this;
|
||||
|
// if (!this.verifyPhone(phone.value)) {
|
||||
|
// uni.$ui.showToast('请输入正确的手机号');
|
||||
|
// return false;
|
||||
|
// }
|
||||
|
// if (!smsCode.value) {
|
||||
|
// uni.$ui.showToast('验证码无效');
|
||||
|
// return false;
|
||||
|
// }
|
||||
|
|
||||
|
// if (phone.value === user.value.phone) {
|
||||
|
// uni.$ui.showToast('新手机号不能与旧手机号相同');
|
||||
|
// return;
|
||||
|
// }
|
||||
|
// return true;
|
||||
|
// },
|
||||
|
|
||||
|
// // 粘贴
|
||||
|
// setCode() {
|
||||
|
// // 获取粘贴板内容
|
||||
|
// // 小程序平台
|
||||
|
// //#ifdef MP-WEIXIN
|
||||
|
// var _this = this
|
||||
|
// uni.getClipboardData({
|
||||
|
// success (res) {
|
||||
|
// _this.smsCode = res.data;
|
||||
|
// }
|
||||
|
// });
|
||||
|
// //#endif
|
||||
|
|
||||
|
// // 非小程序平台
|
||||
|
// //#ifndef MP-WEIXIN
|
||||
|
// this.getClipboardContents()
|
||||
|
// //#endif
|
||||
|
// },
|
||||
|
|
||||
|
// // 非小程序平台粘贴
|
||||
|
// async getClipboardContents() {
|
||||
|
// try {
|
||||
|
// const text = await navigator.clipboard.readText();
|
||||
|
// this.smsCode = text;
|
||||
|
// } catch (err) {
|
||||
|
// console.error('Failed to read clipboard contents: ', err);
|
||||
|
// }
|
||||
|
// },
|
||||
|
|
||||
|
// /**
|
||||
|
// * 验证手机号格式
|
||||
|
// * @param {string} phone 手机号
|
||||
|
// */
|
||||
|
// verifyPhone(phone) {
|
||||
|
// const phoneExg = /^1\d{10}$/;
|
||||
|
// return phoneExg.test(phone);
|
||||
|
// },
|
||||
|
|
||||
|
// /**
|
||||
|
// * 验证账号/密码 格式
|
||||
|
// * @param {string} account 账号
|
||||
|
// */
|
||||
|
// verifyLoginname(account) {
|
||||
|
// const accountExg = /^[a-zA-Z0-9._-]{2,20}$/;
|
||||
|
// return accountExg.test(account);
|
||||
|
// },
|
||||
|
|
||||
|
// // 微信登录
|
||||
|
// handleWxLogin() {
|
||||
|
// const origin = 'https://test.tall.wiki/pt-mui'; // 测试
|
||||
|
// const appid = 'wxd1842e073e0e6d91';
|
||||
|
// const state = 'wx_web';
|
||||
|
// const href = 'https://open.weixin.qq.com/connect/qrconnect';
|
||||
|
// // eslint-disable-next-line
|
||||
|
// window.location.href =
|
||||
|
// `${href}?appid=${appid}&redirect_uri=${origin}&response_type=code&scope=snsapi_login&state=${state}#wechat_redirect`;
|
||||
|
// },
|
||||
|
// // }
|
||||
|
// };
|
||||
@ -1,178 +1,190 @@ |
|||||
import store from '@/store/index'; |
import store from '@/store/index'; |
||||
|
|
||||
/** |
/** |
||||
* 等待token执行api |
* 等待token执行api |
||||
* 没有token 就延时执行自己 直到有了token在请求 |
* 没有token 就延时执行自己 直到有了token在请求 |
||||
* @param {function} requestFn 执行请求的函数 |
* @param {function} requestFn 执行请求的函数 |
||||
*/ |
*/ |
||||
export const waitTokenRequest = requestFn => { |
export const waitTokenRequest = requestFn => { |
||||
if (!requestFn || typeof requestFn !== 'function') throw new Error(`requestFn must be a function`); |
if (!requestFn || typeof requestFn !== 'function') throw new Error(`requestFn must be a function`); |
||||
if (uni.$storage.getStorageSync('anyringToken')) { |
if (uni.$storage.getStorageSync('anyringToken')) { |
||||
requestFn(); |
requestFn(); |
||||
} else { |
} else { |
||||
setTimeout(() => waitTokenRequest(requestFn), 10); |
setTimeout(() => waitTokenRequest(requestFn), 10); |
||||
} |
} |
||||
}; |
}; |
||||
|
|
||||
export default { |
export default { |
||||
/** |
/** |
||||
* 获取项目列表 |
* 获取项目列表 |
||||
* @param {number} startTime 起始时间 |
* @param {number} startTime 起始时间 |
||||
* @param {number} endTime 截止时间 |
* @param {number} endTime 截止时间 |
||||
*/ |
*/ |
||||
getProjects(startTime, endTime, fn) { |
getProjects(startTime, endTime, fn) { |
||||
let remote = false; |
let remote = false; |
||||
if (store.getters.useStorage) { |
if (store.getters.useStorage) { |
||||
// 有缓存 且 服务端数据未返回 就先返回缓存
|
// 有缓存 且 服务端数据未返回 就先返回缓存
|
||||
uni.$cache.getProjectsByDay(startTime, endTime) |
uni.$cache |
||||
.then(data => { |
.getProjectsByDay(startTime, endTime) |
||||
!remote && fn(null, data); |
.then(data => { |
||||
}) |
!remote && fn(null, data); |
||||
.catch(err => !remote && fn(err)); |
}) |
||||
} |
.catch(err => !remote && fn(err)); |
||||
waitTokenRequest(() => { |
} |
||||
// 拿到api数据后 再用api的数据
|
waitTokenRequest(() => { |
||||
uni.$u.api.getProjects(startTime, endTime) |
// 拿到api数据后 再用api的数据
|
||||
.then(data => { |
uni.$u.api |
||||
remote = true; |
.getProjects(startTime, endTime) |
||||
fn(null, data); |
.then(data => { |
||||
// 存api到cache里
|
remote = true; |
||||
uni.$cache.putProjects(data); |
fn(null, data); |
||||
}) |
// 存api到cache里
|
||||
.catch(err => fn(err)); |
uni.$cache.putProjects(data); |
||||
}); |
}) |
||||
}, |
.catch(err => fn(err)); |
||||
|
}); |
||||
/** |
}, |
||||
* 通过项目id获取角色信息 |
|
||||
* @param {object} params 提交的参数 |
/** |
||||
*/ |
* 通过项目id获取角色信息 |
||||
findShowRole(params, fn) { |
* @param {object} params 提交的参数 |
||||
let remote = false; |
*/ |
||||
// 有缓存 且 服务端数据未返回 就先返回缓存
|
findShowRole(params, fn) { |
||||
uni.$cache.getShowRole(params.projectId) |
let remote = false; |
||||
.then(data => { |
// 有缓存 且 服务端数据未返回 就先返回缓存
|
||||
!remote && fn(null, data); |
uni.$cache |
||||
}) |
.getShowRole(params.projectId) |
||||
.catch(err => !remote && fn(err)); |
.then(data => { |
||||
|
!remote && fn(null, data); |
||||
waitTokenRequest(() => { |
}) |
||||
// 拿到api数据后 再用api的数据
|
.catch(err => !remote && fn(err)); |
||||
uni.$u.api.findShowRole(params) |
|
||||
.then(data => { |
waitTokenRequest(() => { |
||||
remote = true; |
// 拿到api数据后 再用api的数据
|
||||
fn(null, data); |
uni.$u.api |
||||
// 存api到cache里
|
.findShowRole(params) |
||||
uni.$cache.putShowRole(params.projectId, data); |
.then(data => { |
||||
}) |
remote = true; |
||||
.catch(err => fn(err)); |
fn(null, data); |
||||
}); |
// 存api到cache里
|
||||
}, |
uni.$cache.putShowRole(params.projectId, data); |
||||
|
}) |
||||
/** |
.catch(err => fn(err)); |
||||
* 根据时间基准点和角色查找定期任务 |
}); |
||||
* @param {object} params 提交的参数 |
}, |
||||
*/ |
|
||||
getRegularTask(params, fn) { |
/** |
||||
let remote = false; |
* 根据时间基准点和角色查找定期任务 |
||||
// 有缓存 且 服务端数据未返回 就先返回缓存
|
* @param {object} params 提交的参数 |
||||
uni.$cache.getStorageRegularTask(params) |
*/ |
||||
.then(data => { |
getRegularTask(params, fn) { |
||||
console.log('cache data: ', data); |
let remote = false; |
||||
!remote && fn(null, data); |
// 有缓存 且 服务端数据未返回 就先返回缓存
|
||||
}) |
uni.$cache |
||||
.catch(err => !remote && fn(err)); |
.getStorageRegularTask(params) |
||||
|
.then(data => { |
||||
waitTokenRequest(() => { |
console.log('cache data: ', data); |
||||
// 拿到api数据后 再用api的数据
|
!remote && fn(null, data); |
||||
uni.$u.api.getRegularTask(params) |
}) |
||||
.then(data => { |
.catch(err => !remote && fn(err)); |
||||
console.log('api data: ', uni.$u.deepClone(data)); |
|
||||
remote = true; |
waitTokenRequest(() => { |
||||
|
// 拿到api数据后 再用api的数据
|
||||
fn(null, uni.$u.deepClone(data)); |
uni.$u.api |
||||
// 存api到cache里
|
.getRegularTask(params) |
||||
uni.$cache.putStorageRegularTask(params, data); |
.then(data => { |
||||
}) |
console.log('api data: ', uni.$u.deepClone(data)); |
||||
.catch(err => fn(err)); |
remote = true; |
||||
}); |
|
||||
}, |
fn(null, uni.$u.deepClone(data)); |
||||
|
// 存api到cache里
|
||||
/** |
uni.$cache.putStorageRegularTask(params, data); |
||||
* 根据角色查找永久的日常任务 |
}) |
||||
* @param {object} params 提交的参数 |
.catch(err => fn(err)); |
||||
*/ |
}); |
||||
getPermanent(params, fn) { |
}, |
||||
let remote = false; |
|
||||
// 有缓存 且 服务端数据未返回 就先返回缓存
|
/** |
||||
uni.$cache.getStoragePermanent(params) |
* 根据角色查找永久的日常任务 |
||||
.then(data => { |
* @param {object} params 提交的参数 |
||||
!remote && fn(null, data); |
*/ |
||||
}) |
getPermanent(params, fn) { |
||||
.catch(err => !remote && fn(err)); |
let remote = false; |
||||
|
// 有缓存 且 服务端数据未返回 就先返回缓存
|
||||
waitTokenRequest(() => { |
uni.$cache |
||||
// 拿到api数据后 再用api的数据
|
.getStoragePermanent(params) |
||||
uni.$u.api.getPermanent(params) |
.then(data => { |
||||
.then(data => { |
!remote && fn(null, data); |
||||
remote = true; |
}) |
||||
fn(null, data); |
.catch(err => !remote && fn(err)); |
||||
// 存api到cache里
|
|
||||
uni.$cache.putStoragePermanent(params, data); |
waitTokenRequest(() => { |
||||
}) |
// 拿到api数据后 再用api的数据
|
||||
.catch(err => fn(err)); |
uni.$u.api |
||||
}); |
.getPermanent(params) |
||||
}, |
.then(data => { |
||||
|
remote = true; |
||||
/** |
fn(null, data); |
||||
* 根据时间和角色查找日常任务 |
// 存api到cache里
|
||||
* @param {object} params 提交的参数 |
uni.$cache.putStoragePermanent(params, data); |
||||
*/ |
}) |
||||
getGlobal(params, fn) { |
.catch(err => fn(err)); |
||||
let remote = false; |
}); |
||||
// 有缓存 且 服务端数据未返回 就先返回缓存
|
}, |
||||
uni.$cache.getDailyTask(params) |
|
||||
.then(data => { |
/** |
||||
!remote && fn(null, data); |
* 根据时间和角色查找日常任务 |
||||
}) |
* @param {object} params 提交的参数 |
||||
.catch(err => !remote && fn(err)); |
*/ |
||||
|
getGlobal(params, fn) { |
||||
waitTokenRequest(() => { |
let remote = false; |
||||
// 拿到api数据后 再用api的数据
|
// 有缓存 且 服务端数据未返回 就先返回缓存
|
||||
uni.$u.api.getGlobal(params) |
uni.$cache |
||||
.then(data => { |
.getDailyTask(params) |
||||
remote = true; |
.then(data => { |
||||
fn(null, data); |
!remote && fn(null, data); |
||||
// 存api到cache里
|
}) |
||||
uni.$cache.putDailyTask(params, data); |
.catch(err => !remote && fn(err)); |
||||
}) |
|
||||
.catch(err => fn(err)); |
waitTokenRequest(() => { |
||||
}); |
// 拿到api数据后 再用api的数据
|
||||
}, |
uni.$u.api |
||||
|
.getGlobal(params) |
||||
/** |
.then(data => { |
||||
* 获取插件信息 |
remote = true; |
||||
* @param {object} params 提交的参数 |
fn(null, data); |
||||
*/ |
// 存api到cache里
|
||||
getOtherPlugin(params, fn) { |
uni.$cache.putDailyTask(params, data); |
||||
let remote = false; |
}) |
||||
// 有缓存 且 服务端数据未返回 就先返回缓存
|
.catch(err => fn(err)); |
||||
uni.$cache.getPlugin(params.pluginId) |
}); |
||||
.then(data => { |
}, |
||||
!remote && fn(null, data); |
|
||||
}) |
/** |
||||
.catch(err => !remote && fn(err)); |
* 获取插件信息 |
||||
|
* @param {object} params 提交的参数 |
||||
waitTokenRequest(() => { |
*/ |
||||
// 拿到api数据后 再用api的数据
|
getOtherPlugin(params, fn) { |
||||
uni.$u.api.getOtherPlugin(params) |
let remote = false; |
||||
.then(data => { |
// 有缓存 且 服务端数据未返回 就先返回缓存
|
||||
remote = true; |
uni.$cache |
||||
fn(null, data); |
.getPlugin(params.pluginId) |
||||
// 存api到cache里
|
.then(data => { |
||||
uni.$cache.putPlugin(params.pluginId, data); |
!remote && fn(null, data); |
||||
}) |
}) |
||||
.catch(err => fn(err)); |
.catch(err => !remote && fn(err)); |
||||
}); |
|
||||
}, |
waitTokenRequest(() => { |
||||
|
// 拿到api数据后 再用api的数据
|
||||
|
uni.$u.api |
||||
|
.getOtherPlugin(params) |
||||
|
.then(data => { |
||||
|
remote = true; |
||||
|
fn(null, data); |
||||
|
// 存api到cache里
|
||||
|
uni.$cache.putPlugin(params.pluginId, data); |
||||
|
}) |
||||
|
.catch(err => fn(err)); |
||||
|
}); |
||||
|
}, |
||||
}; |
}; |
||||
|
|||||
Loading…
Reference in new issue