diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue index 454f83f0..ec5d2c6d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue @@ -4,13 +4,15 @@
- + {{ title }} - +
+ +
@@ -108,8 +110,7 @@ export default { padding-top: 3px; align-items: center; justify-content: space-between; - background: url("~@screen/images/title/box-title.png") no-repeat; - background-size: 100% 100%; + background: linear-gradient(90deg, #267494 0%, rgba(38, 116, 148, 0) 100%); font-size: 19px; font-family: PingFang SC, PingFang SC; font-weight: 500; @@ -117,9 +118,9 @@ export default { .title-icon { position: absolute; - top: 0; - width: 258px; - height: 5px; + top: -1px; + left: -1px; + height: 6px; } .icon-close { @@ -138,17 +139,12 @@ export default { .dialog-content { padding: 10px 20px 20px 20px; max-height: 96vh; + } - .icon-content { - display: flex; - - img { - display: inline-block; - // width: 23px; - // height: 21px; - margin-right: 10px; - } - } + .bottom-right { + position: absolute; + right: 0; + bottom: 0; } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue index 59f1c70a..b1b54877 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue @@ -3,7 +3,7 @@ - + @@ -72,6 +72,12 @@ export default { gridTemplateColumns: `repeat(${this.column}, 1fr)`, } }, + getBindData(item) { + return { + placeholder: "请输入", + ...item.options + } + }, getComponent(type) { return `El${type.replace(/^[a-z]/, word => word.toUpperCase())}` } @@ -100,13 +106,13 @@ export default { &:first-child { .el-form-item__label-wrap { - padding-top: 9px; + // padding-top: 9px; } } .el-form-item__label-wrap { width: fit-content; - align-self: start; + // align-self: start; .el-form-item__label { height: 22px; diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/dialog/icon-close.png b/ruoyi-ui/src/views/JiHeExpressway/images/dialog/icon-close.png deleted file mode 100644 index 666c4d0b..00000000 Binary files a/ruoyi-ui/src/views/JiHeExpressway/images/dialog/icon-close.png and /dev/null differ diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/dialog/icon-close.svg b/ruoyi-ui/src/views/JiHeExpressway/images/dialog/icon-close.svg new file mode 100644 index 00000000..ccc92b57 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/dialog/icon-close.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/dialog/right-bottom.svg b/ruoyi-ui/src/views/JiHeExpressway/images/dialog/right-bottom.svg new file mode 100644 index 00000000..05beeab2 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/dialog/right-bottom.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/dialog/title-icon.svg b/ruoyi-ui/src/views/JiHeExpressway/images/dialog/title-icon.svg new file mode 100644 index 00000000..c93c4dbd --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/dialog/title-icon.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable copy.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable copy.vue new file mode 100644 index 00000000..71f7ba92 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable copy.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue index 71f7ba92..f000d588 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue @@ -2,18 +2,35 @@
- +
+
+ 甘易玫 + 13011600555 +
+
+ +
+
+

白天值班:

+
+

甘易玫

+
+
+
+

晚上值班:

+
+

甘易玫

+
+
+
+
+ +
@@ -26,18 +43,15 @@