ccsens_tall
/
TALL-MUI-4
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat: 主体颜色

test2
xuesinan 4 years ago
parent
9871356013
commit
bb5c0e36ed
5 changed files with 206 additions and 199 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      App.vue
  2. 1
      CHANGELOG.md
  3. 8
      apis/tall.js
  4. 4
      pages/index/index.vue
  5. 160
      pages/project/project.vue

12
App.vue
View File

@ -18,10 +18,10 @@ export default {
this.checkNetwork(); // 监听网络状态
this.getSystemInfo(); // 获取系统设备信息、
const token = this.$store.state.user.token || this.$storage.getStorageSync('anyringToken') || '';
if (token) {
this.$store.commit('user/setToken', token);
}
// const token = this.$store.state.user.token || this.$storage.getStorageSync('anyringToken') || '';
// if (token) {
// this.$store.commit('user/setToken', token);
// }
// if (!token) {
// this.$ui.showToast('获取用户信息失败, 请登录');
@ -29,8 +29,8 @@ export default {
// return;
// }
// await this.syncLocalDataToStore(options.query.u); // 将localStorage里的数据同步到store里
// token = await this.getToken();
await this.syncLocalDataToStore('1217647686598135808'); // 将localStorage里的数据同步到store里
const token = await this.getToken();
// this.noPhone(this.$store.state.user.phone);
this.$store.dispatch('socket/initSocket');

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@
- | 将时间轴改成swiper滑动 | [12384f9](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12384f9)
- | 日历页首页 | [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)
- | 设置状态栏 | [9871356](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9871356)
- | 时间轴接口 | [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)
- | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380)

8
apis/tall.js
View File

@ -1,9 +1,9 @@
import Config from '@/common/js/config.js'
// const apiUrl = Config.apiUrl;
const apiUrl = Config.apiUrlNew;
// const tall = `${apiUrl}/tall3/v3.0`;
const tall = `${apiUrl}/ptostall`;
const apiUrl = Config.apiUrl;
// const apiUrl = Config.apiUrlNew;
const tall = `${apiUrl}/tall3/v3.0`;
// const tall = `${apiUrl}/ptostall`;
export function setupTall(app) {
uni.$u.api = { ...uni.$u.api } || {};

4
pages/index/index.vue
View File

@ -5,7 +5,7 @@
</view>
<!-- <view class="flex flex-col h-full bg-gray-50" @click="openAuth"> -->
<view class="flex flex-col h-full bg-gray-50">
<theme class="flex flex-col h-full bg-gray-50">
<view class="relative">
<!-- <view class="relative" @touchmove="onMove"> -->
<!-- 日历 -->
@ -26,7 +26,7 @@
<!-- 全局提示框 -->
<u-top-tips ref="uTips"></u-top-tips>
</view>
</theme>
</template>
<script setup>

160
pages/project/project.vue
View File

@ -24,74 +24,45 @@
</template>
<script setup>
import { ref, computed, watch, onMounted } from 'vue';
import { useStore } from 'vuex';
import useInit from '@/hooks/project/useInit';
import useGetTasks from '@/hooks/project/useGetTasks';
import dayjs from 'dayjs';
const initHook = useInit();
const getTasksHook = useGetTasks();
const store = useStore();
const roleId = computed(() => store.state.role.roleId);
const timeNode = computed(() => store.state.task.timeNode);
const timeUnit = computed(() => store.state.task.timeUnit);
const projectId = computed(() => store.getters['project/projectId']);
const userId = computed(() => store.getters['user/userId']);
const newProjectInfo = computed(() => store.state.task.newProjectInfo);
const showScrollTo = computed(() => store.state.task.showScrollTo);
const visibleRoles = computed(() => store.state.role.visibleRoles);
const allTasks = computed(() => store.state.task.allTasks);
const roleIndex = computed(() => store.state.role.roleIndex);
const globals = computed(() => store.getters['task/globals']);
const timeGranularity = computed(() => store.getters['task/timeGranularity']);
const height = ref(null);
onMounted(() => {
import { ref, computed, watch, onMounted } from 'vue';
import { useStore } from 'vuex';
import useInit from '@/hooks/project/useInit';
import useGetTasks from '@/hooks/project/useGetTasks';
import dayjs from 'dayjs';
const initHook = useInit();
const getTasksHook = useGetTasks();
const store = useStore();
const projectId = computed(() => store.getters['project/projectId']);
const userId = computed(() => store.getters['user/userId']);
const roleId = computed(() => store.state.role.roleId); // 当前展示查看的角色id
const roleIndex = computed(() => store.state.role.roleIndex); // 时间轴角色索引
const visibleRoles = computed(() => store.state.role.visibleRoles); // 展示的角色信息
const timeNode = computed(() => store.state.task.timeNode); // 时间基准点
const timeUnit = computed(() => store.state.task.timeUnit); // 时间颗粒度
const newProjectInfo = computed(() => store.state.task.newProjectInfo);
const showScrollTo = computed(() => store.state.task.showScrollTo); // 是否可以设置时间轴自动滚动的位置
const allTasks = computed(() => store.state.task.allTasks); // 所有任务
const globals = computed(() => store.getters['task/globals']); // 所有的日常任务 永久 + 可变 日常任务
const timeGranularity = computed(() => store.getters['task/timeGranularity']); // 计算颗粒度 对应的 dayjs add 的单位
const height = ref(null); // 页面高度
onMounted(() => {
const system = uni.getSystemInfoSync();
height.value = `${system.windowHeight}px`;
});
// 获取可变全局任务
function getGlobalData() {
if(!allTasks.value[roleIndex]) {
const param = {
roleId: roleId.value,
timeNode: timeNode.value,
timeUnit: timeUnit.value,
projectId: projectId.value,
};
store.dispatch('task/getGlobal', param);
}
// 添加到allTasks里
const index = visibleRoles.value.findIndex(role => role.id === roleId.value);
const arr = [...allTasks.value];
arr[index].global = [...globals.value];
store.commit('task/setAllTasks', arr);
}
// 清除已有的任务数据
function clearTasksData() {
// 清空日常任务的数据
store.commit('task/setPermanents', []);
store.commit('task/setDailyTasks', []);
// 清空定期任务数据
store.commit('task/clearTasks');
// 到顶的标志复位
// 到底的标志复位
store.commit('task/clearEndFlag');
}
});
/**
/**
* 当角色发生变化时
* 重新查询永久日常任务和普通日常任务
* 注意: 切换角色后 重新设置了时间基准点 时间基准点一定会变
* 所以监听时间基准点获取 可变日常任务即可 这里不用获取 避免重复获取
*/
watch(roleId, newValue => {
watch(roleId, newValue => {
if (newValue) {
// 判断如果allTasks里有就不用加了
if (allTasks.value.length && allTasks.value[roleIndex.value].global && allTasks.value[roleIndex.value].task) return;
if (allTasks.value.length && allTasks.value[roleIndex.value].global && allTasks.value[roleIndex.value].task)
return;
console.log('当角色发生变化时', newValue);
store.commit('task/setTimeNode', Date.now());
@ -102,14 +73,14 @@ watch(roleId, newValue => {
};
store.dispatch('task/getPermanent', params);
}
});
});
/**
/**
* 当时间基准点发生变化时
* 重新根据时间和角色查询普通日常任务
* 永久日常任务不发生 改变
*/
watch(timeNode, newValue => {
watch(timeNode, newValue => {
if (newValue && roleId.value) {
console.log('当时间基准点发生变化时');
clearTasksData();
@ -126,14 +97,14 @@ watch(timeNode, newValue => {
}
}, 300);
}
});
});
/**
/**
* 当收到打开新项目消息状态时
* 重新根据时间和角色查询普通日常任务
* 永久日常任务不发生改变
*/
watch(newProjectInfo, newValue => {
watch(newProjectInfo, newValue => {
console.log('当收到打开新项目消息状态时');
if (newValue && newValue.value.projectId && newValue.value.url) {
uni.$u.route('/', {
@ -147,22 +118,56 @@ watch(newProjectInfo, newValue => {
initHook.init(options);
}
});
});
// 获取可变全局任务
function getGlobalData() {
if (!allTasks.value[roleIndex]) {
const param = {
roleId: roleId.value,
timeNode: timeNode.value,
timeUnit: timeUnit.value,
projectId: projectId.value,
};
store.dispatch('task/getGlobal', param);
}
// 添加到allTasks里
const index = visibleRoles.value.findIndex(role => role.id === roleId.value);
const arr = [...allTasks.value];
arr[index].global = [...globals.value];
store.commit('task/setAllTasks', arr);
}
function getTasks(params) {
// 清除已有的任务数据
function clearTasksData() {
// 清空日常任务的数据
store.commit('task/setPermanents', []);
store.commit('task/setDailyTasks', []);
// 清空定期任务数据
store.commit('task/clearTasks');
// 到顶的标志复位
// 到底的标志复位
store.commit('task/clearEndFlag');
}
function getTasks(params) {
getTasksHook.initPlanTasks(params); // 处理定期任务
}
}
// tabs通知swiper切换
function tabsChange(e) {
const { id } = visibleRoles.value[e.detail.current];
// tabs通知swiper切换
function tabsChange(e) {
const {
id
} = visibleRoles.value[e.detail.current];
store.commit('role/setRoleIndex', e.detail.current);
store.commit('role/setRoleId', id);
}
}
// 设置自动滚动位置
function setScrollPosition() {
// 设置自动滚动位置
function setScrollPosition() {
// 如果storage里有taskId 滚动到这个id的任务
const taskId = uni.$storage.getStorageSync('taskId');
if (taskId) {
@ -175,15 +180,16 @@ function setScrollPosition() {
} else {
// 没有本地记录的taskId
// 找到当前时间基准线的任务id 记录 并滚动到当前时间基准线
const task = allTasks.value[roleIndex.value].task.find(item => dayjs(+item.planStart).isSame(timeNode.value, timeGranularity.value));
const task = allTasks.value[roleIndex.value].task.find(item => dayjs(+item.planStart).isSame(timeNode.value,
timeGranularity.value));
task && store.commit('task/setScrollToTaskId', `a${task.id}`); // 有这个task 就记录他的id
}
}
}
}
</script>
<style lang="scss" scoped>
.border-b {
.border-b {
border-bottom: 1px solid #e4e7ed;
}
}
</style>

Write Preview
Loading…
Cancel
Save