diff --git a/src/assets/images/iconClearWhere.png b/src/assets/images/iconClearWhere.png new file mode 100644 index 0000000..8407365 Binary files /dev/null and b/src/assets/images/iconClearWhere.png differ diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index aff8136..dc3e409 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -432,7 +432,7 @@ h6 { } .my-confirm-btn { - width: 100px; + min-width: 100px; height: 34px; border-radius: 4px 4px 4px 4px; background: #1a75e6; @@ -1058,7 +1058,7 @@ h6 { font-weight: 700; font-size: 18px; color: #000000; - line-height: 30px !important; + line-height: 30px !important; } .my_dialog .el-dialog__headerbtn { diff --git a/src/views/index.vue b/src/views/index.vue index 784cc8a..f92f0c9 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,67 +1,70 @@ \ No newline at end of file diff --git a/src/views/mediaTool/index.vue b/src/views/mediaTool/index.vue new file mode 100644 index 0000000..28d676f --- /dev/null +++ b/src/views/mediaTool/index.vue @@ -0,0 +1,318 @@ + + + + \ No newline at end of file diff --git a/src/views/outdoorMedia/index.vue b/src/views/outdoorMedia/index.vue index ef1cc8e..aca6c4f 100644 --- a/src/views/outdoorMedia/index.vue +++ b/src/views/outdoorMedia/index.vue @@ -102,10 +102,10 @@ 清空所选媒体 - + + :height="unfoldFlag ? 'calc(100vh - 372px)' : 'calc(100vh - 338px)'">