diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f4d402..25133fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-08-25)
+# 0.1.0 (2021-08-26)
### 🌟 新功能
范围|描述|commitId
@@ -55,6 +55,7 @@
- | 面变化首页变化 | [5e860f1](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/5e860f1)
- | 项目api url设置 | [6cd5245](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/6cd5245)
- | 项目列表, 项目url | [32e005b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/32e005b)
+ - | 项目列表排序 | [224c58b](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/224c58b)
- | 首页项目样式改变 | [8514c85](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/8514c85)
diff --git a/src/apis/tall.js b/src/apis/tall.js
index d21b334..04cedce 100644
--- a/src/apis/tall.js
+++ b/src/apis/tall.js
@@ -35,6 +35,10 @@ const install = (Vue, vm) => {
vm.$u.api.getProjects = (startTime, endTime) => vm.$u.post(`${tall}/project/query`, { startTime, endTime });
// 查询日历是否有小红点
vm.$u.api.findRedPoint = (startTime, endTime) => vm.$u.post(`${tall}/project/day`, { startTime, endTime });
+ // 设置项目顺序
+ vm.$u.api.setProjectSort = params => vm.$u.post(`${tall}/project/setProjectSort`, params);
+ // 设置项目父子结构
+ vm.$u.api.setProjectRelation = params => vm.$u.post(`${tall}/project/setProjectRelation`, params);
};
export default { install };
diff --git a/src/components/Projects/ProjectItem.vue b/src/components/Projects/ProjectItem.vue
index cc25f88..a242035 100644
--- a/src/components/Projects/ProjectItem.vue
+++ b/src/components/Projects/ProjectItem.vue
@@ -1,10 +1,10 @@
-
-
+
+
-
+
{{ item.name }}
@@ -12,52 +12,66 @@
- {{ $moment(+item.startTime).format('MM-DD HH:mm') }}
+
+ {{ $moment(+item.startTime).format('MM-DD HH:mm') }}
+
至
- {{ $moment(+item.endTime).format('MM-DD HH:mm') }}
+ {{ $moment(+item.endTime).format('MM-DD HH:mm') }}
-
+
-
+
-
-
+
+
-
+
-
+
{{ subItem.name }}
-
- 进行中
+
+
+ {{ subItem.status === 0 ? '未开始' : subItem.status === 1 ? '进行中' : subItem.status === 2 ? '暂停' : '已完成' }}
+
-
+
-
-
+
+
+
diff --git a/src/components/Projects/Projects copy.vue b/src/components/Projects/Projects copy.vue
deleted file mode 100644
index 073d320..0000000
--- a/src/components/Projects/Projects copy.vue
+++ /dev/null
@@ -1,206 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {{ project.name }}
-
- 进行中
-
-
-
- {{ $moment(+project.startTime).format('MM-DD HH:mm') }}
- 至
- {{ $moment(+project.endTime).format('MM-DD HH:mm') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ subItem.name }}
-
- 进行中
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/Projects/Projects.vue b/src/components/Projects/Projects.vue
index a240d4d..3b0a355 100644
--- a/src/components/Projects/Projects.vue
+++ b/src/components/Projects/Projects.vue
@@ -2,7 +2,7 @@
-
+
@@ -53,38 +53,50 @@ export default {
},
methods: {
- SortChange(e) {
- console.log(e);
- // frontData 插到谁后面
- // data 操作的数据
+ change(options) {
+ if (options instanceof Array) {
+ let projectIdList = [];
+ let arr = [];
+ options.forEach(item => {
+ projectIdList.push(item.id);
+ arr.push(item.name);
+ });
+ this.setProjectSort(projectIdList);
+ console.log('arr: ', arr);
+ } else {
+ this.setProjectRelation(options);
+ }
},
/**
- * 打开项目
- * @param {object} project 所点击的项目的信息
+ * 设置项目顺序
+ * @param { Array } projectIdList 项目id
*/
- openProject(project) {
- const { name, id, url } = project;
- url && (uni.$t.domain = url);
- this.$u.route('pages/project/project', {
- u: this.userId,
- p: id,
- pname: name,
- url: encodeURIComponent(url),
- });
+ async setProjectSort(projectIdList) {
+ try {
+ const params = { projectIdList };
+ await this.$u.api.setProjectSort(params);
+ } catch (error) {
+ console.log('error: ', error);
+ this.$t.ui.showToast(error.msg || '修改失败');
+ }
+ this.$emit('getProjects');
},
/**
- * 弹出项目操作面板
+ * 设置项目父子结构
+ * @param { string } id 当前移动的项目的id
+ * @param { string } parentId 父项目的id
*/
- openMenu(project) {
- this.showMenu = true;
- this.tips.text = project.name;
- },
-
- // 展开子项目
- openSubProject() {
- this.show = !this.show;
+ async setProjectRelation(options) {
+ try {
+ const params = options;
+ await this.$u.api.setProjectRelation(params);
+ } catch (error) {
+ console.log('error: ', error);
+ this.$t.ui.showToast(error.msg || '修改失败');
+ }
+ this.$emit('getProjects');
},
},
};
diff --git a/src/components/pretty-exchange/pretty-exchange.vue b/src/components/pretty-exchange/pretty-exchange.vue
index f200380..b72ca20 100644
--- a/src/components/pretty-exchange/pretty-exchange.vue
+++ b/src/components/pretty-exchange/pretty-exchange.vue
@@ -1,36 +1,122 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+ 进行中
+
+
+
+ {{ $moment(+item.startTime).format('MM-DD HH:mm') }} 至
+ {{ $moment(+item.endTime).format('MM-DD HH:mm') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ subItem.name }}
+
+
+ {{ subItem.status === 0 ? '未开始' : subItem.status === 1 ? '进行中' : subItem.status === 2 ? '暂停' : '已完成' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+