-
![]()
+
{{ dayjs(item.planStart).format('D日 HH:mm') }}
@@ -56,6 +56,7 @@ import { computed, watch, reactive, ref } from 'vue';
import { useStore } from 'vuex';
import dayjs from 'dayjs';
import { findShowRole, getRegularTask, findSonTask, findProjectById } from 'apis';
+import { ReloadOutlined, MoreOutlined, PlayCircleOutlined } from '@ant-design/icons-vue';
const store = useStore();
const projectId = sessionStorage.getItem('projectId');
@@ -222,6 +223,11 @@ function toDetail(item) {
color: #333;
}
+.project-action .anticon {
+ margin-left: 16px;
+ cursor: pointer;
+}
+
.role-list {
padding: 0 16px;
height: 36px;
@@ -282,9 +288,7 @@ function toDetail(item) {
height: 32px;
}
-.task-time img {
- width: 23px;
- height: 23px;
+.task-time .anticon {
margin-right: 16px;
}
diff --git a/src/components/tall/left/Projects.vue b/src/components/tall/left/Projects.vue
index 198d419..d96a11a 100644
--- a/src/components/tall/left/Projects.vue
+++ b/src/components/tall/left/Projects.vue
@@ -79,6 +79,7 @@ const store = useStore();
const projects = reactive({ projects: [] });
const visible = ref(false);
const deleteId = ref(null);
+const projectId = sessionStorage.getItem('projectId');
// 点击操作面试显示隐藏
const showActionCard = item => {
@@ -94,9 +95,18 @@ const getProjectsList = async (startTime, endTime) => {
data.forEach(item => {
item.show = false;
+ if (item.id === projectId) {
+ item.show = true;
+ }
+
if (item.sonProjectList) {
item.sonProjectList.forEach(sonItem => {
sonItem.show = false;
+
+ if (sonItem.id === projectId) {
+ sonItem.show = true;
+ item.show = true;
+ }
});
}
@@ -111,11 +121,13 @@ const getProjectsList = async (startTime, endTime) => {
getProjectsList(dayjs().startOf('day').format('x'), dayjs().endOf('day').format('x'));
-function toDetail(project) {
+function toDetail(item) {
+ item.show = !item.show;
+
const obj = {
- id: project.id,
- name: project.name,
- url: project.url,
+ id: item.id,
+ name: item.name,
+ url: item.url,
};
store.commit('projects/setProject', obj);
diff --git a/src/components/tall/top/Navbar.vue b/src/components/tall/top/Navbar.vue
index 9aafa88..8783626 100644
--- a/src/components/tall/top/Navbar.vue
+++ b/src/components/tall/top/Navbar.vue
@@ -10,6 +10,11 @@ import { useStore } from 'vuex';
const store = useStore();
const taskDetail = computed(() => store.state.task.taskDetail); // 任务名称
const taskInfo = ref({});
+const sessionTaskDetail = sessionStorage.getItem('taskDetail');
+
+if (sessionTaskDetail) {
+ taskInfo.value = JSON.parse(sessionTaskDetail);
+}
// 监听任务信息
watch(taskDetail, newVal => {
diff --git a/src/store/tall/projects/index.js b/src/store/tall/projects/index.js
index 240928f..87df125 100644
--- a/src/store/tall/projects/index.js
+++ b/src/store/tall/projects/index.js
@@ -57,7 +57,6 @@ export default {
*/
setProject(state, data) {
state.project = data || { name: '加载中...' };
- console.log(11111111111, data);
if (data) {
sessionStorage.setItem('projectId', data.id);
sessionStorage.setItem('project', JSON.stringify(data));
diff --git a/src/store/tall/task/index.js b/src/store/tall/task/index.js
index 71a733e..f360005 100644
--- a/src/store/tall/task/index.js
+++ b/src/store/tall/task/index.js
@@ -289,8 +289,15 @@ export default {
/**
* 设置当前点击的任务信息
*/
- setTaskDetail(state, show) {
- state.taskDetail = show;
+ setTaskDetail(state, data) {
+ state.taskDetail = data;
+ if (data) {
+ sessionStorage.setItem('taskId', data.id);
+ sessionStorage.setItem('taskDetail', JSON.stringify(data));
+ } else {
+ sessionStorage.removeItem('taskId');
+ sessionStorage.removeItem('taskDetail');
+ }
},
},
diff --git a/src/views/detail/Test.vue b/src/views/detail/Test.vue
index ec232f3..d2fe2b9 100644
--- a/src/views/detail/Test.vue
+++ b/src/views/detail/Test.vue
@@ -14,6 +14,11 @@ import { useStore } from 'vuex';
const store = useStore();
const taskDetail = computed(() => store.state.task.taskDetail); // 任务名称
const taskInfo = ref({});
+const sessionTaskDetail = sessionStorage.getItem('taskDetail');
+
+if (sessionTaskDetail) {
+ taskInfo.value = JSON.parse(sessionTaskDetail);
+}
// 监听任务信息
watch(taskDetail, newVal => {
diff --git a/src/views/home/Index.vue b/src/views/home/Index.vue
index 8fa3d71..669f36e 100644
--- a/src/views/home/Index.vue
+++ b/src/views/home/Index.vue
@@ -16,7 +16,7 @@
-
+
@@ -45,6 +45,7 @@ import ProjectDetail from 'components/tall/center/ProjectDetail.vue';
const locale = zhCN;
const store = useStore();
const collapsed = computed(() => store.state.layout.display.left); // 是否显示左栏
+const sessionTaskId = sessionStorage.getItem('taskId');
// 验证 获取query中u参数 获取token
// const route = useRoute();