Merge branch 'deliver' of ssh://101.201.226.163:50022/TALL/TALL-MUI-4 into deliver

4 years ago · 018ba8a6b7
4 changed files with 171 additions and 33 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,74 +3,86 @@
 ### 🌟 新功能
 范围|描述|commitId
 --|--|--
- - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
+ - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a)
+ - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de)
+ project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff)
+ theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758)
+ - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad)
+ - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8)
+ - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da)
+ - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b)
 - | 插件的填写与提交，修改与删除 | [d461252](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d461252)
 - | 插件面板分开显示 | [fb5e86b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fb5e86b)
- - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
- - | 日历页首页 | [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)
+ - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6)
+ - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380)
 - | 时间轴接口 | [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)
- - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8)
- - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da)
- - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b)
+ - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc)
 - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b)
- - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)
+ - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e)
+ - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e)
 - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5)
 - | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d)
- - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e)
- - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a)
- - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de)
- project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff)
- theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758)
- - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad)
+ - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)


 ### 🎨 代码样式
 范围|描述|commitId
 --|--|--
+ - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
 - | 交付物相关细节调整 | [87ae00d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/87ae00d)
 - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87)
- - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)


 ### 🐛 Bug 修复
 范围|描述|commitId
 --|--|--
- - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
- - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
- - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a)
- - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6)
- - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce)
 app.vue | 修复获取token报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54)
 createTask | 修复createTask v-model的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0)
 - | defineExpose, defineEmits不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc)
+ - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce)
+ - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a)
+ - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90)
+ - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6)
+ - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
+
+
+### 📝 文档
+范围|描述|commitId
+--|--|--
+ - | deliver http 文件更新 | [568115c](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/568115c)
+ - | 添加交付物http测试文件 | [0b7e6ab](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0b7e6ab)


 ### 📦 持续集成
 范围|描述|commitId
 --|--|--
- - | 测试ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8)
- - | 测试ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7)
+ - | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e)
+ - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b)
+ - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3)
 - | 更新drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3)
 - | 更新drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598)
+ - | 测试ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8)
+ - | 测试ci' | [d25f2a7](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d25f2a7)
 - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89)
- - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3)
- - | ci update | [d38262e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d38262e)
- - | drone | [8cddc7b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8cddc7b)


 ### 🔨 代码重构
 范围|描述|commitId
 --|--|--
+ - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
 - | 交付物插件代码审查 | [5f4d47b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5f4d47b)
+<<<<<<< HEAD
 - | 完善历史记录页面和修改插件的TODO | [3d58c15](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d58c15)
 - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98)
+=======
+>>>>>>> 5ae68e2ac8215a85885453cb2cfd4fdbf68f1795
 - | 修改插件名的输入框和查看历史记录 | [99fb88e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/99fb88e)
 - | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72)
+ - | 完善历史记录页面和修改插件的TODO | [3d58c15](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3d58c15)
 - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
- - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
+ - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98)


 ### 🚀 性能优化
--- a/apis/plugin.js
+++ b/apis/plugin.js
@ -19,4 +19,6 @@ export function setupPlugin(app) {
  uni.$u.api.queryDeliverOfTask = param => uni.$u.post(`${defaultwbs}/deliver/queryDeliverOfTask`, param);
  // 检查交付物
  uni.$u.api.checkDeliver = param => uni.$u.post(`${defaultwbs}/deliver/checkDeliver`, param);
+  // 根据任务id获取任务的交付物信息
+  uni.$u.api.getDeliverByTaskId = param => uni.$u.post(`${defaultwbs}/deliver/getDeliver`, param);
 }
--- a/plugins/p-deliver/p-deliver.vue
+++ b/plugins/p-deliver/p-deliver.vue
@ -8,9 +8,9 @@
      <!-- TODO: 可能会有多个交付物 需要遍历 或者展示第一个 -->
      <!-- TODO: 应该是交付物的名称 -->
      <view class="flex-1">
-        <span class="relative px-1">
+        <span class="relative px-1" v-if="deliver && deliver.deliverName">
          <u-badge :is-dot="true" is-center v-if="uBadgeShow"></u-badge>
-          {{ task.name }}
+          {{ deliver.deliverName }}
        </span>
      </view>

@ -68,22 +68,41 @@
 <script setup>
 import { ref, computed} from 'vue';

- const taskRef = defineProps({ task: { type: Object, default: () => {} } })
- // console.log(taskRef.task.name)
+ const props = defineProps({ task: { type: Object, default: () => {} } })
+ // console.log(props.task.name)

 // 插件名称
 const deliverRef = ref(true); // 交付物插件的显示与销毁
 const linkValue = ref(''); // 链接的值
 const showMask = ref(false); // 编辑和删除页面
 const showEditModal = ref(false); // 编辑交付物标题的modal
+<<<<<<< HEAD
 const newInputRef = ref(taskRef.task.name); // 修改的插件名的值
+=======
+const newInputRef = ref(props.task.name); // 修改的插件名的值
+// const reviewerData = ref();   // 获取选中的审核人
+>>>>>>> 5ae68e2ac8215a85885453cb2cfd4fdbf68f1795
 const showDeleteModal = ref(false)  // 删除二次提示的modal
 const content ='是否确定删除'
 const uBadgeShow = ref(false)   //u-badge的显示与隐藏
+const deliver = ref(null);

 // 判断提交按钮的状态
 const submitState = computed(() => !linkValue.value);

+// 根据任务id获取交付物信息
+(async function getDeliverData() {
+  try{
+    const { id: taskId } = props.task;
+    if (!taskId) return;
+    const param = { "taskId": props.task.id }
+    const data = await uni.$u.api.getDeliverByTaskId(param)
+    deliver.value = data;
+  }catch(error){
+    console.log('error: ', error);
+    uni.$ui.showToast('获取交付物信息失败');
+  }
+})();

 // (async function getDeliverData(){
 //   try{
@ -127,7 +146,6 @@ function paste() {
 }

 // 文件上传
-
 async function uploadFile(){
  try{
    const data = await uni.$upload.chooseAndUpload('https://test.tall.wiki/filedeal/file/upload/multiple',{},  ['.xls', '.xlsx','.zip','.exe','.pdf','.doc','.docx','.ppt','.pptx'] , 'files')
@ -141,7 +159,6 @@ async function uploadFile(){

 // 拍照上传
 async function uploadPhoto() {
-
  try{
    const data = await uni.$upload.chooseAndUpload('https://test.tall.wiki/filedeal/file/upload/multiple',{},  ['.xls', '.xlsx','.zip','.exe','.pdf','.doc','.docx','.ppt','.pptx'] , 'files')
     // console.log(data[0])
@ -149,7 +166,6 @@ async function uploadPhoto() {
  }catch(error){
    console.error('error: ', error);
  }
-
 }

 // 确定修改交付物名称
--- a/rest/deliver.http
+++ b/rest/deliver.http
@ -0,0 +1,108 @@
+@url=https://test.tall.wiki/gateway/defaultwbs
+@type=content-type: application/json
+@token=eyJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2NDIzODg5NjMsInN1YiI6IjEyMTc2NDc2ODY1OTgxMzU4MDgiLCJhdXRoSWQiOiIxMTc3MTU4ODQ4ODg1MTY2MDgwIiwiZXhwIjoxNjQyNDc1MzYzfQ.3rZu2gphjGZC9bod_jGxt0RC-DOTPZScN6tdYJPlTxg
+
+### login
+# @name login
+POST https://test.tall.wiki/gateway/tall3/v3.0/users/signin
+{{type}}
+
+{
+  "client": 1,
+  "data": {
+    "credential": "123456",
+	  "identifier": "zy11"
+  },
+  "type": 3
+}
+
+### 查看成员
+POST {{url}}/deliver/queryChecker
+{{type}}
+Authorization: Bearer {{token}}
+
+{
+    "param":{
+        "projectId": "1418109550141382656"
+    }
+}
+
+### 修改编辑交付物名称
+POST {{url}}/deliver/saveDeliver
+{{type}}
+Authorization: Bearer {{token}}
+
+{
+    "param":{
+        "projectId": "1418109550141382656",
+        "taskId": "1418109566541111296",
+        "deliverName":"测试交付物1"
+    }
+}
+
+### 查询交付物
+POST {{url}}/deliver/getDeliver
+{{type}}
+Authorization: Bearer {{token}}
+
+{
+    "param":{
+        "taskId": "1418109566541111296"
+    }
+}
+
+### 提交交付物信息
+POST {{url}}/deliver/submitDeliver
+{{type}}
+Authorization: Bearer {{token}}
+
+{
+    "param":{
+        "projectId": "1418109550141382656",
+        "deliverId": "1482975132598411264",
+        "fileList": [
+            "asdasd"
+        ],
+        "checkerList":[
+            "1418109552909623296",
+            "1418109555648503808"
+        ]
+    }
+}
+
+### 检查交付物
+POST {{url}}/deliver/checkDeliver
+{{type}}
+Authorization: Bearer {{token}}
+
+{
+    "param":{
+        "deliverRecordId": "1482980930758123520",
+        "projectId": "1418109550141382656",
+        "type": "2",
+        "remark": "我后悔了",
+        "score": "10.2"
+    }
+}
+
+### 查看交付物提交历史
+POST {{url}}/deliver/queryRecord
+{{type}}
+Authorization: Bearer {{token}}
+
+{
+    "param":{
+        "deliverId": "1482975132598411264"
+    }
+}
+
+### 查看检查记录
+POST {{url}}/deliver/queryCheckLog
+{{type}}
+Authorization: Bearer {{token}}
+
+{
+    "param":{
+        "deliverRecordId": "1482980930758123520"
+    }
+}