diff --git a/src/components/layouts/UserLayout.vue b/src/components/layouts/UserLayout.vue index a0281dc..97feae6 100644 --- a/src/components/layouts/UserLayout.vue +++ b/src/components/layouts/UserLayout.vue @@ -5,26 +5,12 @@
- Jeecg Boot + 核素监测数据自动处理与交互分析系统
-
- Jeecg Boot 是中国最具影响力的 企业级 低代码平台 -
- - diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue index 268413e..df90da5 100644 --- a/src/components/page/GlobalLayout.vue +++ b/src/components/page/GlobalLayout.vue @@ -663,14 +663,17 @@ } .sub-menus { + border-top: 1px solid rgba(12, 235, 201, .3); + border-bottom: 1px solid rgba(12, 235, 201, .3); margin-bottom: 16px; + padding: 5px 10px; + background-color: rgba(12, 235, 201, .05); + overflow: auto; .ant-menu { - font-size: 16px; - background: rgba(12, 235, 201, .05); border-bottom: none; - height: 40px; + font-size: 16px; line-height: normal; - padding-top: 5px; + background-color: transparent; .ant-menu-item { background: rgba(58, 236, 240, .22) !important; border-bottom: none !important; diff --git a/src/style.less b/src/style.less index 2dd5fdd..4edc2c1 100644 --- a/src/style.less +++ b/src/style.less @@ -71,7 +71,7 @@ body { } } &-placeholder { - background-color: transparent; + background-color: @modalBg; border-top: none; border-bottom: none; } @@ -582,6 +582,15 @@ body { background-color: #15494c !important; } +#userLayout { + .container { + background-color: @modalBg !important; + .title { + color: #fff !important; + } + } +} + ::-webkit-scrollbar-track { background-color: #15494c !important; } diff --git a/src/views/system/DetectorInfo.vue b/src/views/system/DetectorInfo.vue index d86d07a..a33b468 100644 --- a/src/views/system/DetectorInfo.vue +++ b/src/views/system/DetectorInfo.vue @@ -52,8 +52,10 @@ :colon="false" :labelCol="{ style: { width: '115px' } }" :wrapperCol="{ style: { width: '300px' } }" - autocomplete="off" > + + + @@ -193,6 +195,7 @@ export default { return { queryParam: {}, rules: { + detectorId: [{ required: true, message: 'Please Enter Detector Id' }], detectorCode: [{ required: true, validator: validateDetectorCode }], moddate: [{ required: true, message: 'Please Select Moddate' }] }, diff --git a/src/views/system/NuclearFacility.vue b/src/views/system/NuclearFacility.vue index 616b55e..bb3aeb0 100644 --- a/src/views/system/NuclearFacility.vue +++ b/src/views/system/NuclearFacility.vue @@ -53,6 +53,9 @@ :labelCol="{ style: { width: '105px' } }" :wrapperCol="{ style: { width: '300px' } }" > + + + @@ -145,6 +148,7 @@ export default { return { queryParam: {}, rules: { + facilityId: [{ required: true, message: 'Please Enter Facility Id' }], facilityName: [{ required: true, message: 'Please Enter Facility Name' }] }, url: { @@ -165,13 +169,26 @@ export default { if (this.selectedRowKeys && this.selectedRowKeys.length) { this.isAdd = false this.visible = true - const find = this.dataSource.find(item => item.id === this.selectedRowKeys[0]) + const find = this.dataSource.find(item => item.facilityId === this.selectedRowKeys[0]) this.model = cloneDeep(find) } else { this.$message.warn('Please Select An Item To Edit') } }, - onDel() {} + onDel() { + if (this.selectedRowKeys && this.selectedRowKeys.length) { + this.$confirm({ + title: 'Do You Want To Delete This Item?', + okText: 'OK', + cancelText: 'Cancel', + onOk: () => { + this.handleDelete(this.selectedRowKeys[0]) + } + }) + } else { + this.$message.warn('Please Select An Item To Delete') + } + } } } diff --git a/src/views/system/stationList.vue b/src/views/system/stationList.vue index e84b300..ccbec42 100644 --- a/src/views/system/stationList.vue +++ b/src/views/system/stationList.vue @@ -54,6 +54,9 @@ :wrapperCol="{ style: { width: '300px' } }" autocomplete="off" > + + + @@ -181,6 +184,7 @@ export default { return { queryParam: {}, rules: { + stationId: [{ required: true, message: 'Please Enter Station Id' }], stationCode: [{ required: true, validator: validateStationCode }], countryCode: [{ validator: validateCountryCode }] }, diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index 150bdb9..e9b7be4 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -13,12 +13,6 @@ 自动登录 - - 忘记密码 - - - 注册账户 - @@ -27,10 +21,6 @@ - - - -