From 364467c9dd0a37645a3a3b00c42f5671eb70328b Mon Sep 17 00:00:00 2001 From: mors <3067699729@qq.com> Date: Tue, 27 Dec 2022 20:45:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/ZyClothsModularCompentList.vue | 8 +- .../src/views/process/ZyClothsTypeList.vue | 8 + .../process/modules/ZyClothsComponentForm.vue | 1 - .../modules/ZyClothsModularCompentForm.vue | 1 + .../modules/ZyClothsModularCompentModal.vue | 6 +- ...lothsModularCompentModal__Style#Drawer.vue | 1 + .../process/modules/ZyClothsTypeForm.vue | 48 ++-- .../modules/list/ZyClothsComponentList.vue | 6 +- .../views/zyclothsstyle/ZyClothsStyleList.vue | 31 ++- .../modules/ZyClothsStyleForm.vue | 261 +++++++++--------- .../views/zystylemodel/ZyStyleModelList.vue | 12 +- .../views/zystylemodule/ZyStyleModuleList.vue | 2 +- .../ZyClothsModularCompentController.java | 10 +- .../controller/ZyClothsTypeController.java | 15 +- .../demo/base/mapper/ZyClothsTypeMapper.java | 3 + .../base/service/IZyClothsTypeService.java | 5 +- .../service/impl/ZyClothsTypeServiceImpl.java | 43 ++- .../controller/ZyClothsStyleController.java | 77 +++--- .../zyclothsstyle/entity/ZyClothsStyle.java | 4 +- .../service/IZyClothsStyleService.java | 2 + .../impl/ZyClothsStyleServiceImpl.java | 10 + .../controller/ZyStyleModuleController.java | 22 +- .../impl/ZyStyleModuleServiceImpl.java | 3 + 23 files changed, 347 insertions(+), 232 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue index f920ec33..272f403e 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue @@ -200,9 +200,9 @@ export default { this.yid = this.model.id; this.biaoTi = record.modularName+" 模块部件管理"; //this.title = record.modularName; - console.log("+++++ this.biaoTi "+ this.biaoTi) + //console.log("+++++ this.biaoTi "+ this.biaoTi) this.queryParam.modularId = this.model.id; - console.log("+++++ this.queryParam.modularId: " + this.queryParam.modularId); + //console.log("+++++ this.queryParam.modularId: " + this.queryParam.modularId); this.loadData(); this.visible = true; }, @@ -215,10 +215,10 @@ export default { setTimeout(() => { this.visible = false; this.confirmLoading = false; - }, 2000); + }, 1000); }, handleCancel(e) { - console.log('Clicked cancel button'); + //console.log('Clicked cancel button'); this.visible = false; }, diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue index 09bf3ebe..d4dc5ee1 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsTypeList.vue @@ -21,6 +21,14 @@ + + + + + + + diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue index 37cf61df..92604697 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue @@ -215,7 +215,6 @@ // }, add () { this.edit(this.modelDefault); - }, edit (record) { this.model = Object.assign({}, record); diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue index a19c154f..8c4b3942 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue @@ -98,6 +98,7 @@ export default { add1(id) { this.edit(this.modelDefault); this.model.modularId = id; + console.log("form11111") }, edit(record) { this.model = Object.assign({}, record); diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue index 010a3f49..4ca31dff 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue @@ -37,6 +37,7 @@ visible: false, disableSubmit: false, url: { + list: "/base/zyClothsModularCompent/list", add: "/base/zyClothsModularCompent/add", edit: "/base/zyClothsModularCompent/edit", queryById: "/base/zyClothsModularCompent/queryById" @@ -48,7 +49,7 @@ //this.model.componentId = this.$route.query.id; //模块名称 根据id显示模块的名称 this.model.modularId = id; - console.log('this.modularId'+id) + console.log('this.modularId + modal33333'+id) this.visible=true this.$nextTick(()=>{ this.$refs.realForm.add1(id); @@ -71,8 +72,11 @@ // this.$refs.realForm.submitForm(); postAction(this.url.add, this.model).then((res) => { if (res.success) { + console.log(111) this.$message.success(res.message); + //this.loadData() } else { + console.log(222) this.$message.warning(res.message); } this.$emit('valueChange', 1) diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal__Style#Drawer.vue index 1edd96f4..273c8786 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal__Style#Drawer.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal__Style#Drawer.vue @@ -34,6 +34,7 @@ }, methods: { add () { + console.log("modal style") this.visible=true this.$nextTick(()=>{ this.$refs.realForm.add(); diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue index cd9d7b39..c2cd8e20 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsTypeForm.vue @@ -5,7 +5,7 @@ - + @@ -44,9 +44,10 @@ @@ -474,7 +480,8 @@ export default { .ant-form-item { margin-bottom: 16px; } -/deep/ .label label{ - text-align:left; + +/deep/ .label label { + text-align: left; } \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/zystylemodel/ZyStyleModelList.vue b/ant-design-vue-jeecg/src/views/zystylemodel/ZyStyleModelList.vue index 4fb30ec3..b6603011 100644 --- a/ant-design-vue-jeecg/src/views/zystylemodel/ZyStyleModelList.vue +++ b/ant-design-vue-jeecg/src/views/zystylemodel/ZyStyleModelList.vue @@ -5,8 +5,8 @@ - -

{{biaoTi}}

+ +

{{biaoTi}}

@@ -16,7 +16,7 @@ 返回 -
+
+