wally
/
tall-mui-3-project
forked from ccsens_fe/tall-mui-3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

feat: 距调整pc端

develop
wangrongrong 4 years ago
parent
82cfdd4442
commit
5069aa11da
8 changed files with 314 additions and 19 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. 3
      CHANGELOG.md
  2. 257
      src/common/styles/iconfont.css
  3. 17
      src/components/TimeLine/component/TimeBox.vue
  4. 18
      src/components/TimeLine/component/TimeStatus.vue
  5. 27
      src/components/Title/Title.vue
  6. 7
      src/pages.json
  7. 2
      src/pages/project/project.vue
  8. 2
      vue.config.js

3
CHANGELOG.md
View File

@ -1,4 +1,4 @@
# 0.1.0 (2021-07-23)
# 0.1.0 (2021-07-26)
### 🌟 新功能
范围|描述|commitId
@ -19,6 +19,7 @@
- | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/9cbe411)
- | 添加时间轴上下滚动 | [2b81bbc](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/2b81bbc)
- | 引入dayjs | [29b8b93](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/29b8b93)
- | 字体大小更改 | [82cfdd4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/82cfdd4)
- | db store | [6414c4f](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/6414c4f)
- | indexedDB | [687394e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/687394e)
- | post 封装 | [da52e94](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/da52e94)

257
src/common/styles/iconfont.css
View File

File diff suppressed because one or more lines are too long

17
src/components/TimeLine/component/TimeBox.vue
View File

@ -1,14 +1,14 @@
<template>
<view class="px-3 py-5">
<view class="column">
<view :key="index" v-for="(item, index) in tasks">
<view class="flex">
<TimeStatus :content="JSON.stringify(item.process)" :status="item.process" />
<view class="flex justify-between items-center flex-1 ml-2">
<view class="taskColumn flex justify-between items-center flex-1 ml-2">
<view>
<span>{{ $moment(+item.planStart).format('MM-DD HH:mm') }}</span>
</view>
<view>
<view class="flex justify-between" style="min-width: 180rpx">
<view class="flex justify-between" style="min-width: 90px">
<u-icon custom-prefix="custom-icon" name="C-bxl-redux" size="17px"></u-icon>
<u-icon custom-prefix="custom-icon" name="attachment" size="21px"></u-icon>
<u-icon custom-prefix="custom-icon" name="moneycollect" size="20px"></u-icon>
@ -16,7 +16,7 @@
</view>
</view>
</view>
<view class="border-l-2 border-gray-300 ml-3.5 my-2">
<view class="plugin border-l-2 border-gray-300 ml-3.5 my-2">
<view class="ml-4 overflow-hidden shadow-lg task-box">
<u-card
:show-foot="false"
@ -101,4 +101,13 @@ export default {
.task-box {
border-radius: 24rpx;
}
.column {
padding: 24px 14px;
}
.taskColumn {
height: 33px;
}
.plugin {
margin: 8px auto;
}
</style>

18
src/components/TimeLine/component/TimeStatus.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="u-font-14">
<view class="flex items-center justify-center text-blue-400 rounded-full h-7 w-7" v-if="status === 0" @tap="changeStatus($event, 0)">
<view class="iconColumn flex items-center justify-center text-blue-400 rounded-full" v-if="status === 0" @tap="changeStatus($event, 0)">
<u-circle-progress :percent="100" active-color="#2979ff" bgColor="rgba(255,255,255,0)" borderWidth="4" width="66">
<view class="u-progress-content">
<view class="u-progress-dot"></view>
@ -10,7 +10,7 @@
</view>
</u-circle-progress>
</view>
<view class="flex items-center justify-center text-black rounded-full h-7 w-7" v-if="status === 1" @tap="changeStatus($event, 1)">
<view class="iconColumn flex items-center justify-center text-black rounded-full" v-if="status === 1" @tap="changeStatus($event, 1)">
<u-circle-progress :percent="80" active-color="#2979ff" bgColor="rgba(255,255,255,0)" borderWidth="6" width="66">
<view class="u-progress-content">
<view class="u-progress-dot"></view>
@ -18,7 +18,7 @@
</view>
</u-circle-progress>
</view>
<view class="flex items-center justify-center text-gray-400 rounded-full h-7 w-7" v-if="status === 2" @tap="changeStatus($event, 2)">
<view class="iconColumn flex items-center justify-center text-gray-400 rounded-full" v-if="status === 2" @tap="changeStatus($event, 2)">
<u-circle-progress :percent="40" active-color="#2979ff" bgColor="rgba(255,255,255,0)" borderWidth="6" width="66">
<view class="u-progress-content">
<view class="u-progress-dot"></view>
@ -29,7 +29,7 @@
</u-circle-progress>
</view>
<view
class="flex items-center justify-center font-black text-red-800 rounded-full h-7 w-7"
class="iconColumn flex items-center justify-center font-black text-red-800 rounded-full"
v-if="status === 3"
@tap="changeStatus($event, 3)"
>
@ -96,3 +96,13 @@ export default {
},
};
</script>
<style scoped lang="scss">
.iconColumn {
height: 33px;
width: 33px;
}
.one {
height: 33px;
width: 33px;
}
</style>

27
src/components/Title/Title.vue
View File

@ -5,10 +5,10 @@
<view>我是标题</view>
</view>
<view class="mr-2" slot="right">
<u-icon class="m-1" name="xuanzhong2" custom-prefix="custom-icon" size="20px"></u-icon>
<u-icon class="m-1" name="shuaxin1" custom-prefix="custom-icon" size="20px"></u-icon>
<u-icon class="m-1" name="home" custom-prefix="custom-icon" size="20px"></u-icon>
<u-icon class="m-1" name="xuanxiang" custom-prefix="custom-icon" size="20px"></u-icon>
<u-icon class="m-1" name="xuanzhong2" custom-prefix="custom-icon" size="20px" @click="lwbs"></u-icon>
<u-icon class="m-1" name="shuaxin1" custom-prefix="custom-icon" size="20px" @click="projectOverview"></u-icon>
<u-icon class="m-1" name="home" custom-prefix="custom-icon" size="20px" @click="statistics"></u-icon>
<u-icon class="m-1" name="xuanxiang" custom-prefix="custom-icon" size="20px" @click="operation"></u-icon>
</view>
</u-navbar>
</view>
@ -22,5 +22,24 @@ export default {
},
computed: mapState('home', ['project']),
methods: {
// LWBS提示
lwbs() {
this.$t.ui.showToast('LWBS');
},
//项目概览
projectOverview() {
this.$t.ui.showToast('项目概览');
},
//统计
statistics() {
this.$t.ui.showToast('统计');
},
//操作
operation() {
this.$t.ui.showToast('操作');
},
},
};
</script>

7
src/pages.json
View File

@ -4,6 +4,7 @@
"path": "pages/project/project",
"style": {
"navigationStyle": "custom" ,
"titleNView": "false",
"navigationBarTextStyle": "white"
}
},
@ -34,10 +35,8 @@
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
"navigationStyle": "custom" ,
"titleNView": "false"
},
"easycom": {
"autoscan": true,

2
src/pages/project/project.vue
View File

@ -2,7 +2,7 @@
<view :style="{ height: height }" class="flex flex-col overflow-hidden u-font-14">
<!-- 标题栏 -->
<Title />
<view class="container flex flex-col flex-1 overflow-hidden bg-gray-100">
<view class="container flex flex-col flex-1 overflow-hidden bg-gray-100" style="margin: auto">
<!-- 角色栏 -->
<Roles @getTasksByRole="getTasksByRole" />
<!-- 日常任务 -->

2
vue.config.js
View File

@ -6,7 +6,7 @@ module.exports = {
productionSourceMap: false,
devServer: {
// open: true,
host: '127.0.0.1',
// host: '127.0.0.1',
overlay: { warnings: false, errors: true },
// proxy: {}
},

Write Preview
Loading…
Cancel
Save