Merge branch 'develop' into hhb/develop-2205

TEAMModelOS.FunctionV4/TEAMModelOS.FunctionV4.csproj

@@ -40,6 +40,9 @@
 		<None Update="host.json">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
+		<None Update="libwkhtmltox.dll">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
 		<None Update="local.settings.json">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 			<CopyToPublishDirectory>Never</CopyToPublishDirectory>

TEAMModelOS/ClientApp/src/components/student-web/ClassRecord/ReceiveBack.vue

@@ -12,31 +12,31 @@
                         收集的作品
                     </div>
                     <!-- 图片类型作品 -->
-                    <div v-else-if="collateType == 1">
+                    <div v-else-if="collateType == 'Image' || collateType == 1">
                         <img class="receive-img" :src="item.url" alt="" @click="viewImage(item.url)">
                     </div>
                     <!-- HTEX作品类型 -->
-                    <div v-else-if="collateType == 2">
+                    <div v-else-if="collateType == 'Htex' || collateType == 2">
                         收集的HTEX作品
                     </div>
                     <!-- 音频 -->
-                    <div v-else-if="collateType == 3">
+                    <div v-else-if="collateType == 'Audio' || collateType == 3">
                         <div class="audio-box" @click="viewAudio(item.url)">
                             <Icon class="collate-type-icon" custom="iconfont icon-audio-outline" />
                         </div>
                     </div>
                     <!-- 视频 -->
-                    <div v-else-if="collateType == 4">
+                    <div v-else-if="collateType == 'Video' || collateType == 4">
                         <div class="audio-box" @click="viewAudio(item.url)">
                             <Icon class="collate-type-icon" custom="iconfont icon-video-outline" />
                         </div>
                     </div>
                     <!-- 文字 -->
-                    <div v-else-if="collateType == 5">
+                    <div v-else-if="collateType == 'Text' || collateType == 5">
                         收集的文字
                     </div>
                     <!-- 附件 -->
-                    <div v-else-if="collateType == 6">
+                    <div v-else-if="collateType == 'File' || collateType == 6">
                         <div class="audio-box" @click="downloadFile(item.url, item.name)">
                             <Icon class="collate-type-icon" custom="iconfont icon-file" />
                         </div>

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventList.vue

@@ -97,24 +97,24 @@
                                     <div class="paper-item-school">
                                         <span class="paper-owner" v-if="item.owner === 'school'" style="background-color: #88a1d8;">{{ $t('studentWeb.public.school') }}</span>
                                         <span class="paper-owner" v-else>{{ $t('studentWeb.public.private') }}</span>
-                                        <span class="paper-source" :style="{'border-color': item.owner === 'school' ? '#88a1d8' :'#ababab'}" v-if="item.source === '0'">
+                                        <span class="paper-extType" :style="{'border-color': item.owner === 'school' ? '#88a1d8' :'#ababab'}" v-if="item.source === '0'">
                                             {{ $t("studentWeb.exam.source.evMode1") }}
                                         </span>
                                         <span class="paper-source" :style="{'border-color': item.owner === 'school' ? '#88a1d8' :'#ababab', color: '#2f98a9'}" v-if="item.source === '1'">
                                             {{ $t("studentWeb.exam.source.evMode2") }}
                                         </span>
-                                        <span class="paper-source" :style="{'border-color': item.owner === 'school' ? '#88a1d8' :'#ababab', color: '#b68268'}" v-if="item.source === '2'">
+                                        <span class="paper-extType" :style="{'border-color': item.owner === 'school' ? '#88a1d8' :'#ababab', color: '#b68268'}" v-if="item.source === '2'">
                                             {{ $t("studentWeb.exam.source.evMode3") }}
                                         </span>
                                         
                                         <!-- 课中评量才判断：qamode：0（书面问答），1（纸本测验） -->
                                         <template v-if="item.source === '1'">
-                                            <span class="paper-source" :style="{'border-color': item.owner === 'school' ? '#88a1d8' :'#ababab', color: '#b68268'}"
+                                            <span class="paper-extType" :style="{'border-color': item.owner === 'school' ? '#88a1d8' :'#ababab', color: '#b68268'}"
                                                 v-if="item.qamode"
                                             >
                                                 {{ $t("studentWeb.exam.source.evMode21") }}
                                             </span>
-                                            <span class="paper-source" :style="{'border-color': item.owner === 'school' ? '#88a1d8' :'#ababab', color: '#b68268'}"
+                                            <span class="paper-extType" :style="{'border-color': item.owner === 'school' ? '#88a1d8' :'#ababab', color: '#b68268'}"
                                                 v-else
                                             >
                                                 {{ $t("studentWeb.exam.source.evMode22") }}

TEAMModelOS/ClientApp/src/view/student-web/AppNew.vue

@@ -54,7 +54,8 @@
                 <!-- 头像 -->
                 <div class="profile-dropdown">
                     <div id="stuPhoto">
-                        <img :src="userInfo.picture" alt="" width="35" height="35">
+                        <img v-if="userInfo.picture" :src="userInfo.picture" alt="" width="35" height="35">
+                        <PersonalPhoto v-if="!userInfo.picture && userInfo.name !== undefined" class="avatar-link" :width="'35px'" :height="'35px'" :fontSize="'0.8rem'" :name="userInfo.name" color="#00AD6C" />
                         <span style="margin-left: 5px;">{{ userInfo.name }}</span>
                     </div>
                     <div id="profile-pop">
@@ -113,8 +114,8 @@
 </template>
 
 <script>
-    import jwtDecode from 'jwt-decode'
-    import PersonalPhoto from '@/components/public/personalPhoto/Index.vue'
+    import jwtDecode from 'jwt-decode';
+    import PersonalPhoto from '@/components/public/personalPhoto/Index.vue';
     export default {
         name: "App",
         components: {