ccsens_tall
/
TALL-MUI-4
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

deliver
wally 4 years ago
parent
87ae00d438 176b7384a6
commit
e7d9c0a06e
4 changed files with 219 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 132
      CHANGELOG.md
  2. 22
      components/Reviewer/Reviewer.vue
  3. 70
      pages/submitlist/submitlist.vue
  4. 103
      plugins/p-deliver/p-deliver.vue

132
CHANGELOG.md
View File

@ -1,87 +1,91 @@
# 1.0.0 (2022-01-14)
# 1.0.0 (2022-01-12)
### 🌟 新功能
范围|描述|commitId
--|--|--
- | 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)
- | 日历页添加 | [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)
- | 更新代码 | [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)
- | 表单验证 | [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)
- | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e)
| 范围 | 描述 | commitId |
| ------- | ---------------------------- | ------------------------------------------------------------------------ |
| - | 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) |
| - | 日历页添加 | [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) |
| - | 更新代码 | [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) |
| - | 表单验证 | [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) |
| - | 项目操作面板 | [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)
- | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87)
| 范围 | 描述 | commitId |
| ---- | ----------------------- | ------------------------------------------------------------------------ |
| - | calender 格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b) |
| - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) |
### 🐛 Bug 修复
范围|描述|commitId
--|--|--
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 |
| ---------- | ------------------------------------ | ------------------------------------------------------------------------ |
| 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
--|--|--
- | 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)
| 范围 | 描述 | commitId |
| ---- | -------------- | ------------------------------------------------------------------------ |
| - | 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) |
### 🔨 代码重构
范围|描述|commitId
--|--|--
- | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
- | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72)
- | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
- | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98)
| 范围 | 描述 | commitId |
| ---- | ---------------------- | ------------------------------------------------------------------------ |
| - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) |
| - | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72) |
| - | 重构 project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) |
| - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98) |
| - | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72) |
| - | 重构 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) |
### 🚀 性能优化
范围|描述|commitId
--|--|--
- | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b)
| 范围 | 描述 | commitId |
| ---- | -------- | ------------------------------------------------------------------------ |
| - | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b) |
### chore
范围|描述|commitId
--|--|--
- | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089)
范围|描述|commitId
--|--|--
- | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49)
| 范围 | 描述 | commitId |
| ---- | ------------------- | ------------------------------------------------------------------------ |
| - | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089) |
| 范围 | 描述 | commitId |
| ---- | -------------- | ------------------------------------------------------------------------ |
| - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49) |

22
components/Reviewer/Reviewer.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="deliverFoot border border-solid border-gray-300 rounded-md mt-3 p-2">
<view class="top flex justify-between">
<view class="mr-3">
<view class="mr-3 text-sm">
审核人
</view>
<!-- 展示选择的审核人 -->
@ -14,7 +14,7 @@
</view>
<!-- 点击更换图标 -->
<view>
<u-icon v-if="isUicon" name="arrow-down" @click="changeIcon"></u-icon>
<u-icon v-if="isUicon" name="arrow-down" @click="isUicon = !isUicon"></u-icon>
<u-icon v-else="isUicon" name="arrow-up" @click="changeIcon"></u-icon>
</view>
</view>
@ -37,6 +37,10 @@
import {ref , reactive , computed }from 'vue'
// 图标切换
let isUicon = ref('true')
let arrList = ref([{
checked:true,
name:'冯教授'
}])
// 审核人员列表
const delivers = reactive([
{
@ -80,10 +84,24 @@
return arr
})
// 点击切换箭头图标
function changeIcon(){
isUicon.value = !isUicon.value
let arr = [];
delivers.forEach((item)=>{
if(item.checked){
arr.push(item)
}
})
arrList.value = arr
// console.log(arrList.value)
}
defineExpose({
  arrList
})
</script>
<style lang="scss">

70
pages/submitlist/submitlist.vue
View File

@ -1,24 +1,70 @@
<template>
<theme class="h-full w-full pt-1">
<view class="bg-white mx-5 my-2 rounded-md p-3">
<view class="flex justify-between text-gray-400 mb-2">
<view>插件名</view> <view>提交时间</view>
<view class="bg-white mx-5 my-2 rounded-md p-3 text-gray-400" v-for="item in listRef">
<!-- 插件名称和提交时间显示 -->
<view class="flex justify-between mb-2">
<view>{{item.plugname}}</view>
<view>{{item.subtime}}</view>
</view>
<!-- 提交的链接 -->
<view class="text-blue-400 mb-2">
链接
{{item.link}}
</view>
<!-- 该插件物的审核人 -->
<view class="mb-2">审核人</view>
<view class="flex justify-between" v-for="items in item.reviewer">
<view>
<view>
{{items.name}}
</view>
<view>
{{items.advise}}
</view>
<view>
{{items.item}}
</view>
</view>
<view>
{{items}}
</view>
</view>
<view class="mb-2 text-gray-400">审核人</view>
</view>
</theme>
</template>
<script>
export default {
data() {
return {
};
}
}
<script setup>
import{ref} from 'vue'
const listRef = ref([
{
plugname:'入职插件V0.8输出',
subtime:'12/25 13:01',
link:'https://www.baidu.com/'
reviewer:[
{
name:'冯老师',
time: '12/25 14:22',
advise:'加油！',
state:'已通过',
grade:80
},
{
name:'宋老师',
time: '12/28 8:22',
advise:'不详细！',
state:'已驳回',
grade:''
},
{
name:'张老师',
time: '12/30 6:22',
advise:'',
state:'待审批',
grade:''
},
]
},
])
</script>
<style lang="scss">

103
plugins/p-deliver/p-deliver.vue
View File

@ -7,7 +7,7 @@
<!-- <u-input v-model="iptValue" type="text" :border="false" placeholder="请编辑交付物名称" /> -->
<!-- TODO: 可能会有多个交付物 需要遍历 或者展示第一个 -->
<!-- TODO: 应该是交付物的名称 -->
<view class="self-center">{{ task.name }}</view>
<view class="self-center flex-1">{{ task.name }}</view>
<u-button type="primary" size="mini" @click="submit" class="self-center" :disabled="sbumitState">提交</u-button>
@ -16,7 +16,7 @@
<view :class="viewRef" class="py-3 pl-2">
<span class="relative px-1">
<u-badge :is-dot="true" is-center></u-badge>
{{ iptValue }}
{{ textValue }}
</span>
</view>
@ -31,7 +31,6 @@
</view>
<!-- 提示框 -->
<u-toast ref="tips" />
<!-- 取消和确定 -->
<u-mask :show="showRef" @click="showRef = false">
@ -56,7 +55,7 @@
</view>
<!-- 插件审核人员选择 -->
<Reviewer />
<Reviewer ref="reviewerData"></Reviewer>
</view>
</template>
@ -66,20 +65,22 @@ import { ref, computed, reactive } from 'vue';
defineProps({ task: { type: Object, default: () => {} } })
// 插件名称
const deliverRef = ref(true);
const iptValue = ref('');
const linkValue = ref('');
const historyIcon = ref(false);
const tips = ref('');
const showRef = ref(false);
const maskRef = ref('hidden');
const inputRef = ref('block');
const viewRef = ref('hidden');
const newInputRef = ref('');
const submitHistory = reactive([]);
const deliverRef = ref(true); // 交付物插件的显示与销毁
const textValue = ref('入职插件V0.8原型输出'); // 插件名的值
const linkValue = ref(''); // 链接的值
const historyIcon = ref(false); // 查看历史记录的图标
const showRef = ref(false); // 编辑和删除页面
const maskRef = ref('hidden'); // 带模态框的遮罩
const inputRef = ref('block'); // 未点击提交按钮的状态框
const viewRef = ref('hidden'); // 点击提交按钮后的状态框
const newInputRef = ref(''); // 修改的插件名的值
const submitHistory = reactive([]); // 提交的历史记录列表
const reviewerData = ref();
// const aa = this.$reviewer.arrList
// 判断提交按钮的状态
const sbumitState = computed(() => !(iptValue.value && linkValue.value));
const sbumitState = computed(() => !linkValue.value);
// 获取当前时间
function getTime() {
@ -87,8 +88,7 @@ function getTime() {
const DD = uni.$dayjs().$D;
const HH = uni.$dayjs().$H;
const mm = uni.$dayjs().$m;
const getTime = MM + '/' + DD + ' ' + HH + ':' + (mm < 10 ? '0' + mm : mm);
return getTime;
return `${MM}/${DD} ${HH}:${mm < 10 ? `0${mm}` : mm}`;
}
// 提交后验证链接并修改状态
@ -100,27 +100,68 @@ function submit() {
} else {
inputRef.value = 'hidden';
viewRef.value = 'block';
const time = getTime();
// 创建提交的历史对象
const obj = {};
obj.name = iptValue.value;
const time = getTime();
obj.name = textValue.value;
obj.time = time;
obj.link = linkValue.value;
obj.deliver = reviewerData.value.arrList;
submitHistory.push(obj);
console.log(submitHistory);
// console.log(submitHistory)
// console.log(reviewerData.value.arrList)
}
}
// 查看历史记录
function historical() {
uni.navigateTo({
url: '/pages/submitList/submitList',
const editItem = submitHistory;
uni.navigateTo({ url: `/pages/submitList/submitList?editItem=${encodeURIComponent(JSON.stringify(editItem))}` });
// console.log(editItem)
}
// 粘贴上传
function paste() {
uni.getClipboardData({
success(res) {
linkValue.value = res.data;
},
});
}
// 文件上传
function getfile() {
uni.chooseFile({
count: 1, // 默认100
extension: ['.zip', '.doc'],
success(res) {
linkValue.value = JSON.stringify(res.tempFilePaths);
},
});
}
// 拍照上传
function photos() {
uni.chooseImage({
count: 1, // 默认9
sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ['album', 'camera'], // 从相册选择
success(res) {
linkValue.value = JSON.stringify(res.tempFilePaths);
},
});
}
// 查看历史记录
function historical() {
uni.navigateTo({ url: '/pages/submitList/submitList' });
}
// 粘贴上传
function paste() {
uni.getClipboardData({
success: function (res) {
success(res) {
linkValue.value = res.data;
},
});
@ -129,9 +170,9 @@ function paste() {
// 文件上传
function getfile() {
uni.chooseFile({
count: 1, //默认100
count: 1, // 默认100
extension: ['.zip', '.doc'],
success: function (res) {
success(res) {
linkValue.value = JSON.stringify(res.tempFilePaths);
},
});
@ -140,10 +181,10 @@ function getfile() {
// 拍照上传
function photos() {
uni.chooseImage({
count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['album', 'camera'], //从相册选择
success: function (res) {
count: 1, // 默认9
sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ['album', 'camera'], // 从相册选择
success(res) {
linkValue.value = JSON.stringify(res.tempFilePaths);
},
});
@ -171,7 +212,7 @@ function cancelClick() {
}
// 修改界面的确定按钮事件
function sureClick() {
iptValue.value = newInputRef.value;
textValue.value = newInputRef.value;
newInputRef.value = '';
inputRef.value = 'block';
viewRef.value = 'hidden';

Write Preview
Loading…
Cancel
Save