feat: "代码整理"

src/apis/index.js

@@ -94,6 +94,9 @@ export const delMember = params => http.post(`${experiment}/organization/del`, p
 // 分配实验
 export const createExperiment = params => http.post(`${experiment}/subExperiment/create`, params);
 
+// 根据ID查询实验信息
+export const getExperimentation = params => http.post(`${experiment}/subExperiment/getExperimentation`, params);
+
 // 根据code查询所有试题
 export const getByCode = params => http.post(`${experiment}/question/getByCode`, params);
 

src/components/tall/center/Index.vue

@@ -30,12 +30,6 @@ import RegularTask from './RegularTask.vue'; // 定期任务
 
 const store = useStore();
 const project = computed(() => store.state.projects.project); // 项目信息
-const sessionProject = sessionStorage.getItem('project'); // 项目信息
-
-if (sessionProject) {
-  const projectInfo = JSON.parse(sessionProject);
-  store.commit('projects/setProject', projectInfo);
-}
 </script>
 
 <style scoped>

src/components/tall/center/RegularTask.vue

@@ -49,7 +49,7 @@ const sessionGlobalHeight = sessionStorage.getItem('globalHeight'); // 日常任
 const regularTasks = computed(() => store.state.task.regularTasks); // 定期任务
 const taskObj = reactive({ tasks: [] }); // 定期任务
 const sessionTasks = sessionStorage.getItem('regularTasks'); // 定期任务缓存
-const subProjectInfo = computed(() => store.state.task.subProjectInfo); // 子课题信息
+const refreshProjects = computed(() => store.state.layout.refreshProjects); // 刷新项目列表
 
 if (sessionGlobalHeight) {
   store.commit('task/setGlobalHeight', sessionGlobalHeight);
@@ -60,7 +60,7 @@ if (sessionTasks) {
   store.commit('task/setRegularTasks', arr);
 }
 
-watch([project, roleId, subProjectInfo], async () => {
+watch([project, roleId, refreshProjects], async () => {
   if (roleId.value) {
     await getTasks({ roleId: roleId.value }); // 根据角色查找定期任务
   }
@@ -115,11 +115,13 @@ async function getSonTask(id) {
 function toDetail(item) {
   store.commit('task/setTaskDetail', item);
   store.commit('task/sonDetailId', '');
+  store.commit('task/sonExperimentationId', '');
 }
 
 function toSonDetail(item, id) {
   store.commit('task/setTaskDetail', item);
   store.commit('task/sonDetailId', id);
+  store.commit('task/sonExperimentationId', id);
 }
 </script>
 

src/components/tall/left/Index.vue

@@ -50,72 +50,13 @@ const handleOk = async () => {
 async function createExperiment() {
   try {
     const data = await create();
-    store.commit('projects/setNewProject', data);
-    // projectsRef.value.getProjectsList(dayjs().startOf('day').format('x'), dayjs().endOf('day').format('x'));
+    store.commit('layout/setRefreshProjects');
     return data;
   } catch (error) {
     throw new Error(error);
   }
 }
 
-// const isShowCard = ref(false);
-
-// function showCard() {
-//   isShowCard.value = !isShowCard.value;
-// }
-
-// 导入wbs
-// async function handleUpload(e) {
-//   try {
-//     const data = await importWbs(e);
-//     console.log(data);
-
-//     setTimeout((data) => {
-//       const obj = {
-//         id: data.id,
-//         name: data.name,
-//         url: data.url,
-//       };
-
-//       store.commit('projects/setProject', obj);
-//     }, 2000);
-//   } catch (error) {
-//     throw new Error(error);
-//   }
-// }
-
-// const store = useStore();
-// const projects = reactive([]);
-
-// 获取项目列表
-// const getProjectsList = async (startTime, endTime) => {
-//   try {
-//     const data = await getProjects(startTime, endTime);
-
-//     data.forEach(item => {
-//       item.show = false;
-//     });
-
-//     data.forEach(item => {
-//       item.show = false;
-
-//       if (item.sonsonProjectList) {
-//         item.sonsonProjectList.forEach(sonItem => {
-//           sonItem.show = false;
-//         });
-//       }
-
-//       projects.push(item);
-//     });
-
-//     store.commit('projects/setProjects', projects);
-//   } catch (error) {
-//     console.log(error);
-//   }
-// };
-
-// getProjectsList(dayjs().startOf('day').format('x'), dayjs().endOf('day').format('x'));
-
 function changeTime(data) {
   console.log(data);
   store.commit('layout/setSelectTime', data);

src/components/tall/left/Projects.vue

@@ -7,7 +7,7 @@
         <div class="detail">
           <div class="name-box flex items-center">
             <div class="name truncate">{{ item.name }}</div>
-            <div class="precent-num">50%</div>
+            <!-- <div class="precent-num">50%</div> -->
           </div>
 
           <div class="time">{{ dayjs(item.startTime).format('HH:mm:ss') }} 至 {{ dayjs(item.endTime).format('HH:mm:ss') }}</div>
@@ -22,11 +22,11 @@
       <div class="two-box" v-if="item.show">
         <div class="two-flex" v-for="(sonItem, sonIndex) in item.sonProjectList" :key="sonIndex">
           <div class="two-level h-70 cursor-pointer flex items-center" @click="toDetail(sonItem)">
-            <div class="icon"><img src="https://www.tall.wiki/staticrec/drag.svg" /></div>
+            <div class="icon" @click.stop="showActionCard(item)"><img src="https://www.tall.wiki/staticrec/drag.svg" /></div>
             <div class="detail">
               <div class="name-box flex items-center">
                 <div class="name truncate">{{ sonItem.name }}</div>
-                <div class="precent-num">50%</div>
+                <!-- <div class="precent-num">50%</div> -->
               </div>
 
               <div class="time">{{ dayjs(sonItem.startTime).format('HH:mm:ss') }} 至 {{ dayjs(sonItem.endTime).format('HH:mm:ss') }}</div>
@@ -45,11 +45,11 @@
               :key="thirdIndex"
               @click="toDetail(thirdItem)"
             >
-              <div class="icon"><img src="https://www.tall.wiki/staticrec/drag.svg" /></div>
+              <div class="icon" @click.stop="showActionCard(item)"><img src="https://www.tall.wiki/staticrec/drag.svg" /></div>
               <div class="detail">
                 <div class="name-box flex items-center">
                   <div class="name truncate">{{ thirdItem.name }}</div>
-                  <div class="precent-num">50%</div>
+                  <!-- <div class="precent-num">50%</div> -->
                 </div>
 
                 <div class="time">
@@ -79,23 +79,40 @@ const store = useStore();
 
 const visible = ref(false);
 const deleteId = ref(null);
-const projectId = sessionStorage.getItem('projectId');
+
+const projectId = sessionStorage.getItem('projectId'); // 项目ID缓存
+const sessionProject = sessionStorage.getItem('project'); // 项目信息缓存
 const projectInfo = computed(() => store.state.projects.project); // 当前选择项目信息
-const newProject = computed(() => store.state.projects.newProject); // 新建项目
+
 const projects = computed(() => store.state.projects.projects); // 项目列表
-const subProjectInfo = computed(() => store.state.task.subProjectInfo); // 子课题信息
+
 const startTime = computed(() => store.state.layout.startTime); // 当前选择时间
 const endTime = computed(() => store.state.layout.endTime); // 当前选择时间
-let start = startTime.value ? startTime.value : dayjs().startOf('day').format('x');
-let end = endTime.value ? endTime.value : dayjs().endOf('day').format('x');
 
-watch([newProject, startTime, endTime, projectInfo, subProjectInfo], () => {
-  start = startTime.value ? startTime.value : dayjs().startOf('day').format('x');
-  end = endTime.value ? endTime.value : dayjs().endOf('day').format('x');
-  getProjectsList(start, end);
+const refreshProjects = computed(() => store.state.layout.refreshProjects); // 刷新项目列表
+
+// 如果有缓存，则将缓存信息放到store中，一般用于页面刷新
+if (sessionProject) {
+  if (!projectInfo.value.id) {
+    const info = JSON.parse(sessionProject);
+    store.commit('projects/setProject', info);
+  }
+}
+
+// 判断时间是否存在，不存在则设置
+if (!startTime.value) {
+  const data = {
+    startTime: dayjs().startOf('day').format('x'),
+    endTime: dayjs().endOf('day').format('x'),
+  };
+  store.commit('layout/setSelectTime', data);
+}
+
+watch([startTime, endTime, refreshProjects], () => {
+  getProjectsList();
 });
 
-getProjectsList(start, end);
+getProjectsList();
 
 // 点击操作面试显示隐藏
 const showActionCard = item => {
@@ -104,10 +121,10 @@ const showActionCard = item => {
 };
 
 // 获取项目列表
-async function getProjectsList(startData, endData) {
+async function getProjectsList() {
   try {
-    const data = await getProjects(startData, endData);
-    // projectList.value = [];
+    const data = await getProjects(startTime.value, endTime.value);
+
     data.forEach(item => {
       item.show = false;
 
@@ -126,7 +143,6 @@ async function getProjectsList(startData, endData) {
         });
       }
     });
-    // projectList.value = [...data];
 
     store.commit('projects/setProjects', data);
   } catch (error) {
@@ -154,7 +170,7 @@ function changeShow(item) {
 async function handleOk() {
   visible.value = false;
   await deleteProject(deleteId.value);
-  getProjectsList(dayjs().startOf('day').format('x'), dayjs().endOf('day').format('x'));
+  getProjectsList();
 }
 
 // 删除项目

src/components/tall/task/AssignmentExperiment.vue

@@ -44,21 +44,21 @@
 </template>
 
 <script setup>
-import { ref, computed, toRaw } from 'vue';
+import { ref, computed, watch } from 'vue';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
-import { createExperiment, memberQuery } from 'apis';
+import { createExperiment, memberQuery, getExperimentation } from 'apis';
 
 const store = useStore();
 const formRef = ref(null);
-const sessionProject = sessionStorage.getItem('project');
+
 const projectId = computed(() => store.getters['projects/projectId']);
 const options = ref([]);
+const experimentationId = computed(() => store.state.task.experimentationId); // 子课题ID
 
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
+watch(experimentationId, async () => {
+  await getSubProject(experimentationId.value);
+});
 
 const assignExperFormData = ref({
   projectId: projectId.value,
@@ -93,7 +93,7 @@ const onSubmit = () => {
 
   const params = { param: assignExperFormData.value };
   createExperiment(params);
-  console.log('submit!', toRaw(assignExperFormData.value));
+  getSubProject(experimentationId.value);
 };
 
 // 获取成员列表
@@ -116,6 +116,35 @@ async function getList(name) {
     console.log('error', error);
   }
 }
+
+async function getSubProject(id) {
+  try {
+    const params = { param: { id } };
+    const data = await getExperimentation(params);
+    store.commit('layout/setRefreshProjects');
+
+    if (data) {
+      const start = dayjs(Number(data.startTime));
+      const end = dayjs(Number(data.endTime));
+      data.date = [start, end];
+      data.projectId = projectId.value;
+      assignExperFormData.value = data;
+    } else {
+      assignExperFormData.value = {
+        projectId: projectId.value,
+        id: '',
+        name: '',
+        memberId: '',
+        date: [],
+        startTime: '',
+        endTime: '',
+        target: '',
+      };
+    }
+  } catch (error) {
+    throw new Error(error);
+  }
+}
 </script>
 
 <style scoped>

src/components/tall/task/AssignmentSubject.vue

@@ -97,16 +97,11 @@ import dayjs from 'dayjs';
 
 const store = useStore();
 const formRef = ref(null);
-const sessionProject = sessionStorage.getItem('project'); // 项目信息
+
 const projectId = computed(() => store.getters['projects/projectId']); // 项目ID
 const options = ref([]);
 const detailId = computed(() => store.state.task.detailId); // 子课题ID
 
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 watch(detailId, async () => {
   await getSubProject(detailId.value);
 });
@@ -260,29 +255,55 @@ async function getSubProject(id) {
   try {
     const params = { param: { taskDetailId: id } };
     const data = await getSubExperiment(params);
-    store.commit('task/setSubProjectInfo', data);
-
-    const start = dayjs(Number(data.startTime));
-    const end = dayjs(Number(data.endTime));
-    data.date = [start, end];
-    data.projectId = projectId.value;
-    topicSubFormData.value = data;
-
-    data.subExperimentStageDtoList.forEach(item => {
-      item.startTime = item.stageStartTime;
-      item.endTime = item.stageEndTime;
-      item.date = [dayjs(Number(item.startTime)), dayjs(Number(item.endTime))];
-      item.checkContent = [];
-      if (item.thesis) item.checkContent.push('1');
-      if (item.patent) item.checkContent.push('2');
-      if (item.theSoft) item.checkContent.push('3');
-      if (item.sciThesis) item.checkContent.push('4');
-      if (item.inventPatent) item.checkContent.push('5');
-      if (item.practicalPatent) item.checkContent.push('6');
-      if (item.facadePatent) item.checkContent.push('7');
-    });
-
-    stageList.value = data.subExperimentStageDtoList;
+    store.commit('layout/setRefreshProjects');
+
+    if (data) {
+      const start = dayjs(Number(data.startTime));
+      const end = dayjs(Number(data.endTime));
+      data.date = [start, end];
+      data.projectId = projectId.value;
+      topicSubFormData.value = data;
+      data.subExperimentStageDtoList.forEach(item => {
+        item.startTime = item.stageStartTime;
+        item.endTime = item.stageEndTime;
+        item.date = [dayjs(Number(item.startTime)), dayjs(Number(item.endTime))];
+        item.checkContent = [];
+        if (item.thesis) item.checkContent.push('1');
+        if (item.patent) item.checkContent.push('2');
+        if (item.theSoft) item.checkContent.push('3');
+        if (item.sciThesis) item.checkContent.push('4');
+        if (item.inventPatent) item.checkContent.push('5');
+        if (item.practicalPatent) item.checkContent.push('6');
+        if (item.facadePatent) item.checkContent.push('7');
+      });
+      stageList.value = data.subExperimentStageDtoList;
+    } else {
+      topicSubFormData.value = {
+        projectId: projectId.value,
+        id: detailId.value,
+        name: '',
+        memberId: '',
+        date: [],
+        startTime: '',
+        endTime: '',
+        stageDtoList: [],
+      };
+      stageList.value = [
+        {
+          date: [],
+          startTime: '',
+          endTime: '',
+          checkContent: [],
+          thesis: '',
+          sciThesis: '',
+          patent: '',
+          inventPatent: '',
+          practicalPatent: '',
+          facadePatent: '',
+          theSoft: '',
+        },
+      ];
+    }
   } catch (error) {
     throw new Error(error);
   }

src/components/tall/task/CheckSubjectProgress.vue

@@ -82,16 +82,10 @@ import { getExperimentProgress } from 'apis';
 import { useStore } from 'vuex';
 
 const store = useStore();
-const sessionProject = sessionStorage.getItem('project');
 const projectId = computed(() => store.getters['projects/projectId']);
 const infoOne = ref({});
 const infoSec = ref([]);
 
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 const colorList = ref([
   { color: '#FF9191', bgColor: 'rgba(255, 145, 145, 0.2)' },
   { color: '#FF934B', bgColor: 'rgba(255, 147, 75, 0.2)' },

src/components/tall/task/Conclusion.vue

@@ -67,8 +67,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -80,12 +79,6 @@ const questionList = ref([]);
 // 当前操作的问题下标
 const currIndex = ref(null);
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 const beforeUpload = index => {

src/components/tall/task/ContractManagement.vue

@@ -67,8 +67,6 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -80,12 +78,6 @@ const questionList = ref([]);
 // 当前操作的问题下标
 const currIndex = ref(null);
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 const beforeUpload = index => {

src/components/tall/task/DataUnlock.vue

@@ -42,17 +42,12 @@ import { CloseCircleFilled } from '@ant-design/icons-vue';
 
 const store = useStore();
 const projectId = computed(() => store.getters['projects/projectId']);
-const sessionProject = sessionStorage.getItem('project');
+
 const unlockList = ref([]);
 const visible = ref(false);
 const remark = ref(null);
 const experimentId = ref(null);
 
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getUnlockList();
 
 const showModal = id => {

src/components/tall/task/ExperimentalCode.vue

@@ -67,8 +67,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -80,12 +79,6 @@ const questionList = ref([]);
 // 当前操作的问题下标
 const currIndex = ref(null);
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 const beforeUpload = index => {

src/components/tall/task/ExperimentalData.vue

@@ -67,8 +67,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -80,12 +79,6 @@ const questionList = ref([]);
 // 当前操作的问题下标
 const currIndex = ref(null);
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 const beforeUpload = index => {

src/components/tall/task/ExperimentalResult.vue

@@ -67,8 +67,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -80,12 +79,6 @@ const questionList = ref([]);
 // 当前操作的问题下标
 const currIndex = ref(null);
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 const beforeUpload = index => {

src/components/tall/task/InterimInspection.vue

@@ -67,8 +67,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -80,12 +79,6 @@ const questionList = ref([]);
 // 当前操作的问题下标
 const currIndex = ref(null);
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 const beforeUpload = index => {

src/components/tall/task/LabReport.vue

@@ -67,8 +67,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -80,12 +79,6 @@ const questionList = ref([]);
 // 当前操作的问题下标
 const currIndex = ref(null);
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 const beforeUpload = index => {

src/components/tall/task/MeetingManagement.vue

@@ -98,7 +98,7 @@ const summaryList = ref([]);
 const attachmentList = ref([]);
 const meetId = computed(() => store.state.task.meetId);
 const projectId = computed(() => store.getters['projects/projectId']);
-const sessionProject = sessionStorage.getItem('project');
+
 const topicMeetFormData = ref({
   projectId: projectId.value,
   id: '',
@@ -112,11 +112,6 @@ const topicMeetFormData = ref({
   attachmentList: [],
 });
 
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 watch(meetId, async () => {
   if (meetId.value) {
     await getMeetingInfo();

src/components/tall/task/MemberManagement.vue

@@ -42,14 +42,8 @@ import { memberQuery, saveMember, updateMember, delMember } from 'apis';
 
 const store = useStore();
 const projectId = computed(() => store.getters['projects/projectId']);
-const sessionProject = sessionStorage.getItem('project');
 const isAdd = ref(false);
 
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 const columns = ref([
   {
     title: '序号',

src/components/tall/task/PlanAssignment.vue

@@ -156,19 +156,12 @@ import dayjs from 'dayjs';
 const store = useStore();
 const formRef = ref(null);
 const projectInfo = computed(() => store.state.projects.project); // 当前选择项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 const projectId = computed(() => store.getters['projects/projectId']);
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
 const action = uploadImg;
 const fileList = ref([]);
-// const members = computed(() => store.state.task.members);
-// console.log('members', members.value)
-
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
 
 const topicMeetFormData = ref({
   projectId: projectInfo.value.id,

src/components/tall/task/Procedure.vue

@@ -67,8 +67,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -80,12 +79,6 @@ const questionList = ref([]);
 // 当前操作的问题下标
 const currIndex = ref(null);
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 const beforeUpload = index => {

src/components/tall/task/PublishPatent.vue

@@ -84,8 +84,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -96,12 +95,6 @@ const code = computed(() => store.state.task.label); // code
 const questionList = ref([]);
 const intellectualId = computed(() => store.state.task.intellectualId); // 知识产权ID
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 watch(intellectualId, () => {

src/components/tall/task/PublishThesis.vue

@@ -76,8 +76,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -90,12 +89,6 @@ const questionList = ref([]);
 const currIndex = ref(null);
 const intellectualId = computed(() => store.state.task.intellectualId); // 知识产权ID
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 watch(intellectualId, () => {

src/components/tall/task/PublishWork.vue

@@ -76,8 +76,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -90,12 +89,6 @@ const questionList = ref([]);
 const currIndex = ref(null);
 const intellectualId = computed(() => store.state.task.intellectualId); // 知识产权ID
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 watch(intellectualId, () => {

src/components/tall/task/Result.vue

@@ -67,8 +67,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -80,12 +79,6 @@ const questionList = ref([]);
 // 当前操作的问题下标
 const currIndex = ref(null);
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 const beforeUpload = index => {

src/components/tall/task/ScientificPayoffs.vue

@@ -9,7 +9,7 @@
       <template #bodyCell="{ column, text, record }">
         <div class="flex items-center" v-if="column.key === 'action'">
           <a-button
-            :disabled="record.status === 0 || record.status === 2 ? false : true"
+            :disabled="record.status === 0 ? false : true"
             class="action-btn edit-btn"
             type="primary"
             @click="showModal(record.id, 'success')"
@@ -17,18 +17,14 @@
             通过
           </a-button>
           <a-button
-            :disabled="record.status === 0 || record.status === 2 ? false : true"
+            :disabled="record.status === 0 ? false : true"
             class="action-btn del-btn"
             type="primary"
             @click="showModal(record.id, 'fail')"
           >
             驳回
           </a-button>
-          <img
-            v-if="record.status === 0 || record.status === 2"
-            style="width: 28px"
-            src="https://www.tall.wiki/staticrec/experiment/unlock.png"
-          />
+          <img v-if="record.status === 0" style="width: 28px" src="https://www.tall.wiki/staticrec/experiment/unlock.png" />
           <img
             v-if="record.status === 1"
             class="cursor-pointer"
@@ -91,7 +87,7 @@ import { CheckCircleFilled, CloseCircleFilled, ExclamationCircleFilled } from '@
 
 const store = useStore();
 const projectId = computed(() => store.getters['projects/projectId']);
-const sessionProject = sessionStorage.getItem('project');
+
 const success = ref(false);
 const fail = ref(false);
 const tips = ref(false);
@@ -99,11 +95,6 @@ const currId = ref(null);
 const remark1 = ref(null);
 const remark2 = ref(null);
 
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 const columns = ref([
   {
     title: '序号',

src/components/tall/task/SubConclusion.vue

@@ -67,8 +67,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -80,12 +79,6 @@ const questionList = ref([]);
 // 当前操作的问题下标
 const currIndex = ref(null);
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 const beforeUpload = index => {

src/components/tall/task/SubInterimInspection.vue

@@ -67,8 +67,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -80,12 +79,6 @@ const questionList = ref([]);
 // 当前操作的问题下标
 const currIndex = ref(null);
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 const beforeUpload = index => {

src/components/tall/task/SubMeetingManagement.vue

@@ -78,7 +78,6 @@ const summaryList = ref([]);
 const attachmentList = ref([]);
 const subMeetId = computed(() => store.state.task.subMeetId);
 const projectId = computed(() => store.getters['projects/projectId']);
-const sessionProject = sessionStorage.getItem('project');
 const topicMeetFormData = ref({
   projectId: projectId.value,
   id: '',
@@ -91,11 +90,6 @@ const topicMeetFormData = ref({
   attachmentList: [],
 });
 
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getMeetingInfo();
 watch(subMeetId, async () => {
   if (subMeetId.value) {

src/components/tall/task/SubResult.vue

@@ -67,8 +67,7 @@ import { InboxOutlined } from '@ant-design/icons-vue';
 import { uploadImg } from 'apis';
 
 const store = useStore();
-// 项目信息
-const sessionProject = sessionStorage.getItem('project');
+
 // 上传文件相关
 const token = computed(() => store.getters['user/token']);
 const headers = { Authorization: `Bearer ${token.value}` };
@@ -80,12 +79,6 @@ const questionList = ref([]);
 // 当前操作的问题下标
 const currIndex = ref(null);
 
-// 更新项目ID
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 getDataByCode();
 
 const beforeUpload = index => {

src/components/tall/task/SubSubjectProgress.vue

@@ -80,16 +80,11 @@ import { useStore } from 'vuex';
 import { getProgress } from 'apis';
 
 const store = useStore();
-const sessionProject = sessionStorage.getItem('project');
+
 const projectId = computed(() => store.getters['projects/projectId']);
 const infoOne = ref({});
 const infoSec = ref([]);
 
-if (sessionProject) {
-  const project = JSON.parse(sessionProject);
-  store.commit('projects/setProject', project);
-}
-
 const colorList = ref([
   { color: '#FF9191', bgColor: 'rgba(255, 145, 145, 0.2)' },
   { color: '#FF934B', bgColor: 'rgba(255, 147, 75, 0.2)' },

src/store/tall/layout/mutations.js

@@ -19,6 +19,11 @@ const mutations = {
     state.startTime = data.startTime;
     state.endTime = data.endTime;
   },
+
+  // 设置刷新项目列表的值
+  setRefreshProjects(state) {
+    state.refreshProjects = !state.refreshProjects;
+  },
 };
 
 export default mutations;

src/store/tall/layout/state.js

@@ -6,6 +6,7 @@ const state = {
   isShowListStatus: false, // 是否显示任务详情列表
   startTime: '',
   endTime: '',
+  refreshProjects: false, // 刷新项目
 };
 
 export default state;

src/store/tall/task/index.js

@@ -31,6 +31,8 @@ export default {
     globalHeight: 0, // 日常任务面板高度
     detailId: '', // 子课题Id
     subProjectInfo: null, // 当前子课题信息
+    experimentationId: '', // 实验ID
+    experimentationInfo: null, // 当前实验信息
     regularTasks: [], // 定期任务
     intellectualId: '', // 当前选择的知识产权ID
     meetId: '', // 当前选择的会议ID
@@ -362,6 +364,20 @@ export default {
       state.subProjectInfo = data;
     },
 
+    /**
+     * 实验Id
+     */
+    sonExperimentationId(state, data) {
+      state.experimentationId = data;
+    },
+
+    /**
+     * 设置当前实验信息
+     */
+    setExperimentationInfo(state, data) {
+      state.experimentationInfo = data;
+    },
+
     /**
      * 知识产权ID
      */