From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Thu, 25 Aug 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/newHome/index.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/views/newHome/index.vue b/src/views/newHome/index.vue
index d508581..aeddaa1 100644
--- a/src/views/newHome/index.vue
+++ b/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;
--
Gitblit v1.9.2