Merge branch 'master' of http://39.101.69.29:3000/sunzehao/cesium_three

src/api/index.js

@@ -10,7 +10,15 @@ export function getTempData(data) {
     });
 }
 
-//获取百度天气数据
+//获取城市名称/百度天气数据
+export function getCityName(data) {
+    return request({
+      baseURL: import.meta.env.VITE_APP_BD_API,
+      url: `/weather/inchina/cityname`,
+      params: data,
+      method: "get",
+    });
+}
 export function getBaiduTempData(data) {
     return request({
       baseURL: import.meta.env.VITE_APP_BD_API,

src/assets/main.less

@@ -138,26 +138,122 @@ a,
     }
 }
 .el-popper{
-    .el-date-picker{
+    .el-date-range-picker{
         .el-picker-panel__body-wrapper{
             .el-picker-panel__body{
                 background: rgb(35, 67, 73) !important;
-                .el-date-picker__header{
-                    .el-date-picker__prev-btn, .el-date-picker__next-btn{
-                        .d-arrow-left, .d-arrow-right{
-                            color: #fff;
-                        }
-                    }
-                    .el-date-picker__header-label{
-                        color: #fff;
-                    }
-                }
                 .el-picker-panel__content{
                     .el-date-table-cell__text{
                         color: #fff;
                     }
+                    .el-date-range-picker__header{
+                      .el-picker-panel__icon-btn{
+                          color: #fff !important;
+                          .el-icon{
+                            fill: #fff !important;
+                          }
+                          .d-arrow-left, .d-arrow-right{
+                              color: #fff !important;
+                          }
+                      }
+                      .el-date-picker__header-label, .el-date-range-picker__header-label{
+                          color: #fff !important;
+                      }
+                    }
+                    .el-date-table{
+                      tbody{
+                        tr{
+                          th{
+                            color: #fff !important;
+                          }
+                          .in-range .el-date-table-cell{
+                            background: #22626a !important;
+                          }
+                          .start-date .el-date-table-cell__text{
+                            background: #2fb0c9 !important;
+                          }
+                          .end-date .el-date-table-cell .el-date-table-cell__text{
+                            background: #2fb0c9 !important;
+                          }
+                        }
+                      }
+                    }
                 }
             }
         }
     }
-}
+    .el-date-picker{
+      .el-picker-panel__body-wrapper{
+        .el-picker-panel__body{
+          background: rgb(35, 67, 73) !important;
+          .el-date-picker__header{
+            .el-date-picker__header-label{
+              color: #fff !important;
+            }
+            .el-date-picker__prev-btn, .el-date-picker__next-btn {
+              .d-arrow-left, .d-arrow-right{
+                  color: #fff !important;
+              }
+              .el-picker-panel__icon-btn{
+                color: #fff !important;
+              }
+            }
+          }
+          .el-picker-panel__content{
+                .el-date-table-cell__text{
+                    color: #fff;
+                }
+                .el-date-range-picker__header{
+                  .el-picker-panel__icon-btn{
+                      color: #fff !important;
+                      .el-icon{
+                        fill: #fff !important;
+                      }
+                      .d-arrow-left, .d-arrow-right{
+                          color: #fff !important;
+                      }
+                  }
+                  .el-date-picker__header-label, .el-date-range-picker__header-label{
+                      color: #fff !important;
+                  }
+                }
+                .el-date-table{
+                    tbody{
+                      tr{
+                        th{
+                          color: #fff !important;
+                        }
+                        td{
+                          .in-range .el-date-table-cell{
+                            background: #22626a !important;
+                          }
+                          .start-date .el-date-table-cell__text{
+                            color: #2fb0c9 !important;
+                          }
+                        }
+                        
+                      }
+                    }
+                  }
+                .el-date-table td.current:not(.disabled) .el-date-table-cell__text{
+                  background: #22626a !important;
+                }
+            }
+        }
+        
+      }
+    }
+}
+
+
+.el-date-editor{
+  .el-range-input, .el-range-separator{
+    color: #fff !important;
+  }
+}
+.el-input__wrapper{
+    background: transparent !important;
+    .el-input__inner{
+      color: #fff;
+    }
+  }