Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatesyspic

src/router/modules/message.ts

@@ -1,5 +1,5 @@
-import type { RouteRecordRaw } from 'vue-router'
 import { Layout } from '@/router/constant'
+import type { RouteRecordRaw } from 'vue-router'
 
 /**
  * @param name 路由名称, 必须设置,且不能重名
@@ -40,7 +40,7 @@ const routes: Array<RouteRecordRaw> = [
         path: 'message-detail',
         name: 'message-detail',
         meta: {
-          title: 'message',
+          title: '消息公告',
         },
         component: () => import('@/views/message/content/Detail.vue'),
       },

src/views/message/content/List.vue

@@ -452,6 +452,7 @@ console.log(tabList)
         text-align: left;
         color: #666666;
         line-height: 25px;
+        margin-bottom: 15px;
       }
 
       .subtitle {

src/views/task/content/Content.vue

@@ -887,7 +887,7 @@ function nodrage(){
           <div class="time-item">
             <SvgIcon class="svg-time" color="#FFF" size="16" name="camera-time" />
 
-            <span>{{ taskDetailInfo?.ocrPicture?.photoDateTimestamp ?? "-" }}</span>
+            <span>{{ taskDetailInfo?.ocrPicture?.photoDateTimestamp ?? "- -" }}</span>
           </div>
           <div class="time-item time-item2">
             <SvgIcon class="svg-time" color="#FFF" size="16" name="submit-time" />
@@ -895,7 +895,7 @@ function nodrage(){
             <span>{{
               taskDetailInfo?.ocrPicture?.submitDateTimestamp
                 ? formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp))
-                : "-"
+                : "- -"
             }}</span>
           </div>
         </div>

src/views/worksheet/content/Content.vue

@@ -576,7 +576,7 @@ defineExpose({
 <template>
   <div class="wrapper fullscreen-container" :style="fullscreenStyles">
     <div class="wrapper-header">
-      <div class="left">
+      <div class="left" >
         <span class="font">{{ packageName }}</span>
         <SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
         <SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
@@ -638,9 +638,10 @@ defineExpose({
             class="left"
             :style="{
               'background-image': `url(${taskDetailInfo?.imgurl})`,
-              'flex': imgbigshow ? '0.6' : '1',
+              'flex': imgbigshow ? '0.6' : '0.98',
+              'height':imgbigshow?' 100%':'80vh'
             }"
-            @click="previewHandler"
+           
             @mouseover="showAction"
             @mouseleave="leaveTaskHandler"
           >
@@ -749,42 +750,45 @@ defineExpose({
                 @click.stop="handleRejectdubiousfileyd(taskDetailInfo.id)"
               />
             </div>
-          </div>
-
-          <!-- 缩放线 -->
+               <!-- 缩放线 -->
           <div
             v-show="isFullScreen"
             :style="{
-              position: 'fixed',
+              position: 'absolute',
               zIndex: 169,
               background: 'rgb(80, 122, 253)',
-              right: imgbigshow ? '46%' : '16px',
+           right: imgbigshow ? '-23px':'0',
               marginTop: '5px',
               width: '2px',
-              height: '350px',
+              height: imgbigshow?'340px':'79vh',
             }"
           />
           <div
             v-show="isFullScreen"
             class="aside-collapse-btn"
             :style="{
-              position: 'fixed',
-              right: imgbigshow ? '45%' : '0px',
-              top: '155px',
+              position: 'absolute',
+              right: imgbigshow ? '-40px':'-16px',
+              top: '73px',
               cursor: 'pointer',
               zIndex: 170,
             }"
           >
             <SvgIcon
-              :name="false ? 'expand-cir' : 'collapse-cir'"
+              :name="imgbigshow ? 'expand-cir' : 'collapse-cir'"
               size="40"
               @click="changeimgbigshow"
             />
           </div>
+          </div>
+
+       
 
           <PictureInfo v-show="imgbigshow" :task-detail-info="taskDetailInfo" />
         </div>
         <div
+
+        v-if="imgbigshow"
           style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0"
         >
           <div>
@@ -841,7 +845,7 @@ defineExpose({
             </div>
           </div>
         </div>
-        <div class="wrapper-list">
+        <div class="wrapper-list" v-if="imgbigshow">
           <div
             v-for="(item, index) in listData"
             :key="index"
@@ -869,7 +873,7 @@ defineExpose({
                 <span class="current-time">{{
                   item.submitDateTimestamp
                     ? formatToDateHMS(Number(item.submitDateTimestamp) || 0)
-                    : "-"
+                    : "- -"
                 }}</span>
               </div>
             </div>