diff --git a/src/assets/icons/zhankai.svg b/src/assets/icons/zhankai.svg new file mode 100644 index 0000000..c08e970 --- /dev/null +++ b/src/assets/icons/zhankai.svg @@ -0,0 +1,24 @@ + + + 展开 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/images/approval_modal_bg.png b/src/assets/images/approval_modal_bg.png index 689cc8d..ee17ca6 100644 Binary files a/src/assets/images/approval_modal_bg.png and b/src/assets/images/approval_modal_bg.png differ diff --git a/src/assets/images/tishi.png b/src/assets/images/tishi.png new file mode 100644 index 0000000..5d88b60 Binary files /dev/null and b/src/assets/images/tishi.png differ diff --git a/src/components/RichEditor/Quill.vue b/src/components/RichEditor/Quill.vue index f0a9d5b..aa943dc 100644 --- a/src/components/RichEditor/Quill.vue +++ b/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; diff --git a/src/views/home/aside/comp/items/IzApprovalStatus.vue b/src/views/home/aside/comp/items/IzApprovalStatus.vue index 94f1c90..128a4cc 100644 --- a/src/views/home/aside/comp/items/IzApprovalStatus.vue +++ b/src/views/home/aside/comp/items/IzApprovalStatus.vue @@ -69,7 +69,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/IzCustomlevel.vue b/src/views/home/aside/comp/items/IzCustomlevel.vue index 4555d34..0296498 100644 --- a/src/views/home/aside/comp/items/IzCustomlevel.vue +++ b/src/views/home/aside/comp/items/IzCustomlevel.vue @@ -77,7 +77,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/IzCustomname.vue b/src/views/home/aside/comp/items/IzCustomname.vue index 810651c..0524674 100644 --- a/src/views/home/aside/comp/items/IzCustomname.vue +++ b/src/views/home/aside/comp/items/IzCustomname.vue @@ -74,7 +74,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/IzCustomtype.vue b/src/views/home/aside/comp/items/IzCustomtype.vue index 0b05b24..aa4ec0d 100644 --- a/src/views/home/aside/comp/items/IzCustomtype.vue +++ b/src/views/home/aside/comp/items/IzCustomtype.vue @@ -73,7 +73,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/IzCustomtypes.vue b/src/views/home/aside/comp/items/IzCustomtypes.vue index c1f7b43..ce013da 100644 --- a/src/views/home/aside/comp/items/IzCustomtypes.vue +++ b/src/views/home/aside/comp/items/IzCustomtypes.vue @@ -79,7 +79,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/IzProduct.vue b/src/views/home/aside/comp/items/IzProduct.vue index 91c787a..748b497 100644 --- a/src/views/home/aside/comp/items/IzProduct.vue +++ b/src/views/home/aside/comp/items/IzProduct.vue @@ -73,7 +73,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/IzProject.vue b/src/views/home/aside/comp/items/IzProject.vue index c037488..ff36a0e 100644 --- a/src/views/home/aside/comp/items/IzProject.vue +++ b/src/views/home/aside/comp/items/IzProject.vue @@ -96,7 +96,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/IzProjecttype.vue b/src/views/home/aside/comp/items/IzProjecttype.vue index a29b725..0e1c224 100644 --- a/src/views/home/aside/comp/items/IzProjecttype.vue +++ b/src/views/home/aside/comp/items/IzProjecttype.vue @@ -74,7 +74,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/IzSearch.vue b/src/views/home/aside/comp/items/IzSearch.vue index 1ffede6..b081761 100644 --- a/src/views/home/aside/comp/items/IzSearch.vue +++ b/src/views/home/aside/comp/items/IzSearch.vue @@ -79,7 +79,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/IzSearchManager.vue b/src/views/home/aside/comp/items/IzSearchManager.vue index de6a3f9..ba9c62f 100644 --- a/src/views/home/aside/comp/items/IzSearchManager.vue +++ b/src/views/home/aside/comp/items/IzSearchManager.vue @@ -79,7 +79,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/IzShow.vue b/src/views/home/aside/comp/items/IzShow.vue index a034ff3..c2a3ec2 100644 --- a/src/views/home/aside/comp/items/IzShow.vue +++ b/src/views/home/aside/comp/items/IzShow.vue @@ -73,7 +73,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/IzStatus.vue b/src/views/home/aside/comp/items/IzStatus.vue index e81036e..7cf8287 100644 --- a/src/views/home/aside/comp/items/IzStatus.vue +++ b/src/views/home/aside/comp/items/IzStatus.vue @@ -95,7 +95,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/IzVisitcity.vue b/src/views/home/aside/comp/items/IzVisitcity.vue index 97c31f2..b2865bb 100644 --- a/src/views/home/aside/comp/items/IzVisitcity.vue +++ b/src/views/home/aside/comp/items/IzVisitcity.vue @@ -73,7 +73,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/Izfiled17.vue b/src/views/home/aside/comp/items/Izfiled17.vue index 0153d71..1e54b45 100644 --- a/src/views/home/aside/comp/items/Izfiled17.vue +++ b/src/views/home/aside/comp/items/Izfiled17.vue @@ -79,7 +79,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/Izfiled2.vue b/src/views/home/aside/comp/items/Izfiled2.vue index 63066be..1fb04eb 100644 --- a/src/views/home/aside/comp/items/Izfiled2.vue +++ b/src/views/home/aside/comp/items/Izfiled2.vue @@ -79,7 +79,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/Izfiled3.vue b/src/views/home/aside/comp/items/Izfiled3.vue index cb5ad4a..f35dcf3 100644 --- a/src/views/home/aside/comp/items/Izfiled3.vue +++ b/src/views/home/aside/comp/items/Izfiled3.vue @@ -79,7 +79,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/Izfiled6.vue b/src/views/home/aside/comp/items/Izfiled6.vue index 606dda4..8b6cbe0 100644 --- a/src/views/home/aside/comp/items/Izfiled6.vue +++ b/src/views/home/aside/comp/items/Izfiled6.vue @@ -79,7 +79,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/Izfirm.vue b/src/views/home/aside/comp/items/Izfirm.vue index 4af4768..74c006e 100644 --- a/src/views/home/aside/comp/items/Izfirm.vue +++ b/src/views/home/aside/comp/items/Izfirm.vue @@ -73,7 +73,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/Iztaskrrom.vue b/src/views/home/aside/comp/items/Iztaskrrom.vue index ed14a76..095540c 100644 --- a/src/views/home/aside/comp/items/Iztaskrrom.vue +++ b/src/views/home/aside/comp/items/Iztaskrrom.vue @@ -97,7 +97,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/Iztaskstatus.vue b/src/views/home/aside/comp/items/Iztaskstatus.vue index 0244794..9ba93c5 100644 --- a/src/views/home/aside/comp/items/Iztaskstatus.vue +++ b/src/views/home/aside/comp/items/Iztaskstatus.vue @@ -73,7 +73,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/Izvisitpro.vue b/src/views/home/aside/comp/items/Izvisitpro.vue index 2f810da..7899750 100644 --- a/src/views/home/aside/comp/items/Izvisitpro.vue +++ b/src/views/home/aside/comp/items/Izvisitpro.vue @@ -73,7 +73,18 @@ function onChange(value: Array) { + > + + diff --git a/src/views/home/aside/comp/items/PictureType.vue b/src/views/home/aside/comp/items/PictureType.vue index 7452541..a836f32 100644 --- a/src/views/home/aside/comp/items/PictureType.vue +++ b/src/views/home/aside/comp/items/PictureType.vue @@ -23,6 +23,19 @@ function onChange(value: string[]) { diff --git a/src/views/home/aside/comp/items/Region.vue b/src/views/home/aside/comp/items/Region.vue index 20cc7d1..408129c 100644 --- a/src/views/home/aside/comp/items/Region.vue +++ b/src/views/home/aside/comp/items/Region.vue @@ -24,6 +24,19 @@ function onChange(value: string[]) { diff --git a/src/views/home/aside/comp/items/Similarity.vue b/src/views/home/aside/comp/items/Similarity.vue index 7a9581c..b924bf9 100644 --- a/src/views/home/aside/comp/items/Similarity.vue +++ b/src/views/home/aside/comp/items/Similarity.vue @@ -49,6 +49,19 @@ function onChange(value: number & number[]) { @@ -117,16 +118,26 @@ defineExpose({ background-image: url(../../../../assets/images/approval_modal_bg.png); background-repeat: no-repeat; background-size: 100%; - width: 470px; - height: 361px; + width: 403px; + 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; - left: 20px; - + bottom: 0; font-size: 22px; font-weight: 550; font-family: YouSheBiaoTiHei, YouSheBiaoTiHei-Regular; diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue index 983bfc9..61f2a81 100644 --- a/src/views/login/components/Login.vue +++ b/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; }