diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 3ee0cb18..bccf85b2 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -180,6 +180,16 @@ li { .ant-cascader-checkbox-indeterminate .ant-cascader-checkbox-inner::after { background-color: #767676; } +.ant-modal-mask { + background: linear-gradient(45deg, #eee4f3, #f3f4e6); + min-width: 1440px; + border-radius: 1rem; + overflow: hidden; + height: calc(100% - 7rem); + bottom: 0; + top: auto; + margin: 0 9rem; +} .modal_component.ant-modal { top: 0; } diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 35760a8d..fda575fb 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -191,6 +191,18 @@ ul,li{ .ant-cascader-checkbox-indeterminate .ant-cascader-checkbox-inner::after{ background-color: #767676; } + +.ant-modal-mask{ + background: linear-gradient(45deg, #eee4f3, #f3f4e6); + min-width: 1440px; + border-radius: 1rem; + overflow: hidden; + height: calc(100% - 7rem); + bottom: 0; + top: auto; + margin: 0 9rem; +} + //弹窗公共样式 .modal_component{ diff --git a/src/component/LibraryPage/ModelPlacement.vue b/src/component/LibraryPage/ModelPlacement.vue index 3753d4f7..8f9bc56f 100644 --- a/src/component/LibraryPage/ModelPlacement.vue +++ b/src/component/LibraryPage/ModelPlacement.vue @@ -564,7 +564,7 @@ export default defineComponent({ that = this if(this.modelType == 'System' && this.userInfo.userId == 88 || this.userInfo.userId == 83){ if(this.printObject.templateId){ - this.printObject.id = this.printObject.libraryId + this.printObject.id = this.printObject.relationId this.confrimSubmit() }else{ this.customRequest().then((rv:any)=>{ @@ -579,7 +579,7 @@ export default defineComponent({ cropper.getCropData(async (value:any) => { // 转换为File对象 if(this.printObject.templateId){ - this.printObject.id = this.printObject.libraryId + this.printObject.id = this.printObject.relationId this.confrimSubmit() }else{ let file:any = base64toFile(value,this.printObject.file.name); @@ -599,6 +599,7 @@ export default defineComponent({ }, confrimSubmit(){ + let param = { libraryId:this.printObject.id, templateId:this.printObject.templateId || null, diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue new file mode 100644 index 00000000..13b34a5a --- /dev/null +++ b/src/component/LibraryPage/setLabel.vue @@ -0,0 +1,128 @@ + + + \ No newline at end of file diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 2cfff2c0..db3c5cbf 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -1300,7 +1300,6 @@ export default defineComponent({ } \ No newline at end of file diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue index 5e46e655..73688883 100644 --- a/src/views/LibraryPage.vue +++ b/src/views/LibraryPage.vue @@ -304,7 +304,7 @@ - +
@@ -319,6 +319,7 @@ import { LoadingOutlined } from "@ant-design/icons-vue"; import { defineComponent,h ,ref,createVNode,nextTick} from 'vue' import HeaderComponent from "@/component/HomePage/Header.vue"; import ModelPlacement from '@/component/LibraryPage/ModelPlacement.vue'; +import setLabel from '@/component/LibraryPage/setLabel.vue'; import ModelPlacementMobile from '@/component/LibraryPage/ModelPlacementMobile.vue'; import RobotAssist from "@/component/HomePage/RobotAssist.vue"; import { Modal,message,Upload,CascaderProps } from 'ant-design-vue'; @@ -333,6 +334,7 @@ export default defineComponent({ components: { HeaderComponent, ModelPlacement, + setLabel, ModelPlacementMobile, RobotAssist, }, @@ -1018,9 +1020,13 @@ export default defineComponent({ removeClick(){ }, addLabel(){ + let setLabel:any = this.$refs.setLabel + setLabel.init('add') this.labelOpen = false }, removeLabel(){ + let setLabel:any = this.$refs.setLabel + setLabel.init('remove') this.labelOpen = false } }