From 3cdb1ce6c244f9940fa276e6f2c2bc0b0888c0f4 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Mon, 10 Jan 2022 10:06:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                 | 17 ++--
 components/Calendar/Calendar.vue             |  2 +-
 components/Globals/Globals.vue               |  3 +-
 components/Plugin/Plugin.vue                 |  2 +-
 components/Projects/ProjectItem.vue          |  2 +-
 components/Roles/Roles.vue                   | 12 +--
 components/Skeleton/READ_ME.md               | 84 --------------------
 components/Skeleton/Skeleton.vue             |  2 +-
 components/TimeLine/TimeLine.vue             |  2 +-
 components/TimeLine/component/TaskTools.vue  |  2 +-
 components/TimeLine/component/TimeStatus.vue |  2 +-
 components/Tips/Tips.vue                     |  2 +-
 pages/index/index.vue                        |  4 +-
 pages/project/project.vue                    | 17 ++--
 14 files changed, 38 insertions(+), 115 deletions(-)
 delete mode 100644 components/Skeleton/READ_ME.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f35e00..1b19190 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,20 @@
-# 1.0.0 (2022-01-07)
+# 1.0.0 (2022-01-10)
 
 ### 🌟 新功能
 范围|描述|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)
- - | 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)
- - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91)
+ - | 更新代码 | [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)
  - | 时间轴接口 | [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)
- - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5)
+ - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8)
+ - | 添加 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)
+ - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5)
+ - | 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)
+ - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad)
 
 
 ### 🎨 代码样式
diff --git a/components/Calendar/Calendar.vue b/components/Calendar/Calendar.vue
index 86e098f..0c7c7b7 100644
--- a/components/Calendar/Calendar.vue
+++ b/components/Calendar/Calendar.vue
@@ -87,7 +87,7 @@
 </template>
 
 <script setup>
-import { reactive, computed, watchEffect, defineProps, defineEmits } from 'vue';
+import { reactive, computed, watchEffect } from 'vue';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
 import { generateDates, formatDate } from './generateDates.js';
diff --git a/components/Globals/Globals.vue b/components/Globals/Globals.vue
index 8209e84..dcdec0c 100644
--- a/components/Globals/Globals.vue
+++ b/components/Globals/Globals.vue
@@ -39,7 +39,8 @@
 
 <script setup>
 import { computed } from 'vue';
-import { useStore } from 'vuex';
+import { useStore } from 'vuex';
+import Skeleton from '@/components/Skeleton/Skeleton.vue';
 
 const store = useStore();
 const isShrink = computed(() => store.state.task.isShrink);
diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue
index a22b86c..fcc9f9f 100644
--- a/components/Plugin/Plugin.vue
+++ b/components/Plugin/Plugin.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script setup>
-import { reactive, defineProps, nextTick, computed } from 'vue';
+import { reactive, nextTick, computed } from 'vue';
 import { useStore } from 'vuex';
 
 const props = defineProps({
diff --git a/components/Projects/ProjectItem.vue b/components/Projects/ProjectItem.vue
index 4838195..e6c5f03 100644
--- a/components/Projects/ProjectItem.vue
+++ b/components/Projects/ProjectItem.vue
@@ -63,7 +63,7 @@
 </template>
 
 <script setup>
-import { ref, computed, defineProps, defineEmits } from 'vue';
+import { ref, computed } from 'vue';
 import dayjs from 'dayjs';
 import { useStore } from 'vuex';
 import config from '@/common/js/config.js';
diff --git a/components/Roles/Roles.vue b/components/Roles/Roles.vue
index 4b668be..51dcf27 100644
--- a/components/Roles/Roles.vue
+++ b/components/Roles/Roles.vue
@@ -65,10 +65,10 @@ onMounted(() => {
     const query = uni.createSelectorQuery().in(this);
     query
       .selectAll('.tab-children')
-      .boundingClientRect(data => {
-        console.log('data', data);
-        if (data.length) {
-          data.roleLeft = data[0].left;
+      .boundingClientRect(res => {
+        console.log('data', res);
+        if (res.length) {
+          data.roleLeft = res[0].left;
         }
       })
       .exec();
@@ -84,8 +84,8 @@ function setCurrentRole(index) {
   const query = uni.createSelectorQuery().in(this);
   query
     .selectAll('.tab-children')
-    .boundingClientRect(data => {
-      data.forEach(item => {
+    .boundingClientRect(res => {
+      res.forEach(item => {
         data.tabList.push({ width: item.width });
       });
     })
diff --git a/components/Skeleton/READ_ME.md b/components/Skeleton/READ_ME.md
deleted file mode 100644
index 09ccf28..0000000
--- a/components/Skeleton/READ_ME.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# skeleton组件
-
-### 1.描述
-> 此组件用于加载数据时占位图显示，跟vant-ui骨架屏用法相似，但比vant-ui更灵活
-
-
-
-### 2.用法
-
-- 基本用法
-
-代码：
-```vue
-//基本用法
-<skeleton :row="3" animate :loading="loading" >
-  <view>
-    content
-  </view>
-</skeleton>
-```
-
-
-- **显示 title ——通过 **title 属性显示title占位图
-
-代码：
-```vue
-//显示 title——通过 title 属性显示title占位图
-<skeleton :row="3" title animate :loading="loading">
-  <view>
-    content
-  </view>
-</skeleton>
-```
-
-
-- 显示头像（上面)——通过avatar=‘top’让头像的占位图上面显示
-
-代码：
-```vue
-<skeleton  :avatar="top"  avatarAlign="left" :row="3" animate :loading="loading" style="margin-top:24rpx;">
-  <view>
-    content
-  </view>
-</skeleton>
-```
-
-
-- 显示头像（左边)——通过avatar=‘left’让头像的占位图左边显示
-
-代码：
-```vue
-<skeleton title :avatar="left" :row="3" animate :loading="loading" style="margin-top:24rpx;">
-  <view>
-    content
-  </view>
-</skeleton>
-```
-
-
-- 显示banner**——通过 **banner属性显示banner占位图（只显示banner，不显示内容占位图时设置row="0"）
-
-代码：
-```vue
-<skeleton banner :row="0" animate :loading="loading" style="margin-top:24rpx;">
-  <view>
-    content
-  </view>
-</skeleton>
-```
-### 
-### 3. API
-### Props
-| **属性名** | **说明** | **类型** | **默认值** | 可取值 |
-| --- | --- | --- | --- | --- |
-| loading | 是否显示骨架屏 | Boolean | true | true/false |
-| row | 段落行数 | Number | String | 3 | 0表示不展现 |
-| rowWidth | 段落行宽度 | Boolean &#124; Number | '100%' |  |
-| title | 是否显示标题 | Boolean &#124; String | false |  |
-| banner | 是否显示banner | Boolean &#124; String | false |  |
-| animate | 是否开启动画 | Boolean &#124; String | false |  |
-| avatar | 头像位置 | Boolean &#124; String | ''空 | left/top |
-| avatarSize | 头像大小 | String | - |  |
-| avatarShape | 头像形状 | String | circle | circle/round |
-
diff --git a/components/Skeleton/Skeleton.vue b/components/Skeleton/Skeleton.vue
index b589156..ca033a9 100644
--- a/components/Skeleton/Skeleton.vue
+++ b/components/Skeleton/Skeleton.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script setup>
-import { computed, defineProps } from 'vue';
+import { computed } from 'vue';
 /**
  * skeleton 骨架屏
  * @description 用于加载数据时占位图显示，跟Vant-UI用法相似，但比Vant-UI更灵活
diff --git a/components/TimeLine/TimeLine.vue b/components/TimeLine/TimeLine.vue
index e09077c..98b699b 100644
--- a/components/TimeLine/TimeLine.vue
+++ b/components/TimeLine/TimeLine.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script setup>
-import { reactive, computed, defineEmits } from 'vue';
+import { reactive, computed } from 'vue';
 import { useStore } from 'vuex';
 // import Barrier from './component/Barrier.vue';
 import dayjs from 'dayjs';
diff --git a/components/TimeLine/component/TaskTools.vue b/components/TimeLine/component/TaskTools.vue
index 32023c6..52f4c3e 100644
--- a/components/TimeLine/component/TaskTools.vue
+++ b/components/TimeLine/component/TaskTools.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script setup>
-import { defineProps, reactive } from 'vue';
+import { reactive } from 'vue';
 import CreateTask from '@/components/Title/components/CreateTask.vue';
 
 defineProps({ task: { type: Object, default: () => {} } });
diff --git a/components/TimeLine/component/TimeStatus.vue b/components/TimeLine/component/TimeStatus.vue
index c05fced..239f910 100644
--- a/components/TimeLine/component/TimeStatus.vue
+++ b/components/TimeLine/component/TimeStatus.vue
@@ -57,7 +57,7 @@
 </template>
 
 <script setup>
-import { reactive, onMounted, defineProps, computed } from 'vue';
+import { reactive, onMounted, computed } from 'vue';
 import { useStore } from 'vuex';
 import CreateTask from '../../Title/components/CreateTask.vue';
 
diff --git a/components/Tips/Tips.vue b/components/Tips/Tips.vue
index 47d46b8..ad48ca0 100644
--- a/components/Tips/Tips.vue
+++ b/components/Tips/Tips.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script setup>
-import { useStore, defineProps, onMounted, computed, reactive } from 'vuex';
+import { useStore, onMounted, computed, reactive } from 'vuex';
 
 defineProps({ title: { default: '提示', type: String } });
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 251fee9..b78e509 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,9 +3,7 @@
 	<view class="flex flex-col h-full bg-gray-50">
 		<view class="relative" @touchmove="onMove">
 			<!-- 日历 -->
-			<Calendar @selected-change="onDateChange" :show-back="true" ref="calendar"
-				@handleFindPoint="handleFindPoint"
-/>
+			<Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" @handleFindPoint="handleFindPoint" />
 			<!-- 上传 导入wbs -->
 			<Upload @success="onUploadSuccess" @error="onUploadError" />
 		</view>
diff --git a/pages/project/project.vue b/pages/project/project.vue
index 7a33141..41278dd 100644
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -11,16 +11,14 @@
       <Globals />
 
       <!-- 定期任务面板 -->
-      <TimeLine @getTasks="getTasks" class="flex-1 overflow-hidden" ref="timeLine" />
+      <!-- <TimeLine @getTasks="getTasks" class="flex-1 overflow-hidden" ref="timeLine" /> -->
+      <TimeLine class="flex-1 overflow-hidden" ref="timeLine" />
     </view>
   </view>
 </template>
 
 <script setup>
-import {
-  computed,
-  watch,
-} from 'vue';
+import { ref, computed, watch, onMounted } from 'vue';
 import { useStore } from 'vuex';
 import useInit from '@/hooks/project/useInit';
 import useGetTasks from '@/hooks/project/useGetTasks';
@@ -34,6 +32,15 @@ const timeUnit = computed(() => store.state.task.timeUnit);
 const projectId = computed(() => store.getters['project/projectId']);
 const userId = computed(() => store.getters['user/userId']);
 const newProjectInfo = computed(() => store.state.task.newProjectInfo);
+const height = ref(null);
+
+
+onMounted(() => {
+  const system = uni.getSystemInfoSync();
+  height.value = system.windowHeight + 'px';
+});
+
+
 
 // 获取可变全局任务
 function getGlobalData() {