diff --git a/src/assets/images/home/gridGreen.png b/src/assets/images/home/gridGreen.png index bd0089d35..08762a914 100644 Binary files a/src/assets/images/home/gridGreen.png and b/src/assets/images/home/gridGreen.png differ diff --git a/src/assets/images/home/gridRed.png b/src/assets/images/home/gridRed.png index 86bff43c6..32a731d58 100644 Binary files a/src/assets/images/home/gridRed.png and b/src/assets/images/home/gridRed.png differ diff --git a/src/assets/images/home/gridYellow.png b/src/assets/images/home/gridYellow.png index 0e8b94604..48e6e2b23 100644 Binary files a/src/assets/images/home/gridYellow.png and b/src/assets/images/home/gridYellow.png differ diff --git a/src/assets/scss/pages/resiAdd.scss b/src/assets/scss/pages/resiAdd.scss index 5b97e2246..a93875839 100644 --- a/src/assets/scss/pages/resiAdd.scss +++ b/src/assets/scss/pages/resiAdd.scss @@ -52,18 +52,18 @@ h5 { color:#ff5107 ; } } -.font-color-blue{ - ::v-deep .el-form-item__label{ - color:#3876f2; - position: relative; - &::before{ - content: '*'; - position: absolute; - top: 0px; - left: 16px; - } - } -} +// .font-color-blue{ +// ::v-deep .el-form-item__label{ +// color:#3876f2; +// position: relative; +// &::before{ +// content: '*'; +// position: absolute; +// top: 0px; +// left: 16px; +// } +// } +// } .font-color-blue2{ ::v-deep .el-form-item__label{ &::before{ diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue index 2032ddd83..24f2c1332 100644 --- a/src/components/GridTree/nodeWrap.vue +++ b/src/components/GridTree/nodeWrap.vue @@ -263,16 +263,19 @@ export default { @include lastLevel; background-image: url(~@/assets/images/home/gridGreen.png); background-repeat: no-repeat; + background-size: 100% 100%; } .dyzxhRed { @include lastLevel; background-image: url(~@/assets/images/home/gridRed.png); background-repeat: no-repeat; + background-size: 100% 100%; } .dyzxhYellow { @include lastLevel; background-image: url(~@/assets/images/home/gridYellow.png); background-repeat: no-repeat; + background-size: 100% 100%; } .lxjt { @include spanLevel; diff --git a/src/utils/desensitization.js b/src/utils/desensitization.js index acc5b952d..aa619ae1a 100644 --- a/src/utils/desensitization.js +++ b/src/utils/desensitization.js @@ -1,6 +1,6 @@ export default function desensitizeSubstring(inputString, start, end) { - if (!inputString) { - return '' + if (!inputString||inputString.length<11) { + return '--' } if (end >= inputString.length) { end = inputString.length - 1 diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index d51d3f3d4..3ca535131 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -162,7 +162,6 @@
- + class="list_item_width_1" @change="handelChangeSelsect(itemj.id,itemk.formName)"> @@ -206,6 +206,15 @@ export default { mounted() { }, methods: { + handelChangeSelsect(pname,cname){ + if(pname === 'specialSupportDto' && cname === 'specialSupportType'){ + if(this.form.specialSupportDto.specialSupportType === '2'){ + this.formList[0].children[4].check = 'sixFont' + }else{ + this.formList[0].children[4].check = null; + } + } + }, checkNumberInput(itemj, itemk) { if (this.form[itemj][itemk]) { if (isNaN(this.form[itemj][itemk])) { @@ -256,7 +265,20 @@ export default { this.$emit('hideExpand', this.formType) }, handleClickSUbmitExpand() { - this.$emit('submitExpand', this.form, this.formType) + console.log(this.formList); + console.log(this.form); + this.formList.forEach((group) => { + group.children.forEach((item) => { + if (item.check && !this.form[group.id][item.formName]) { + this.$message.error(`${item.label}不能为空`); + throw new Error(`${item.label}不能为空`); + } + }); + }); + if (this.formType === 'add') { + this.form.id = this.form.partyOrgId; + } + // this.$emit('submitExpand', this.form, this.formType) }, handlePartyOrgCascadarChange(selectedNode) { this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1]; diff --git a/src/views/dataBoard/overview/components/ResourceScheduling.vue b/src/views/dataBoard/overview/components/ResourceScheduling.vue index 070b97bfb..f8390f357 100644 --- a/src/views/dataBoard/overview/components/ResourceScheduling.vue +++ b/src/views/dataBoard/overview/components/ResourceScheduling.vue @@ -1,74 +1,73 @@