Merge pull request 'fix:样式调整' (#331) from fix/change_task into test

Reviewed-on: #331

src/assets/icons/addicon.svg

@@ -0,0 +1,18 @@
+<?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(-1192.000000, -3118.000000)">
+            <g id="添加" transform="translate(1192.000000, 3118.000000)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="蒙版"></g>
+                <path d="M33.6001601,10.1217936 C34.1524449,10.1217936 34.6001601,10.5695089 34.6001601,11.1217936 L34.6001601,11.1217936 L34.5992064,29.3997936 L52.8782064,29.3998399 C53.4304911,29.3998399 53.8782064,29.8475551 53.8782064,30.3998399 L53.8782064,33.6001601 C53.8782064,34.1524449 53.4304911,34.6001601 52.8782064,34.6001601 L34.5992064,34.5997936 L34.6001601,53.1217936 C34.6001601,53.6346295 34.21412,54.0573008 33.7167813,54.1150659 L33.6001601,54.1217936 L30.3998399,54.1217936 C29.8475551,54.1217936 29.3998399,53.6740784 29.3998399,53.1217936 L29.3998399,53.1217936 L29.3992064,34.5997936 L10.8782064,34.6001601 C10.3259216,34.6001601 9.87820635,34.1524449 9.87820635,33.6001601 L9.87820635,30.3998399 C9.87820635,29.8475551 10.3259216,29.3998399 10.8782064,29.3998399 L29.3992064,29.3997936 L29.3998399,11.1217936 C29.3998399,10.6089578 29.78588,10.1862865 30.2832187,10.1285214 L30.3998399,10.1217936 Z" id="形状结合" fill="#507AFD" mask="url(#mask-2)"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/layout/components/Header/index.vue

@@ -285,7 +285,7 @@ onUnmounted(() => {
         </div>
       </div>
       <!-- 个人中心 -->
-      <div style="margin-left: 16px;" class="layout-header-trigger layout-header-trigger-min">
+      <div style="margin-left: 19px;margin-right:4px" class="layout-header-trigger layout-header-trigger-min">
         <!-- <n-avatar :src="getImgUrl(useInfo.usericon)" round /> -->
         <n-avatar
           style="width: 36px; height: 36px"

src/views/final/comp/NewFilterModal.vue

@@ -313,6 +313,12 @@ defineExpose({
                 maxlength="15"
                 @keydown.enter.prevent
               />
+               <template #feedback>
+                <div v-show="!formValue.name" style="color:#d03050">
+                  {{formValue.name}}
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/> 请输入标题内容
+    </div>
+      </template>
             </n-form-item>
             <n-form-item v-show="false" path="logic" label="逻辑关系">
               <n-select
@@ -367,14 +373,62 @@ defineExpose({
                    margin-left: 17px;"
               >
                 <template #icon>
-                  <SvgIcon size="24" name="close" />
+                  <!-- <SvgIcon size="24" name="close" color="#F00"/>
+                   -->
+                  <svg
+                 
+                    width="24px"
+                    height="24px"
+                    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>
+                    <g
+                      id="页面-1"
+                      stroke="none"
+                      stroke-width="1"
+                      fill="none"
+                      fill-rule="evenodd"
+                    >
+                      <g
+                        id="PrevailCloud-Design-图标集"
+                        transform="translate(-3040.000000, -3118.000000)"
+                        fill-rule="nonzero"
+                      >
+                        <g id="清除" transform="translate(3040.000000, 3118.000000)">
+                          <rect
+                            id="矩形"
+                            fill="#000000"
+                            opacity="0"
+                            x="0"
+                            y="0"
+                            width="64"
+                            height="64"
+                          />
+                          <path
+                            id="形状"
+                            d="M32,4 C16.5619675,4 4,16.5600322 4,32 C4,47.4399678 16.5600322,60 32,60 C47.4380325,60 60,47.4399678 60,32 C60,16.5600322 47.4399678,4 32,4 Z M43.4220132,40.6240021 C44.2020159,41.4079827 44.1999731,42.6720064 43.4180353,43.4520091 C43.0280877,43.8400215 42.5180487,44.0360166 42.0060745,44.0360166 C41.4920576,44.0360166 40.9800834,43.8400214 40.5900283,43.4480311 L31.9900014,34.8219862 L23.3620213,43.3580432 C22.9720737,43.7420776 22.4639699,43.9360301 21.9559737,43.9360301 C21.4400215,43.9360301 20.9260046,43.7379922 20.5340143,43.3420239 C19.7579895,42.5560005 19.7640102,41.2919768 20.5500336,40.5140169 L29.1680151,31.9900013 L20.5819648,23.3759978 C19.8019621,22.5939524 19.8040049,21.3279935 20.5859428,20.5479908 C21.3679882,19.7659454 22.6319043,19.7700309 23.4139498,20.5519687 L32.0119339,29.1759709 L40.639914,20.6400214 C41.4238946,19.8620614 42.6918962,19.8700173 43.467921,20.6560407 C44.2458809,21.4420641 44.2379251,22.708023 43.4519016,23.4840477 L34.8340277,32.0079559 L43.4220132,40.6240021 Z"
+                            fill="#DDDDDD"
+                          />
+                        </g>
+                      </g>
+                    </g>
+                  </svg>
                 </template>
               </n-button>
+                <template #feedback>
+                <div v-if="formValue.conditions[index].type==null||formValue.conditions[index].result==null||formValue.conditions[index].result==''" style="color:#d03050">
+               
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请选择过滤条件
+    </div>
+      </template>
             </n-form-item>
           </n-form>
         </div>
         <div class="wrapper-new" @click="createCondition">
-          <span style="font-size: 16px">+</span>
+           <SvgIcon size="16" name="addicon"  style="margin-top: 3px;"/>
           <span style="margin-left: 8px;margin-bottom: 40px;">添加筛选条件</span>
         </div>
       </div>
@@ -384,7 +438,7 @@ defineExpose({
           <n-button style="background-color: #507afd;width: 72px;height: 38px;" type="info" @click="handleSumbit">
             保存
           </n-button>
-          <n-button secondary style="margin-left: 15px ;width: 72px;height: 38px;" @click="closeModal">
+          <n-button secondary style="margin-left: 15px ;width: 72px;height: 38px;background-color: #fff; border:1px solid rgb(202, 210, 221)" @click="closeModal">
             取消
           </n-button>
         </div>
@@ -405,7 +459,7 @@ defineExpose({
   }
 
   &-bar {
-    background-color: #e8e8e8;
+    background-color: #F8F8F8;
     width: 100%;
     margin-top: 27px;
     font-size: 16px;

src/views/final/comp/RepeatModal.vue

@@ -130,7 +130,7 @@ defineExpose({
 
 <style lang="less" scoped>
 .modal_wrap {
-  background-image: url(../../../assets/images/approval_modal_bg.png);
+  background-image: url(../../../assets/images/approval_modal_bgtwo.png);
   background-repeat: no-repeat;
   background-size: 100%;
   width: 700px;

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

@@ -1,12 +1,13 @@
 <script lang="ts" setup>
 import type { FormInst, FormItemRule, FormRules } from 'naive-ui'
-import { computed, defineOptions, onBeforeMount, reactive, ref, unref, watch } from 'vue'
+import { computed, defineOptions, onBeforeMount, reactive, ref, unref, watch,h } from 'vue'
 import { asideMap } from '@/config/aside'
 import { useDictionary } from '@/store/modules/dictonary'
 import { useConfig } from '@/store/modules/asideConfig'
 import type { FilterCondition } from '/#/api'
 import { addCondition, updateCondition } from '@/api/home/filter'
 import { formatToDate2, formatToDate3 } from '@/utils/dateUtil'
+import SvgIcon from '@/components/Icon/SvgIcon.vue'
 
 type Status = 'edit' | 'new'
 
@@ -295,11 +296,30 @@ function edit(editFilter: any) {
     }
   })
 }
-
+function createTimeForNumber (type) {
+console.log(formValue.name)
+if(formValue.name){
+  return ``}
+  else{
+return  `请输入标题内容`
+  }
+}
+let inputNumberFeedback=  createTimeForNumber(1)
 defineExpose({
   showModal,
   edit,
 })
+watch(
+  () => formValue.name,
+  (newVal) => {
+console.log(formValue.name)
+if(formValue.name){
+  createTimeForNumber(0)
+}else{
+   createTimeForNumber(1)
+}
+  },
+)
 </script>
 
 <template>
@@ -337,7 +357,7 @@ defineExpose({
             :rules="rules"
             require-mark-placement="left"
           >
-            <n-form-item path="name" label="标题" merged-require-mark-placement="left">
+            <n-form-item path="name" label="标题" merged-require-mark-placement="left"   >
               <!-- j -->
               <n-input
                 v-model:value="formValue.name"
@@ -346,6 +366,12 @@ defineExpose({
                 placeholder="请输入过滤条件名称"
                 @keydown.enter.prevent
               />
+               <template #feedback>
+                <div v-show="!formValue.name" style="color:#d03050">
+                  {{formValue.name}}
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;"/> {{ inputNumberFeedback }}
+    </div>
+      </template>
             </n-form-item>
             <n-form-item v-show="false" path="logic" label="逻辑关系">
               <n-select
@@ -445,11 +471,17 @@ defineExpose({
                   </svg>
                 </template>
               </n-button>
+                  <template #feedback>
+                <div v-if="formValue.conditions[index].type==null||formValue.conditions[index].result==null||formValue.conditions[index].result==''" style="color:#d03050">
+               
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请选择过滤条件
+    </div>
+      </template>
             </n-form-item>
           </n-form>
         </div>
         <div class="wrapper-new" @click="createCondition">
-          <span style="font-size: 16px">+</span>
+         <SvgIcon size="16" name="addicon"  style="margin-top: 3px;"/>
           <span style="margin-left: 8px">添加筛选条件</span>
         </div>
       </div>

src/views/login/components/Forget.vue

@@ -297,6 +297,11 @@ function forget() {
               <svg-icon size="20" name="enterprise" />
             </template>
           </n-input>
+            <template #feedback>
+                <div v-if="!formForget.agentcode" style="color:#d03050">              
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请输入企业编码
+    </div>
+      </template>
         </n-form-item>
         <n-form-item class="form-item" path="loginname">
           <n-input
@@ -310,6 +315,11 @@ function forget() {
               <svg-icon size="20" name="account" />
             </template>
           </n-input>
+           <template #feedback>
+                <div v-if="!formForget.loginname" style="color:#d03050">              
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请输入用户名
+    </div>
+      </template>
         </n-form-item>
         <n-form-item class="form-item" path="phone">
           <n-input
@@ -329,6 +339,11 @@ function forget() {
             </template>
             
           </n-input>
+           <template #feedback>
+                <div v-if="!formForget.phone" style="color:#d03050">              
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请输入手机号
+    </div>
+      </template>
         </n-form-item>
         <n-form-item class="form-item" path="phonecode">
           <n-input
@@ -359,6 +374,11 @@ function forget() {
               </div>
             </template>
           </n-input>
+            <template #feedback>
+                <div v-if="!formForget.phonecode" style="color:#d03050">              
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请输入验证码
+    </div>
+      </template>
         </n-form-item>
         <!-- <n-form-item class="form-item"> -->
         <n-button

src/views/login/components/Login.vue

@@ -376,6 +376,11 @@ function forget() {
               <svg-icon size="20" name="enterprise" />
             </template>
           </n-input>
+          <template #feedback>
+                <div v-if="!formInline.enterprisecode" style="color:#d03050">              
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请输入企业编码
+    </div>
+      </template>
         </n-form-item>
         <n-form-item class="form-item" path="username">
           <n-input
@@ -388,6 +393,11 @@ function forget() {
               <svg-icon size="20" name="account" />
             </template>
           </n-input>
+           <template #feedback>
+                <div v-if="!formInline.username" style="color:#d03050">              
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请输入用户名
+    </div>
+      </template>
         </n-form-item>
         <n-form-item class="form-item" path="password">
           <n-input
@@ -402,6 +412,11 @@ function forget() {
               <svg-icon size="20" name="password" />
             </template>
           </n-input>
+           <template #feedback>
+                <div v-if="!formInline.password" style="color:#d03050">              
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请输入密码
+    </div>
+      </template>
         </n-form-item>
         <!-- <n-form-item class="form-item"> -->
         <n-button
@@ -449,6 +464,11 @@ function forget() {
               <svg-icon size="20" name="enterprise" />
             </template>
           </n-input>
+           <template #feedback>
+                <div v-if="!formSms.agentcode" style="color:#d03050">              
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请输入企业编码
+    </div>
+      </template>
         </n-form-item>
         <n-form-item class="form-item" path="phone">
           <n-input
@@ -466,6 +486,11 @@ function forget() {
               />
             </template>
           </n-input>
+           <template #feedback>
+                <div v-if="!formSms.phone" style="color:#d03050">              
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请输入手机号
+    </div>
+      </template>
         </n-form-item>
         <n-form-item class="form-item" path="phonecode">
           <n-input
@@ -497,6 +522,11 @@ function forget() {
               </div>
             </template>
           </n-input>
+           <template #feedback>
+                <div v-if="!formSms.phonecode" style="color:#d03050">              
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请输入验证码
+    </div>
+      </template>
         </n-form-item>
         <!-- <n-form-item class="form-item"> -->
         <n-button

src/views/task/aside/Aside.vue

@@ -407,10 +407,14 @@ function handleOk(item: any) {
     height: calc(100vh - 253px);
             background: #fff
   }
+
   @media (max-height: 900px) {
   ::v-deep(.list){
     height: calc(100vh - 234px);
             background: #fff
   }}
+   ::v-deep(.wrapper-left-popover){
+    left: -25px !important;
+  }
 </style>
 

src/views/task/index.vue

@@ -52,9 +52,12 @@ function setAsideItemName(text) {
   width: 100%;
  height: calc(100vh - 192px);
 }
+
+
   @media (max-height: 900px) {
   .main{
     height: calc(100vh - 175px);
            
   }}
+ 
 </style>

src/views/task/modal/NewFilterModal.vue

@@ -311,6 +311,12 @@ defineExpose({
                 maxlength="15"
                 @keydown.enter.prevent
               />
+              <template #feedback>
+                <div v-show="!formValue.name" style="color:#d03050">
+                  {{formValue.name}}
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/> 请输入标题内容
+    </div>
+      </template>
             </n-form-item>
             <n-form-item v-show="false" path="logic" label="逻辑关系">
               <n-select
@@ -365,14 +371,62 @@ defineExpose({
                    margin-left: 17px;"
               >
                 <template #icon>
-                  <SvgIcon size="24" name="close" />
+                  <!-- <SvgIcon size="24" name="close" color="#F00"/>
+                   -->
+                  <svg
+                 
+                    width="24px"
+                    height="24px"
+                    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>
+                    <g
+                      id="页面-1"
+                      stroke="none"
+                      stroke-width="1"
+                      fill="none"
+                      fill-rule="evenodd"
+                    >
+                      <g
+                        id="PrevailCloud-Design-图标集"
+                        transform="translate(-3040.000000, -3118.000000)"
+                        fill-rule="nonzero"
+                      >
+                        <g id="清除" transform="translate(3040.000000, 3118.000000)">
+                          <rect
+                            id="矩形"
+                            fill="#000000"
+                            opacity="0"
+                            x="0"
+                            y="0"
+                            width="64"
+                            height="64"
+                          />
+                          <path
+                            id="形状"
+                            d="M32,4 C16.5619675,4 4,16.5600322 4,32 C4,47.4399678 16.5600322,60 32,60 C47.4380325,60 60,47.4399678 60,32 C60,16.5600322 47.4399678,4 32,4 Z M43.4220132,40.6240021 C44.2020159,41.4079827 44.1999731,42.6720064 43.4180353,43.4520091 C43.0280877,43.8400215 42.5180487,44.0360166 42.0060745,44.0360166 C41.4920576,44.0360166 40.9800834,43.8400214 40.5900283,43.4480311 L31.9900014,34.8219862 L23.3620213,43.3580432 C22.9720737,43.7420776 22.4639699,43.9360301 21.9559737,43.9360301 C21.4400215,43.9360301 20.9260046,43.7379922 20.5340143,43.3420239 C19.7579895,42.5560005 19.7640102,41.2919768 20.5500336,40.5140169 L29.1680151,31.9900013 L20.5819648,23.3759978 C19.8019621,22.5939524 19.8040049,21.3279935 20.5859428,20.5479908 C21.3679882,19.7659454 22.6319043,19.7700309 23.4139498,20.5519687 L32.0119339,29.1759709 L40.639914,20.6400214 C41.4238946,19.8620614 42.6918962,19.8700173 43.467921,20.6560407 C44.2458809,21.4420641 44.2379251,22.708023 43.4519016,23.4840477 L34.8340277,32.0079559 L43.4220132,40.6240021 Z"
+                            fill="#DDDDDD"
+                          />
+                        </g>
+                      </g>
+                    </g>
+                  </svg>
                 </template>
               </n-button>
+                 <template #feedback>
+                <div v-if="formValue.conditions[index].type==null||formValue.conditions[index].result==null||formValue.conditions[index].result==''" style="color:#d03050">
+               
+        <SvgIcon size="16" name="notice"  style="margin-top: -2px;margin-right: 5px;"/>请选择过滤条件
+    </div>
+      </template>
             </n-form-item>
           </n-form>
         </div>
         <div class="wrapper-new" @click="createCondition">
-          <span style="font-size: 16px">+</span>
+           <SvgIcon size="16" name="addicon"  style="margin-top: 3px;"/>
           <span style="margin-left: 8px">添加筛选条件</span>
         </div>
       </div>
@@ -383,7 +437,7 @@ defineExpose({
             ">
             保存
           </n-button>
-          <n-button secondary style="margin-left: 15px ;width: 72px;height: 38px;" @click="closeModal" >
+          <n-button secondary style="margin-left: 15px ;width: 72px;height: 38px;background-color: #fff; border:1px solid rgb(202, 210, 221)" @click="closeModal" >
             取消
           </n-button>
         </div>
@@ -404,7 +458,7 @@ defineExpose({
   }
 
   &-bar {
-    background-color: #e8e8e8;
+    background-color: #F8F8F8;
     width: 100%;
     margin-top: 27px;
     font-size: 16px;

src/views/worksheet/aside/Aside.vue

@@ -331,7 +331,8 @@ if (searchContent) {
   border-top: 1px solid #e8e8e8;
     width: 100%;
     height: 1px;
-    padding-bottom: 16px;
+    
   }
 }
+
 </style>

src/views/worksheet/aside/ListItem.vue

@@ -174,8 +174,8 @@ onMounted(async () => {})
     <template v-if="showFieldList?.length > 6">
       <div class="absolute bottom-0 py-[8px] pl-[20px] text-[#666] item-action">
         <span style="font-size:13px" class="cursor-pointer" @click.stop="showFull = !showFull">
-          <SvgIcon v-if="showFull" style="margin-left: 6px" name="expand" size="11" />
-          <SvgIcon v-else style="margin-left: 6px" name="collapse" size="11" />
+          <SvgIcon v-if="showFull" style="margin-left: 6px" name="expand" size="14" />
+          <SvgIcon v-else style="margin-left: 6px" name="collapse" size="14" />
           {{ showFull ? "收起" : "展开" }}
         </span>
       </div>
@@ -199,7 +199,7 @@ onMounted(async () => {})
 
 <style lang="less" scoped>
 .list-item {
-     margin-left: 16px;
+     
     padding: 10px 0px 30px 0px;
   position: relative;
   border-bottom: 1px solid #e8e8e8;
@@ -212,7 +212,7 @@ onMounted(async () => {})
   &-header {
     display: flex;
     align-items: center;
-margin-left: 6px;
+margin-left: 20px;
 
     .id-wrap {
       display: flex;

src/views/worksheet/content/Content.vue

@@ -743,7 +743,7 @@ defineExpose({
             class="left"
             :style="{
               'background-image': `url(${taskDetailInfo?.imgurl})`,
-              'flex': imgbigshow ? '0.6' : '0.98',
+              'flex': imgbigshow ? '0.65' : '0.98',
               'height': imgbigshow ? ' 100%' : '80vh',
               'background-size': imgbigshow ? 'auto 100%' : 'cover',
             }"
@@ -902,7 +902,7 @@ defineExpose({
         <div
 
           v-if="imgbigshow"
-          style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0;    margin-top: 9px"
+          style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0;    margin-top: 12px"
         >
           <div>
             <span
@@ -1168,10 +1168,11 @@ defineExpose({
 
   &-detail {
     display: flex;
-    height: 350px;
+    height: 346px;
     border-radius: 8px;
+        margin-bottom: 6px;
     .left {
-      flex: 0.6;
+     
       // background-size: auto 346px;
       background-size: auto 100%;
       background-position: center;
@@ -1331,7 +1332,7 @@ defineExpose({
       // margin-left: 20px;
       // padding: 24px;
       // width: 24vw;
-      flex: 0.5;
+      flex: 0.35;
       background: #f9f9f9;
       border-radius: 8px;
       margin-left: 20px;