Merge branch 'jie' into main

src/config/home.ts

@@ -22,14 +22,14 @@ export const timeOptions = [
 ]
 
 export const viewOptions = [
-  {
-    label: '横版',
-    value: 'horizontalVersion',
-  },
   {
     label: '平铺',
     value: 'masonry',
   },
+  {
+    label: '横版',
+    value: 'horizontalVersion',
+  },
   {
     label: '竖版',
     value: 'verticalVersion',

src/layout/components/Header/UserSettings.vue

@@ -16,8 +16,8 @@ const useInfo = userStore.getUserInfo
 
 const aiDisabled = ref(false)
 
-function handleSelect(key: string) {
+function handleSelect(row) {
-  userStore.updateTenantId(key)
+  userStore.updateTenantId(row.key)
   location.reload()
 }
 
@@ -55,6 +55,7 @@ onMounted(() => {
 
 const showPopover = ref(false)
 const popRef = ref(null)
+const changeFlag = ref(false)
 
 const iconName = computed(() => {
   return showPopover.value ? 'expand' : 'collapse'
@@ -88,10 +89,8 @@ const options = computed(() => {
 </script>
 
 <template>
-  <n-popover
+  <n-popover ref="popRef" style="border-radius: 10px" placement="bottom-end" raw :show-arrow="false" trigger="click"
-    ref="popRef" style="border-radius: 10px" placement="bottom-end" raw :show-arrow="false" trigger="click"
+    @update:show="handleUpdateShow">
-    @update:show="handleUpdateShow"
-  >
     <template #trigger>
       <div class="setting">
         <span>{{ useInfo.username }}</span>
@@ -100,18 +99,16 @@ const options = computed(() => {
     </template>
     <div class="container">
       <div class="header">
-        <n-avatar :src="getImgUrl(useInfo.usericon)" round size="medium" />
+        <n-avatar :src="getImgUrl(useInfo.usericon)" round style="width:53px; height:53px" />
-        <div style="margin-left: 10px">
+        <div style="margin-left: 12px">
-          <span style="display: block; font-size: 20px">{{ useInfo.username }}</span>
+          <span style="display: block; font-size: 21px">{{ useInfo.username }}</span>
-          <span style="display: block; font-size: '20px'">{{ useInfo.departname }}</span>
+          <span style="display: block; font-size: 16px">{{ useInfo.departname }}</span>
         </div>
       </div>
-      <n-dropdown placement="left-start" trigger="hover" :options="options" @select="handleSelect">
+      <div class="trigger">
-        <div class="trigger">
+        <span>{{ currentCompanyName }}</span>
-          <span>{{ currentCompanyName }}</span>
+        <span @click="changeFlag = !changeFlag" style="cursor: pointer;">icon</span>
-          <span>icon</span>
+      </div>
-        </div>
-      </n-dropdown>
       <div class="item">
         <span>AI设置开关</span>
         <n-switch v-model:value="aiDisabled" />
@@ -119,10 +116,15 @@ const options = computed(() => {
       <div class="trigger">
         联系我们
       </div>
-      <n-divider style="margin-top: 0px; margin-bottom: 10px" />
+      <n-divider style="margin-top: 0px; margin-bottom: 10px;padding: 0 22px;" />
       <div class="trigger" @click="logOut">
         退出登录
       </div>
+      <div class="container" v-show="changeFlag" style="position: absolute;right:332px;width: 220px;padding:24px 0">
+        <div class="trigger" v-for="option in options" :key="option.key" @click="handleSelect(option)">
+          {{ option.label }}
+        </div>
+      </div>
     </div>
   </n-popover>
 </template>
@@ -140,26 +142,40 @@ const options = computed(() => {
   border-radius: 10px;
   justify-content: center;
   background-color: #ffffff;
+  width: 320px;
+  position: relative;
 
   .header {
     border-radius: 10px 10px 0px 0px;
-    background-color: #7a92ff;
+    background: linear-gradient(122deg, #4867ff 5%, #a0b3ff 100%);
     padding: 10px 20px;
     display: flex;
     align-items: center;
-    margin-bottom: 20px;
+    margin-bottom: 14px;
     color: #ffffff;
+    height: 80px;
   }
 
   .trigger,
   .item {
     display: flex;
     justify-content: space-between;
-    padding: 10px 20px;
+    padding: 13px 20px;
+    cursor: pointer;
+    color: #333333;
   }
 
   .trigger:hover {
     background-color: #e8f2ff;
   }
 }
+
+::v-deep(.n-dropdown-option) {
+  color: lime;
+  background: red;
+}
+
+::v-deep(.n-dropdown-option-body__label) {
+  color: lime;
+}
 </style>

src/layout/components/IconGroup/index.vue

@@ -36,7 +36,7 @@ function getSvgName(item: MenuMixedOption) {
         class="icon-button" :class="{ 'icon-button--selected': isSelect(item) }"
         @click="handleClick(item)"
       >
-        <SvgIcon :size="item.svgsize as number" :name="getSvgName(item)" />
+        <SvgIcon color="#666666" :size="item.svgsize as number" :name="getSvgName(item)"  />
       </button>
     </template>
     <span>{{ item.title }}</span>

src/router/modules/home.ts

@@ -18,7 +18,7 @@ const routes: Array<RouteRecordRaw> = [
     redirect: '/home',
     component: Layout,
     meta: {
-      title: 'AI查重',
+      title: 'AI一键查重',
       svgname: 'ai-main',
       svgsize: 60,
       permissions: ['home_main'],
@@ -29,7 +29,7 @@ const routes: Array<RouteRecordRaw> = [
         path: 'home',
         name: `home_main`,
         meta: {
-          title: 'AI查重',
+          title: 'AI一键查重',
           permissions: ['home_main'],
           affix: true,
         },

src/views/home/aside/comp/AdvanceFilter.vue

@@ -226,7 +226,7 @@ const moveEnd = () => {
       >
         <template #trigger>
           <div class="wrapper-left-dropdown" @click="showClick">
-            <span>高级筛选</span>
+            <span style="font-size: 20px;color: #333333;font-weight: Medium;">高级筛选</span>
             <SvgIcon :style="{ marginLeft: '5px' }" name="down" size="14" />
           </div>
         </template>

src/views/home/aside/comp/Upload.vue

@@ -112,8 +112,8 @@ const handleDrop = async (e) => {
 <style lang="less" scoped>
 .wrapper {
   width: 288px;
-  height: 116px;
+  height: 156px;
-  padding: 12px;
+  padding: 32px 16px;
   box-sizing: border-box;
   margin-top: 10px;
   background: rgba(202, 210, 221, 0.10);
@@ -168,5 +168,13 @@ const handleDrop = async (e) => {
       margin: 0px 15px;
     }
   }
+  .wrapper-tip1 {
+    line-height: inherit;
+    margin-top: 7px;
+  }
+  .wrapper-tip2 {
+    line-height: inherit;
+    margin-top: 7px;
+  }
 }
 </style>

src/views/home/aside/comp/items/IzProject.vue

@@ -30,6 +30,7 @@ const options = ref([])
 const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
+  color: '#333333'
 }
 
 onBeforeMount(async () => {

src/views/home/aside/comp/items/PictureType.vue

@@ -35,4 +35,7 @@ function onChange(value: string[]) {
 .wrapper {
   padding: 10px;
 }
+::v-deep(.n-collapse-item-arrow){
+  color: #999999 !important;;
+}
 </style>

src/views/home/aside/comp/items/PictureUpload.vue

@@ -31,5 +31,12 @@ function onChange(value: string) {
 <style lang="less" scoped>
 .wrapper {
   padding: 10px;
+  margin-top: 0;
+}
+::v-deep(.n-collapse-item-arrow){
+  color: #999999 !important;;
+}
+::v-deep(.n-collapse-item__content-inner){
+  padding-top: 0!important;
 }
 </style>

src/views/home/aside/comp/items/Similarity.vue

@@ -39,4 +39,7 @@ function onChange(value: number & number[]) {
 .wrapper {
   padding: 10px;
 }
+::v-deep(.n-collapse-item-arrow){
+  color: #999999 !important;;
+}
 </style>

src/views/home/aside/comp/items/Time.vue

@@ -22,7 +22,11 @@ function onChange(value: [number, number]) {
     <n-collapse :default-expanded-names="['1']" arrow-placement="right">
       <n-collapse-item :title="label" name="1">
         <n-space>
-          <n-date-picker v-model:value="time" type="daterange" clearable @update:value="onChange" />
+          <n-date-picker v-model:value="time" type="daterange" clearable @update:value="onChange" >
+            <template #separator>
+              至
+            </template>
+          </n-date-picker>
         </n-space>
       </n-collapse-item>
     </n-collapse>
@@ -33,4 +37,10 @@ function onChange(value: [number, number]) {
 .wrapper {
   padding: 10px;
 }
+::v-deep(.n-collapse-item-arrow){
+  color: #999999 !important;
+}
+::v-deep(.n-input__separator){
+  color: #999999 !important;;
+}
 </style>

src/views/home/content/Content.vue

@@ -168,7 +168,7 @@ const gridHeight = computed(() => {
   } else if (viewMode.value === 'horizontalVersion') {
     height = '145px'
   } else if (viewMode.value === 'verticalVersion') {
-    height = '320px'
+    height = '300px'
   } else if (viewMode.value === '3:4') {
     height = '240px'
   }
@@ -337,12 +337,12 @@ function previewHandler(index: number,event: MouseEvent) {
               <SvgIcon class="gap" name="arrow-botton" size="14" />
             </div>
           </n-popselect>
-          <div style="margin-left: 15px;cursor: pointer" @click="sortHandler()">
+          <div style="margin-left: 15px;cursor: pointer;color:#323233" @click="sortHandler()">
             <span>相似度排序</span>
             <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
           </div>
         </div>
-        <span>共{{ totalCount }}项</span>
+        <span style="font-size: 16px;color:#494949">共 <span style="color:#7899fd;font-weight: 500;">{{ totalCount }}</span> 项</span>
       </div>
       <n-spin :show="loading">
         <div ref="el" class="scroll" :style="listStyle">
@@ -473,6 +473,8 @@ function previewHandler(index: number,event: MouseEvent) {
       justify-content: space-between;
       margin-top: 4px;
       position: relative;
+      color: #666666;
+      font-size: 16px;
 
       .left {
         display: flex;
@@ -485,8 +487,8 @@ function previewHandler(index: number,event: MouseEvent) {
       }
 
       .avatar {
-        width: 15px;
+        width: 20px;
-        height: 15px;
+        height: 20px;
         margin-right: 5px;
       }
     }
@@ -496,6 +498,7 @@ function previewHandler(index: number,event: MouseEvent) {
       flex-direction: row;
       align-items: center;
       margin-right: 24px;
+      color:#323233;
 
       .gap {
         margin-left: 5px;