From 7656962ded2a6ccbe3eae75304b3789662d82711 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期三, 26 一月 2022 16:01:56 +0800
Subject: [PATCH] 集群改动
---
src/pages/library/components/addBase.vue | 109 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 64 insertions(+), 45 deletions(-)
diff --git a/src/pages/library/components/addBase.vue b/src/pages/library/components/addBase.vue
index d27669c..66011eb 100644
--- a/src/pages/library/components/addBase.vue
+++ b/src/pages/library/components/addBase.vue
@@ -56,6 +56,7 @@
<el-col :span="11" class>
<el-date-picker
size="small"
+ popper-class="popper-add"
type="datetime"
placeholder="閫夋嫨鏃ユ湡"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -63,13 +64,6 @@
:picker-options="pickerOptions"
style="width: 100%"
></el-date-picker>
- <!-- <el-checkbox
- v-model="foreverChecked"
- @change="forever"
- class="check-css"
- >姘镐箙鏈夋晥</el-checkbox
- > -->
- <!-- <el-radio v-model="foreverChecked" label="1">澶囬�夐」</el-radio> -->
</el-col>
<el-col :span="2" class="text-center pick-time">
<span>-</span>
@@ -78,6 +72,7 @@
<el-date-picker
size="small"
class="end-time-pick"
+ popper-class="popper-add"
type="datetime"
:placeholder="foreverChecked ? '姘镐箙鏈夋晥' : '閫夋嫨鏃ユ湡'"
:disabled="foreverChecked"
@@ -164,16 +159,6 @@
</el-form-item>
</el-col>
</el-row>
- <!-- <el-row>
- <el-col :span="7" :offset="1">
- <el-form-item label="鏄惁鍚屾" label-width="80px" style="width:100%;text-align:left" required>
- <el-radio-group v-model="form.isSync" class>
- <el-radio label="1">鏄�</el-radio>
- <el-radio label="0">鍚�</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- </el-row>-->
<el-row class="footer">
<el-button
type="info"
@@ -228,9 +213,9 @@
},
},
rules: {
- tableName: [{ required: true, message: "搴曞簱鍚嶇О涓嶈兘涓虹┖" }],
+ tableName: [{ required: true, message: "搴曞簱鍚嶇О涓嶈兘涓虹┖"}],
tableType: [{ required: true, message: "搴曞簱绫诲瀷涓嶈兘涓虹┖" }],
- bwType: [{ required: true, message: "榛戠櫧鍚嶅崟蹇呴��" }],
+ bwType: [{ required: true, message: "榛戠櫧鍚嶅崟蹇呴��"}],
startTime: [
{ required: !this.foreverChecked, message: "璇烽�夋嫨璧峰鏃堕棿" },
],
@@ -305,7 +290,6 @@
// id涓嶄负绌猴紝淇敼搴曞簱
this.$refs[formName].validate(async (valid) => {
if (valid) {
- // const { ...json } = this.form
let res = await updateBase({
analyServerId: this.form.analyServerId,
tableName: this.form.tableName,
@@ -390,11 +374,7 @@
init() {
if (Object.keys(this.baseObject).length > 3) {
this.form = this.baseObject;
- if (!this.form.endTime) {
- this.foreverChecked = true;
- } else {
- this.foreverChecked = false;
- }
+ this.foreverChecked = !this.form.endTime
} else {
this.$refs.baseForm.resetFields();
}
@@ -414,21 +394,15 @@
return new Date(dateArray[0], dateArray[1] - 1, dateArray[2]);
},
isEmpty(str) {
- if (!str || str === undefined || str === null) {
- return true;
- } else {
- return false;
- }
+ return !str || str === undefined || str === null
},
dateCompare(dateString, compareDateString) {
// dateString:褰撳墠鏃堕棿
// compareDateString:闇�瑕佹瘮杈冪殑鏃堕棿
if (this.isEmpty(dateString)) {
- // alert('dateString涓嶈兘涓虹┖')
return;
}
if (this.isEmpty(compareDateString)) {
- // alert('compareDateString涓嶈兘涓虹┖')
return 1;
}
var dateTime = this.dateParse(dateString).getTime();
@@ -455,6 +429,58 @@
};
</script>
<style lang="scss">
+.el-date-picker.el-popper.popper-add {
+ border-radius: 8px;
+ .el-input--small .el-input__inner {
+ border: 1px solid #d4d5d8;
+ border-radius: 16px;
+ }
+ .el-date-range-picker__time-header {
+ border-bottom: none;
+ }
+ .el-picker-panel__footer {
+ border-top: none;
+ text-align: center;
+ padding-bottom: 10px;
+ border-radius: inherit;
+ }
+ .el-date-range-picker .el-picker-panel__content {
+ margin: 0;
+ padding: 5px 15px;
+ }
+ .el-date-picker__time-header {
+ border-bottom: none;
+ }
+ .el-date-picker__header {
+ margin-bottom: 0;
+ }
+ .el-picker-panel__content {
+ margin-top: 0;
+ }
+ .el-button--text {
+ color: #999999;
+ background: #fff;
+ padding: 9px 37px;
+ font-size: 14px;
+ border: 1px solid #999999;
+ border-radius: 18px;
+ }
+ .el-date-table td.start-date span,
+ .el-date-table td.end-date span {
+ background-color: var(--colorCard);
+ }
+ .el-date-table td.in-range div {
+ background-color: var(--colorCard) 17;
+ }
+ .el-button--default {
+ background: var(--colorCard);
+ padding: 9px 37px;
+ color: #fff;
+ border: 1px solidvar(--colorCard);
+ border-radius: 18px;
+ font-size: 14px;
+ }
+}
.add-base-c {
background: #ffffff;
border-radius: 24px;
@@ -482,6 +508,7 @@
}
.add-base-form {
padding: 30px 20px;
+
.el-form-item__label {
color: #999999;
}
@@ -500,7 +527,7 @@
background: var(--colorCard) !important;
padding: 9px 37px;
color: #fff;
- border: 1px solidvar(--colorCard) !important;
+ border: 1px solid var(--colorCard) !important;
border-radius: 18px;
font-size: 14px;
width: 150px;
@@ -518,7 +545,6 @@
}
.end-time-pick.is-disabled .el-input__inner {
background-color: #fff;
- // border-color: #dfe4ed;
cursor: not-allowed;
}
.el-form-item__content {
@@ -534,9 +560,6 @@
.end-time-pick.is-disabled .el-input__inner::placeholder {
color: #606266;
}
- // .el-date-editor .el-input__inner {
- // text-align: center;
- // }
.el-select-dropdown__item.selected {
color: var(--colorCard);
}
@@ -553,8 +576,8 @@
}
.el-select-dropdown {
border-radius: 8px;
- box-shadow: 0px 0px 8px rgb(0 0 0 / 16%); left: 0px !important;
-
+ box-shadow: 0px 0px 8px rgb(0 0 0 / 16%);
+ left: 0px !important;
}
.el-popper[x-placement^="bottom"] .popper__arrow {
top: -7px;
@@ -578,12 +601,12 @@
}
.el-form-item__error {
color: #fe6d68;
- padding-top: 3px;
+ padding-top: 5px;
left: 15px;
}
.start-time-pick {
.el-form-item__error {
- top: 36px;
+ top: 34px;
left: 105px;
}
}
@@ -600,10 +623,6 @@
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
-// .el-radio__input.is-checked .el-radio__inner {
-// border-color: #3d68e1;
-// background: #3d68e1;
-// }
.save {
background: var(--colorCard);
border-radius: 2px;
--
Gitblit v1.8.0