From 1aba082ea71210e4a6baf17f4a0d907519a88e06 Mon Sep 17 00:00:00 2001
From: zhangyanli <zhangyanli@zcloudchina.com>
Date: Mon, 20 May 2024 17:58:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E9=80=9A=E7=8F=AD=E7=BA=A7=E4=B8=80?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=80=E6=A1=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/signature_form_traffic.vue     | 10 ++---
 .../archives_management/user/archives.vue     | 43 ++++++++++++++++---
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/views/archives_management/semester/components/signature_form_traffic.vue b/src/views/archives_management/semester/components/signature_form_traffic.vue
index 0a240ab..906d0a0 100644
--- a/src/views/archives_management/semester/components/signature_form_traffic.vue
+++ b/src/views/archives_management/semester/components/signature_form_traffic.vue
@@ -41,7 +41,7 @@
             <td class="title">
               <viewer v-if="item.SIGNATURE_PATH">
                 <img
-                  :src="FILE_URL.fileUrl + item.SIGNATURE_PATH"
+                  :src="FILE_URL + item.SIGNATURE_PATH"
                   alt=""
                   width="80"
                   height="50"
@@ -64,9 +64,7 @@
                 "
               >
                 <img
-                  :src="
-                    FILE_URL.fileUrl + data.students[index + 1].SIGNATURE_PATH
-                  "
+                  :src="FILE_URL + data.students[index + 1].SIGNATURE_PATH"
                   alt=""
                   width="80"
                   height="50"
@@ -90,9 +88,7 @@
                 "
               >
                 <img
-                  :src="
-                    FILE_URL.fileUrl + data.students[index + 2].SIGNATURE_PATH
-                  "
+                  :src="FILE_URL + data.students[index + 2].SIGNATURE_PATH"
                   alt=""
                   width="80"
                   height="50"
diff --git a/src/views/archives_management/user/archives.vue b/src/views/archives_management/user/archives.vue
index 81197ce..d6476d1 100644
--- a/src/views/archives_management/user/archives.vue
+++ b/src/views/archives_management/user/archives.vue
@@ -181,15 +181,29 @@
           <tr>
             <td>序号</td>
             <td>课程内容</td>
-            <td>课时</td>
+            <td
+              v-if="
+                data.classInfo.TRAINTYPE === 'bd2a3b7767db49968e26cfccc3c2b4a4'
+              "
+            >
+              学时
+            </td>
+            <td v-else>课时</td>
             <td>讲师</td>
           </tr>
           <tbody>
             <tr v-for="(item, index) in data.videoList" :key="index">
               <td>{{ index + 1 }}</td>
               <td>{{ item.COURSEWARENAME }}</td>
-              <!--<td>{{ item.CLASSHOUR }}</td>-->
-              <td>1</td>
+              <td
+                v-if="
+                  data.classInfo.TRAINTYPE ===
+                  'bd2a3b7767db49968e26cfccc3c2b4a4'
+                "
+              >
+                {{ item.CLASSHOUR }}
+              </td>
+              <td v-else>1</td>
               <td>{{ item.TEACHERNAME }}</td>
             </tr>
           </tbody>
@@ -417,7 +431,7 @@
               data.classInfo.POSTTYPE === 'bb5170f52dcd4183aa67a2053163ae29'
             "
           >
-            生产经营单位从业人员{{ classInfo.POSTTYPE_NAME }}考核记录
+            生产经营单位从业人员{{ data.classInfo.POSTTYPE_NAME }}考核记录
           </template>
           <!-- 培训类型是交通运输 end-->
         </h2>
@@ -627,7 +641,15 @@
           "
         />
         <tr>
-          <td style="text-align: center">应学课时</td>
+          <td
+            v-if="
+              data.classInfo.TRAINTYPE === 'bd2a3b7767db49968e26cfccc3c2b4a4'
+            "
+            style="text-align: center"
+          >
+            应学学时
+          </td>
+          <td v-else style="text-align: center">应学课时</td>
           <td width="240px">
             {{
               data.learningRecord.SUM_CLASSHOUR === 0.0
@@ -635,7 +657,16 @@
                 : parseFloat(data.learningRecord.SUM_CLASSHOUR).toFixed(2)
             }}
           </td>
-          <td width="240px" style="text-align: center">已学课时</td>
+          <td
+            v-if="
+              data.classInfo.TRAINTYPE === 'bd2a3b7767db49968e26cfccc3c2b4a4'
+            "
+            width="240px"
+            style="text-align: center"
+          >
+            已学学时
+          </td>
+          <td v-else width="240px" style="text-align: center">已学课时</td>
           <td width="240px">
             {{
               data.learningRecord.COMPLETE_CLASSHOUR === 0.0