fix:样式修改

patches/naive-ui+2.38.1.patch

@@ -20,10 +20,7 @@ index 3aacec9..a63ab54 100644
 -            class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error`
 -          }, feedbackNodes) : mergedValidationStatus === 'success' ? h("div", {
 +            class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error flex`
-+          }, [h('img', {
++          }, ) : mergedValidationStatus === 'success' ? h("div", {
-+            style: { width: '1rem', height: '1rem' },
-+           src: 'notice.svg'
-+          }), feedbackNodes]) : mergedValidationStatus === 'success' ? h("div", {
              key: "controlled-success",
              class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success`
            }, feedbackNodes) : h("div", {
@@ -179,7 +176,7 @@ index 4f47aad..6dae078 100644
                              const feedbackNodes = children || feedback ? ((0, vue_1.h)("div", { key: "__feedback__", class: `${mergedClsPrefix}-form-item-feedback__line` }, children || feedback)) : this.renderExplains.length ? ((_a = this.renderExplains) === null || _a === void 0 ? void 0 : _a.map(({ key, render }) => ((0, vue_1.h)("div", { key: key, class: `${mergedClsPrefix}-form-item-feedback__line` }, render())))) : null;
 -                            return feedbackNodes ? (mergedValidationStatus === 'warning' ? ((0, vue_1.h)("div", { key: "controlled-warning", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--warning` }, feedbackNodes)) : mergedValidationStatus === 'error' ? ((0, vue_1.h)("div", { key: "controlled-error", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error` }, feedbackNodes)) : mergedValidationStatus === 'success' ? ((0, vue_1.h)("div", { key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success` }, feedbackNodes)) : ((0, vue_1.h)("div", { key: "controlled-default", class: `${mergedClsPrefix}-form-item-feedback` }, feedbackNodes))) : null;
 +                            return feedbackNodes ? (mergedValidationStatus === 'warning' ? ((0, vue_1.h)("div", { key: "controlled-warning", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--warning` }, feedbackNodes)) : mergedValidationStatus === 'error' ? ((0, vue_1.h)("div", { key: "controlled-error", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error flex` }, [h('img', {
-+                                style: { width: '1rem', height: '1rem' },src: 'notice.svg'
++                                style: { width: '1rem', height: '1rem' },src: src
 +                            }), feedbackNodes])) : mergedValidationStatus === 'success' ? ((0, vue_1.h)("div", { key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success` }, feedbackNodes)) : ((0, vue_1.h)("div", { key: "controlled-default", class: `${mergedClsPrefix}-form-item-feedback` }, feedbackNodes))) : null;
                          });
                      }

src/layout/components/Header/ConfrimModal.vue

@@ -13,7 +13,8 @@ const props = defineProps({
 
 const show = ref(false)
 const cardStyle = {
-  'width': '450px',
+  'width': '424px',
+  'height': '192px',
   '--n-padding-top': '20px',
   '--n-padding-bottom': '20px',
   '--n-padding-left': '20px',
@@ -46,7 +47,7 @@ onBeforeMount(async () => { })
     <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
       <div class="wrapper">
         <div class="wrapper-header">
-          <SvgIcon name="exclamation-solid" size="16" />
+          <SvgIcon name="exclamation-solid" size="21" />
           <span class="wrapper-left">确认提示</span>
         </div>
         <div class="wrapper-content">
@@ -55,10 +56,12 @@ onBeforeMount(async () => { })
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit">
+          <n-button type="info" style="background:#1980FF;width: 60px;
+height: 36px;" @click="handleSumbit">
             确定
           </n-button>
-          <n-button secondary style="margin-left:15px" @click="closeModal">
+          <n-button secondary style="margin-left: 15px;width: 60px;background:#f8f8f8;border:1px solid #D9D9D9;
+height: 36px;"  @click="closeModal">
             取消
           </n-button>
         </div>
@@ -83,7 +86,7 @@ onBeforeMount(async () => { })
   }
 
   &-content {
-    margin-left: 15px;
+    margin-left: 46px;
     color: #8e8e8e;
 
     .highlighted-text {

src/layout/components/Header/index.vue

@@ -46,6 +46,7 @@ export default defineComponent({
   },
   emits: ['update:collapsed'],
   setup() {
+    const showx = ref(false)
     const message = useMessage()
     const dialog = useDialog()
 
@@ -105,7 +106,7 @@ export default defineComponent({
       router.push({ name: key })
     }
 
-    const ModalRef=ref(null)
+    const tishiModalRef=ref(null)
 const paramasref=ref(null)
 const tishiok=()=>{
     userStore.logout().then(() => {
@@ -122,11 +123,12 @@ const tishiok=()=>{
 }
     // 退出登录
     const doLogout = () => {
-      console.log(ModalRef.value)
+       showx.value = true
+      console.log(tishiModalRef.value)
     //const modal3 = unref(tishiref)! as any
   //  console.log(modal3)
 //modal3.showModalx()
-     dialog.warning({
+   /*  dialog.warning({
         title: '确认提示',
         content: '您确定要退出登录吗',
        positiveText: '取消',
@@ -152,7 +154,7 @@ const tishiok=()=>{
               })
               .finally(() => location.reload())
           })},
-      })
+      })*/
     }
 
 
@@ -208,6 +210,23 @@ const quillModalRef = ref(null)
       modal2.closeModal()
   
     }
+    function closeModal() {
+  showx.value = false
+}
+function onok(){
+ userStore.logout().then(() => {
+            message.success('成功退出登录')
+            router
+              .replace({
+                name: 'Login',
+                query: {
+                  // redirect: route.fullPath,
+                },
+              })
+              .finally(() => location.reload())
+          })
+   showx.value = false
+}
     onMounted(() => {
       getMessage()
       mousetrap.bind('n r', quillHandler)
@@ -222,7 +241,10 @@ onUnmounted(() => {
     const defaultAvatarSrc = ref(defaultAvatar)
 
     return {
-      ModalRef,
+      closeModal,
+      onok,
+      showx,
+      tishiModalRef,
       paramasref,
       tishiok,
       ...toRefs(state),
@@ -297,11 +319,31 @@ onUnmounted(() => {
       <UserSettings @logout="doLogout" />
     </div>
   </div>
+   <div class="tishi">
+     <n-modal v-model:show="showx" transform-origin="center" class="modal_wrap">
+   <div>
+ 
+   <div class="title">  <SvgIcon size="21" class="icon" style="margin-right:17.5px" name="warn"  />确认提示</div>
+   <div class="content">您确定要退出登录吗</div>
+     <div class="footer">
+          <n-button style="background:#1980FF;width: 60px;
+height: 36px;" type="info" @click="onok">
+            确定
+          </n-button>
+          <n-button secondary class="btn" style="margin-left: 15px;width: 60px;background:#f8f8f8;border:1px solid #D9D9D9;
+height: 36px;" @click="closeModal">
+            取消
+          </n-button>
+        </div>
+   </div>
+  </n-modal>
+   </div>
   <RecycleModal ref="recycleModalRef" />
   <QuillModal ref="quillModalRef" />
   <ShortcutModal ref="shortcutModal" />
   <SearchModal ref="SearchModalRef" />
-   <TishiDialog  ref="ModalRef"  :label="'您确定要退出登录吗'" @tishiok="tishiok"/>
+   <TishiDialog  ref="tishiModalRef"  :label="'您确定要退出登录吗'" @tishiok="tishiok"/>
+  
 </template>
 
 <style lang="less" scoped>
@@ -414,4 +456,31 @@ onUnmounted(() => {
   flex-direction: row;
   align-items: center;
 }
+
+  .modal_wrap{
+    width: 424px;
+height: 192px;
+background: #ffffff;
+border-radius: 2px;
+}
+.title{
+    color: #333333;
+line-height: 24px;
+font-size: 16px;
+font-weight: 550;
+margin-top: 33.5px;
+margin-left: 33.5px;
+}
+.content{
+    font-size: 14px;
+    color: #666666;
+    margin-top: 12px;
+    margin-left: 72px;
+}
+.footer{
+      position: absolute;
+    bottom: 24px;
+    right: 32px;
+}
+
 </style>

src/views/final/comp/CustomTabelModal.vue

@@ -226,7 +226,20 @@ watch(
     }
   },
 )
+function zhidingfun(item){
+let obj = item;
+let newarr= onList.value
+// 先检查并移除对象是否已经存在于数组中
+let index =  newarr.indexOf(obj);
+if (index !== -1) {
+    newarr.splice(index, 1);
+}
+
+// 使用 unshift 方法将对象放到数组的第一位
+newarr.unshift(obj);
+ onList.value=newarr
 
+}
 watch(
   () => showIds.value.length,
   (newVal, oldVal) => {
@@ -404,7 +417,7 @@ const indeterminate = computed(() => {
                     >
                       <SvgIcon name="drag" size="14" color="#666666" />
                       <span class="ml-2">{{ item.name }}</span>
-                         <div class="zhiding">
+                         <div class="zhiding" @click="zhidingfun(item)">
                      <n-popover trigger="hover"  placement="bottom">
                  <template #trigger>
                       <SvgIcon

src/views/final/comp/FilterModal.vue

@@ -441,10 +441,10 @@ function handleOk() {
         </div>
         <template #footer>
           <div class="wrapper-footer">
-            <NButton type="info" @click="handleOk">
+            <NButton type="info" style="width:60px;height:34px" @click="handleOk">
-              确认
+              确定
             </NButton>
-            <NButton secondary style="margin-left: 15px" @click="closeModal">
+            <NButton secondary style="margin-left: 15px;background:#FFF;border:1px solid #CAD2DD;width:60px;height:34px" @click="closeModal">
               取消
             </NButton>
           </div>

src/views/final/content/ListContent.vue

@@ -95,6 +95,7 @@ function switchBatch() {
       itemx.showcheck = false
     })
   })
+  valuetwo.value=false
   selectionIds.value = []
 }
 function changeContent() {
@@ -342,6 +343,7 @@ function tishiok(){
           selectionIds.value = []
         }
       })
+      valuetwo.value=false
 }
 // 单个审批通过
 function singleApproval(row) {
@@ -492,7 +494,7 @@ function changesort(sortnamex) {
 function notpass() {
   const modal = unref(headerref)! as any
   initData(1, 20, {}, props.taskvalue)
-
+  valuetwo.value=false
   selectionIds.value = []
   modal.getData()
   // haeaderstore.setDataConfig(true)
@@ -516,8 +518,12 @@ watch(
       for (let i=0; i<item.length;i++){
           console.log(item[i])
      item[i].showcheck=true
+    if(item[i].states == 2){
      selectionIds.value.push(item[i])
+    
+    }
     ooo.push(item[i])
+    
         }
        // console.log(item)
         item=ooo

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

@@ -11,6 +11,11 @@ import { favorite, getConditionList, sort, unfavorite } from '@/api/home/filter'
 defineOptions({ name: 'AdvanceFilter' })
 
 const props = defineProps({
+  leftvalue:{
+    type:Boolean,
+    default:false,
+      required: true,
+  },
   type: {
     type: Number,
     default: 0,
@@ -36,6 +41,7 @@ const emit = defineEmits<{
 const ruleForm = reactive({
   keyword: '',
 })
+const leftvalue=ref(props.leftvalue)
 const ruleformRef = ref()
 const data = ref<FilterEntity[]>([])
 const unData = ref<FilterEntity[]>([])
@@ -323,7 +329,7 @@ defineExpose({
           </div>
         </template>
         <n-spin :show="loading">
-          <div class="wrapper-left-popover">
+          <div class="wrapper-left-popover" :style="leftvalue?{left:'-25px'}:{}">
             <n-form ref="ruleformRef"  :model="ruleForm">
               <n-form-item path="keyword">
                 <n-input

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

@@ -59,11 +59,11 @@ defineExpose({
    <div class="title">  <SvgIcon size="21" class="icon" style="margin-right:17.5px" name="warn" @click="closeModal" />确认提示</div>
    <div class="content">{{label}}</div>
      <div class="footer">
-          <n-button style="background: #507afd;width: 60px;
+          <n-button style="background:#1980FF;width: 60px;
 height: 36px;" type="info" @click="onok">
             确定
           </n-button>
-          <n-button secondary class="btn" style="margin-left: 15px;width: 60px;
+          <n-button secondary class="btn" style="margin-left: 15px;width: 60px;background:#f8f8f8;border:1px solid #D9D9D9;
 height: 36px;" @click="closeModal">
             取消
           </n-button>

src/views/login/components/Login.vue

@@ -436,8 +436,9 @@ function forget() {
           <div class="flex justify-between w-full" style="margin-top:14px">
             <div class="flex-initial" >
               <n-checkbox v-model:checked="autoLogin">
-                <span class="forgetSpan">记住账号</span>
+                
               </n-checkbox>
+              <span class="forgetSpan">记住账号</span>
             </div>
             <div class="flex-initial order-last" @click="forget">
               <a href="javascript:">忘记密码？</a>
@@ -588,7 +589,7 @@ function forget() {
   .tab {
     display: flex;
     .tab-item {
-      width: 4.5rem;
+      width: 5rem;
       height: 1.5625rem;
       font-size: 1.125rem;
       font-family: PingFang SC, PingFang SC-Medium;
@@ -600,7 +601,7 @@ function forget() {
       cursor: pointer;
 
       &-active {
-        width: 6rem;
+        width: 7rem;
         height: 2.0625rem;
         font-size: 1.5rem;
         font-family: PingFang SC, PingFang SC-Medium;
@@ -687,6 +688,7 @@ function forget() {
   color: #ff4e4f !important;
 }
 .forgetSpan {
+  margin-left: 5px;
   font-size: 0.9375rem;
   font-family: PingFang SC, PingFang SC-Regular;
   font-weight: Regular;
@@ -728,4 +730,9 @@ color: #999999;
 width: 1.1rem;
 height: 1.1rem;
 }
+::v-deep(.n-checkbox .n-checkbox-box){
+
+  height: 16px;
+  width: 16px;
+}
 </style>

src/views/task/aside/Aside.vue

@@ -274,6 +274,7 @@ function handleOk(item: any) {
       </div> -->
       <!-- 高级筛选 -->
       <AdvanceFilter
+      :leftvalue="true"
       :icontype=1
         v-show="!showSearch"
         ref="AdvanceFilterRef"

src/views/task/content/Content.vue

@@ -1592,7 +1592,7 @@ function cancel() {
   &-detail {
     display: flex;
     height: calc((100vh - 88px - 72px) / 2);
-
+    margin-bottom: 7px;
     .left {
       flex: 0.7;
       background-size: auto 100%;

src/views/task/modal/CustomFieldModal.vue

@@ -432,6 +432,7 @@ const moreThanSix = computed(() => {
                     :class="{ fix: item.fix }"
                     class="cursor-move draggable-item"
                   >
+                   <SvgIcon name="drag" size="14" />
                     <span class="ml-2">{{ item.name }}</span>
                   </div>
                 </div>
@@ -556,6 +557,7 @@ const moreThanSix = computed(() => {
   border-bottom: none;
   color: gray;
   padding: 12px;
+  padding-left: 16px;
 }
 .draggable-ul {
   width: 100%;
@@ -580,7 +582,7 @@ const moreThanSix = computed(() => {
     color: #333;
     display: flex;
     align-items: center;
-    border-bottom: 1px solid #e8e8e8;
+    
   }
 
   .disable-check {

src/views/worksheet/content/Content.vue

@@ -34,6 +34,8 @@ import CheckingTaskModal from '@/views/home/content/modal/CheckingTaskModal.vue'
 import { getCheckDuplicateStatus, getCheckDuplicateStatusx, getLastCheckNox, removeCheckDuplicate } from '@/api/home/main'
 import TishiDialog from "@/views/home/aside/comp/modals/TiShi.vue"
 
+const tishithreeref=ref()
+const paramasrefthree=ref()
 const tishiref=ref()
 const tishireftwo=ref()
 const paramasreftwo=ref()
@@ -628,13 +630,12 @@ function reloadList() {
   haeaderstore.setDataConfig(true)
 }
 function handleRejectdubiousfileyd(pictureid) {
-  dialog.info({
+     tishithreeref.value.showModalx()
-    title: '确认提示',
+paramasrefthree.value=pictureid
-    content: '确认将图片移入可疑文件夹吗?',
+
-    positiveText: '确定',
+}
-    negativeText: '取消',
+function tishiokthree(){
-    onPositiveClick: () => {
+  dubiousfileyd({ pictureid:paramasrefthree.value }).then(({ code }) => {
-      dubiousfileyd({ pictureid }).then(({ code }) => {
         if (code === 'OK')
           message.success('加入成功')
         const packageid = workStore.getActiveId
@@ -646,9 +647,7 @@ function handleRejectdubiousfileyd(pictureid) {
         }
         queryDetail(packageid)
       })
-    },
+     
-    onNegativeClick: () => {},
-  })
 }
 /**
  * 检查查重状态
@@ -1064,6 +1063,7 @@ defineExpose({
     />
      <TishiDialog ref="tishiref" :label="'确认给该任务审批为【通过】吗?'" @tishiok="tishiok"/>
       <TishiDialog ref="tishireftwo" :label="'确认给该任务审批为【通过】吗?'" @tishiok="tishioktwo"/>
+      <TishiDialog ref="tishithreeref" :label="'确认给该任务审批为【通过】吗?'" @tishiok="tishiokthree"/>
   </div>
 </template>
 

src/views/worksheet/modal/CustomFieldModal.vue

@@ -42,9 +42,11 @@ const showOffList = computed(() => {
   })
 })
 const showFixList = computed(() => {
+ 
   return fixList.value.filter(i => i.name.includes(searchFixVal.value))
 })
 const showOnList = computed(() => {
+   console.log(searchFixVal.value)
   return onList.value.filter(i => i.name.includes(searchFixVal.value))
 })
 const selectCount = computed(() => {
@@ -126,7 +128,20 @@ function onCheckChange(checked: any, item: any) {
     selectIds.value.push(item.id)
   else selectIds.value.splice(index, 1)
 }
+function zhidingfun(item){
+let obj = item;
+let newarr= onList.value
+// 先检查并移除对象是否已经存在于数组中
+let index =  newarr.indexOf(obj);
+if (index !== -1) {
+    newarr.splice(index, 1);
+}
+
+// 使用 unshift 方法将对象放到数组的第一位
+newarr.unshift(obj);
+ onList.value=newarr
 
+}
 const showIds = computed(() => {
   return onList.value.map((item) => {
     return item.id
@@ -178,6 +193,14 @@ watch(
   },
 )
 
+watch(
+  () => showOnList.value,
+  (newVal, oldVal) => {
+    console.log(showOnList.value)
+ // alert(1)
+  },
+)
+
 watch(
   () => showIds.value.length,
   (newVal, oldVal) => {
@@ -382,6 +405,7 @@ const indeterminate = computed(() => {
                   </template>
                 </n-input>
                 <div class="titletwo">系统默认</div>
+             
                 <div class="draggable-ul">
                   <div
                     v-for="item in showFixList"
@@ -389,6 +413,7 @@ const indeterminate = computed(() => {
                     :class="{ fix: item.fix }"
                     class="cursor-move draggable-item"
                   >
+                   <SvgIcon name="drag" size="14" />
                     <span class="ml-2" style="color: #666">{{ item.name }}</span>
                   </div>
                 </div>
@@ -408,7 +433,7 @@ const indeterminate = computed(() => {
                     <SvgIcon name="drag" size="14" />
                     <span class="ml-2">{{ item.name }}</span>
             
-                  <div class="zhiding">
+                  <div class="zhiding" @click="zhidingfun(item)">
                      <n-popover trigger="hover"  placement="bottom">
                  <template #trigger>
                       <SvgIcon
@@ -593,7 +618,8 @@ font-weight: Regular;
 text-align: left;
 color: #999999;
 line-height: 20px;
-    margin-left: 20px;
+    margin-top: 12px;
+    margin-left: 16px;
   }
 ::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) {
   border: 0px;