Merge pull request 'fix:样式修改' (#323) from fix/change_task into test

Reviewed-on: #323

src/assets/icons/zhankai.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>展开</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="64" height="64"></rect>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="PrevailCloud-Design-图标集" transform="translate(-2512.000000, -2179.000000)">
+            <g id="展开-2" transform="translate(2512.000000, 2179.000000)">
+                <g id="展开" transform="translate(32.000000, 32.000000) scale(-1, 1) rotate(-270.000000) translate(-32.000000, -32.000000) ">
+                    <mask id="mask-2" fill="white">
+                        <use xlink:href="#path-1"></use>
+                    </mask>
+                    <g id="蒙版"></g>
+                    <g id="编组" mask="url(#mask-2)" fill="#999999">
+                        <g transform="translate(32.398318, 32.358039) scale(-1, 1) translate(-32.398318, -32.358039) translate(18.781652, 8.065215)" id="形状结合">
+                            <path d="M7.27477106e-13,24.1889844 C0.0208813961,23.5597929 0.271458149,22.9368064 0.75173026,22.4565343 L0.75173026,22.4565343 L1.10421929,22.1040453 C1.1915415,22.0167231 1.28358153,21.9369941 1.3795189,21.8648584 L22.8677171,0.376576996 C23.3698198,-0.125525665 24.183889,-0.125525665 24.6859917,0.376576996 L26.8567553,2.54734061 C27.358858,3.04944327 27.358858,3.86351253 26.8567553,4.36561519 L6.929,24.293 L26.8567553,44.2200322 C27.3253845,44.6886613 27.3566264,45.429048 26.9504812,45.9339115 L26.8567553,46.0383067 L24.6859917,48.2090704 C24.183889,48.711173 23.3698198,48.711173 22.8677171,48.2090704 L22.8677171,48.2090704 L1.37441953,26.7169448 C1.28031918,26.6458236 1.18999323,26.567376 1.10421929,26.4816021 L0.75173026,26.129113 C0.271458149,25.6488409 0.0208813961,25.0258544 -1.7706149e-13,24.3966629 Z" transform="translate(13.616666, 24.292824) scale(1, -1) translate(-13.616666, -24.292824) "></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/components/RichEditor/Quill.vue

@@ -23,7 +23,7 @@ const options = reactive({
     toolbar: [
       ['bold', 'italic', 'underline', 'strike'], // toggled buttons
       [{ align: '' }, { align: 'center' }, { align: 'right' }, { align: 'justify' }],
-      [{ 'color': [] },], 
+    
     ],
   },
   theme: 'snow',
@@ -104,11 +104,16 @@ const saveHandler = debounce(() => {
   background: #f8f8f8;
   border: 1px solid #d8d8d8;
   margin-top:-4px ;
+  
 }
-
 .ql-container.ql-snow {
   border: 1px solid #d8d8d8;
 }
+::v-deep(.ql-toolbar.ql-snow){
+  background: #f8f8f8;
+border: 1px solid #d8d8d8;
+height:48px ;
+}
 ::v-deep(.n-card__content){
   padding-left:24px !important ;
    padding-right:24px !important;

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

@@ -69,7 +69,18 @@ function onChange(value: Array<string>) {
       <n-select filterable clearable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择审核状态" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -77,7 +77,18 @@ function onChange(value: Array<string>) {
       <n-select filterable clearable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户级别" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -74,7 +74,18 @@ function onChange(value: Array<string>) {
       <n-select filterable  clearable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户名称" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -73,7 +73,18 @@ function onChange(value: Array<string>) {
       <n-select filterable clearable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户类型" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -79,7 +79,18 @@ function onChange(value: Array<string>) {
       <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择izcustomtype" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -73,7 +73,18 @@ function onChange(value: Array<string>) {
       <n-select filterable clearable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择产品名称" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -96,7 +96,18 @@ function onChange(value: Array<string>) {
       <n-select filterable  clearable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择所属项目" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -74,7 +74,18 @@ function onChange(value: Array<string>) {
       <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访项目类别" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -79,7 +79,18 @@ function onChange(value: Array<string>) {
       <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择IzSearch" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -79,7 +79,18 @@ function onChange(value: Array<string>) {
       <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择IzSearchManager" multiple :options="options"
         @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -73,7 +73,18 @@ function onChange(value: Array<string>) {
       <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择分类" multiple :options="options"
         @update:value="onChange"
-      />
+      >
+  <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -95,7 +95,18 @@ function onChange(value: Array<string>) {
       <n-select filterable clearable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择审核状态" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -73,7 +73,18 @@ function onChange(value: Array<string>) {
       <n-select filterable clearable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择发布地区" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -79,7 +79,18 @@ function onChange(value: Array<string>) {
       <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访项目类别" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -79,7 +79,18 @@ function onChange(value: Array<string>) {
       <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户类型" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -79,7 +79,18 @@ function onChange(value: Array<string>) {
       <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户名称" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -79,7 +79,18 @@ function onChange(value: Array<string>) {
       <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户级别" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -73,7 +73,18 @@ function onChange(value: Array<string>) {
       <n-select filterable clearable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择厂商" multiple
         :options="options" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -97,7 +97,18 @@ function onChange(value: Array<string>) {
       <n-select filterable clearable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择任务来源" multiple :options="options"
         @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -73,7 +73,18 @@ function onChange(value: Array<string>) {
       <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择任务审批状态" multiple :options="options"
         @update:value="onChange"
-      />
+      >
+  <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -73,7 +73,18 @@ function onChange(value: Array<string>) {
       <n-select filterable clearable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择省份" multiple :options="options"
         @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -23,6 +23,19 @@ function onChange(value: string[]) {
 <template>
   <div class="wrapper">
     <n-collapse :default-expanded-names="['1']" arrow-placement="right">
+         <template #header-extra>
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="zhankai"
+          class="zhankai"
+        />
+    </template>
+     <template #arrow>
+      <n-icon>
+    
+      </n-icon>
+    </template>
       <CollapseItem
         v-model:checked-keys="checkedKeys" :title="label" name="1" :request="configStore.fetchPictureTypeList"
         @update:checked-keys="onChange"

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

@@ -21,6 +21,19 @@ function onChange(value: string) {
 <template>
   <div class="wrapper">
     <n-collapse :default-expanded-names="['1']" arrow-placement="right">
+         <template #header-extra>
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="zhankai"
+          class="zhankai"
+        />
+    </template>
+     <template #arrow>
+      <n-icon>
+    
+      </n-icon>
+    </template>
       <n-collapse-item :title="label" name="1">
         <Upload v-model:value="url" @update:value="onChange" />
       </n-collapse-item>

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

@@ -95,7 +95,18 @@ function onChange(value: Array<string>) {
       <n-select filterable clearable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择计划" multiple :options="planOptons"
         @update:value="onChange"
-      />
+      >
+      <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -24,6 +24,19 @@ function onChange(value: string[]) {
 <template>
   <div class="wrapper">
     <n-collapse :default-expanded-names="['1']" arrow-placement="right">
+         <template #header-extra>
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="zhankai"
+          class="zhankai"
+        />
+    </template>
+     <template #arrow>
+      <n-icon>
+    
+      </n-icon>
+    </template>
       <CollapseItem
         v-model:checked-keys="checkedKeys" :title="label" name="1" :request="configStore.fetchRegionList"
         @update:checked-keys="onChange"

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

@@ -101,7 +101,18 @@ function onChange(value: Array<string>) {
       clearable
         v-model:value="formValue.users" :max-tag-count="2" multiple placeholder="请选择提报人(可多选)"
         :options="personOptions" @update:value="onChange"
-      />
+      >
+        <template #arrow>
+        <transition name="slide-left">
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="down"
+          class="close_box"
+        />
+        </transition>
+      </template>
+      </n-select>
     </n-form-item>
   </n-form>
 </template>

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

@@ -49,6 +49,19 @@ function onChange(value: number & number[]) {
 <template>
   <div class="wrapper">
     <n-collapse :default-expanded-names="['1']" arrow-placement="right">
+         <template #header-extra>
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="zhankai"
+          class="zhankai"
+        />
+    </template>
+     <template #arrow>
+      <n-icon>
+    
+      </n-icon>
+    </template>
       <n-collapse-item :title="label" name="1">
         <n-space vertical>
           <n-slider

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

@@ -75,6 +75,19 @@ watch(
 <template>
   <div class="wrapper">
     <n-collapse :default-expanded-names="['1']" arrow-placement="right">
+       <template #header-extra>
+        <SvgIcon
+          size="14"
+          color="#000000"
+          name="zhankai"
+          class="zhankai"
+        />
+    </template>
+     <template #arrow>
+      <n-icon>
+    
+      </n-icon>
+    </template>
       <n-collapse-item :title="label" name="1">
         <n-space>
           <n-date-picker

src/views/home/aside/comp/modals/CustomFilterModal.vue

@@ -631,4 +631,5 @@ border: 1px solid #cad2dd;
 border-radius: 2px;
 border-left: 2px solid #1980FF;
   }
+  
 </style>

src/views/home/content/modal/LoginSuccessModal.vue

@@ -108,6 +108,7 @@ defineExpose({
           />
         </div> -->
       </div>
+      <div class="aidog"></div>
     </div>
   </n-modal>
 </template>
@@ -117,16 +118,26 @@ defineExpose({
   background-image: url(../../../../assets/images/approval_modal_bg.png);
   background-repeat: no-repeat;
   background-size: 100%;
-  width: 470px;
+  width: 403px;
-  height: 361px;
+  height: 252px;
   box-shadow: none !important;
   margin-left: 30px !important;
 }
 .wrapper {
   position: absolute;
   left: calc(50% - 286px);
+  .aidog{
+    position: absolute;
+        top: -65px;
+    left: -35px;
+    width: 107px;
+    height: 98.5px;
+     background-image: url(../../../../assets/images/tishi.png);
+  background-repeat: no-repeat;
+  background-size: 100%;
+  }
   .wrapper-hearder {
-    margin-top: 68px;
+    margin-top: 20.5px;
     margin-left: 18px;
     .wrapper-title {
       text-align: center;
@@ -150,13 +161,13 @@ defineExpose({
   .wrapper-content {
     flex: 1;
     border-radius: 8px;
-    margin: 75px  50px 16px 48px;
+    margin: 75px 29px 16px 29px;
     .flex_box {
       display: flex;
       flex-flow: row nowrap;
       align-items: center;
       justify-content: space-between;
-      margin: -18.5px 0 0 20px;
+      margin: -48px 0 0 0px;
       .item {
         .num_box {
           font-size: 20px;
@@ -165,6 +176,7 @@ defineExpose({
           text-align: center;
           color: #202020;
           line-height: 23px;
+          margin-top: 10px;
         }
         .title_box {
           opacity: 0.6;
@@ -230,12 +242,9 @@ defineExpose({
       border-radius: 24px;
       box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
       cursor: pointer;
-
       margin: 20px auto 0;
       position: relative;
-      bottom: -20px;
+      bottom: 0;
-      left: 20px;
-
       font-size: 22px;
       font-weight: 550;
       font-family: YouSheBiaoTiHei, YouSheBiaoTiHei-Regular;

src/views/login/components/Login.vue

@@ -689,7 +689,7 @@ function forget() {
   margin-right: 12px !important;
 }
 ::v-deep(.n-button__content){
-  font-size: 15px !important;
+  font-size: 17px !important;
   line-height: 20px;
    font-family: PingFang SC, PingFang SC-Medium;
 }