diff --git a/src/assets/css/skincolor.scss b/src/assets/css/skincolor.scss index 31e0d21..f39f27d 100644 --- a/src/assets/css/skincolor.scss +++ b/src/assets/css/skincolor.scss @@ -1,3 +1,8 @@ +.vue-treeselect .vue-treeselect__control { + border: 1px solid rgb(0, 119, 254) !important; + background-color: var(--innerbgc) !important; +} + .el-table--border { border-left: none !important; } diff --git a/src/assets/css/skincolor.scss b/src/assets/css/skincolor.scss index 31e0d21..f39f27d 100644 --- a/src/assets/css/skincolor.scss +++ b/src/assets/css/skincolor.scss @@ -1,3 +1,8 @@ +.vue-treeselect .vue-treeselect__control { + border: 1px solid rgb(0, 119, 254) !important; + background-color: var(--innerbgc) !important; +} + .el-table--border { border-left: none !important; } diff --git a/src/components/common/PageForm/index.vue b/src/components/common/PageForm/index.vue index 9fbe98e..6448cd5 100644 --- a/src/components/common/PageForm/index.vue +++ b/src/components/common/PageForm/index.vue @@ -90,11 +90,11 @@ @change="handleEvent(item.event, data[item.value])" > + v-for="(childItem, childIndex) in listTypeInfo[item.list]" + :key="childIndex" + :label="childItem.key" + :value="childItem.value" + /> { if (this.data.endTime) { - let halfYear = this.limitTimePeriod / 2 * 24 * 3600 * 1000; + let halfYear = (this.limitTimePeriod / 2) * 24 * 3600 * 1000; let endTime = new Date(this.data.endTime).getTime(); let limitTime = endTime - halfYear; - let result = this.limitTime ? (limitTime > time.getTime() || time.getTime() > endTime) : (time.getTime() > endTime); + let result = this.limitTime + ? limitTime > time.getTime() || time.getTime() > endTime + : time.getTime() > endTime; return result; } } @@ -244,10 +246,12 @@ pickerOptionsEnd: { disabledDate: time => { if (this.data.startTime) { - let halfYear = this.limitTimePeriod / 2 * 24 * 3600 * 1000; + let halfYear = (this.limitTimePeriod / 2) * 24 * 3600 * 1000; let startTime = new Date(this.data.startTime).getTime(); let limitTime = startTime + halfYear; - let result = this.limitTime ? (limitTime < time.getTime() || time.getTime() < startTime) : (time.getTime() < startTime); + let result = this.limitTime + ? limitTime < time.getTime() || time.getTime() < startTime + : time.getTime() < startTime; return result; } } @@ -280,7 +284,7 @@ } } }, - deep: true, // 深度监听 + deep: true // 深度监听 } }, mounted() { @@ -357,11 +361,11 @@ }; }, //级联选中节点时触发事件 - handleChange(val,node) { - if(this.$refs.cascader && Array.isArray(this.$refs.cascader)) { + handleChange(val, node) { + if (this.$refs.cascader && Array.isArray(this.$refs.cascader)) { const checkedNode = this.$refs.cascader[0].getCheckedNodes(); const nodeObj = checkedNode[0]; - this.$emit('currentAreaJwd',nodeObj); + this.$emit("currentAreaJwd", nodeObj); } this.data.area = val.length ? val[val.length - 1] : ""; }, @@ -419,7 +423,7 @@ .el-form-item__label { text-align: right !important; } - .el-icon-date:before{ + .el-icon-date:before { color: #fff; } } @@ -489,23 +493,23 @@ /deep/ .vue-treeselect { .vue-treeselect__control { padding-left: 10px; - border: 1px solid rgb(4, 51, 52); + border: 1px solid var(--selecthover); background-color: transparent; } .vue-treeselect__single-value { color: var(--white); } .vue-treeselect__menu { - color: #fff; + color: var(--white); z-index: 99999; - background-color: #3c3939; - border: 1px solid rgb(4, 51, 52); + background-color: var(--shouselect); + border: 1px solid var(--selecthover); } .vue-treeselect__menu-container { z-index: 99999; } .vue-treeselect__option--highlight { - background: rgb(4, 51, 52); + background: var(--selecthover); } .vue-treeselect__checkbox--checked { border-color: #039be5; @@ -515,11 +519,11 @@ /deep/ .vue-treeselect:not(.vue-treeselect--disabled):not(.vue-treeselect--focused) .vue-treeselect__control:hover { - border: 1px solid rgb(4, 51, 52); + border: 1px solid var(--selecthover); } /deep/ .vue-treeselect--single .vue-treeselect__option--selected { - color: #efe201 !important; - background: rgb(4, 51, 52); + color: rgb(4, 51, 52) !important; + background: var(--selecthover); } /****级联样式重置****/ /deep/ .el-cascader {