From 2682c931e065aa518f42de5b99a9d01a47eb77b4 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Thu, 20 Feb 2025 13:18:40 +0800
Subject: [PATCH] =?UTF-8?q?#=E6=96=B0=E5=A2=9E=201=E3=80=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=88=91=E7=9A=84=E6=A1=A3=E6=A1=88=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#修复
1、去除任务进度顶部培训分类
---
 src/manifest.json               |   4 +-
 src/pages.json                  |   6 +
 src/pages/promote/progress.vue  |  17 ++-
 src/pages/promote/promote.vue   |   2 +-
 src/pages/user/archive.vue      | 253 ++++++++++++++++++++++++++++++++
 src/pages/user/paper.vue        |   2 +-
 src/pages/user/user.vue         |   1 +
 src/static/image/archiveBox.png | Bin 0 -> 2689 bytes
 8 files changed, 274 insertions(+), 11 deletions(-)
 create mode 100644 src/pages/user/archive.vue
 create mode 100644 src/static/image/archiveBox.png

diff --git a/src/manifest.json b/src/manifest.json
index e0cd833..9bff86d 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
     "appid" : "__UNI__06C03D0",
     //__UNI__06C03D0
     "description" : "",
-    "versionName" : "1.33.11",
-    "versionCode" : "248",
+    "versionName" : "1.34.0",
+    "versionCode" : "249",
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/src/pages.json b/src/pages.json
index ab8c8e2..6ed1b54 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -501,6 +501,12 @@
         "navigationBarTitleText": "我的活动"
       }
     },
+    {
+      "path": "pages/user/archive",
+      "style": {
+        "navigationBarTitleText": "我的档案"
+      }
+    },
     {
       "path": "pages/user/config",
       "style": {
diff --git a/src/pages/promote/progress.vue b/src/pages/promote/progress.vue
index f65934e..ce4f3da 100644
--- a/src/pages/promote/progress.vue
+++ b/src/pages/promote/progress.vue
@@ -1,11 +1,11 @@
 <template>
   <view class="min-height">
-    <scroll-view class="tab-box" scroll-x="true">
-      <view :class="['tab-item',{active:tabIndex === index}]" v-for="(item,index) in tabList" :key="index"
-            @click="handTab(index)">
-        {{ item.name }}
-      </view>
-    </scroll-view>
+<!--    <scroll-view class="tab-box" scroll-x="true">-->
+<!--      <view :class="['tab-item',{active:tabIndex === index}]" v-for="(item,index) in tabList" :key="index"-->
+<!--            @click="handTab(index)">-->
+<!--        {{ item.name }}-->
+<!--      </view>-->
+<!--    </scroll-view>-->
     <view class="layout layout-train">
       <view class="title-box">
         <view class="title">培训任务</view>
@@ -37,6 +37,7 @@
             </view>
           </view>
         </view>
+        <uv-empty v-if="!trainList.length" text="暂无培训任务"/>
       </view>
     </view>
     <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>
@@ -122,6 +123,7 @@
             :borderWidth="4"
           ></mprogress>
         </view>
+        <uv-empty v-if="!examList.length" text="暂无考试任务"/>
       </view>
     </view>
     <uv-gap height="30rpx" bgColor="#f4f4f4"></uv-gap>
@@ -155,6 +157,7 @@
             :borderWidth="4"
           ></mprogress>
         </view>
+        <uv-empty v-if="!matchList.length" text="暂无竞赛任务"/>
       </view>
     </view>
   </view>
@@ -184,7 +187,7 @@ const handTab = (index) => {
 
 const trainInfoList = ref([])
 const getTrainInfoList = async () => {
-  const res = await trainInfoUserListReq()
+  const res = await trainInfoUserListReq({})
   trainInfoList.value = []
   if (res) {
     trainInfoList.value = res.data
diff --git a/src/pages/promote/promote.vue b/src/pages/promote/promote.vue
index 06bc9f8..67e52cb 100644
--- a/src/pages/promote/promote.vue
+++ b/src/pages/promote/promote.vue
@@ -413,7 +413,7 @@ export default {
         item.progress = 50
         item.color = '#57d801'
         item.text = '进行中'
-        if (dayjs(item.endDate).isAfter(dayjs)) {
+        if (dayjs(item.endDate).isBefore(dayjs)) {
           item.progress = 100
           item.color = '#f29900'
           item.text = '已完成'
diff --git a/src/pages/user/archive.vue b/src/pages/user/archive.vue
new file mode 100644
index 0000000..2b072dc
--- /dev/null
+++ b/src/pages/user/archive.vue
@@ -0,0 +1,253 @@
+<template>
+  <view class="min-height bg-gray-light">
+    <uv-tabs :list="activeTabList" @click="changeTab" :current="current" :scrollable="false"/>
+    <view v-if="list.length" class="p-20">
+      <template v-if="current === 0">
+        <view class="card mb-25 flex justify-start" v-for="(item, index) in list" :key="index">
+          <uv-image :src="item.cover" width="140rpx" height="140rpx" radius="10"/>
+          <view class="ml-20 flex flex-col justify-start items-start">
+            <uv-text :text="item.title" size="28rpx" lineHeight="40rpx" :lines="1"
+                     align="left" bold
+                     color="#000"></uv-text>
+            <uv-text v-if="item.endDate" :text="`结束日期:${item.endDate}`" size="24rpx"
+                     lineHeight="40rpx" :lines="1"
+                     align="left"
+                     color="#AAA"></uv-text>
+            <uv-text :text="`已学:${(item.learnSec / 3600).toFixed(2)}个学时`" size="24rpx"
+                     lineHeight="40rpx" :lines="1"
+                     align="left"
+                     color="#AAA"></uv-text>
+          </view>
+        </view>
+      </template>
+      <template v-else-if="current === 1">
+        <view class="card mb-20 flex justify-between" v-for="(item,index) in list" :key="index">
+          <view class="flex flex-col justify-start items-start">
+            <view class="name">
+              <uv-text :text="item.title" size="24rpx" lineHeight="40rpx" :lines="1" bold></uv-text>
+            </view>
+            <view class="flex justify-start items-center mt-20">
+              <view class="text-20 text-gray mr-35">{{ item.peopleNum }}人</view>
+              <view class="text-20 text-gray">竞赛时间: {{ item.startDate }} ~ {{ item.endDate }}</view>
+            </view>
+          </view>
+          <mprogress
+            :progress="item.progress"
+            :activeColor="item.color"
+            :valueColor="item.color"
+            :valueFontSize="12"
+            :valueText="item.text"
+            :width="50"
+            :borderWidth="4"
+          ></mprogress>
+        </view>
+      </template>
+      <template v-else-if="current === 2">
+        <view class="card mb-20 flex justify-between" v-for="(item,index) in list"
+              :key="index">
+          <view class="info info-1">
+            <view class="name">
+              <uv-text :text="item.title" size="24rpx" lineHeight="40rpx" :lines="1" bold></uv-text>
+            </view>
+            <view class="my-15  text-25 text-gray">考试类型: {{ ['线上', '线下'][item.type] }}</view>
+            <template v-if="item.type === 1 && item.trainExamPeopleInRoom">
+              <view v-if="item.trainExamPeopleInRoom.roomConfig" class="my-15  text-25 text-gray">考场:
+                {{ item.trainExamPeopleInRoom.roomConfig.position }}
+              </view>
+              <view v-if="item.trainExamPeopleInRoom.examSession" class="my-15  text-25 text-gray">考试时间:
+                {{ item.trainExamPeopleInRoom.examSession.startTime }} ~
+                {{ item.trainExamPeopleInRoom.examSession.endTime }}
+              </view>
+            </template>
+            <template v-if="item.type === 0">
+              <view class="my-15  text-25 text-gray" v-if="item.examDateMode === 0">考试截止日期: {{ item.examDate }}</view>
+              <view class="my-15  text-25 text-gray flex justify-start flex-col items-start" v-else>
+                <text>考试时间段:</text>
+                <text v-for="(item, index) in JSON.parse(item.examDateList)" :key="index">
+                  {{ item.date.join('~') }}
+                </text>
+              </view>
+            </template>
+            <view class="my-15  text-25 text-gray" v-if="item.workTypeLists && item.workTypeLists.length > 0 && item.workTypeLists[0].course">考试科目:
+              {{
+                item.workTypeLists[0].course.title
+              }}({{
+                ['初级', '中级', '高级', '技师', '高级技师'][item.workTypeLists[0].course.level]
+              }})
+            </view>
+            <view class="my-15  text-25 text-gray" v-if="!item.trainExamPeopleInfo">总分 {{ item.paper.totalPoint }} 合格分
+              {{ item.paper.passPoint }}
+            </view>
+            <view class="my-15 text-25 text-gray" v-else>
+              <template v-if="item.text === '已完成' && item.trainExamPeopleInfo.realScore">
+                <view v-if="item.type === 0 && item.trainId">
+                  <text>考试得分 {{ item.trainExamPeopleInfo.score }}</text>
+                  <text class="ml-15" v-if="item.trainExamPeopleInfo.inWhiteList === 0">平时分
+                    {{ item.trainExamPeopleInfo.normalScore }}
+                  </text>
+                  <text class="ml-15">总分
+                    {{ item.trainExamPeopleInfo.totalScore }}
+                  </text>
+                  <text class="ml-15">实际得分
+                    {{ item.trainExamPeopleInfo.totalScore }}
+                  </text>
+                </view>
+                <view v-else>
+                  <text>考试得分 {{ item.trainExamPeopleInfo.score }}</text>
+                  <text class="ml-15" v-if="item.type === 1">实操得分 {{ item.trainExamPeopleInfo.operateScore }}</text>
+                  <text class="ml-15">总分
+                    {{ item.trainExamPeopleInfo.realScore }}
+                  </text>
+                </view>
+                <view class="mt-15"
+                      :class="[item.trainExamPeopleInfo.totalScore >= 60 ? 'text-green' : 'text-red']"
+                      v-if="item.showResult">{{
+                    item.trainExamPeopleInfo.totalScore >= 60 ? '合格' : '不合格'
+                  }}
+                </view>
+              </template>
+            </view>
+            <view class="my-15 text-25 text-gray"
+                  v-if="item.trainExamPeopleInfo && item.trainExamPeopleInfo.highLevelStatus > 0">
+              <text>专家评审结果:</text>
+              <text class="ml-15"
+                    :class="[item.trainExamPeopleInfo.highLevelStatus === 1 ? 'text-green' : 'text-red']">
+                {{ ['待审核', '已通过', '未通过'][item.trainExamPeopleInfo.highLevelStatus] }}
+              </text>
+            </view>
+          </view>
+          <mprogress
+            :progress="item.progress"
+            :activeColor="item.color"
+            :valueColor="item.color"
+            :valueFontSize="12"
+            :valueText="item.text"
+            :width="50"
+            :borderWidth="4"
+          ></mprogress>
+        </view>
+      </template>
+      <template v-else-if="current === 3">
+        <view class="flex justify-start items-center bg-white p-20 my-20" v-for="(item, index) in list" :key="index">
+          <uv-image :src="item.url" height="150rpx" mode="heightFix" @click="handPreviewImage(item)"/>
+          <view class="flex ml-20 flex-col justify-start items-start">
+            <text>{{ item.title }}</text>
+            <text class="my-20 text-25 text-gray">获得时间: {{
+                dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss')
+              }}
+            </text>
+            <uv-button type="primary" shape="circle" size="mini" @click="save(item.url)">下载证书</uv-button>
+          </view>
+        </view>
+      </template>
+    </view>
+    <uv-empty v-else text="暂无数据"></uv-empty>
+  </view>
+</template>
+
+<script setup>
+import {ref} from 'vue'
+import {userTrainListReq} from "@/api/train";
+import {matchListReq, userHasJoinMatchReq} from "@/api/match";
+import dayjs from "dayjs";
+import mprogress from "@/components/m-progress/mprogress.vue";
+import {trainExamListReq} from "@/api/trainInfo";
+import {trainUserPaperListReq} from "@/api/user";
+
+const current = ref(0)
+const activeTabList = [{name: '培训记录'}, {name: '竞赛记录'}, {name: '考试记录'}, {name: '申报记录'}]
+const changeTab = ({index}) => {
+  current.value = index
+  if (current.value === 0) getTrainList()
+  else if (current.value === 1) getMatchList()
+  else if (current.value === 2) getExamList()
+  else if (current.value === 3) getPaperList()
+}
+
+const list = ref([])
+
+const getTrainList = async () => {
+  const res = await userTrainListReq({
+    withProgress: true,
+    page: 1,
+    limit: 9999
+  })
+  if (res && res.data) {
+    list.value = res.data.list.filter(item => item.summary)
+  }
+}
+
+const getMatchList = async () => {
+  const {data} = await matchListReq({withAll: true})
+  list.value = data.filter(item => dayjs(item.endDate).isBefore(dayjs())).map(item => {
+    item.progress = 100
+    item.color = '#f29900'
+    item.text = '已完成'
+    return item
+  })
+}
+
+const getExamList = async () => {
+  const res = await trainExamListReq({
+    type: 0
+  })
+  if (res) {
+    list.value = res.data.filter(item => {
+      return (item.paper && item.trainExamPeopleInfo)
+    }).map(item => {
+      let progress = 0, text = '未完成', color = '#cacaca'
+      progress = 100
+      color = '#f29900'
+      text = '已完成'
+      item.progress = progress
+      item.color = color
+      item.text = text
+      item.showResult = true
+      return item
+    })
+  }
+}
+
+const getPaperList = async () => {
+  const {data} = await trainUserPaperListReq()
+  list.value = data
+}
+
+const handPreviewImage = (item) => {
+  uni.previewImage({
+    current: 0,
+    urls: [item.url]
+  })
+}
+
+const save = (url) => {
+  uni.showLoading({title: '下载中'})
+  uni.downloadFile({
+    url,
+    success: function (res) {
+      uni.saveImageToPhotosAlbum({
+        filePath: res.tempFilePath,
+        success: function (res) {
+          uni.showToast({
+            title: '保存成功',
+            icon: 'success',
+            duration: 2000
+          })
+          uni.hideLoading()
+          console.log('保存成功')
+        },
+        fail: function (err) {
+          console.log(err)
+        }
+      })
+    },
+    complete: res => {
+      uni.hideLoading()
+      console.log(res)
+    }
+  })
+
+}
+
+getTrainList()
+</script>
\ No newline at end of file
diff --git a/src/pages/user/paper.vue b/src/pages/user/paper.vue
index 676b24e..2a7ce25 100644
--- a/src/pages/user/paper.vue
+++ b/src/pages/user/paper.vue
@@ -65,4 +65,4 @@ const save = (url) => {
 onLoad(() => {
   getList()
 })
-</script>F
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue
index 42a911b..ed30f64 100644
--- a/src/pages/user/user.vue
+++ b/src/pages/user/user.vue
@@ -104,6 +104,7 @@ export default {
         {icon: '/static/image/address.png?=1.0', title: '收货地址', url: '/pages/user/address/list'},
         // {icon: '/static/image/s-3.png?=1.0', title: '我的知识', url: ''},
         {icon: '/static/image/s-4.png?=1.0', title: '留言板', url: '/pages/user/msg'},
+        {icon: '/static/image/archiveBox.png', title: '我的档案', url: '/pages/user/archive'},
         {icon: '/static/image/s-5.png?=1.0', title: '我的活动', url: '/pages/user/activity'},
         {icon: '/static/image/s-8.png?=1.0', title: '认定预约报名', url: '/pages/user/signUp'},
         {icon: '/static/image/s-9.png?=1.0', title: '我的专利', url: '/pages/user/patent'},
diff --git a/src/static/image/archiveBox.png b/src/static/image/archiveBox.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bac659b6c280e68bbf4b05e42945de819f91306
GIT binary patch
literal 2689
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
Jnq%q1{5Pchw+a9N

literal 0
HcmV?d00001