Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

guanqb

2022-12-08 2fbf1ed5c3b5aadabd459e08901e8fdf706b5a3f

Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

 src/styles/media/index.scss

@@ -40,7 +40,6 @@
                    }
                }

                .main-containter {

                    .main-content {
                        top: countSizeVh(60);
@@ -241,7 +240,6 @@
                    .main-content.spread {
                        width: countSizeVw(400, 1920);
                    }
                }

                .flexible-btn {
                    padding: 0 countSizeVw(2, 1920);
@@ -254,8 +252,6 @@

                .flexible-btn.spread {
                    left: countSizeVw(400, 1920);
                }
            }
        }

        // 地图，控制按钮
@@ -352,6 +348,9 @@
            bottom: countSizeVh(154);
        }
    }
        }

    }

}

@@ -359,7 +358,7 @@

    html,
    body {
        font-size: 1.44vh !important;
        font-size: countSizeVh(16) !important;

        #app {
            width: 100vw;

 src/styles/scssFile.scss

@@ -14,7 +14,8 @@

$sub-tab-on-border-color: rgb(0, 188, 212);

$menu-tab-bg-color: rgba(19, 41, 168, .8);

$menu-tab-bg-color: $bg-one-color;

$menu-tab-shadow: rgba(144, 202, 249, 0.8);