Merge pull request 'FIX:第四次审批样式修改' (#166) from fix/change_task into test

Reviewed-on: #166

src/views/task/content/Content.vue

@@ -98,7 +98,14 @@ const fullscreenStyles = computed<any>(() => ({
   left: isFullScreen.value ? '0' : '',
   zIndex: isFullScreen.value ? '100' : '',
 }))
-
+const fullscreenStylestwo = computed<any>(() => ({
+  width: isFullScreen.value ? '100vw' : '',
+  height: isFullScreen.value ? '100vh' : '',
+  position: isFullScreen.value ? 'fixed' : '',
+  top: isFullScreen.value ? '0' : '',
+  left: isFullScreen.value ? '0' : '',
+  zIndex: isFullScreen.value ? '160' : '',
+}))
 onMounted(() => {
   window.addEventListener('keydown', handleKeydown)
 
@@ -470,6 +477,7 @@ onUnmounted(() => {
 })
 
 function immersionHandler() {
+  imgbigshow.value=true
   // taskStore.updateImmersion()
   toggleFullScreen()
 }
@@ -661,7 +669,7 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
   <div
     ref="scrollContainer"
     class="wrapper fullscreen-container"
-    :style="fullscreenStyles"
+    :style="!imgbigshow?fullscreenStylestwo:fullscreenStyles"
     @scroll="checkBottom"
   >
     <div class="wrapper-header">
@@ -771,6 +779,12 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
           : {}
       "
     >
+    <div v-show="!imgbigshow" :style="{position:'fixed',height:'100vh',zIndex:169,   height: '100vh',
+  background:'rgb(80, 122, 253)',
+    right: '16px',
+    marginTop: '5px',
+    width: '2px',
+    height: '91.5vh'}"></div>
       <div
         v-show="!imgbigshow"
         class="aside-collapse-btn"
@@ -779,10 +793,12 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
           right: '0px',
           top: '155px',
           cursor: 'pointer',
-          zIndex: 100,
+          zIndex:170
+         
         }"
         @click="collapseHandler"
       >
+      
         <SvgIcon
           :name="false ? 'expand-cir' : 'collapse-cir'"
           size="40"
@@ -796,12 +812,13 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
             ? imgbigshow
               ? {
                 'position': 'relative',
-                'flex': 2,
+                'flex': 0.75,
                 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`,
               }
               : {
                 'height': '92vh',
-                'flex': 2,
+                 'flex': 1,
+             
                 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`,
               }
             : {
@@ -951,9 +968,10 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
         :style="
           isFullScreen
             ? {
-              width: '320px',
+             flex:'0.25',
               borderLeft: '2px solid #507AFD',
               position: 'relative',
+              borderRadius:0
             }
             : {}
         "
@@ -1063,7 +1081,7 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
               </div>
             </div>
             <n-scrollbar v-else style="max-height: 100%">
-              <n-ellipsis style="">
+              <n-ellipsis :style="{fontSize:'22px',fontWeight:500,color:'#0D0B22'}">
                 {{ taskDetailInfo.fromtaskname }}
               </n-ellipsis>
               <div class="tags">
@@ -1096,11 +1114,11 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
                 </div>
               </div>
               <n-divider class="divider-line" />
-              <div>
-                <div v-for="(item, index) in taskTableData" :key="index">
+              <div :style="{width:'100%'}">
+                <div v-for="(item, index) in taskTableData" :key="index" :style="{width:'100%'}">
                   <div
                     v-if="item[0].label == '拜访终端名称'"
-                    :style="{ display: 'flex', height: '26px' }"
+                    :style="{ display: 'flex', height: '100%',width:'100%' }"
                   >
                     <div
                       :style="{
@@ -1111,7 +1129,9 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
                     >
                       {{ item[0].label }}
                     </div>
-                    <div :style="{ marginLeft: '15px', fontSize: '16px' }">
+                    <div :style="{ marginLeft: '15px', fontSize: '16px'    ,textOverflow: 'ellipsis',
+    paddingTop: '2px'
+ }">
                       {{ item[0].value }}
                     </div>
                   </div>
@@ -1658,7 +1678,7 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
 
       .action {
         position: absolute;
-        z-index: 3;
+       
         width: 100%;
         height: 100%;
         display: flex;

src/views/task/index.vue

@@ -32,6 +32,9 @@ function setAsideItemName(text) {
 :deep(.wrapper){
   top:0
 }
+:deep(.ip_box){
+ z-index: 105;
+}
 .main {
   display: flex;
   flex-direction: row;