conflict

Your Name

2022-08-25 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6

 src/views/newHome/index.vue

@@ -21,7 +21,7 @@
        <div class="leftCont"></div>
        <div class="topCont">
            <div class="topInfo">
                <div class="topTit">新疆国泰新华<br />安全风险预警监测系统</div>
                <div class="topTit">新疆国泰新华<br />安全风险预警监测系统（试运行）</div>
                <div class="topTime">
                    <div class="time">
                        {{ time }}
@@ -814,7 +814,6 @@

            .topTit {
                font-size: 44px;
                font-family: 'PingFang SC';
                font-weight: bolder;
                text-align: left;
                color: #fff;