diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f97357..b6d54ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 (2021-12-13) +# 0.1.0 (2021-12-24) ### 🌟 新功能 范围|描述|commitId @@ -33,6 +33,7 @@ - | 设置小红点 | 9316bcb - | 时间基准线，默认插件 | a33ba1e - | 时间轴界面 | 33927e9 + - | 时间轴时间、交付物新原型 | c57f986 - | 时间轴修改状态时提示框增加 | e841392 - | 适配小程序；小程序登录 | cefc0eb - | 首页项目样式改变 | 8514c85 diff --git a/src/apis/plugin.js b/src/apis/plugin.js index e01ef1e..6015863 100644 --- a/src/apis/plugin.js +++ b/src/apis/plugin.js @@ -15,6 +15,9 @@ const install = (Vue, vm) => { vm.$u.api.queryDeliverOfTask = param => vm.$u.post(`${uni.$t.domain}/deliver/queryDeliverOfTask`, param); // 检查交付物 vm.$u.api.checkDeliver = param => vm.$u.post(`${uni.$t.domain}/deliver/checkDeliver`, param); + // 单文件上传 + vm.$u.api.fileUpload = formData => vm.$t.chooseAndUpload(`${uni.$t.domain}/file/upload`, formData); + vm.$u.api.ImgUpload = formData => vm.$t.chooseAndUploadImg(`${uni.$t.domain}/file/upload`, formData, ['camera']); }; export default { install }; diff --git a/src/apis/wbs.js b/src/apis/wbs.js index e9a13a5..5504eed 100644 --- a/src/apis/wbs.js +++ b/src/apis/wbs.js @@ -1,7 +1,7 @@ const install = (Vue, vm) => { vm.$u.api = { ...vm.$u.api } || {}; // 导入wbs - vm.$u.api.import = formData => vm.$t.chooseAndUpload(`${uni.$t.domain}/wbs`, formData); + vm.$u.api.import = formData => vm.$t.chooseAndUpload(`${uni.$t.domain}/wbs`, formData, ['.xls', '.xlsx']); }; export default { install }; diff --git a/src/components/Globals/Globals.vue b/src/components/Globals/Globals.vue index 3278dd1..ca35343 100644 --- a/src/components/Globals/Globals.vue +++ b/src/components/Globals/Globals.vue @@ -62,7 +62,7 @@ export default { ...mapGetters('task', ['globals']), globalsHeight: function () { - let h = ((this.sysHeight - 44 - 30 - 10) / 5) * 4; + let h = ((this.sysHeight - 44 - 30 - 10) / 5) * 3; return h; }, }, diff --git a/src/plugins/p-deliver-check/p-deliver-check.vue b/src/plugins/p-deliver-check/p-deliver-check.vue index 64eec82..ee8b847 100644 --- a/src/plugins/p-deliver-check/p-deliver-check.vue +++ b/src/plugins/p-deliver-check/p-deliver-check.vue @@ -1,17 +1,22 @@ @@ -19,6 +24,14 @@ - + diff --git a/src/plugins/p-deliver-check/p-deliver-check1.vue b/src/plugins/p-deliver-check/p-deliver-check1.vue deleted file mode 100644 index ee8b847..0000000 --- a/src/plugins/p-deliver-check/p-deliver-check1.vue +++ /dev/null @@ -1,120 +0,0 @@ - - - - - diff --git a/src/plugins/p-deliver-check/p-deliver-check2.vue b/src/plugins/p-deliver-check/p-deliver-check2.vue new file mode 100644 index 0000000..64eec82 --- /dev/null +++ b/src/plugins/p-deliver-check/p-deliver-check2.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/src/plugins/p-delivery-history/p-delivery-history.vue b/src/plugins/p-delivery-history/p-delivery-history.vue index f21e8d9..9dd59fc 100644 --- a/src/plugins/p-delivery-history/p-delivery-history.vue +++ b/src/plugins/p-delivery-history/p-delivery-history.vue @@ -3,42 +3,44 @@ - - - {{ list.name }} - {{ $moment(+list.time).format('YYYY-MM-DD HH:mm:ss') }} - - - {{ list.content }} - {{ list.content }} - - - - - {{ checker.checkerName }} - (我) - - - 通过 - 驳回 - {{ checker.score }}分 - 未审核 - - 驳回 - 通过 - + + {{ list.name }} + {{ $moment(+list.time).format('YYYY-MM-DD HH:mm:ss') }} + + + {{ + list.content + }} + {{ list.content }} + + + + + {{ checker.checkerName }} + (我) + + + 通过 + 驳回 + {{ checker.score }}分 + 未审核 + + + 通过 + + 驳回 - {{ checker.remark }} + {{ checker.remark }} - - + + @@ -46,7 +48,7 @@ - + diff --git a/src/plugins/p-delivery-history/p-delivery-history1.vue b/src/plugins/p-delivery-history/p-delivery-history2.vue similarity index 57% rename from src/plugins/p-delivery-history/p-delivery-history1.vue rename to src/plugins/p-delivery-history/p-delivery-history2.vue index 7ec9bab..e1e10e8 100644 --- a/src/plugins/p-delivery-history/p-delivery-history1.vue +++ b/src/plugins/p-delivery-history/p-delivery-history2.vue @@ -3,44 +3,42 @@ - - {{ list.name }} - {{ $moment(+list.time).format('YYYY-MM-DD HH:mm:ss') }} - - - {{ - list.content - }} - {{ list.content }} - - - - - {{ checker.checkerName }} - (我) - - - 通过 - 驳回 - {{ checker.score }}分 - 未审核 - - - 通过 - - 驳回 + + + {{ list.name }} + {{ $moment(+list.time).format('YYYY-MM-DD HH:mm:ss') }} + + + {{ list.content }} + {{ list.content }} + + + + + {{ checker.checkerName }} + (我) + + + 通过 + 驳回 + {{ checker.score }}分 + 未审核 + + 驳回 + 通过 + + {{ checker.remark }} - {{ checker.remark }} - - + + @@ -48,7 +46,7 @@ - + diff --git a/src/plugins/p-upload-deliverable/p-upload-deliverable.vue b/src/plugins/p-upload-deliverable/p-upload-deliverable.vue index 0f19113..d68217f 100644 --- a/src/plugins/p-upload-deliverable/p-upload-deliverable.vue +++ b/src/plugins/p-upload-deliverable/p-upload-deliverable.vue @@ -1,94 +1,426 @@ - + diff --git a/src/plugins/p-upload-deliverable/p-upload-deliverable1.vue b/src/plugins/p-upload-deliverable/p-upload-deliverable1.vue deleted file mode 100644 index 82abb41..0000000 --- a/src/plugins/p-upload-deliverable/p-upload-deliverable1.vue +++ /dev/null @@ -1,297 +0,0 @@ - - - - - diff --git a/src/plugins/p-upload-deliverable/p-upload-deliverable2.vue b/src/plugins/p-upload-deliverable/p-upload-deliverable2.vue new file mode 100644 index 0000000..0f19113 --- /dev/null +++ b/src/plugins/p-upload-deliverable/p-upload-deliverable2.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/src/utils/tall.js b/src/utils/tall.js index 19c5b17..c4acacc 100644 --- a/src/utils/tall.js +++ b/src/utils/tall.js @@ -3,13 +3,13 @@ import cache from '@/utils/cache.js'; import cacheAndRequest from '@/utils/cacheAndRequest.js'; import plugin from '@/config/plugin.js'; import storage from '@/utils/storage.js'; +import task from '@/config/task.js'; import time from '@/utils/time.js'; import timeConfig from '@/config/time'; import ui from '@/utils/ui.js'; import upload from '@/utils/upload.js'; import user from '@/config/user.js'; import zIndex from '@/config/zIndex.js'; -import task from '@/config/task.js'; const gateway = process.env.VUE_APP_API_URL; @@ -22,6 +22,7 @@ const $t = { timeConfig, // 时间相关配置 ui, // ui界面提示相关 chooseAndUpload: upload.chooseAndUpload, // 选择并上传单个文件相关的封装 + chooseAndUploadImg: upload.chooseAndUploadImg, // 选择并上传单个图片相关的封装 domain: `${gateway}/defaultwbs`, cache, // 本地存储相关 $q: cacheAndRequest, diff --git a/src/utils/upload.js b/src/utils/upload.js index 537a82a..0b9d0db 100644 --- a/src/utils/upload.js +++ b/src/utils/upload.js @@ -7,7 +7,7 @@ export default { * @param {string} name * @returns */ - chooseAndUpload(url, formData = {}, extension = ['.xls', '.xlsx'], name = 'param') { + chooseAndUpload(url, formData = {}, extension, name = 'param') { uni.hideLoading(); clearTimeout(timer); let timer = null; @@ -63,4 +63,71 @@ export default { }); }); }, + + /** + * 上传图片 + * @param {string} url 服务器地址 + * @param {object} formData 上传的其他字段 + * @param {array} extension 上传文件类型 扩展名数组 + * @param {array} sourceType 来源 ['album', 'camera'] + * @param {string} name + * @returns + */ + chooseAndUploadImg(url, formData = {}, sourceType, extension, name = 'param') { + uni.hideLoading(); + clearTimeout(timer); + let timer = null; + return new Promise((resolve, reject) => { + const token = uni.$t.storage.getStorageSync(uni.$t.app.tokenKey); + if (!token) { + return reject('用户未登录，请登录后重试'); + } + uni.chooseImage({ + count: 1, //默认100 + extension, + sourceType: sourceType, + success: res => { + if (!timer) { + timer = setTimeout(() => { + uni.$t.ui.showLoading('正在上传...'); + timer = null; + }, 800); + } + // 开始上传 + uni.uploadFile({ + url, + filePath: res.tempFilePaths[0], + name, + formData, + header: { Authorization: `Bearer ${token}` }, + success: ({ data, statusCode }) => { + clearTimeout(timer); + uni.hideLoading(); + + if (statusCode === 200 && data) { + const { code, msg } = JSON.parse(data); + if (code !== 200) { + reject(msg); + } else { + resolve(JSON.parse(data).data); + } + } else { + reject('上传失败'); + } + }, + fail: error => { + clearTimeout(timer); + uni.hideLoading(); + reject(error); + }, + }); + }, + fail: error => { + clearTimeout(timer); + uni.hideLoading(); + reject(error); + }, + }); + }); + }, };