3
1

2 Commity 0e5ac71d16 ... d51eba9b80

Autor SHA1 Správa Dátum
  wangtao d51eba9b80 Merge branch '165' of http://47.111.81.118:3000/uskycloud/usky-web-mobile into wangtao 2 mesiacov pred
  wangtao 19ecadb783 1.报告记录添加头像 2.项目状态样式调整 2 mesiacov pred

+ 1 - 0
.gitignore

@@ -4,6 +4,7 @@
 package-lock.json
 node_modules/
 dist/
+unpackage/resources
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

+ 2 - 2
src/pages/business/common/projectMange/list/index.vue

@@ -73,11 +73,11 @@
             <view class="content-area-row_wrap-view"> 负责人: {{ proxy.$common.mapping("nickName", "userId", base.projectHead, userDate) }} </view>
             <view class="content-area-row_wrap-view">
               状态:
-              <uni-tag :text='proxy.$common.mapping("label", "value", base.projectStatus, project_status)' :type='proxy.$common.mapping("elTagType", "value", base.projectStatus, project_status)' />
+			  <span :style='{color:proxy.$common.mapping("elTagClass", "value", base.projectStatus, project_status)}'>{{ proxy.$common.mapping("label", "value", base.projectStatus, project_status) }}</span>
             </view>
             <view class="content-area-row_wrap-view">
               类型:
-              <uni-tag :text='proxy.$common.mapping("label", "value", base.projectStatus, project_type)' :type='proxy.$common.mapping("elTagType", "value", base.projectStatus, project_type)' />
+			  {{ proxy.$common.mapping("label", "value", base.projectStatus, project_type) }}
             </view>
             <view class="content-area-row_wrap-view" style="display: block">
               成员:<span>{{ proxy.$common.mapping("nickName", "userId", base.projectMember, userDate) }} </span>

+ 1 - 1
src/pages/business/common/projectMange/overview/components/echarts.vue

@@ -32,7 +32,7 @@ let option = {
     // data: ["邮件营销"],
   },
   grid: {
-    top: "15%",
+    top: "20%",
     left: "3%",
     right: "8%",
     bottom: "3%",

+ 7 - 7
src/pages/business/common/projectMange/overview/index.vue

@@ -1,6 +1,6 @@
 <template>
   <u-sticky class="shadow-default projectOverview" bgColor="#fff" style="top: 0">
-    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="项目概览" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="概览" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
       <template #left>
         <view class="u-navbar__content__left__item">
           <u-icon name="arrow-left" size="20" color="#000"></u-icon>
@@ -27,7 +27,7 @@
       <view class="menu-list" style="font-size: 15px; line-height: 30px;padding:0;">
         <view class="list-cell" style="color: #666666;padding:10px;">
           <view class="menu-item">
-            <span style="color:#559AFF;font-weight:bold;font-size: 15px;">丨 项目概况</span>
+            <span style="color:#559AFF;font-weight:bold;font-size: 15px;">丨 概况</span>
           </view>
           <view class="tableType4" style="margin-top:10px;">
             <u-row v-for="(item, index) in overviewData" :key="index">
@@ -36,7 +36,7 @@
               </u-col>
               <u-col span="8">
                 <view style="text-align: left; padding: 0px 5px 0px 5px;overflow-x:scroll !important;width:100%;white-space:none !important;" v-if="!item.color">{{ item.value ? item.value : '无' }}</view>
-                <view style="text-align: left; padding: 0px 5px 0px 5px;overflow-x:scroll !important;width:100%;white-space:none !important;" v-if="item.color"><uni-tag :text="item.value" :type="item.color" /></view>
+                <view style="text-align: left; padding: 0px 5px 0px 5px;overflow-x:scroll !important;width:100%;white-space:none !important;" v-if="item.color"><span :style="{color:item.color}">{{ item.value }}</span></view>
               </u-col>
             </u-row>
           </view>
@@ -45,7 +45,7 @@
       <view class="menu-list" style="font-size: 15px; line-height: 30px;padding:0;">
         <view class="list-cell" style="color: #666666;padding:10px;">
           <view class="menu-item">
-            <span style="color:#559AFF;font-weight:bold;">丨 项目背景</span>
+            <span style="color:#559AFF;font-weight:bold;">丨 背景</span>
           </view>
           <view class="menu-item">
             <span>{{ project.projectDescribe ? project.projectDescribe : "无" }}</span>
@@ -55,11 +55,11 @@
       <view class="menu-list" style="font-size: 15px; line-height: 30px;padding:0;">
         <view class="list-cell" style="color: #666666;padding:10px;">
           <view class="menu-item">
-            <span style="color:#559AFF;font-weight:bold;">丨 项目参与人员</span>
+            <span style="color:#559AFF;font-weight:bold;">丨 工时投入统计</span>
           </view>
           <view class="menu-item">
             <view class="example-body" style="width:100%">
-              <uni-datetime-picker v-model="range" type="daterange" @change="changeTime"  style="margin:10px 0;"/>
+              <uni-datetime-picker v-model="range" type="daterange" :clear-icon="false" @change="changeTime"  style="margin:10px 0;"/>
               <lineEcharts :xAxisDataList="xAxisDataList" :seriesDataList="seriesDataList" style="width:100%;margin-top:10px;" v-if="xAxisDataList.length>0"></lineEcharts>
             </view>
           </view>
@@ -190,7 +190,7 @@ function selectListApi(id) {
         project.value = requset.data.records[0];
         overviewData.value[0].value = proxy.$common.mapping("nickName", "userId", project.value.projectHead, userDate.value)
         overviewData.value[1].value = proxy.$common.mapping("label", "value", project.value.projectStatus, project_status.value)
-        overviewData.value[1].color = proxy.$common.mapping("elTagType", "value", project.value.projectStatus, project_status.value)
+        overviewData.value[1].color = proxy.$common.mapping("elTagClass", "value", project.value.projectStatus, project_status.value)
         overviewData.value[2].value = proxy.$common.mapping("label", "value", project.value.projectType, project_type.value)
         overviewData.value[3].value = project.value.projectWorkload
         overviewData.value[4].value = proxy.$common.mapping("nickName", "userId", project.value.projectMember, userDate.value)

+ 7 - 0
src/pages/business/common/projectMange/record/details.vue

@@ -28,7 +28,9 @@
     <template #default>
       <view class="content-area radius bg-white" v-for="(item,index) in dataList" :key="index">
         <view class="content-area-header flex mb10">
+          <img :src="item.avatar"  class="content-area-header-avatarImg mr10" v-if="item.avatar"/>
           <u-avatar
+            v-if="!item.avatar"
             class="content-area-header-avatar mr10"
             :text="item.createBy.length > 2 ? item.createBy.slice(1, 3) : item.createBy"
             shape="square"
@@ -161,6 +163,11 @@ onUnload(() => {
     &-avatar {
       margin: auto 0;
     }
+    &-avatarImg {
+      width:35px;
+      height:35px;
+      border-radius: 4px;
+    }
 
     &-title {
       margin: 0 0 15px 0;

+ 7 - 2
src/pages/business/common/projectMange/record/index.vue

@@ -60,11 +60,11 @@
           <view class="content-area-top menu-item" style="float:right;padding:10px 0px">
             <view class="content-area-top-time"> </view>
             <u-icon class="content-area-top-icon" name="more-dot-fill" size="20" color="#000" @click="moreClick(el)"></u-icon>
-            <!-- <u-icon class="content-area-top-icon" name="edit-pen" size="20" color="rgb(20, 158, 255)" @click="handleSubmit('update',el)" v-if="state.tabsCurrent ==1" style="display:inline-block;margin-right:30px;"></u-icon> -->
-            <!-- <u-icon class="content-area-top-icon" name="trash" size="20" color="red" @click="tips('error',`确认删除时间为 '${el.submitDate}' 的日报吗?`,el,'delete')" v-if="state.tabsCurrent ==1" style="display:inline-block;"></u-icon> -->
           </view>
           <view class="flex mb10" @click="goContentDetails(el)">
+            <img :src="el.avatar"  class="content-area-center-avatarImg mr10" v-if="el.avatar"/>
             <u-avatar
+              v-if="!el.avatar"
               class="content-area-center-avatar mr10"
               :text="el.createBy.length > 2 ? el.createBy.slice(1, 3) : el.createBy"
               shape="square"
@@ -453,6 +453,11 @@ onUnload(() => {
     &-avatar {
       margin: auto 0;
     }
+    &-avatarImg {
+      width:35px;
+      height:35px;
+      border-radius: 4px;
+    }
 
     &-title {
       margin: 0 0 15px 0;

BIN
unpackage/res/icons/1024x1024.png


BIN
unpackage/res/icons/120x120.png


BIN
unpackage/res/icons/144x144.png


BIN
unpackage/res/icons/152x152.png


BIN
unpackage/res/icons/167x167.png


BIN
unpackage/res/icons/180x180.png


BIN
unpackage/res/icons/192x192.png


BIN
unpackage/res/icons/20x20.png


BIN
unpackage/res/icons/29x29.png


BIN
unpackage/res/icons/40x40.png


BIN
unpackage/res/icons/58x58.png


BIN
unpackage/res/icons/60x60.png


BIN
unpackage/res/icons/72x72.png


BIN
unpackage/res/icons/76x76.png


BIN
unpackage/res/icons/80x80.png


BIN
unpackage/res/icons/87x87.png


BIN
unpackage/res/icons/96x96.png


BIN
unpackage/res/push/18x18.png


BIN
unpackage/res/push/24x24.png


BIN
unpackage/res/push/36x36.png


BIN
unpackage/res/push/48x48.png


BIN
unpackage/res/push/72x72.png