Merge pull request 'fix: 修复可疑文件夹，图审审批批量选择问题' (#67) from jie into test

Reviewed-on: #67

src/layout/components/Header/RecycleModal.vue

@@ -460,7 +460,7 @@ function refreshHandler() {
                     class="wrapper-content-item-img"
                     :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }" :src="item.imgUrl"
                   > -->
-                  <n-image :src="item.imgurl" class="img "
+                  <n-image :src="item.imgUrl" class="img "
                     :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }" />
                   <n-checkbox v-if="batch" v-model:checked="item.checked" style="position:absolute;left:20px;top:20px"
                     @click.prevent @update:checked="onCheckChange($event, item)" />

src/views/worksheet/content/Content.vue

@@ -485,63 +485,6 @@ function reloadList() {
               <SvgIcon style="cursor: pointer; margin-left: 30px" name="t2" @click.stop="rejectHandler" />
             </div>
           </div>
-          <!-- 右侧任务 标题信息 -->
-          <!-- <div class="right">
-            <n-scrollbar style="max-height: 100%">
-              <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
-              <div class="tags">
-                <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == '1'">待审批</div>
-                <div class="tag tag-submited" v-else-if="taskDetailInfo.historyStates == 2 || taskDetailInfo.workStatus == 3">已审批</div>
-                <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{
-                  TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
-                <div class="tag tag-not-passed" v-else-if="taskDetailInfo.workStatus == 3">{{
-                  TASK_STATUS_OBJ[taskDetailInfo.historyStates]
-                }}</div>
-              </div>
-              <n-divider class="divider-line" />
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">图片大小
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo && taskDetailInfo?.pictureInfo?.imgSize&&
-                  (taskDetailInfo?.pictureInfo?.imgSize / 1000).toFixed(2) }}KB</span>
-              </div>
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">图片格式
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgFormat }}</span>
-              </div>
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">图片尺寸
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgMeasure }}</span>
-              </div>
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">色彩空间
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgSpace }}</span>
-              </div>
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">提报人
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.upname || "-" }}</span>
-              </div>
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">创建时间
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo && taskDetailInfo?.pictureInfo.createTime }}</span>
-              </div>
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">提报时间
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.submitDateTimestamp &&
-                  format(taskDetailInfo?.submitDateTimestamp, 'yyyy-MM-dd HH:mm:ss') || '-' }}</span>
-              </div>
-              <div v-for="key in Object.keys(propertys)" :key="key" class="property">
-                <span class="property-name">{{ fieldMap[key] }}</span>
-                <span class="property-content">{{ propertys[key] }}</span>
-              </div>
-            </n-scrollbar>
-          </div> -->
           <PictureInfo :taskDetailInfo="taskDetailInfo"></PictureInfo>
         </div>
         <div style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0">
@@ -661,6 +604,39 @@ function reloadList() {
         margin-left: 6px;
       }
     }
+    .right {
+      display: flex;
+      align-items: center;
+
+      .btn {
+        width: 118px;
+        height: 36px;
+        background: linear-gradient(135deg, #5b85f8, #3c6cf0);
+        border-radius: 17px;
+        box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #fff;
+        margin-right: 6px;
+        cursor: pointer;
+      }
+
+      .batch {
+        display: flex;
+        align-items: center;
+
+        .btn-approval {
+          width: 68px;
+          height: 28px;
+          cursor: pointer;
+        }
+
+        .btn-left {
+          margin-left: 16px;
+        }
+      }
+    }
 
     .font {
       font-size: 20px;