feat: 导入子项目、交付物增加角色id、时间轴

4 years ago · 586a3f0bea
13 changed files with 150 additions and 76 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,4 +1,4 @@
-# 1.0.0 (2022-03-24)
+# 1.0.0 (2022-03-30)

 ### 🌟 新功能
 范围|描述|commitId
@ -152,6 +152,7 @@
 - | 向上查向下查 | [1933e1b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1933e1b)
 - | 项目列表排序 | [ad0ce75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ad0ce75)
 - | 消息id | [f79918b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f79918b)
+ - | 小红点、上传项目刷新项目列表 | [02d933e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/02d933e)
 - | 小红点监听 | [f0f158d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f0f158d)
 - | 小红点修复 | [ef33187](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ef33187)
 - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce)
--- a/apis/tall.js
+++ b/apis/tall.js
@ -37,7 +37,8 @@ export function setupTall(app) {
 	// 设置项目顺序
 	uni.$u.api.setProjectSort = params => uni.$u.post(`${tall}/project/setProjectSort`, params);
 	// 设置项目父子结构
-	uni.$u.api.setProjectRelation = params => uni.$u.post(`${tall}/project/setProjectRelation`, params);
+	// uni.$u.api.setProjectRelation = params => uni.$u.post(`${tall}/project/setProjectRelation`, params);
+	uni.$u.api.setProjectRelation = params => uni.$u.post(`${tall}/project/drag`, params);
 	// 删除某个项目
 	uni.$u.api.delProject = (projectId, url) => uni.$u.post(`${url}/tall/project/delete`, { projectId });
 }
--- a/apis/wbs.js
+++ b/apis/wbs.js
@ -7,7 +7,7 @@ const domain = computed(() => store.state.domain);
 export function setupWbs(app) {
 	uni.$u.api = { ...uni.$u.api } || {};
 	// 导入wbs
-	uni.$u.api.import = formData => uni.$upload.chooseAndUpload(`${domain.value}/tall/project/wbs`, formData);
+	uni.$u.api.import = (parentId, formData) => uni.$upload.chooseAndUpload(`${domain.value}/tall/project/wbs?parentId=${parentId}`, formData);
  // 导入时查找域内的业务列表
  uni.$u.api.getBusinessList = params => uni.$u.http.post(`${Config.apiUrl}/ptostall/business/import/query`, params);
 }
--- a/components/PrettyExchange/PrettyExchange.vue
+++ b/components/PrettyExchange/PrettyExchange.vue
@ -26,7 +26,7 @@
          class="cu-item flex-col"
          v-for="(item, index) in data.itemList"
        >
-          <view class="border-100 bg-blue-500" v-if="item.showTopBorder"></view>
+          <!-- <view class="border-100 bg-blue-500" v-if="item.showTopBorder"></view> -->

          <!-- 内容区 -->
          <!-- 父项目 -->
@ -48,7 +48,7 @@
                </view>
              </view>

-              <view class="workbench-btn" v-if="index === 0" @click="toWorkbench">工作台</view>
+              <!-- <view class="workbench-btn" v-if="index === 0" @click="toWorkbench">工作台</view> -->

              <!-- 箭头 -->
              <view v-if="item.sonProjectList && item.sonProjectList.length">
@ -164,11 +164,11 @@ const data = reactive({
  clickProject: {},
  projectId: 0,
  // menuList: [{ text: '复制' }, { text: '编辑' }, { text: '删除' }, { text: '置顶' }, { text: '排序' }],
-  menuList: [{ text: '导出' }, { text: '删除' }],
+  menuList: [{ text: '导入' }, { text: '导出' }, { text: '删除' }, { text: '排序' }],

  // show: false,
  // border: 'border border-blue-500 shadow rounded-md',
-  showBorder: false, // 一级项目底部边框是否显示
+  // showBorder: false, // 一级项目底部边框是否显示
  showItemIndex: undefined,
 });

@ -179,9 +179,9 @@ watchEffect(() => {
  if (projects.value) {
    data.itemList = projects.value;
    data.itemList.forEach(item => {
-      item.showBorder = false; // 一级项目底部边框是否显示
-      item.showSubBorder = false; // 一级项目底部边框是否显示
-      item.showTopBorder = false; // 一级项目顶部边框是否显示
+      item.showBorder = false; // 一级项目移动位置底部边框是否显示
+      item.showSubBorder = false; // 二级项目移动位置底部边框是否显示
+      item.showTopBorder = false; // 一级项目移动位置顶部边框是否显示
      item.remindNum = 0;

      if (remindData.value) {
@ -245,7 +245,8 @@ function chooseAction(e) {
  const obj = {
    index: e,
    projectId: data.projectId,
-    url: data.clickProject.url,
+    url: data.clickProject.url,
+    projectName: data.tips.text
  };
  // emit('chooseAction', data);
  actionFun(obj);
@ -262,6 +263,12 @@ function actionFun(obj) {
  if (action === '删除') {
    data.changeEvent = false;
    delProject(obj.projectId, obj.url);
+  }
+
+  if (action === '导入') {
+    data.changeEvent = false;
+    store.commit('setDomain', obj.url);
+    importProject(obj.projectId, obj.projectName);
  }

  if (action === '导出') {
@ -391,10 +398,10 @@ function move(e, length) {
 }

 function stops(e, index, length) {
-  console.log('结束');
+  console.log('结束', e, index, length);
  const touch = e.changedTouches[0];
  const lastIndex = findOverIndex(touch.pageY, length);
-
+  console.log('11111111111', data.itemList)
  // 交换两个值
  for (let i = 0; i < data.itemList.length; i++) {
    // 插入顶部
@ -408,9 +415,14 @@ function stops(e, index, length) {
        const Value = data.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
        data.itemList.unshift(Value);
        data.itemList[arr[0] - 0].sonProjectList.splice([arr[1] - 0], 1);
-        const options = {
-          id: Value.id,
-          parentId: 0,
+        // const options = {
+        //   id: Value.id,
+        //   parentId: 0,
+        // };
+        const options = {
+          businessCode: Value.businessCode,
+          moveProjectId: Value.id,
+          targetProjectId: '',
        };
        emit('change', options);
      }
@ -434,9 +446,14 @@ function stops(e, index, length) {
        const Value = data.itemList[arr[0] - 0].sonProjectList[arr[1] - 0];
        data.itemList.splice(i + 1, 0, Value);
        data.itemList[arr[0] - 0].sonProjectList.splice([arr[1] - 0], 1);
-        const options = {
-          id: Value.id,
-          parentId: 0,
+        // const options = {
+        //   id: Value.id,
+        //   parentId: 0,
+        // };
+        const options = {
+          businessCode: Value.businessCode,
+          moveProjectId: Value.id,
+          targetProjectId: '',
        };
        emit('change', options);
      }
@ -457,9 +474,14 @@ function stops(e, index, length) {
        data.itemList.splice(index, 1);
        // 清空
        clearSet(i);
-        const options = {
-          id: Value.id,
-          parentId: data.itemList[lastIndex - 1].id,
+        // const options = {
+        //   id: Value.id,
+        //   parentId: data.itemList[lastIndex - 1].id,
+        // };
+        const options = {
+          businessCode: Value.businessCode,
+          moveProjectId: Value.id,
+          targetProjectId: data.itemList[lastIndex - 1].id,
        };
        emit('change', options);
      } else {
@ -473,15 +495,25 @@ function stops(e, index, length) {
        data.itemList[arr[0] - 0].sonProjectList.splice([arr[1] - 0], 1);
        // 清空
        clearSet(i);
-        const options = {
-          id: Value.id,
-          parentId: data.itemList[lastIndex].id,
+        // const options = {
+        //   id: Value.id,
+        //   parentId: data.itemList[lastIndex].id,
+        // };
+        const options = {
+          businessCode: Value.businessCode,
+          moveProjectId: Value.id,
+          targetProjectId: data.itemList[lastIndex].id,
        };
        emit('change', options);

-        const options1 = {
-          id: Value.id,
-          parentId: 0,
+        // const options1 = {
+        //   id: Value.id,
+        //   parentId: 0,
+        // };
+        const options1 = {
+          businessCode: Value.businessCode,
+          moveProjectId: Value.id,
+          targetProjectId: '',
        };
        emit('change', options1);
      }
@ -546,8 +578,39 @@ function delProject(id, url) {
      }
    },
  });
+}
+
+// 导入
+function importProject(id, name) {
+  uni.showModal({
+    content: '是否导入到' + name,
+    showCancel: true,
+    success: async ({ confirm }) => {
+      if (confirm) {
+        try {
+          const res = await uni.$u.api.import(id);
+          // 导入WBS成功后
+          // 直接打开导入的项目
+          emit('success');
+          // const { apiUrl } = Config;
+          // let defaultwbs = `${apiUrl}/defaultwbs`;
+          // res.url && (defaultwbs = res.url);
+
+          store.commit('project/setIsRefresh', 1);
+
+          setTimeout(() => {
+            uni.navigateTo({ url: `/pages/project/project?u=${user.value.id}&p=${res.id}&pname=${res.name}&url=${encodeURIComponent(res.url)}` });
+          }, 2000);
+        } catch (error) {
+          console.error('error: ', error);
+          emit('error', error);
+        }
+      }
+    },
+  });
 }
-
+
+// 导出
 function exportProject(id, url) {
  uni.showModal({
    title: '',
@ -590,9 +653,9 @@ function exportProject(id, url) {
 }

 // 跳转工作台
-function toWorkbench() {
-  uni.navigateTo({ url: '/pages/workbench/workbench' });
-}
+// function toWorkbench() {
+//   uni.navigateTo({ url: '/pages/workbench/workbench' });
+// }
 </script>

 <style lang="scss" scoped>
--- a/components/Projects/Projects.vue
+++ b/components/Projects/Projects.vue
@ -6,16 +6,16 @@

 <script setup>
  const emit = defineEmits(['getProjects']);
-  
+
 	function change(options) {
 		if (options instanceof Array) {
-			let projectIdList = [];
-			let arr = [];
-			options.forEach(item => {
-				projectIdList.push(item.id);
-				arr.push(item.name);
-			});
-			setProjectSort(projectIdList);
+			// let projectIdList = [];
+			// let arr = [];
+			// options.forEach(item => {
+			// 	projectIdList.push(item.id);
+			// 	arr.push(item.name);
+			// });
+			// setProjectSort(projectIdList);
 		} else {
 			setProjectRelation(options);
 		}
--- a/components/Upload/Upload.vue
+++ b/components/Upload/Upload.vue
@ -43,7 +43,7 @@
        success: async ({ confirm }) => {
          if (confirm) {
            try {
-              const res = await uni.$u.api.import();
+              const res = await uni.$u.api.import('');
              // 导入WBS成功后
              // 直接打开导入的项目
              emit('success');
--- a/hooks/project/useGetTasks.js
+++ b/hooks/project/useGetTasks.js
@ -165,6 +165,11 @@ export default function useGetTasks() {
    let downTargetTime = dayjs(+lastTime).add(params.pageSize - 1, timeGranularity.value);
    const nextPage = params.queryType === 0 ? upNextPage.value : downNextPage.value; // 下一页的值

+    // 双击小红点
+    if (currLocationTaskId.value) {
+      lastTime = centerData.length ? centerData[0].planStart : new Date().getTime();
+    }
+
    if (centerData.length) {
      let arr = [];

--- a/pages/business/business.vue
+++ b/pages/business/business.vue
@ -51,7 +51,7 @@ async function toUpload(url) {
  store.commit('setDomain', url);

  try {
-    const res = await uni.$u.api.import();
+    const res = await uni.$u.api.import('');
    // 导入WBS成功后
    // 直接打开导入的项目
    uni.$ui.showToast('导入成功，即将打开新项目', 3000);
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -95,7 +95,7 @@
      } else {
        let arr = [];
        data.forEach(item => {
-          item.show = false;
+          item.show = true;

          const index = arr.findIndex(v => v.businessCode === item.businessCode);
          if (index === -1) {
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@ -177,6 +177,17 @@ watch(roleId, () => {
    ) return;

    store.commit('task/setTimeNode', Date.now());
+
+    let currRoleRealTasks = [];
+    let currRoleShowTasks = [];
+    if (allTasks.value.length) {
+      const index = visibleRoles.value.findIndex(role => role.id === roleId.value);
+      currRoleRealTasks = allTasks.value[index].realTasks || [];
+      currRoleShowTasks = allTasks.value[index].task || [];
+    }
+    store.commit('socket/setCurrLocationTaskId', '');
+    store.commit('task/setCurrRoleRealTasks', currRoleRealTasks); // 设置当前角色的真实任务数据
+    store.commit('task/setCurrRoleShowTasks', currRoleShowTasks); // 设置当前角色的真实任务数据
  }
 });

@ -188,28 +199,6 @@ watch(roleId, () => {
 watch(timeNode, newValue => {
  if (newValue && roleId.value) {
    clearTasksData();
-
-    let currRoleRealTasks = [];
-    let currRoleShowTasks = [];
-    const index = visibleRoles.value.findIndex(role => role.id === roleId.value);
-    const arr = [...allTasks.value];
-    let upNextPage = 1;
-    let downNextPage = 1;
-    if (arr.length && index > -1) {
-      currRoleRealTasks = arr[index].realTasks || [];
-      currRoleShowTasks = arr[index].task || [];
-      upNextPage = arr[index].upNextPage || 1;
-      downNextPage = arr[index].downNextPage || 1;
-    }
-
-    store.commit('task/updateTasks', currRoleShowTasks); // 更新当前store中存储的显示任务数据为当前角色的
-    store.commit('task/updateRealTasks', currRoleRealTasks); // 更新当前store中存储的真实任务数据为当前角色的
-    store.commit('task/setCurrRoleRealTasks', currRoleRealTasks); // 设置当前角色的真实任务数据
-    store.commit('task/setCurrRoleShowTasks', currRoleShowTasks); // 设置当前角色的展示任务数据
-    store.commit('task/setUpNextPage', upNextPage); // 设置当前角色的真实任务数据的向上查询页数
-    store.commit('task/setDownNextPage', downNextPage); // 设置当前角色的真实任务数据向下查询页数
-    store.commit('socket/setCurrLocationTaskId', targetTaskId.value || '');
-
    // 查任务
    getGlobalData(); // 查可变日常任务
    getPermanent(); // 根据角色查找永久的日常任务
@ -332,6 +321,16 @@ function tabsChange(e) {
  const { id } = visibleRoles.value[e.detail.current];
  store.commit('role/setRoleIndex', e.detail.current);
  store.commit('role/setRoleId', id);
+
+  const index = visibleRoles.value.findIndex(role => role.id === id);
+  const arr = [...allTasks.value];
+  store.commit('task/updateTasks', arr[index].task || []); // 更新当前store中存储的显示任务数据为当前角色的
+  store.commit('task/updateRealTasks', arr[index].realTasks || []); // 更新当前store中存储的真实任务数据为当前角色的
+  store.commit('task/setCurrRoleRealTasks', arr[index].realTasks || []); // 设置当前角色的真实任务数据
+  store.commit('task/setCurrRoleShowTasks', arr[index].task || []); // 设置当前角色的展示任务数据
+  store.commit('task/setUpNextPage', arr[index].upNextPage || 1); // 设置当前角色的真实任务数据的向上查询页数
+  store.commit('task/setDownNextPage', arr[index].downNextPage || 1); // 设置当前角色的真实任务数据向下查询页数
+  store.commit('socket/setCurrLocationTaskId', '');
 }

 // 设置自动滚动位置
--- a/plugins/p-deliver-check/check-form-modal.vue
+++ b/plugins/p-deliver-check/check-form-modal.vue
@ -44,6 +44,7 @@ const emits = defineEmits(['hide', 'submit-end']);
 const store = useStore();
 const words = computed(() => quickWords[props.data.mode]); // 快捷用语
 const projectId = computed(() => store.getters['project/projectId']);
+const roleId = computed(() => store.state.role.roleId);
 const task = inject('task');
 const commit = ref(''); // 提交的信息
 const score = ref(100); // 评分
@ -59,6 +60,7 @@ async function handleSubmit(mode) {
    const deliverRecordId = props.data.deliverRecordId();
    const param = {
      projectId: projectId.value,
+      roleId: roleId.value,
      deliverRecordId,
      type: mode === 'RESOLVE' ? 1 : 2,
      remark: commit.value,
--- a/plugins/p-deliver-upload/p-deliver-upload.vue
+++ b/plugins/p-deliver-upload/p-deliver-upload.vue
@ -99,6 +99,7 @@ const showBadge = ref(false); // u-badge的显示与隐藏
 // 判断提交按钮的状态
 const submitState = computed(() => !linkValue.value);
 const projectId = computed(() => store.getters['project/projectId']);
+const roleId = computed(() => store.state.role.roleId);

 // 验证提交的交付物信息格式
 function validateDeliverForm(checkedCheckers) {
@ -132,6 +133,7 @@ async function submit() {

    const param = {
      projectId: projectId.value,
+      roleId: roleId.value,
      deliverId: deliver.value.deliverId,
      fileList: [linkValue.value],
      checkerList,
--- a/store/project/mutations.js
+++ b/store/project/mutations.js
@ -18,17 +18,18 @@ const mutations = {
   * @param { object } options options:{ index,show }
   */
  setProjectItemShow(state, options) {
-    if (options.show) {
-      for (var i = 0; i < state.projects.length; i++) {
-        if (i === options.index) {
-          state.projects[i].show = true;
-        } else {
-          state.projects[i].show = false;
-        }
-      }
-    } else {
-      state.projects[options.index].show = false;
-    }
+    state.projects[options.index].show = options.show;
+    // if (options.show) {
+    //   for (var i = 0; i < state.projects.length; i++) {
+    //     if (i === options.index) {
+    //       state.projects[i].show = true;
+    //     } else {
+    //       state.projects[i].show = false;
+    //     }
+    //   }
+    // } else {
+    //   state.projects[options.index].show = false;
+    // }
  },

  /**